force UTF8 for json serialization

README.md

@@ -4,32 +4,30 @@ MuWire is an easy to use file-sharing program which offers anonymity using [I2P
 
 It is inspired by the LimeWire Gnutella client and developped by a former LimeWire developer.
 
-The current stable release - 0.4.6 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.1.5 is avaiable for download at http://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 
 You need JRE 8 or newer.  After installing that and setting up the appropriate paths, just type
 
 ```
-./gradlew clean assemble 
+./gradlew assemble 
 ```
 
 If you want to run the unit tests, type
 ```
-./gradlew clean build
+./gradlew build
 ```
 
 Some of the UI tests will fail because they haven't been written yet :-/
 
 ### Running
 
-After you build the application, look inside `gui/build/distributions`.  Untar/unzip one of the `shadow` files and then run the jar contained inside by typing `java -jar MuWire-x.y.z.jar` in a terminal or command prompt.  
+You need to have an I2P router up and running on the same machine.  After you build the application, look inside "gui/build/distributions".  Untar/unzip one of the "shadow" files and then run the jar contained inside by typing "java -jar MuWire-x.y.z.jar" in a terminal or command prompt.  If you use a custom I2CP host and port, create a file $HOME/.MuWire/i2p.properties and put "i2cp.tcp.host=<host>" and "i2cp.tcp.post=<port>" in there.
 
-If you have an I2P router running on the same machine that is all you need to do.  If you use a custom I2CP host and port, create a file `i2p.properties` and put `i2cp.tcp.host=<host>` and `i2cp.tcp.port=<port>` in there.  On Windows that file should go into `%HOME%\AppData\Roaming\MuWire`, on Mac into `$HOME/Library/Application Support/MuWire` and on Linux `$HOME/.MuWire`
+The first time you run MuWire it will ask you to select a nickname.  This nickname will be displayed with search results, so that others can verify the file was shared by you.  It is best to leave MuWire running all the time, just like I2P.
 
-If you do not have an I2P router, pass the following switch to the Java process: `-DembeddedRouter=true`.  This will launch MuWire's embedded router.  Be aware that this causes startup to take a lot longer.
 
-### GPG Fingerprint
+### Known bugs and limitations
-471B 9FD4 5517 A5ED 101F  C57D A728 3207 2D52 5E41
 
-You can find the full key at https://keybase.io/zlatinb
+* Many UI features you would expect are not there yet

TODO.md

@@ -4,6 +4,10 @@ Not in any particular order yet
 
 ### Big Items
 
+##### Alternate Locations
+
+This helps peers discover new sources for a file while the download is in progress.  Also makes sharing of partial files possible.
+
 ##### Bloom Filters
 
 This reduces query traffic by not sending last hop queries to peers that definitely do not have the file
@@ -12,20 +16,27 @@ This reduces query traffic by not sending last hop queries to peers that definit
 
 This helps with scalability
 
+##### Trust List Sharing
+
+For helping users make better decisions whom to trust
+
 ##### Content Control Panel
 
 To allow every user to not route queries for content they do not like.  This is mostly GUI work, the backend part is simple
 
+##### Packaging With JRE, Embedded Router
+
+For ease of deployment for new users, and so that users do not need to run a separate I2P router
+
 ##### Web UI, REST Interface, etc.
 
 Basically any non-gui non-cli user interface
 
-##### Metadata editing and search
-
-To enable parsing of metadata from known file types and the user editing it or adding manual metadata
-
 ### Small Items
 
+* Detect if router is dead and show warning or exit
 * Wrapper of some kind for in-place upgrades
 * Download file sequentially
+* Unsharing of files
 * Multiple-selection download, Ctrl-A
+* Automatic sharing of new files in shared directories (more like medium item)

build.gradle

@@ -2,7 +2,7 @@ subprojects {
     apply plugin: 'groovy'
 
     dependencies {
-        compile 'net.i2p:i2p:0.9.41'
+        compile 'net.i2p:i2p:0.9.40'
         compile 'org.codehaus.groovy:groovy-all:2.4.15'
     }
 

cli/src/main/groovy/com/muwire/cli/Cli.groovy

@@ -4,7 +4,6 @@ import java.util.concurrent.CountDownLatch
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
-import com.muwire.core.UILoadedEvent
 import com.muwire.core.connection.ConnectionAttemptStatus
 import com.muwire.core.connection.ConnectionEvent
 import com.muwire.core.connection.DisconnectionEvent
@@ -35,7 +34,7 @@ class Cli {
         
         Core core 
         try {
-            core = new Core(props, home, "0.4.9")
+            core = new Core(props, home, "0.2.1")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"
@@ -73,7 +72,7 @@ class Cli {
         
         Timer timer = new Timer("status-printer", true)
         timer.schedule({
-            println String.valueOf(new Date()) + " Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
+            println "Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
         } as TimerTask, 60000, 60000)
         
         def latch = new CountDownLatch(1)
@@ -85,7 +84,6 @@ class Cli {
         core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
         core.startServices()
         
-        core.eventBus.publish(new UILoadedEvent())
         println "waiting for files to load"
         latch.await()
         // now we begin
@@ -119,11 +117,11 @@ class Cli {
         volatile int uploads
         public void onUploadEvent(UploadEvent e) {
             uploads++
-            println String.valueOf(new Date()) + " Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+            println "Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
         }
         public void onUploadFinishedEvent(UploadFinishedEvent e) {
             uploads--
-            println String.valueOf(new Date()) + " Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+            println "Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
         }
     }
     

cli/src/main/groovy/com/muwire/cli/CliDownloader.groovy

@@ -53,7 +53,7 @@ class CliDownloader {
 
         Core core
         try {
-            core = new Core(props, home, "0.4.9")
+            core = new Core(props, home, "0.2.1")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

cli/src/main/groovy/com/muwire/cli/FileList.groovy

@@ -1,23 +0,0 @@
-package com.muwire.cli
-
-import com.muwire.core.util.DataUtil
-
-import groovy.json.JsonSlurper
-import net.i2p.data.Base64
-
-class FileList {
-    public static void main(String [] args) {
-        if (args.length < 1) {
-            println "pass files.json as argument"
-            System.exit(1)
-        }
-
-        def slurper = new JsonSlurper()
-        File filesJson = new File(args[0])
-        filesJson.eachLine {
-            def json = slurper.parseText(it)
-            String name = DataUtil.readi18nString(Base64.decode(json.file))
-            println "$name,$json.length,$json.pieceSize,$json.infoHash"
-        }
-    }
-}

core/build.gradle

@@ -2,9 +2,8 @@ apply plugin : 'application'
 mainClassName = 'com.muwire.core.Core'
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
 dependencies {
-    compile 'net.i2p:router:0.9.41'
+    compile 'net.i2p.client:mstreaming:0.9.40'
-    compile 'net.i2p.client:mstreaming:0.9.41'
+    compile 'net.i2p.client:streaming:0.9.40'
-    compile 'net.i2p.client:streaming:0.9.41'
 
     testCompile 'org.junit.jupiter:junit-jupiter-api:5.4.2'    
     testCompile 'junit:junit:4.12'

core/src/main/groovy/com/muwire/core/Constants.groovy

@@ -9,5 +9,7 @@ class Constants {
     public static final int MAX_HEADER_SIZE = 0x1 << 14
     public static final int MAX_HEADERS = 16
     
-    public static final String SPLIT_PATTERN = "[\\*\\+\\-,\\.:;\\(\\)=_/\\\\\\!\\\"\\\'\\\$%\\|\\[\\]\\{\\}\\?]"
+    public static final float DOWNLOAD_SEQUENTIAL_RATIO = 0.8f
+    
+    public static final String SPLIT_PATTERN = "[\\.,_-]"
 }

core/src/main/groovy/com/muwire/core/Core.groovy

@@ -1,7 +1,6 @@
 package com.muwire.core
 
 import java.nio.charset.StandardCharsets
-import java.util.concurrent.atomic.AtomicBoolean
 
 import com.muwire.core.connection.ConnectionAcceptor
 import com.muwire.core.connection.ConnectionEstablisher
@@ -13,14 +12,10 @@ import com.muwire.core.connection.I2PConnector
 import com.muwire.core.connection.LeafConnectionManager
 import com.muwire.core.connection.UltrapeerConnectionManager
 import com.muwire.core.download.DownloadManager
-import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.download.UIDownloadCancelledEvent
 import com.muwire.core.download.UIDownloadEvent
-import com.muwire.core.download.UIDownloadPausedEvent
-import com.muwire.core.download.UIDownloadResumedEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
-import com.muwire.core.files.FileHashingEvent
 import com.muwire.core.files.FileHasher
 import com.muwire.core.files.FileLoadedEvent
 import com.muwire.core.files.FileManager
@@ -28,28 +23,19 @@ import com.muwire.core.files.FileSharedEvent
 import com.muwire.core.files.FileUnsharedEvent
 import com.muwire.core.files.HasherService
 import com.muwire.core.files.PersisterService
-import com.muwire.core.files.AllFilesLoadedEvent
-import com.muwire.core.files.DirectoryUnsharedEvent
-import com.muwire.core.files.DirectoryWatcher
 import com.muwire.core.hostcache.CacheClient
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.hostcache.HostDiscoveredEvent
-import com.muwire.core.mesh.MeshManager
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.ResultsSender
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.search.SearchManager
-import com.muwire.core.search.UIResultBatchEvent
 import com.muwire.core.trust.TrustEvent
 import com.muwire.core.trust.TrustService
-import com.muwire.core.trust.TrustSubscriber
-import com.muwire.core.trust.TrustSubscriptionEvent
 import com.muwire.core.update.UpdateClient
 import com.muwire.core.upload.UploadManager
 import com.muwire.core.util.MuWireLogManager
-import com.muwire.core.content.ContentControlEvent
-import com.muwire.core.content.ContentManager
 
 import groovy.util.logging.Log
 import net.i2p.I2PAppContext
@@ -58,7 +44,6 @@ import net.i2p.client.I2PSession
 import net.i2p.client.streaming.I2PSocketManager
 import net.i2p.client.streaming.I2PSocketManagerFactory
 import net.i2p.client.streaming.I2PSocketOptions
-import net.i2p.client.streaming.I2PSocketManager.DisconnectListener
 import net.i2p.crypto.DSAEngine
 import net.i2p.crypto.SigType
 import net.i2p.data.Destination
@@ -66,9 +51,6 @@ import net.i2p.data.PrivateKey
 import net.i2p.data.Signature
 import net.i2p.data.SigningPrivateKey
 
-import net.i2p.router.Router
-import net.i2p.router.RouterContext
-
 @Log
 public class Core {
     
@@ -79,7 +61,6 @@ public class Core {
     final MuWireSettings muOptions
     
     private final TrustService trustService
-    private final TrustSubscriber trustSubscriber
     private final PersisterService persisterService
     private final HostCache hostCache
     private final ConnectionManager connectionManager
@@ -89,18 +70,23 @@ public class Core {
     private final ConnectionEstablisher connectionEstablisher
     private final HasherService hasherService
     private final DownloadManager downloadManager
-    private final DirectoryWatcher directoryWatcher
-    final FileManager fileManager
-    final UploadManager uploadManager
-    final ContentManager contentManager
-
-    private final Router router
-
-    final AtomicBoolean shutdown = new AtomicBoolean()
         
     public Core(MuWireSettings props, File home, String myVersion) {
         this.home = home		
         this.muOptions = props
+        log.info "Initializing I2P context"
+        I2PAppContext.getGlobalContext().logManager()
+        I2PAppContext.getGlobalContext()._logManager = new MuWireLogManager()
+        
+		log.info("initializing I2P socket manager")
+		def i2pClient = new I2PClientFactory().createClient()
+		File keyDat = new File(home, "key.dat")
+		if (!keyDat.exists()) {
+			log.info("Creating new key.dat")
+			keyDat.withOutputStream { 
+				i2pClient.createDestination(it, Constants.SIG_TYPE)
+			}
+		}
 		
         i2pOptions = new Properties()
         def i2pOptionsFile = new File(home,"i2p.properties")
@@ -109,68 +95,28 @@ public class Core {
 
             if (!i2pOptions.containsKey("inbound.nickname"))
                 i2pOptions["inbound.nickname"] = "MuWire"
-                if (!i2pOptions.containsKey("outbound.nickname"))
+            if (!i2pOptions.containsKey("outbound.nickname"))
-                    i2pOptions["outbound.nickname"] = "MuWire"
+                i2pOptions["outbound.nickname"] = "MuWire"
         } else {
             i2pOptions["inbound.nickname"] = "MuWire"
             i2pOptions["outbound.nickname"] = "MuWire"
             i2pOptions["inbound.length"] = "3"
-            i2pOptions["inbound.quantity"] = "4"
+            i2pOptions["inbound.quantity"] = "2"
             i2pOptions["outbound.length"] = "3"
-            i2pOptions["outbound.quantity"] = "4"
+            i2pOptions["outbound.quantity"] = "2"
             i2pOptions["i2cp.tcp.host"] = "127.0.0.1"
             i2pOptions["i2cp.tcp.port"] = "7654"
-            Random r = new Random()
-            int port = r.nextInt(60000) + 4000
-            i2pOptions["i2np.ntcp.port"] = String.valueOf(port)
-            i2pOptions["i2np.udp.port"] = String.valueOf(port)
-            i2pOptionsFile.withOutputStream { i2pOptions.store(it, "") }
         }
         
-        if (!props.embeddedRouter) {
-            log.info "Initializing I2P context"
-            I2PAppContext.getGlobalContext().logManager()
-            I2PAppContext.getGlobalContext()._logManager = new MuWireLogManager()
-            router = null
-        } else {
-            log.info("launching embedded router")
-            Properties routerProps = new Properties()
-            routerProps.setProperty("i2p.dir.config", home.getAbsolutePath())
-            routerProps.setProperty("router.excludePeerCaps", "KLM")
-            routerProps.setProperty("i2np.inboundKBytesPerSecond", String.valueOf(props.inBw))
-            routerProps.setProperty("i2np.outboundKBytesPerSecond", String.valueOf(props.outBw))
-            routerProps.setProperty("i2cp.disableInterface", "true")
-            routerProps.setProperty("i2np.ntcp.port", i2pOptions["i2np.ntcp.port"])
-            routerProps.setProperty("i2np.udp.port", i2pOptions["i2np.udp.port"])
-            routerProps.setProperty("i2np.udp.internalPort", i2pOptions["i2np.udp.port"])
-            router = new Router(routerProps)
-            router.getContext().setLogManager(new MuWireLogManager())
-            router.runRouter()
-            while(!router.isRunning())
-                Thread.sleep(100)
-        }
-
-        log.info("initializing I2P socket manager")
-        def i2pClient = new I2PClientFactory().createClient()
-        File keyDat = new File(home, "key.dat")
-        if (!keyDat.exists()) {
-            log.info("Creating new key.dat")
-            keyDat.withOutputStream {
-                i2pClient.createDestination(it, Constants.SIG_TYPE)
-            }
-        }
-
-
         // options like tunnel length and quantity
-        I2PSession i2pSession
+		I2PSession i2pSession
-        I2PSocketManager socketManager
+		I2PSocketManager socketManager
-        keyDat.withInputStream {
+		keyDat.withInputStream {
-            socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
+			socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
-        }
+		}
-        socketManager.getDefaultOptions().setReadTimeout(60000)
+		socketManager.getDefaultOptions().setReadTimeout(60000)
-        socketManager.getDefaultOptions().setConnectTimeout(30000)
+		socketManager.getDefaultOptions().setConnectTimeout(30000)
-        socketManager.addDisconnectListener({eventBus.publish(new RouterDisconnectedEvent())} as DisconnectListener)
+		i2pSession = socketManager.getSession()
-        i2pSession = socketManager.getSession()
 		
         def destination = new Destination()
         def spk = new SigningPrivateKey(Constants.SIG_TYPE)
@@ -179,7 +125,7 @@ public class Core {
             def privateKey = new PrivateKey()
             privateKey.readBytes(it)
             spk.readBytes(it)
-        }
+		}
             
         def baos = new ByteArrayOutputStream()
         def daos = new DataOutputStream(baos)
@@ -197,112 +143,87 @@ public class Core {
         me = new Persona(new ByteArrayInputStream(baos.toByteArray()))
         log.info("Loaded myself as "+me.getHumanReadableName())
 
-        eventBus = new EventBus()
+		eventBus = new EventBus()
 		
-        log.info("initializing trust service")
+		log.info("initializing trust service")
-        File goodTrust = new File(home, "trusted")
+		File goodTrust = new File(home, "trusted")
-        File badTrust = new File(home, "distrusted")
+		File badTrust = new File(home, "distrusted")
-        trustService = new TrustService(goodTrust, badTrust, 5000)
+		trustService = new TrustService(goodTrust, badTrust, 5000)
-        eventBus.register(TrustEvent.class, trustService)
+		eventBus.register(TrustEvent.class, trustService)
 		
 		
-        log.info "initializing file manager"
+		log.info "initializing file manager"
-        fileManager = new FileManager(eventBus, props)
+		FileManager fileManager = new FileManager(eventBus, props)
-        eventBus.register(FileHashedEvent.class, fileManager)
+		eventBus.register(FileHashedEvent.class, fileManager)
-        eventBus.register(FileLoadedEvent.class, fileManager)
+		eventBus.register(FileLoadedEvent.class, fileManager)
-        eventBus.register(FileDownloadedEvent.class, fileManager)
+		eventBus.register(FileDownloadedEvent.class, fileManager)
-        eventBus.register(FileUnsharedEvent.class, fileManager)
+		eventBus.register(FileUnsharedEvent.class, fileManager)
-        eventBus.register(SearchEvent.class, fileManager)
+		eventBus.register(SearchEvent.class, fileManager)
-        eventBus.register(DirectoryUnsharedEvent.class, fileManager)
 		
-        log.info("initializing mesh manager")
+		log.info "initializing persistence service"
-        MeshManager meshManager = new MeshManager(fileManager, home, props)
+		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 15000, fileManager)
-        eventBus.register(SourceDiscoveredEvent.class, meshManager)
         
-        log.info "initializing persistence service"
+		log.info("initializing host cache")
-        persisterService = new PersisterService(new File(home, "files.json"), eventBus, 15000, fileManager)
+		File hostStorage = new File(home, "hosts.json")
-        eventBus.register(UILoadedEvent.class, persisterService)
-
-        log.info("initializing host cache")
-        File hostStorage = new File(home, "hosts.json")
         hostCache = new HostCache(trustService,hostStorage, 30000, props, i2pSession.getMyDestination())
-        eventBus.register(HostDiscoveredEvent.class, hostCache)
+		eventBus.register(HostDiscoveredEvent.class, hostCache)
-        eventBus.register(ConnectionEvent.class, hostCache)
+		eventBus.register(ConnectionEvent.class, hostCache)
 		
-        log.info("initializing connection manager")
+		log.info("initializing connection manager")
-        connectionManager = props.isLeaf() ?
+		connectionManager = props.isLeaf() ? 
-            new LeafConnectionManager(eventBus, me, 3, hostCache, props) :
+			new LeafConnectionManager(eventBus, me, 3, hostCache, props) : 
             new UltrapeerConnectionManager(eventBus, me, 512, 512, hostCache, trustService, props)
-        eventBus.register(TrustEvent.class, connectionManager)
+		eventBus.register(TrustEvent.class, connectionManager)
-        eventBus.register(ConnectionEvent.class, connectionManager)
+		eventBus.register(ConnectionEvent.class, connectionManager)
-        eventBus.register(DisconnectionEvent.class, connectionManager)
+		eventBus.register(DisconnectionEvent.class, connectionManager)
         eventBus.register(QueryEvent.class, connectionManager)
 		
-        log.info("initializing cache client")
+		log.info("initializing cache client")
-        cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
+		cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
         
         log.info("initializing update client")
-        updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props, fileManager, me)
+        updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props)
-        eventBus.register(FileDownloadedEvent.class, updateClient)
-        eventBus.register(UIResultBatchEvent.class, updateClient)
         
-        log.info("initializing connector")
+		log.info("initializing connector")
-        I2PConnector i2pConnector = new I2PConnector(socketManager)
+		I2PConnector i2pConnector = new I2PConnector(socketManager)
         
-        log.info "initializing results sender"
+		log.info "initializing results sender"
-        ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me)
+		ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me)
 		
-        log.info "initializing search manager"
+		log.info "initializing search manager"
-        SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
+		SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
-        eventBus.register(QueryEvent.class, searchManager)
+		eventBus.register(QueryEvent.class, searchManager)
-        eventBus.register(ResultsEvent.class, searchManager)
+		eventBus.register(ResultsEvent.class, searchManager)
 		
         log.info("initializing download manager")
-        downloadManager = new DownloadManager(eventBus, trustService, meshManager, props, i2pConnector, home, me)
+        downloadManager = new DownloadManager(eventBus, i2pConnector, home, me)
         eventBus.register(UIDownloadEvent.class, downloadManager)
         eventBus.register(UILoadedEvent.class, downloadManager)
         eventBus.register(FileDownloadedEvent.class, downloadManager)
         eventBus.register(UIDownloadCancelledEvent.class, downloadManager)
-        eventBus.register(SourceDiscoveredEvent.class, downloadManager)
-        eventBus.register(UIDownloadPausedEvent.class, downloadManager)
-        eventBus.register(UIDownloadResumedEvent.class, downloadManager)
         
         log.info("initializing upload manager")
-        uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager)
+        UploadManager uploadManager = new UploadManager(eventBus, fileManager)
         
         log.info("initializing connection establisher")
         connectionEstablisher = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
         
-        log.info("initializing acceptor")
+		log.info("initializing acceptor")
-        I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
+		I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
-        connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props,
+		connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props, 
             i2pAcceptor, hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
 		
-        log.info("initializing directory watcher")
-        directoryWatcher = new DirectoryWatcher(eventBus, fileManager)
-        eventBus.register(FileSharedEvent.class, directoryWatcher)
-        eventBus.register(AllFilesLoadedEvent.class, directoryWatcher)
-        eventBus.register(DirectoryUnsharedEvent.class, directoryWatcher)
         
         log.info("initializing hasher service")
         hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
         eventBus.register(FileSharedEvent.class, hasherService)
-
+	}
-        log.info("initializing trust subscriber")
-        trustSubscriber = new TrustSubscriber(eventBus, i2pConnector, props)
-        eventBus.register(UILoadedEvent.class, trustSubscriber)
-        eventBus.register(TrustSubscriptionEvent.class, trustSubscriber)
-        
-        log.info("initializing content manager")
-        contentManager = new ContentManager()
-        eventBus.register(ContentControlEvent.class, contentManager)
-        eventBus.register(QueryEvent.class, contentManager)
-    }
     
     public void startServices() {
         hasherService.start()
         trustService.start()
         trustService.waitForLoad()
+        persisterService.start()
         hostCache.start()
         connectionManager.start()
         cacheClient.start()
@@ -313,28 +234,14 @@ public class Core {
     }
     
     public void shutdown() {
-        if (!shutdown.compareAndSet(false, true)) {
-            log.info("already shutting down")
-            return
-        }
-        log.info("shutting down trust subscriber")
-        trustSubscriber.stop()
         log.info("shutting down download manageer")
         downloadManager.shutdown()
         log.info("shutting down connection acceeptor")
         connectionAcceptor.stop()
         log.info("shutting down connection establisher")
         connectionEstablisher.stop()
-        log.info("shutting down directory watcher")
-        directoryWatcher.stop()
-        log.info("shutting down cache client")
-        cacheClient.stop()
         log.info("shutting down connection manager")
         connectionManager.shutdown()
-        if (router != null) {
-            log.info("shutting down embedded router")
-            router.shutdown(0)
-        }
     }
 
     static main(args) {
@@ -361,7 +268,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.4.9")
+        Core core = new Core(props, home, "0.2.1")
         core.startServices()
         
         // ... at the end, sleep or execute script

core/src/main/groovy/com/muwire/core/Event.groovy

@@ -4,17 +4,17 @@ import java.util.concurrent.atomic.AtomicLong
 
 class Event {
 
-    private static final AtomicLong SEQ_NO = new AtomicLong();
+	private static final AtomicLong SEQ_NO = new AtomicLong();
-    final long seqNo
+	final long seqNo
-    final long timestamp
+	final long timestamp
 	
-    Event() {
+	Event() {
-        seqNo = SEQ_NO.getAndIncrement()
+		seqNo = SEQ_NO.getAndIncrement()
-        timestamp = System.currentTimeMillis()
+		timestamp = System.currentTimeMillis()
-    }
+	}
 	
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "seqNo $seqNo timestamp $timestamp"
+		"seqNo $seqNo timestamp $timestamp"
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/EventBus.groovy

@@ -11,46 +11,41 @@ import groovy.util.logging.Log
 @Log
 class EventBus {
 	
-    private Map handlers = new HashMap()
+	private Map handlers = new HashMap()
-    private final Executor executor = Executors.newSingleThreadExecutor {r ->
+	private final Executor executor = Executors.newSingleThreadExecutor {r ->
-        def rv = new Thread(r)
+		def rv = new Thread(r)
-        rv.setDaemon(true)
+		rv.setDaemon(true)
-        rv.setName("event-bus")
+		rv.setName("event-bus")
-        rv
+		rv
-    }
+	}
 
-    void publish(Event e) {
+	void publish(Event e) {
-        executor.execute({publishInternal(e)} as Runnable)
+		executor.execute({publishInternal(e)} as Runnable)
-    }
+	}
 	
-    private void publishInternal(Event e) {
+	private void publishInternal(Event e) {
-        log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
+		log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
-        def currentHandlers
+		def currentHandlers
-        final def clazz = e.getClass()
+		final def clazz = e.getClass()
-        synchronized(this) {
+		synchronized(this) {
-            currentHandlers = handlers.getOrDefault(clazz, [])
+			currentHandlers = handlers.getOrDefault(clazz, [])
-        }
+		}
-        currentHandlers.each {
+		currentHandlers.each {
             try {
                 it."on${clazz.getSimpleName()}"(e)
             } catch (Exception bad) {
                 log.log(Level.SEVERE, "exception dispatching event",bad)
             }
-        }
+		}
-    }
+	}
 	
-    synchronized void register(Class<? extends Event> eventType, def handler) {
+	synchronized void register(Class<? extends Event> eventType, def handler) {
-        log.info "Registering $handler for type $eventType"
+		log.info "Registering $handler for type $eventType"
-        def currentHandlers = handlers.get(eventType)
+		def currentHandlers = handlers.get(eventType)
-        if (currentHandlers == null) {
+		if (currentHandlers == null) {
-            currentHandlers = new CopyOnWriteArrayList()
+			currentHandlers = new CopyOnWriteArrayList()
-            handlers.put(eventType, currentHandlers)
+			handlers.put(eventType, currentHandlers)
-        }
+		}
-        currentHandlers.add handler
+		currentHandlers.add handler
-    }
+	}
-    
-    synchronized void unregister(Class<? extends Event> eventType, def handler) {
-        log.info("Unregistering $handler for type $eventType")
-        handlers[eventType]?.remove(handler)
-    }
 }

core/src/main/groovy/com/muwire/core/MuWireSettings.groovy

@@ -1,147 +1,73 @@
 package com.muwire.core
 
-import java.util.stream.Collectors
-
 import com.muwire.core.hostcache.CrawlerResponse
-import com.muwire.core.util.DataUtil
-
-import net.i2p.data.Base64
 
 class MuWireSettings {
 	
     final boolean isLeaf
     boolean allowUntrusted
-    boolean allowTrustLists
-    int trustListInterval
-    Set<Persona> trustSubscriptions
     int downloadRetryInterval
     int updateCheckInterval
-    boolean autoDownloadUpdate
-    String updateType
     String nickname
     File downloadLocation
+    String sharedFiles
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
-    Set<String> watchedDirectories
+    boolean watchSharedDirectories
-    float downloadSequentialRatio
-    int hostClearInterval
-    int meshExpiration
-    boolean embeddedRouter
-    int inBw, outBw
-    Set<String> watchedKeywords
-    Set<String> watchedRegexes
     
-    MuWireSettings() {
+	MuWireSettings() {
         this(new Properties())
     }
 	
-    MuWireSettings(Properties props) {
+	MuWireSettings(Properties props) {
-        isLeaf = Boolean.valueOf(props.get("leaf","false"))
+		isLeaf = Boolean.valueOf(props.get("leaf","false"))
-        allowUntrusted = Boolean.valueOf(props.getProperty("allowUntrusted","true"))
+		allowUntrusted = Boolean.valueOf(props.get("allowUntrusted","true"))
-        allowTrustLists = Boolean.valueOf(props.getProperty("allowTrustLists","true"))
+		crawlerResponse = CrawlerResponse.valueOf(props.get("crawlerResponse","REGISTERED"))
-        trustListInterval = Integer.valueOf(props.getProperty("trustListInterval","1"))
-        crawlerResponse = CrawlerResponse.valueOf(props.get("crawlerResponse","REGISTERED"))
         nickname = props.getProperty("nickname","MuWireUser")
         downloadLocation = new File((String)props.getProperty("downloadLocation", 
             System.getProperty("user.home")))
-        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","1"))
+        sharedFiles = props.getProperty("sharedFiles")
-        updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","24"))
+        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","15"))
-        autoDownloadUpdate = Boolean.parseBoolean(props.getProperty("autoDownloadUpdate","true"))
+        updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","36"))
-        updateType = props.getProperty("updateType","jar")
         shareDownloadedFiles = Boolean.parseBoolean(props.getProperty("shareDownloadedFiles","true"))
-        downloadSequentialRatio = Float.valueOf(props.getProperty("downloadSequentialRatio","0.8"))
+        watchSharedDirectories = Boolean.parseBoolean(props.getProperty("watchSharedDirectories","true"))
-        hostClearInterval = Integer.valueOf(props.getProperty("hostClearInterval","60"))
+	}
-        meshExpiration = Integer.valueOf(props.getProperty("meshExpiration","60"))
-        embeddedRouter = Boolean.valueOf(props.getProperty("embeddedRouter","false"))
-        inBw = Integer.valueOf(props.getProperty("inBw","256"))
-        outBw = Integer.valueOf(props.getProperty("outBw","128"))
-
-        watchedDirectories = readEncodedSet(props, "watchedDirectories")
-        watchedKeywords = readEncodedSet(props, "watchedKeywords")
-        watchedRegexes = readEncodedSet(props, "watchedRegexes")
-
-        trustSubscriptions = new HashSet<>()
-        if (props.containsKey("trustSubscriptions")) {
-            props.getProperty("trustSubscriptions").split(",").each {
-                trustSubscriptions.add(new Persona(new ByteArrayInputStream(Base64.decode(it))))
-            }
-        }
-        
-        
-    }
     
     void write(OutputStream out) throws IOException {
         Properties props = new Properties()
         props.setProperty("leaf", isLeaf.toString())
         props.setProperty("allowUntrusted", allowUntrusted.toString())
-        props.setProperty("allowTrustLists", String.valueOf(allowTrustLists))
-        props.setProperty("trustListInterval", String.valueOf(trustListInterval))
         props.setProperty("crawlerResponse", crawlerResponse.toString())
         props.setProperty("nickname", nickname)
         props.setProperty("downloadLocation", downloadLocation.getAbsolutePath())
         props.setProperty("downloadRetryInterval", String.valueOf(downloadRetryInterval))
         props.setProperty("updateCheckInterval", String.valueOf(updateCheckInterval))
-        props.setProperty("autoDownloadUpdate", String.valueOf(autoDownloadUpdate))
-        props.setProperty("updateType",String.valueOf(updateType))
         props.setProperty("shareDownloadedFiles", String.valueOf(shareDownloadedFiles))
-        props.setProperty("downloadSequentialRatio", String.valueOf(downloadSequentialRatio))
+        props.setProperty("watchSharedDirectories", String.valueOf(watchSharedDirectories))
-        props.setProperty("hostClearInterval", String.valueOf(hostClearInterval))
+        if (sharedFiles != null)
-        props.setProperty("meshExpiration", String.valueOf(meshExpiration))
+            props.setProperty("sharedFiles", sharedFiles)
-        props.setProperty("embeddedRouter", String.valueOf(embeddedRouter))
-        props.setProperty("inBw", String.valueOf(inBw))
-        props.setProperty("outBw", String.valueOf(outBw))
-
-        writeEncodedSet(watchedDirectories, "watchedDirectories", props)
-        writeEncodedSet(watchedKeywords, "watchedKeywords", props)
-        writeEncodedSet(watchedRegexes, "watchedRegexes", props)
-
-        if (!trustSubscriptions.isEmpty()) {
-            String encoded = trustSubscriptions.stream().
-                map({it.toBase64()}).
-                collect(Collectors.joining(","))
-            props.setProperty("trustSubscriptions", encoded)
-        }
-
         props.store(out, "")
     }
 
-    private static Set<String> readEncodedSet(Properties props, String property) {
+	boolean isLeaf() {
-        Set<String> rv = new HashSet<>()
+		isLeaf
-        if (props.containsKey(property)) {
+	}
-            String[] encoded = props.getProperty(property).split(",")
-            encoded.each { rv << DataUtil.readi18nString(Base64.decode(it)) }
-        }
-        rv
-    }
 	
-    private static void writeEncodedSet(Set<String> set, String property, Properties props) {
+	boolean allowUntrusted() {
-        if (set.isEmpty())
+		allowUntrusted
-            return
+	} 
-        String encoded = set.stream().
-            map({Base64.encode(DataUtil.encodei18nString(it))}).
-            collect(Collectors.joining(","))
-        props.setProperty(property, encoded)
-    }
 	
-    boolean isLeaf() {
+	void setAllowUntrusted(boolean allowUntrusted) {
-        isLeaf
+		this.allowUntrusted = allowUntrusted
-    }
+	}
 	
-    boolean allowUntrusted() {
+	CrawlerResponse getCrawlerResponse() {
-        allowUntrusted
+		crawlerResponse
-    }
+	}
 	
-    void setAllowUntrusted(boolean allowUntrusted) {
+	void setCrawlerResponse(CrawlerResponse crawlerResponse) {
-        this.allowUntrusted = allowUntrusted
+		this.crawlerResponse = crawlerResponse
-    }
+	}
-
-    CrawlerResponse getCrawlerResponse() {
-        crawlerResponse
-    }
-
-    void setCrawlerResponse(CrawlerResponse crawlerResponse) {
-        this.crawlerResponse = crawlerResponse
-    }
     
     String getNickname() {
         nickname

core/src/main/groovy/com/muwire/core/Persona.groovy

@@ -82,13 +82,4 @@ public class Persona {
         Persona other = (Persona)o
         name.equals(other.name) && destination.equals(other.destination)
     }
-
-    public static void main(String []args) {
-        if (args.length != 1) {
-            println "This utility decodes a bas64-encoded persona"
-            System.exit(1)
-        }
-        Persona p = new Persona(new ByteArrayInputStream(Base64.decode(args[0])))
-        println p.getHumanReadableName()
-    }
 }

core/src/main/groovy/com/muwire/core/RouterDisconnectedEvent.groovy

@@ -1,4 +0,0 @@
-package com.muwire.core
-
-class RouterDisconnectedEvent extends Event {
-}

core/src/main/groovy/com/muwire/core/Service.groovy

@@ -2,12 +2,12 @@ package com.muwire.core
 
 abstract class Service {
 
-    volatile boolean loaded
+	volatile boolean loaded
 	
-    abstract void load()
+	abstract void load()
 	
-    void waitForLoad() {
+	void waitForLoad() {
-        while (!loaded)
+		while (!loaded)
-            Thread.sleep(10)
+			Thread.sleep(10)
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/connection/Connection.groovy

@@ -22,107 +22,103 @@ import net.i2p.data.Destination
 @Log
 abstract class Connection implements Closeable {
 
-    private static final int SEARCHES = 10
+	final EventBus eventBus
-    private static final long INTERVAL = 1000
+	final Endpoint endpoint
-
+	final boolean incoming
-    final EventBus eventBus
+	final HostCache hostCache
-    final Endpoint endpoint
-    final boolean incoming
-    final HostCache hostCache
     final TrustService trustService
     final MuWireSettings settings
     	
-    private final AtomicBoolean running = new AtomicBoolean()
+	private final AtomicBoolean running = new AtomicBoolean()
-    private final BlockingQueue messages = new LinkedBlockingQueue()
+	private final BlockingQueue messages = new LinkedBlockingQueue()
-    private final Thread reader, writer
+	private final Thread reader, writer
-    private final LinkedList<Long> searchTimestamps = new LinkedList<>()
 	
-    protected final String name
+	protected final String name
 	
-    long lastPingSentTime, lastPongReceivedTime
+	long lastPingSentTime, lastPongReceivedTime
 	
-    Connection(EventBus eventBus, Endpoint endpoint, boolean incoming,
+	Connection(EventBus eventBus, Endpoint endpoint, boolean incoming, 
         HostCache hostCache, TrustService trustService, MuWireSettings settings) {
-        this.eventBus = eventBus
+		this.eventBus = eventBus
-        this.incoming = incoming
+		this.incoming = incoming
-        this.endpoint = endpoint
+		this.endpoint = endpoint
-        this.hostCache = hostCache
+		this.hostCache = hostCache
         this.trustService = trustService
         this.settings = settings
 		
-        this.name = endpoint.destination.toBase32().substring(0,8)
+		this.name = endpoint.destination.toBase32().substring(0,8)
 		
-        this.reader = new Thread({readLoop()} as Runnable)
+		this.reader = new Thread({readLoop()} as Runnable)
-        this.reader.setName("reader-$name")
+		this.reader.setName("reader-$name")
-        this.reader.setDaemon(true)
+		this.reader.setDaemon(true)
 		
-        this.writer = new Thread({writeLoop()} as Runnable)
+		this.writer = new Thread({writeLoop()} as Runnable)
-        this.writer.setName("writer-$name")
+		this.writer.setName("writer-$name")
-        this.writer.setDaemon(true)
+		this.writer.setDaemon(true)
-    }
+	}
 	
-    /**
+	/**
-     * starts the connection threads
+	 * starts the connection threads
-     */
+	 */
-    void start() {
+	void start() {
-        if (!running.compareAndSet(false, true)) {
+		if (!running.compareAndSet(false, true)) {
-            log.log(Level.WARNING,"$name already running", new Exception())
+			log.log(Level.WARNING,"$name already running", new Exception())
-            return
+			return
-        }
+		}
-        reader.start()
+		reader.start()
-        writer.start()
+		writer.start()
-    }
+	}
 	
-    @Override
+	@Override
-    public void close() {
+	public void close() {
-        if (!running.compareAndSet(true, false)) {
+		if (!running.compareAndSet(true, false)) {
-            log.log(Level.WARNING, "$name already closed", new Exception() )
+			log.log(Level.WARNING, "$name already closed", new Exception() )
-            return
+			return
-        }
+		}
         log.info("closing $name")
-        reader.interrupt()
+		reader.interrupt()
-        writer.interrupt()
+		writer.interrupt()
-        endpoint.close()
+		endpoint.close()
-        eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
+		eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
-    }
+	}
 	
-    protected void readLoop() {
+	protected void readLoop() {
-        try {
+		try {
-            while(running.get()) {
+			while(running.get()) {
-                read()
+				read()
-            }
+			}
-        } catch (SocketTimeoutException e) {
+		} catch (SocketTimeoutException e) {
         } catch (Exception e) {
             log.log(Level.WARNING,"unhandled exception in reader",e)
         } finally {
             close()
         }
-    }
+	}
 	
-    protected abstract void read()
+	protected abstract void read()
 	
-    protected void writeLoop() {
+	protected void writeLoop() {
-        try {
+		try {
-            while(running.get()) {
+			while(running.get()) {
-                def message = messages.take()
+				def message = messages.take()
-                write(message)
+				write(message)
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
             log.log(Level.WARNING, "unhandled exception in writer",e)
         } finally {
             close()
         }
-    }
+	}
 	
-    protected abstract void write(def message);
+	protected abstract void write(def message);
 	
-    void sendPing() {
+	void sendPing() {
-        def ping = [:]
+		def ping = [:]
-        ping.type = "Ping"
+		ping.type = "Ping"
-        ping.version = 1
+		ping.version = 1
-        messages.put(ping)
+		messages.put(ping)
-        lastPingSentTime = System.currentTimeMillis()
+		lastPingSentTime = System.currentTimeMillis()
-    }
+	}
     
     void sendQuery(QueryEvent e) {
         def query = [:]
@@ -140,45 +136,27 @@ abstract class Connection implements Closeable {
         messages.put(query)
     }
 	
-    protected void handlePing() {
+	protected void handlePing() {
-        log.fine("$name received ping")
+		log.fine("$name received ping")
-        def pong = [:]
+		def pong = [:]
-        pong.type = "Pong"
+		pong.type = "Pong"
-        pong.version = 1
+		pong.version = 1
-        pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
+		pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
-        messages.put(pong)
+		messages.put(pong)
-    }
+	}
 	
-    protected void handlePong(def pong) {
+	protected void handlePong(def pong) {
-        log.fine("$name received pong")
+		log.fine("$name received pong")
-        lastPongReceivedTime = System.currentTimeMillis()
+		lastPongReceivedTime = System.currentTimeMillis()
-        if (pong.pongs == null)
+		if (pong.pongs == null)
-            throw new Exception("Pong doesn't have pongs")
+			throw new Exception("Pong doesn't have pongs")
-        pong.pongs.each {
+		pong.pongs.each { 
-            def dest = new Destination(it)
+			def dest = new Destination(it)
-            eventBus.publish(new HostDiscoveredEvent(destination: dest))
+			eventBus.publish(new HostDiscoveredEvent(destination: dest))
-        }
+		}
-    }
+	}
-
-    private boolean throttleSearch() {
-        final long now = System.currentTimeMillis()
-        if (searchTimestamps.size() < SEARCHES) {
-            searchTimestamps.addLast(now)
-            return false
-        }
-        Long oldest = searchTimestamps.getFirst()
-        if (now - oldest.longValue() < INTERVAL)
-            return true
-        searchTimestamps.addLast(now)
-        searchTimestamps.removeFirst()
-        false
-    }
     
     protected void handleSearch(def search) {
-        if (throttleSearch()) {
-            log.info("dropping excessive search")
-            return
-        }
         UUID uuid = UUID.fromString(search.uuid)
         byte [] infohash = null
         if (search.infohash != null) {

core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy

@@ -14,12 +14,9 @@ import com.muwire.core.hostcache.HostCache
 import com.muwire.core.trust.TrustLevel
 import com.muwire.core.trust.TrustService
 import com.muwire.core.upload.UploadManager
-import com.muwire.core.util.DataUtil
 import com.muwire.core.search.InvalidSearchResultException
 import com.muwire.core.search.ResultsParser
 import com.muwire.core.search.SearchManager
-import com.muwire.core.search.UIResultBatchEvent
-import com.muwire.core.search.UIResultEvent
 import com.muwire.core.search.UnexpectedResultsException
 
 import groovy.json.JsonOutput
@@ -29,128 +26,125 @@ import groovy.util.logging.Log
 @Log
 class ConnectionAcceptor {
 
-    final EventBus eventBus
+	final EventBus eventBus
-    final UltrapeerConnectionManager manager
+	final UltrapeerConnectionManager manager
-    final MuWireSettings settings
+	final MuWireSettings settings
-    final I2PAcceptor acceptor
+	final I2PAcceptor acceptor
-    final HostCache hostCache
+	final HostCache hostCache
-    final TrustService trustService
+	final TrustService trustService
     final SearchManager searchManager 
     final UploadManager uploadManager
     final ConnectionEstablisher establisher
 	
-    final ExecutorService acceptorThread
+	final ExecutorService acceptorThread
-    final ExecutorService handshakerThreads
+	final ExecutorService handshakerThreads
     
     private volatile shutdown
 	
-    ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
+	ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
-        MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
+		MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
-        TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
+		TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
         ConnectionEstablisher establisher) {
-        this.eventBus = eventBus
+		this.eventBus = eventBus
-        this.manager = manager
+		this.manager = manager
-        this.settings = settings
+		this.settings = settings
-        this.acceptor = acceptor
+		this.acceptor = acceptor
-        this.hostCache = hostCache
+		this.hostCache = hostCache
-        this.trustService = trustService
+		this.trustService = trustService
         this.searchManager = searchManager
         this.uploadManager = uploadManager
-        this.establisher = establisher
+		this.establisher = establisher
         
-        acceptorThread = Executors.newSingleThreadExecutor { r ->
+		acceptorThread = Executors.newSingleThreadExecutor { r -> 
-            def rv = new Thread(r)
+			def rv = new Thread(r)
-            rv.setDaemon(true)
+			rv.setDaemon(true)
-            rv.setName("acceptor")
+			rv.setName("acceptor")
-            rv
+			rv
-        }
+		}
 		
-        handshakerThreads = Executors.newCachedThreadPool { r ->
+		handshakerThreads = Executors.newCachedThreadPool { r ->
-            def rv = new Thread(r)
+			def rv = new Thread(r)
-            rv.setDaemon(true)
+			rv.setDaemon(true)
-            rv.setName("acceptor-processor-${System.currentTimeMillis()}")
+			rv.setName("acceptor-processor-${System.currentTimeMillis()}")
-            rv
+			rv
-        }
+		}
-    }
+	}
 	
-    void start() {
+	void start() {
-        acceptorThread.execute({acceptLoop()} as Runnable)
+		acceptorThread.execute({acceptLoop()} as Runnable)
-    }
+	}
 	
-    void stop() {
+	void stop() {
         shutdown = true
-        acceptorThread.shutdownNow()
+		acceptorThread.shutdownNow()
-        handshakerThreads.shutdownNow()
+		handshakerThreads.shutdownNow()
-    }
+	}
 	
-    private void acceptLoop() {
+	private void acceptLoop() {
         try {
-        while(true) {
+		while(true) {
-            def incoming = acceptor.accept()
+			def incoming = acceptor.accept()
-            log.info("accepted connection from ${incoming.destination.toBase32()}")
+			log.info("accepted connection from ${incoming.destination.toBase32()}")
-            switch(trustService.getLevel(incoming.destination)) {
+			switch(trustService.getLevel(incoming.destination)) {
-                case TrustLevel.TRUSTED : break
+				case TrustLevel.TRUSTED : break
-                case TrustLevel.NEUTRAL :
+				case TrustLevel.NEUTRAL :
-                    if (settings.allowUntrusted())
+					if (settings.allowUntrusted())
-                        break
+						break
-                case TrustLevel.DISTRUSTED :
+				case TrustLevel.DISTRUSTED :
-                    log.info("Disallowing distrusted connection")
+					log.info("Disallowing distrusted connection")
-                    incoming.close()
+					incoming.close()
-                    continue
+					continue
-            }
+			}
-            handshakerThreads.execute({processIncoming(incoming)} as Runnable)
+			handshakerThreads.execute({processIncoming(incoming)} as Runnable)
-        }
+		}
         } catch (Exception e) {
             log.log(Level.WARNING, "exception in accept loop",e)
             if (!shutdown)
                 throw e
         }
-    }
+	}
 	
-    private void processIncoming(Endpoint e) {
+	private void processIncoming(Endpoint e) {
-        InputStream is = e.inputStream
+		InputStream is = e.inputStream
-        try {
+		try {
-            int read = is.read()
+			int read = is.read()
-            switch(read) {
+			switch(read) {
-                case (byte)'M':
+				case (byte)'M':
                     if (settings.isLeaf())
                         throw new IOException("Incoming connection as leaf")
-                    processMuWire(e)
+					processMuWire(e)
-                    break
+					break
-                case (byte)'G':
+				case (byte)'G':
-                    processGET(e)
+					processGET(e)
-                    break
+					break
                 case (byte)'H':
                     processHashList(e)
                     break
                 case (byte)'P':
                     processPOST(e)
                     break
-                case (byte)'T':
+				default:
-                    processTRUST(e)
+					throw new Exception("Invalid read $read")
-                    break
+			}
-                default:
+		} catch (Exception ex) {
-                    throw new Exception("Invalid read $read")
+			log.log(Level.WARNING, "incoming connection failed",ex)
-            }
+			e.close()
-        } catch (Exception ex) {
+			eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED)
-            log.log(Level.WARNING, "incoming connection failed",ex)
+		}
-            e.close()
+	}
-            eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED)
-        }
-    }
 	
-    private void processMuWire(Endpoint e) {
+	private void processMuWire(Endpoint e) {
-        byte[] uWire = "uWire ".bytes
+		byte[] uWire = "uWire ".bytes
-        for (int i = 0; i < uWire.length; i++) {
+		for (int i = 0; i < uWire.length; i++) {
-            int read = e.inputStream.read()
+			int read = e.inputStream.read()
-            if (read != uWire[i]) {
+			if (read != uWire[i]) {
-                throw new IOException("unexpected value $read at position $i")
+				throw new IOException("unexpected value $read at position $i")
-            }
+			}
-        }
+		}
         
-        byte[] type = new byte[4]
+		byte[] type = new byte[4]
-        DataInputStream dis = new DataInputStream(e.inputStream)
+		DataInputStream dis = new DataInputStream(e.inputStream)
-        dis.readFully(type)
+		dis.readFully(type)
                 
         if (type == "leaf".bytes)
             handleIncoming(e, true)
@@ -160,44 +154,44 @@ class ConnectionAcceptor {
             throw new IOException("unknown connection type $type")
     }
 
-    private void handleIncoming(Endpoint e, boolean leaf) {
+	private void handleIncoming(Endpoint e, boolean leaf) {
-        boolean accept = !manager.isConnected(e.destination) &&
+		boolean accept = !manager.isConnected(e.destination) && 
             !establisher.isInProgress(e.destination) &&
             (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
-        if (accept) {
+		if (accept) {
-            log.info("accepting connection, leaf:$leaf")
+			log.info("accepting connection, leaf:$leaf")
-            e.outputStream.write("OK".bytes)
+			e.outputStream.write("OK".bytes)
-            e.outputStream.flush()
+			e.outputStream.flush()
-            def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
+			def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
-            eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.SUCCESSFUL))
+			eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.SUCCESSFUL))
-        } else {
+		} else {
-            log.info("rejecting connection, leaf:$leaf")
+			log.info("rejecting connection, leaf:$leaf")
-            e.outputStream.write("REJECT".bytes)
+			e.outputStream.write("REJECT".bytes)
-            def hosts = hostCache.getGoodHosts(10)
+			def hosts = hostCache.getGoodHosts(10)
-            if (!hosts.isEmpty()) {
+			if (!hosts.isEmpty()) {
-                def json = [:]
+				def json = [:]
-                json.tryHosts = hosts.collect { d -> d.toBase64() }
+				json.tryHosts = hosts.collect { d -> d.toBase64() }
-                json = JsonOutput.toJson(json)
+				json = JsonOutput.toJson(json)
-                def os = new DataOutputStream(e.outputStream)
+				def os = new DataOutputStream(e.outputStream)
-                os.writeShort(json.bytes.length)
+				os.writeShort(json.bytes.length)
-                os.write(json.bytes)
+				os.write(json.bytes)
-            }
+			}
-            e.outputStream.flush()
+			e.outputStream.flush()
-            e.close()
+			e.close()
-            eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
+			eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
-        }
+		}
-    }
+	}
 	
 	
 	
-    private void processGET(Endpoint e) {
+	private void processGET(Endpoint e) {
         byte[] et = new byte[3]
         final DataInputStream dis = new DataInputStream(e.getInputStream())
         dis.readFully(et)
         if (et != "ET ".getBytes(StandardCharsets.US_ASCII))
             throw new IOException("Invalid GET connection")
         uploadManager.processGET(e)
-    }
+	}
     
     private void processHashList(Endpoint e) {
         byte[] ashList = new byte[8]
@@ -231,15 +225,13 @@ class ConnectionAcceptor {
             if (sender.destination != e.getDestination())
                 throw new IOException("Sender destination mismatch expected $e.getDestination(), got $sender.destination")
             int nResults = dis.readUnsignedShort()
-            UIResultEvent[] results = new UIResultEvent[nResults]
             for (int i = 0; i < nResults; i++) {
                 int jsonSize = dis.readUnsignedShort()
                 byte [] payload = new byte[jsonSize]
                 dis.readFully(payload)
                 def json = slurper.parse(payload)
-                results[i] = ResultsParser.parse(sender, resultsUUID, json)
+                eventBus.publish(ResultsParser.parse(sender, resultsUUID, json))
             }
-            eventBus.publish(new UIResultBatchEvent(uuid: resultsUUID, results: results))
         } catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) {
             log.log(Level.WARNING, "failed to process POST", bad)
         } finally {
@@ -247,43 +239,4 @@ class ConnectionAcceptor {
         }
     }
 	
-    private void processTRUST(Endpoint e) {
-        byte[] RUST = new byte[6]
-        DataInputStream dis = new DataInputStream(e.getInputStream())
-        dis.readFully(RUST)
-        if (RUST != "RUST\r\n".getBytes(StandardCharsets.US_ASCII))
-            throw new IOException("Invalid TRUST connection")
-        String header
-        while ((header = DataUtil.readTillRN(dis)) != ""); // ignore headers for now
-
-        OutputStream os = e.getOutputStream()
-        if (!settings.allowTrustLists) {
-            os.write("403 Not Allowed\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-            os.flush()
-            e.close()
-            return
-        }
-
-        os.write("200 OK\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-        List<Persona> good = new ArrayList<>(trustService.good.values())
-        int size = Math.min(Short.MAX_VALUE * 2, good.size())
-        good = good.subList(0, size)
-        DataOutputStream dos = new DataOutputStream(os)
-        dos.writeShort(size)
-        good.each {
-            it.write(dos)
-        }
-
-        List<Persona> bad = new ArrayList<>(trustService.bad.values())
-        size = Math.min(Short.MAX_VALUE * 2, bad.size())
-        bad = bad.subList(0, size)
-        dos.writeShort(size)
-        bad.each {
-            it.write(dos)
-        }
-
-        dos.flush()
-        e.close()
-    }
-
 }

core/src/main/groovy/com/muwire/core/connection/ConnectionEstablisher.groovy

@@ -22,162 +22,162 @@ import net.i2p.util.ConcurrentHashSet
 @Log
 class ConnectionEstablisher {
 	
-    private static final int CONCURRENT = 4
+	private static final int CONCURRENT = 4
 
-    final EventBus eventBus
+	final EventBus eventBus
-    final I2PConnector i2pConnector
+	final I2PConnector i2pConnector
-    final MuWireSettings settings
+	final MuWireSettings settings
-    final ConnectionManager connectionManager
+	final ConnectionManager connectionManager
-    final HostCache hostCache
+	final HostCache hostCache
 	
-    final Timer timer
+	final Timer timer
-    final ExecutorService executor
+	final ExecutorService executor
 	
-    final Set inProgress = new ConcurrentHashSet()
+	final Set inProgress = new ConcurrentHashSet()
 	
     ConnectionEstablisher(){}
     
-    ConnectionEstablisher(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings,
+	ConnectionEstablisher(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings,
-        ConnectionManager connectionManager, HostCache hostCache) {
+		ConnectionManager connectionManager, HostCache hostCache) {
-        this.eventBus = eventBus
+		this.eventBus = eventBus
-        this.i2pConnector = i2pConnector
+		this.i2pConnector = i2pConnector
-        this.settings = settings
+		this.settings = settings
-        this.connectionManager = connectionManager
+		this.connectionManager = connectionManager
-        this.hostCache = hostCache
+		this.hostCache = hostCache
-        timer = new Timer("connection-timer",true)
+		timer = new Timer("connection-timer",true)
-        executor = Executors.newFixedThreadPool(CONCURRENT, { r ->
+		executor = Executors.newFixedThreadPool(CONCURRENT, { r -> 
-            def rv = new Thread(r)
+			def rv = new Thread(r)
-            rv.setDaemon(true)
+			rv.setDaemon(true)
-            rv.setName("connector-${System.currentTimeMillis()}")
+			rv.setName("connector-${System.currentTimeMillis()}")
-            rv
+			rv 
-        } as ThreadFactory)
+		} as ThreadFactory)
-    }
+	}
 	
-    void start() {
+	void start() {
-        timer.schedule({connectIfNeeded()} as TimerTask, 100, 1000)
+		timer.schedule({connectIfNeeded()} as TimerTask, 100, 1000)
-    }
+	}
 	
-    void stop() {
+	void stop() {
-        timer.cancel()
+		timer.cancel()
-        executor.shutdownNow()
+		executor.shutdownNow()
-    }
+	}
 	
-    private void connectIfNeeded() {
+	private void connectIfNeeded() {
-        if (!connectionManager.needsConnections())
+		if (!connectionManager.needsConnections())
-            return
+			return
-        if (inProgress.size() >= CONCURRENT)
+		if (inProgress.size() >= CONCURRENT)
-            return
+			return
 
-        def toTry = null
+		def toTry = null
-        for (int i = 0; i < 5; i++) {
+		for (int i = 0; i < 5; i++) {
-            toTry = hostCache.getHosts(1)
+			toTry = hostCache.getHosts(1)
-            if (toTry.isEmpty())
+			if (toTry.isEmpty())
-                return
+				return
-            toTry = toTry[0]
+			toTry = toTry[0]
-            if (!connectionManager.isConnected(toTry) &&
+			if (!connectionManager.isConnected(toTry) &&
-                !inProgress.contains(toTry)) {
+				!inProgress.contains(toTry)) {
-                break
+				break
-            }
+			}
-        }
+		}
-        if (toTry == null)
+		if (toTry == null)
-            return
+			return
-        if (!connectionManager.isConnected(toTry) && inProgress.add(toTry))
+		if (!connectionManager.isConnected(toTry) && inProgress.add(toTry))
-            executor.execute({connect(toTry)} as Runnable)
+			executor.execute({connect(toTry)} as Runnable)
-    }
+	}
 	
-    private void connect(Destination toTry) {
+	private void connect(Destination toTry) {
-        log.info("starting connect to ${toTry.toBase32()}")
+		log.info("starting connect to ${toTry.toBase32()}")
-        try {
+		try {
-            def endpoint = i2pConnector.connect(toTry)
+			def endpoint = i2pConnector.connect(toTry)
-            log.info("successful transport connect to ${toTry.toBase32()}")
+			log.info("successful transport connect to ${toTry.toBase32()}")
 			
-            // outgoing handshake
+			// outgoing handshake
-            endpoint.outputStream.write("MuWire ".bytes)
+			endpoint.outputStream.write("MuWire ".bytes)
-            def type = settings.isLeaf() ? "leaf" : "peer"
+			def type = settings.isLeaf() ? "leaf" : "peer"
-            endpoint.outputStream.write(type.bytes)
+			endpoint.outputStream.write(type.bytes)
-            endpoint.outputStream.flush()
+			endpoint.outputStream.flush()
 			
-            InputStream is = endpoint.inputStream
+			InputStream is = endpoint.inputStream
-            int read = is.read()
+			int read = is.read()
-            if (read == -1) {
+			if (read == -1) {
-                fail endpoint
+				fail endpoint
-                return
+				return
-            }
+			}
-            switch(read) {
+			switch(read) {
-                case (byte)'O': readK(endpoint); break
+				case (byte)'O': readK(endpoint); break
-                case (byte)'R': readEJECT(endpoint); break
+				case (byte)'R': readEJECT(endpoint); break
-                default :
+				default :
-                    log.warning("unknown response $read")
+					log.warning("unknown response $read")
-                    fail endpoint
+					fail endpoint
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            log.log(Level.WARNING, "Couldn't connect to ${toTry.toBase32()}", e)
+			log.log(Level.WARNING, "Couldn't connect to ${toTry.toBase32()}", e)
-            def endpoint = new Endpoint(toTry, null, null, null)
+			def endpoint = new Endpoint(toTry, null, null, null)
-            fail(endpoint)
+			fail(endpoint)
-        } finally {
+		} finally {
-            inProgress.remove(toTry)
+			inProgress.remove(toTry)
-        }
+		}
-    }
+	}
 	
-    private void fail(Endpoint endpoint) {
+	private void fail(Endpoint endpoint) {
-        endpoint.close()
+		endpoint.close()
-        eventBus.publish(new ConnectionEvent(endpoint: endpoint, incoming: false, leaf: false, status: ConnectionAttemptStatus.FAILED))
+		eventBus.publish(new ConnectionEvent(endpoint: endpoint, incoming: false, leaf: false, status: ConnectionAttemptStatus.FAILED))
-    }
+	}
 	
-    private void readK(Endpoint e) {
+	private void readK(Endpoint e) {
-        int read = e.inputStream.read()
+		int read = e.inputStream.read()
-        if (read != 'K') {
+		if (read != 'K') {
-            log.warning("unknown response after O: $read")
+			log.warning("unknown response after O: $read")
-            fail e
+			fail e
-            return
+			return
-        }
+		}
 		
-        log.info("connection to ${e.destination.toBase32()} established")
+		log.info("connection to ${e.destination.toBase32()} established")
 		
-        // wrap into deflater / inflater streams and publish
+		// wrap into deflater / inflater streams and publish
-        def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
+		def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
-        eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: false, leaf: false, status: ConnectionAttemptStatus.SUCCESSFUL))
+		eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: false, leaf: false, status: ConnectionAttemptStatus.SUCCESSFUL))
-    }
+	}
 	
-    private void readEJECT(Endpoint e) {
+	private void readEJECT(Endpoint e) {
-        byte[] eject = "EJECT".bytes
+		byte[] eject = "EJECT".bytes
-        for (int i = 0; i < eject.length; i++) {
+		for (int i = 0; i < eject.length; i++) {
-            int read = e.inputStream.read()
+			int read = e.inputStream.read()
-            if (read != eject[i]) {
+			if (read != eject[i]) {
-                log.warning("Unknown response after R at position $i")
+				log.warning("Unknown response after R at position $i")
-                fail e
+				fail e
-                return
+				return
-            }
+			}
-        }
+		}
-        log.info("connection to ${e.destination.toBase32()} rejected")
+		log.info("connection to ${e.destination.toBase32()} rejected")
 		
 		
-        eventBus.publish(new ConnectionEvent(endpoint: e, incoming: false, leaf: false, status: ConnectionAttemptStatus.REJECTED))
+		eventBus.publish(new ConnectionEvent(endpoint: e, incoming: false, leaf: false, status: ConnectionAttemptStatus.REJECTED))
-        try {
+		try {
-            DataInputStream dais = new DataInputStream(e.inputStream)
+			DataInputStream dais = new DataInputStream(e.inputStream)
-            int payloadSize = dais.readUnsignedShort()
+			int payloadSize = dais.readUnsignedShort()
-            byte[] payload = new byte[payloadSize]
+			byte[] payload = new byte[payloadSize]
-            dais.readFully(payload)
+			dais.readFully(payload)
 
-            def json = new JsonSlurper()
+			def json = new JsonSlurper()
-            json = json.parse(payload)
+			json = json.parse(payload)
 
-            if (json.tryHosts == null) {
+			if (json.tryHosts == null) {
-                log.warning("post-rejection json didn't contain hosts to try")
+				log.warning("post-rejection json didn't contain hosts to try")
-                return
+				return
-            }
+			}
 
-            json.tryHosts.asList().each {
+			json.tryHosts.asList().each {
-                Destination suggested = new Destination(it)
+				Destination suggested = new Destination(it)
-                eventBus.publish(new HostDiscoveredEvent(destination: suggested))
+				eventBus.publish(new HostDiscoveredEvent(destination: suggested))
-            }
+			}
-        } catch (Exception ignore) {
+		} catch (Exception ignore) {
-            log.log(Level.WARNING,"Problem parsing post-rejection payload",ignore)
+			log.log(Level.WARNING,"Problem parsing post-rejection payload",ignore)
-        } finally {
+		} finally {
-            // the end
+			// the end
-            e.close()
+			e.close()
-        }
+		}
-    }
+	}
     
     public boolean isInProgress(Destination d) {
         inProgress.contains(d)

core/src/main/groovy/com/muwire/core/connection/ConnectionEvent.groovy

@@ -6,14 +6,14 @@ import net.i2p.data.Destination
 
 class ConnectionEvent extends Event {
 
-    Endpoint endpoint
+	Endpoint endpoint
-    boolean incoming
+	boolean incoming
-    Boolean leaf // can be null if uknown
+	Boolean leaf // can be null if uknown
-    ConnectionAttemptStatus status
+	ConnectionAttemptStatus status
 	
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "ConnectionEvent ${super.toString()} endpoint: $endpoint incoming: $incoming leaf : $leaf status : $status"
+		"ConnectionEvent ${super.toString()} endpoint: $endpoint incoming: $incoming leaf : $leaf status : $status"
-    }
+	}
 
 }

core/src/main/groovy/com/muwire/core/connection/ConnectionManager.groovy

@@ -12,63 +12,63 @@ import net.i2p.data.Destination
 
 abstract class ConnectionManager {
 	
-    private static final int PING_TIME = 20000
+	private static final int PING_TIME = 20000
 
-    final EventBus eventBus
+	final EventBus eventBus
 	
-    private final Timer timer
+	private final Timer timer
 	
-    protected final HostCache hostCache
+	protected final HostCache hostCache
     protected final Persona me
     protected final MuWireSettings settings
 	
-    ConnectionManager() {}
+	ConnectionManager() {}
 	
-    ConnectionManager(EventBus eventBus, Persona me, HostCache hostCache, MuWireSettings settings) {
+	ConnectionManager(EventBus eventBus, Persona me, HostCache hostCache, MuWireSettings settings) {
-        this.eventBus = eventBus
+		this.eventBus = eventBus
         this.me = me
-        this.hostCache = hostCache
+		this.hostCache = hostCache
         this.settings = settings
-        this.timer = new Timer("connections-pinger",true)
+		this.timer = new Timer("connections-pinger",true)
-    }
+	}
 	
-    void start() {
+	void start() {
-        timer.schedule({sendPings()} as TimerTask, 1000,1000)
+		timer.schedule({sendPings()} as TimerTask, 1000,1000)
-    }
+	}
 	
-    void stop() {
+	void stop() {
-        timer.cancel()
+		timer.cancel()
-        getConnections().each { it.close() }
+		getConnections().each { it.close() }
-    }
+	}
 	
-    void onTrustEvent(TrustEvent e) {
+	void onTrustEvent(TrustEvent e) {
-        if (e.level == TrustLevel.DISTRUSTED)
+		if (e.level == TrustLevel.DISTRUSTED)
-            drop(e.persona.destination)
+			drop(e.persona.destination)
-    }
+	}
     
-    abstract void drop(Destination d)
+	abstract void drop(Destination d)
 	
-    abstract Collection<Connection> getConnections()
+	abstract Collection<Connection> getConnections()
 	
-    protected abstract int getDesiredConnections()
+	protected abstract int getDesiredConnections()
 	
-    boolean needsConnections() {
+	boolean needsConnections() {
-        return getConnections().size() < getDesiredConnections()
+		return getConnections().size() < getDesiredConnections()
-    }
+	}
 	
-    abstract boolean isConnected(Destination d)
+	abstract boolean isConnected(Destination d)
 	
-    abstract void onConnectionEvent(ConnectionEvent e)
+	abstract void onConnectionEvent(ConnectionEvent e)
 	
-    abstract void onDisconnectionEvent(DisconnectionEvent e)
+	abstract void onDisconnectionEvent(DisconnectionEvent e)
     
     abstract void shutdown()
 	
-    protected void sendPings() {
+	protected void sendPings() {
-        final long now = System.currentTimeMillis()
+		final long now = System.currentTimeMillis()
-        getConnections().each {
+		getConnections().each { 
-            if (now - it.lastPingSentTime > PING_TIME)
+			if (now - it.lastPingSentTime > PING_TIME)
-                it.sendPing()
+				it.sendPing()
-        }
+		}
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/connection/DisconnectionEvent.groovy

@@ -6,10 +6,10 @@ import net.i2p.data.Destination
 
 class DisconnectionEvent extends Event {
 	
-    Destination destination
+	Destination destination
 
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "DisconnectionEvent ${super.toString()} destination:${destination.toBase32()}"
+		"DisconnectionEvent ${super.toString()} destination:${destination.toBase32()}"
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/connection/Endpoint.groovy

@@ -8,39 +8,39 @@ import net.i2p.data.Destination
 
 @Log
 class Endpoint implements Closeable {
-    final Destination destination
+	final Destination destination
-    final InputStream inputStream
+	final InputStream inputStream
-    final OutputStream outputStream
+	final OutputStream outputStream
     final def toClose
 	
-    private final AtomicBoolean closed = new AtomicBoolean()
+	private final AtomicBoolean closed = new AtomicBoolean()
 	
-    Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
+	Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
-        this.destination = destination
+		this.destination = destination
-        this.inputStream = inputStream
+		this.inputStream = inputStream
-        this.outputStream = outputStream
+		this.outputStream = outputStream
         this.toClose = toClose
-    }
+	}
 	
-    @Override
+	@Override
-    public void close() {
+	public void close() {
-        if (!closed.compareAndSet(false, true)) {
+		if (!closed.compareAndSet(false, true)) {
-            log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
+			log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
-            return
+			return
-        }
+		}
-        if (inputStream != null) {
+		if (inputStream != null) {
-            try {inputStream.close()} catch (Exception ignore) {}
+			try {inputStream.close()} catch (Exception ignore) {}
-        }
+		}
-        if (outputStream != null) {
+		if (outputStream != null) {
-            try {outputStream.close()} catch (Exception ignore) {}
+			try {outputStream.close()} catch (Exception ignore) {}
-        }
+		}
         if (toClose != null) {
             try {toClose.reset()} catch (Exception ignore) {}
         }
-    }
+	}
 	
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "destination: ${destination.toBase32()}"
+		"destination: ${destination.toBase32()}"
-    }
+	}
 } 

core/src/main/groovy/com/muwire/core/connection/I2PAcceptor.groovy

@@ -5,18 +5,18 @@ import net.i2p.client.streaming.I2PSocketManager
 
 class I2PAcceptor {
 
-    final I2PSocketManager socketManager
+	final I2PSocketManager socketManager
-    final I2PServerSocket serverSocket
+	final I2PServerSocket serverSocket
 	
-    I2PAcceptor() {}
+	I2PAcceptor() {}
 	
-    I2PAcceptor(I2PSocketManager socketManager) {
+	I2PAcceptor(I2PSocketManager socketManager) {
-        this.socketManager = socketManager
+		this.socketManager = socketManager
-        this.serverSocket = socketManager.getServerSocket()
+		this.serverSocket = socketManager.getServerSocket()
-    }
+	}
 	
-    Endpoint accept() {
+	Endpoint accept() {
-        def socket = serverSocket.accept()
+		def socket = serverSocket.accept()
-        new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
+		new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy

@@ -5,17 +5,17 @@ import net.i2p.data.Destination
 
 class I2PConnector {
 	
-    final I2PSocketManager socketManager
+	final I2PSocketManager socketManager
 	
-    I2PConnector() {}
+	I2PConnector() {}
 	
-    I2PConnector(I2PSocketManager socketManager) {
+	I2PConnector(I2PSocketManager socketManager) {
-        this.socketManager = socketManager
+		this.socketManager = socketManager
-    }
+	}
 	
-    Endpoint connect(Destination dest) {
+	Endpoint connect(Destination dest) {
-        def socket = socketManager.connect(dest)
+		def socket = socketManager.connect(dest)
-        new Endpoint(dest, socket.getInputStream(), socket.getOutputStream(), socket)
+		new Endpoint(dest, socket.getInputStream(), socket.getOutputStream(), socket)
-    }
+	}
 
 }

core/src/main/groovy/com/muwire/core/connection/LeafConnection.groovy

@@ -17,21 +17,21 @@ import net.i2p.data.Destination
  */
 class LeafConnection extends Connection {
 
-    public LeafConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache,
+	public LeafConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, 
         TrustService trustService, MuWireSettings settings) {
-        super(eventBus, endpoint, true, hostCache, trustService, settings);
+		super(eventBus, endpoint, true, hostCache, trustService, settings);
-    }
+	}
 
-    @Override
+	@Override
-    protected void read() {
+	protected void read() {
-        // TODO Auto-generated method stub
+		// TODO Auto-generated method stub
 		
-    }
+	}
 
-    @Override
+	@Override
-    protected void write(Object message) {
+	protected void write(Object message) {
-        // TODO Auto-generated method stub
+		// TODO Auto-generated method stub
 		
-    }
+	}
 
 }

core/src/main/groovy/com/muwire/core/connection/LeafConnectionManager.groovy

@@ -14,21 +14,21 @@ import net.i2p.data.Destination
 @Log
 class LeafConnectionManager extends ConnectionManager {
 	
-    final int maxConnections
+	final int maxConnections
 	
-    final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
+	final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
 	
-    public LeafConnectionManager(EventBus eventBus, Persona me, int maxConnections,
+	public LeafConnectionManager(EventBus eventBus, Persona me, int maxConnections, 
         HostCache hostCache, MuWireSettings settings) {
-        super(eventBus, me, hostCache, settings)
+		super(eventBus, me, hostCache, settings)
-        this.maxConnections = maxConnections
+		this.maxConnections = maxConnections
-    }
+	}
 	
-    @Override
+	@Override
-    public void drop(Destination d) {
+	public void drop(Destination d) {
-        // TODO Auto-generated method stub
+		// TODO Auto-generated method stub
 		
-    }
+	}
     
     void onQueryEvent(QueryEvent e) {
         if (me.destination == e.receivedOn) {
@@ -37,41 +37,41 @@ class LeafConnectionManager extends ConnectionManager {
             
     }
 
-    @Override
+	@Override
-    public Collection<Connection> getConnections() {
+	public Collection<Connection> getConnections() {
-        connections.values()
+		connections.values()
-    }
+	}
 
-    @Override
+	@Override
-    protected int getDesiredConnections() {
+	protected int getDesiredConnections() {
-        return maxConnections;
+		return maxConnections;
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isConnected(Destination d) {
+	public boolean isConnected(Destination d) {
-        connections.containsKey(d)
+		connections.containsKey(d)
-    }
+	}
 
-    @Override
+	@Override
-    public void onConnectionEvent(ConnectionEvent e) {
+	public void onConnectionEvent(ConnectionEvent e) {
-        if (e.incoming || e.leaf) {
+		if (e.incoming || e.leaf) {
-            log.severe("Got inconsistent event as a leaf! $e")
+			log.severe("Got inconsistent event as a leaf! $e")
-            return
+			return
-        }
+		}
-        if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
+		if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
-            return
+			return
 			
-        Connection c = new UltrapeerConnection(eventBus, e.endpoint)
+		Connection c = new UltrapeerConnection(eventBus, e.endpoint)
-        connections.put(e.endpoint.destination, c)
+		connections.put(e.endpoint.destination, c)
-        c.start()
+		c.start()
-    }
+	}
 	
-    @Override
+	@Override 
-    public void onDisconnectionEvent(DisconnectionEvent e) {
+	public void onDisconnectionEvent(DisconnectionEvent e) {
-        def removed = connections.remove(e.destination)
+		def removed = connections.remove(e.destination)
-        if (removed == null)
+		if (removed == null)
-            log.severe("removed destination not present in connection manager ${e.destination.toBase32()}")
+			log.severe("removed destination not present in connection manager ${e.destination.toBase32()}")
-    }
+	}
 	
     @Override
     void shutdown() {

core/src/main/groovy/com/muwire/core/connection/PeerConnection.groovy

@@ -2,6 +2,7 @@ package com.muwire.core.connection
 
 import java.io.InputStream
 import java.io.OutputStream
+import java.nio.charset.StandardCharsets
 
 import com.muwire.core.EventBus
 import com.muwire.core.MuWireSettings
@@ -21,62 +22,62 @@ import net.i2p.data.Destination
 @Log
 class PeerConnection extends Connection {
 	
-    private final DataInputStream dis
+	private final DataInputStream dis
-    private final DataOutputStream dos
+	private final DataOutputStream dos
 	
-    private final byte[] readHeader = new byte[3]
+	private final byte[] readHeader = new byte[3]
-    private final byte[] writeHeader = new byte[3]
+	private final byte[] writeHeader = new byte[3]
 	
-    private final JsonSlurper slurper = new JsonSlurper()
+	private final JsonSlurper slurper = new JsonSlurper()
 
-    public PeerConnection(EventBus eventBus, Endpoint endpoint,
+	public PeerConnection(EventBus eventBus, Endpoint endpoint,
-            boolean incoming, HostCache hostCache, TrustService trustService,
+			boolean incoming, HostCache hostCache, TrustService trustService,
             MuWireSettings settings) {
-        super(eventBus, endpoint, incoming, hostCache, trustService, settings)
+		super(eventBus, endpoint, incoming, hostCache, trustService, settings)
-        this.dis = new DataInputStream(endpoint.inputStream)
+		this.dis = new DataInputStream(endpoint.inputStream)
-        this.dos = new DataOutputStream(endpoint.outputStream)
+		this.dos = new DataOutputStream(endpoint.outputStream)
-    }
+	}
 
-    @Override
+	@Override
-    protected void read() {
+	protected void read() {
-        dis.readFully(readHeader)
+		dis.readFully(readHeader)
-        int length = DataUtil.readLength(readHeader)
+		int length = DataUtil.readLength(readHeader)
-        log.fine("$name read length $length")
+		log.fine("$name read length $length")
 		
-        byte[] payload = new byte[length]
+		byte[] payload = new byte[length]
-        dis.readFully(payload)
+		dis.readFully(payload)
 		
-        if ((readHeader[0] & (byte)0x80) == 0x80) {
+		if ((readHeader[0] & (byte)0x80) == 0x80) {
-            // TODO process binary
+			// TODO process binary
-        } else {
+		} else {
-            def json = slurper.parse(payload)
+			def json = slurper.parse(payload)
-            if (json.type == null)
+			if (json.type == null)
-                throw new Exception("missing json type")
+				throw new Exception("missing json type")
-            switch(json.type) {
+			switch(json.type) {
-                case "Ping" : handlePing(); break;
+				case "Ping" : handlePing(); break;
-                case "Pong" : handlePong(json); break;
+				case "Pong" : handlePong(json); break;
                 case "Search": handleSearch(json); break
-                default :
+				default :
-                    throw new Exception("unknown json type ${json.type}")
+					throw new Exception("unknown json type ${json.type}")
-            }
+			}
-        }
+		}
-    }
+	}
 
-    @Override
+	@Override
-    protected void write(Object message) {
+	protected void write(Object message) {
-        byte[] payload
+		byte[] payload
-        if (message instanceof Map) {
+		if (message instanceof Map) {
-            payload = JsonOutput.toJson(message).bytes
+			payload = JsonOutput.toJson(message).getBytes(StandardCharsets.UTF_8)
-            DataUtil.packHeader(payload.length, writeHeader)
+			DataUtil.packHeader(payload.length, writeHeader)
-            log.fine "$name writing message type ${message.type} length $payload.length"
+			log.fine "$name writing message type ${message.type} length $payload.length"
-            writeHeader[0] &= (byte)0x7F
+			writeHeader[0] &= (byte)0x7F
-        } else {
+		} else {
-            // TODO: write binary
+			// TODO: write binary
-        }
+		}
 		
-        dos.write(writeHeader)
+		dos.write(writeHeader)
-        dos.write(payload)
+		dos.write(payload)
-        dos.flush()
+		dos.flush()
-    }
+	}
 
 }

core/src/main/groovy/com/muwire/core/connection/UltrapeerConnection.groovy

@@ -17,30 +17,30 @@ import net.i2p.data.Destination
  */
 class UltrapeerConnection extends Connection {
 
-    public UltrapeerConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
+	public UltrapeerConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
-        super(eventBus, endpoint, false, hostCache, trustService)
+		super(eventBus, endpoint, false, hostCache, trustService)
-    }
+	}
 
-    @Override
+	@Override
-    protected void read() {
+	protected void read() {
-        // TODO Auto-generated method stub
+		// TODO Auto-generated method stub
 		
-    }
+	}
 
-    @Override
+	@Override
-    protected void write(Object message) {
+	protected void write(Object message) {
-        if (message instanceof Map) {
+		if (message instanceof Map) {
-            writeJsonMessage(message)
+			writeJsonMessage(message)
-        } else {
+		} else {
-            writeBinaryMessage(message)
+			writeBinaryMessage(message)
-        }
+		}
-    }
+	}
 
-    private void writeJsonMessage(def message) {
+	private void writeJsonMessage(def message) {
 		
-    }
+	}
 	
-    private void writeBinaryMessage(def message) {
+	private void writeBinaryMessage(def message) {
 		
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/connection/UltrapeerConnectionManager.groovy

@@ -16,26 +16,26 @@ import net.i2p.data.Destination
 @Log
 class UltrapeerConnectionManager extends ConnectionManager {
 	
-    final int maxPeers, maxLeafs
+	final int maxPeers, maxLeafs
     final TrustService trustService
     
-    final Map<Destination, PeerConnection> peerConnections = new ConcurrentHashMap()
+	final Map<Destination, PeerConnection> peerConnections = new ConcurrentHashMap()
-    final Map<Destination, LeafConnection> leafConnections = new ConcurrentHashMap()
+	final Map<Destination, LeafConnection> leafConnections = new ConcurrentHashMap()
     
-    UltrapeerConnectionManager() {}
+	UltrapeerConnectionManager() {}
 
-    public UltrapeerConnectionManager(EventBus eventBus, Persona me, int maxPeers, int maxLeafs,
+	public UltrapeerConnectionManager(EventBus eventBus, Persona me, int maxPeers, int maxLeafs, 
         HostCache hostCache, TrustService trustService, MuWireSettings settings) {
-        super(eventBus, me, hostCache, settings)
+		super(eventBus, me, hostCache, settings)
-        this.maxPeers = maxPeers
+		this.maxPeers = maxPeers
-        this.maxLeafs = maxLeafs
+		this.maxLeafs = maxLeafs
         this.trustService = trustService
-    }
+	}
-    @Override
+	@Override
-    public void drop(Destination d) {
+	public void drop(Destination d) {
-        peerConnections.get(d)?.close()
+		peerConnections.get(d)?.close()
         leafConnections.get(d)?.close()
-    }
+	}
     
     void onQueryEvent(QueryEvent e) {
         forwardQueryToLeafs(e)
@@ -50,57 +50,57 @@ class UltrapeerConnectionManager extends ConnectionManager {
         }
     }
 
-    @Override
+	@Override
-    public Collection<Connection> getConnections() {
+	public Collection<Connection> getConnections() {
-        def rv = new ArrayList(peerConnections.size() + leafConnections.size())
+		def rv = new ArrayList(peerConnections.size() + leafConnections.size())
-        rv.addAll(peerConnections.values())
+		rv.addAll(peerConnections.values())
-        rv.addAll(leafConnections.values())
+		rv.addAll(leafConnections.values())
-        rv
+		rv
-    }
+	}
 	
-    boolean hasLeafSlots() {
+	boolean hasLeafSlots() {
-        leafConnections.size() < maxLeafs
+		leafConnections.size() < maxLeafs
-    }
+	}
 	
-    boolean hasPeerSlots() {
+	boolean hasPeerSlots() {
-        peerConnections.size() < maxPeers
+		peerConnections.size() < maxPeers
-    }
+	}
 	
-    @Override
+	@Override
-    protected int getDesiredConnections() {
+	protected int getDesiredConnections() {
-        return maxPeers / 2;
+		return maxPeers / 2;
-    }
+	}
-    @Override
+	@Override
-    public boolean isConnected(Destination d) {
+	public boolean isConnected(Destination d) {
-        peerConnections.containsKey(d) || leafConnections.containsKey(d)
+		peerConnections.containsKey(d) || leafConnections.containsKey(d)
-    }
+	}
 
-    @Override
+	@Override
-    public void onConnectionEvent(ConnectionEvent e) {
+	public void onConnectionEvent(ConnectionEvent e) {
-        if (!e.incoming && e.leaf) {
+		if (!e.incoming && e.leaf) {
-            log.severe("Inconsistent event $e")
+			log.severe("Inconsistent event $e")
-            return
+			return
-        }
+		}
 		
-        if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
+		if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
-            return
+			return
 		
-        Connection c = e.leaf ?
+		Connection c = e.leaf ? 
-            new LeafConnection(eventBus, e.endpoint, hostCache, trustService, settings) :
+			new LeafConnection(eventBus, e.endpoint, hostCache, trustService, settings) : 
-            new PeerConnection(eventBus, e.endpoint, e.incoming, hostCache, trustService, settings)
+			new PeerConnection(eventBus, e.endpoint, e.incoming, hostCache, trustService, settings)
-        def map = e.leaf ? leafConnections : peerConnections
+		def map = e.leaf ? leafConnections : peerConnections
-        map.put(e.endpoint.destination, c)
+		map.put(e.endpoint.destination, c)
-        c.start()
+		c.start()
-    }
+	}
 	
-    @Override
+	@Override
-    public void onDisconnectionEvent(DisconnectionEvent e) {
+	public void onDisconnectionEvent(DisconnectionEvent e) {
-        def removed = peerConnections.remove(e.destination)
+		def removed = peerConnections.remove(e.destination)
-        if (removed == null)
+		if (removed == null)
-            removed = leafConnections.remove(e.destination)
+			removed = leafConnections.remove(e.destination)
-        if (removed == null)
+		if (removed == null)
-            log.severe("Removed connection not present in either leaf or peer map ${e.destination.toBase32()}")
+			log.severe("Removed connection not present in either leaf or peer map ${e.destination.toBase32()}")
-    }
+	}
     
     @Override
     void shutdown() {
@@ -110,7 +110,7 @@ class UltrapeerConnectionManager extends ConnectionManager {
         leafConnections.clear()
     }
 	
-    void forwardQueryToLeafs(QueryEvent e) {
+	void forwardQueryToLeafs(QueryEvent e) {
 		
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/content/ContentControlEvent.groovy

@@ -1,9 +0,0 @@
-package com.muwire.core.content
-
-import com.muwire.core.Event
-
-class ContentControlEvent extends Event {
-    String term
-    boolean regex
-    boolean add
-}

core/src/main/groovy/com/muwire/core/content/ContentManager.groovy

@@ -1,30 +0,0 @@
-package com.muwire.core.content
-
-import java.util.concurrent.ConcurrentHashMap
-
-import com.muwire.core.search.QueryEvent
-
-import net.i2p.util.ConcurrentHashSet
-
-class ContentManager {
-
-    Set<Matcher> matchers = new ConcurrentHashSet()    
-    
-    void onContentControlEvent(ContentControlEvent e) {
-        Matcher m
-        if (e.regex)
-            m = new RegexMatcher(e.term)
-        else
-            m = new KeywordMatcher(e.term)
-        if (e.add)
-            matchers.add(m)
-        else
-            matchers.remove(m)
-    }
-    
-    void onQueryEvent(QueryEvent e) {
-        if (e.searchEvent.searchTerms == null)
-            return
-        matchers.each { it.process(e) }
-    }
-}

core/src/main/groovy/com/muwire/core/content/KeywordMatcher.groovy

@@ -1,36 +0,0 @@
-package com.muwire.core.content
-
-class KeywordMatcher extends Matcher {
-    private final String keyword
-    KeywordMatcher(String keyword) {
-        this.keyword = keyword
-    }
-    
-    @Override
-    protected boolean match(List<String> searchTerms) {
-        boolean found = false
-        searchTerms.each { 
-            if (keyword == it)
-                found = true
-        }
-        found
-    }
-    
-    @Override
-    public String getTerm() {
-        keyword
-    }
-    
-    @Override
-    public int hashCode() {
-        keyword.hashCode()
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof KeywordMatcher))
-            return false
-        KeywordMatcher other = (KeywordMatcher) o
-        keyword.equals(other.keyword)
-    }
-}

core/src/main/groovy/com/muwire/core/content/Match.groovy

@@ -1,9 +0,0 @@
-package com.muwire.core.content
-
-import com.muwire.core.Persona
-
-class Match {
-    Persona persona
-    String [] keywords
-    long timestamp
-}

core/src/main/groovy/com/muwire/core/content/Matcher.groovy

@@ -1,20 +0,0 @@
-package com.muwire.core.content
-
-import com.muwire.core.search.QueryEvent
-
-abstract class Matcher {
-    final List<Match> matches = Collections.synchronizedList(new ArrayList<>())
-    final Set<UUID> uuids = new HashSet<>()
-    
-    protected abstract boolean match(List<String> searchTerms);
-    
-    public abstract String getTerm();
-    
-    public void process(QueryEvent qe) {
-        def terms = qe.searchEvent.searchTerms
-        if (match(terms) && uuids.add(qe.searchEvent.uuid)) {
-            long now = System.currentTimeMillis()
-            matches << new Match(persona : qe.originator, keywords : terms, timestamp : now)
-        }
-    }
-}

core/src/main/groovy/com/muwire/core/content/RegexMatcher.groovy

@@ -1,35 +0,0 @@
-package com.muwire.core.content
-
-import java.util.regex.Pattern
-import java.util.stream.Collectors
-
-class RegexMatcher extends Matcher {
-    private final Pattern pattern
-    RegexMatcher(String pattern) {
-        this.pattern = Pattern.compile(pattern)
-    }
-    
-    @Override
-    protected boolean match(List<String> keywords) {
-        String combined = keywords.join(" ")
-        return pattern.matcher(combined).find()
-    }
-    
-    @Override
-    public String getTerm() {
-        pattern.pattern()
-    }
-    
-    @Override
-    public int hashCode() {
-        pattern.pattern().hashCode()
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof RegexMatcher))
-            return false
-        RegexMatcher other = (RegexMatcher) o
-        pattern.pattern() == other.pattern.pattern()
-    }
-}

core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy

@@ -3,10 +3,6 @@ package com.muwire.core.download
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHasher
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.mesh.MeshManager
-import com.muwire.core.trust.TrustLevel
-import com.muwire.core.trust.TrustService
 import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonBuilder
@@ -18,33 +14,24 @@ import net.i2p.util.ConcurrentHashSet
 
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
 import com.muwire.core.UILoadedEvent
 
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
 public class DownloadManager {
     
     private final EventBus eventBus
-    private final TrustService trustService
-    private final MeshManager meshManager
-    private final MuWireSettings muSettings
     private final I2PConnector connector
     private final Executor executor
     private final File incompletes, home
     private final Persona me
     
-    private final Map<InfoHash, Downloader> downloaders = new ConcurrentHashMap<>()
+    private final Set<Downloader> downloaders = new ConcurrentHashSet<>()
     
-    public DownloadManager(EventBus eventBus, TrustService trustService, MeshManager meshManager, MuWireSettings muSettings,
+    public DownloadManager(EventBus eventBus, I2PConnector connector, File home, Persona me) {
-        I2PConnector connector, File home, Persona me) {
         this.eventBus = eventBus
-        this.trustService = trustService
-        this.meshManager = meshManager
-        this.muSettings = muSettings
         this.connector = connector
         this.incompletes = new File(home,"incompletes")
         this.home = home
@@ -71,30 +58,18 @@ public class DownloadManager {
         e.result.each { 
             destinations.add(it.sender.destination)
         }
-        destinations.addAll(e.sources)
-        destinations.remove(me.destination)
-
-        Pieces pieces = getPieces(infohash, size, pieceSize)
         
         def downloader = new Downloader(eventBus, this, me, e.target, size,
             infohash, pieceSize, connector, destinations,
-            incompletes, pieces)
+            incompletes)
-        downloaders.put(infohash, downloader)
+        downloaders.add(downloader)
         persistDownloaders()
         executor.execute({downloader.download()} as Runnable)
         eventBus.publish(new DownloadStartedEvent(downloader : downloader))
     }
     
     public void onUIDownloadCancelledEvent(UIDownloadCancelledEvent e) {
-        downloaders.remove(e.downloader.infoHash)
+        downloaders.remove(e.downloader)
-        persistDownloaders()
-    }
-
-    public void onUIDownloadPausedEvent(UIDownloadPausedEvent e) {
-        persistDownloaders()
-    }
-
-    public void onUIDownloadResumedEvent(UIDownloadResumedEvent e) {
         persistDownloaders()
     }
     
@@ -122,54 +97,23 @@ public class DownloadManager {
                 byte [] root = Base64.decode(json.hashRoot)
                 infoHash = new InfoHash(root)
             }
-
-            Pieces pieces = getPieces(infoHash, (long)json.length, json.pieceSizePow2)
-
             def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
-                infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
+                infoHash, json.pieceSizePow2, connector, destinations, incompletes)
-            if (json.paused != null)
+            downloaders.add(downloader)
-                downloader.paused = json.paused
+            downloader.download()
-            downloaders.put(infoHash, downloader)
-            downloader.readPieces()
-            if (!downloader.paused)
-                downloader.download()
             eventBus.publish(new DownloadStartedEvent(downloader : downloader))
         }
     }
     
-    private Pieces getPieces(InfoHash infoHash, long length, int pieceSizePow2) {
-        int pieceSize = 0x1 << pieceSizePow2
-        int nPieces = (int)(length / pieceSize)
-        if (length % pieceSize != 0)
-            nPieces++
-        Mesh mesh = meshManager.getOrCreate(infoHash, nPieces)
-        mesh.pieces
-    }
-
-    void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-        Downloader downloader = downloaders.get(e.infoHash)
-        if (downloader == null)
-            return
-        boolean ok = false
-        switch(trustService.getLevel(e.source.destination)) {
-            case TrustLevel.TRUSTED: ok = true; break
-            case TrustLevel.NEUTRAL: ok = muSettings.allowUntrusted; break
-            case TrustLevel.DISTRUSTED: ok = false; break
-        }
-
-        if (ok)
-            downloader.addSource(e.source.destination)
-    }
-
     void onFileDownloadedEvent(FileDownloadedEvent e) {
-        downloaders.remove(e.downloader.infoHash)
+        downloaders.remove(e.downloader)
         persistDownloaders()
     }
     
     private void persistDownloaders() {
         File downloadsFile = new File(home,"downloads.json")
         downloadsFile.withPrintWriter { writer -> 
-            downloaders.values().each { downloader ->
+            downloaders.each { downloader ->
                 if (!downloader.cancelled) {
                     def json = [:]
                     json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
@@ -186,8 +130,6 @@ public class DownloadManager {
                         json.hashList = Base64.encode(infoHash.hashList)
                     else
                         json.hashRoot = Base64.encode(infoHash.getRoot())
-
-                    json.paused = downloader.paused
                     writer.println(JsonOutput.toJson(json))
                 }
             }
@@ -195,7 +137,7 @@ public class DownloadManager {
     }
     
     public void shutdown() {
-        downloaders.values().each { it.stop() }
+        downloaders.each { it.stop() }
         Downloader.executorService.shutdownNow()
     }
 }

core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy

@@ -3,56 +3,49 @@ package com.muwire.core.download;
 import net.i2p.data.Base64
 
 import com.muwire.core.Constants
-import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.util.DataUtil
-
 import static com.muwire.core.util.DataUtil.readTillRN
 
 import groovy.util.logging.Log
 
 import java.nio.ByteBuffer
-import java.nio.MappedByteBuffer
 import java.nio.channels.FileChannel
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import java.util.logging.Level
 
 @Log
 class DownloadSession {
     
-    private final EventBus eventBus
+    private static int SAMPLES = 10
+    
     private final String meB64
-    private final Pieces pieces
+    private final Pieces downloaded, claimed
     private final InfoHash infoHash
     private final Endpoint endpoint
     private final File file
     private final int pieceSize
     private final long fileLength
-    private final Set<Integer> available
     private final MessageDigest digest
     
-    private long lastSpeedRead = System.currentTimeMillis()
+    private final LinkedList<Long> timestamps = new LinkedList<>()
-    private long dataSinceLastRead
+    private final LinkedList<Integer> reads = new LinkedList<>()
     
-    private MappedByteBuffer mapped
+    private ByteBuffer mapped
     
-    DownloadSession(EventBus eventBus, String meB64, Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file,
+    DownloadSession(String meB64, Pieces downloaded, Pieces claimed, InfoHash infoHash, Endpoint endpoint, File file, 
-        int pieceSize, long fileLength, Set<Integer> available) {
+        int pieceSize, long fileLength) {
-        this.eventBus = eventBus
         this.meB64 = meB64
-        this.pieces = pieces
+        this.downloaded = downloaded
+        this.claimed = claimed
         this.endpoint = endpoint
         this.infoHash = infoHash
         this.file = file
         this.pieceSize = pieceSize
         this.fileLength = fileLength
-        this.available = available
         try {
             digest = MessageDigest.getInstance("SHA-256")
         } catch (NoSuchAlgorithmException impossible) {
@@ -70,101 +63,71 @@ class DownloadSession {
         OutputStream os = endpoint.getOutputStream()
         InputStream is = endpoint.getInputStream()
         
-        int[] pieceAndPosition
+        int piece
-        if (available.isEmpty())
+        while(true) {
-            pieceAndPosition = pieces.claim()
+            piece = downloaded.getRandomPiece()
-        else
+            if (claimed.isMarked(piece)) {
-            pieceAndPosition = pieces.claim(new HashSet<>(available))
+                if (downloaded.donePieces() + claimed.donePieces() == downloaded.nPieces) {
-        if (pieceAndPosition == null)
+                    log.info("all pieces claimed")
-            return false
+                    return false
-        int piece = pieceAndPosition[0]
+                }
-        int position = pieceAndPosition[1]
+                continue
-        boolean steal = pieceAndPosition[2] == 1
+            }
-        boolean unclaim = true
+            break
+        }
+        claimed.markDownloaded(piece)
         
-        log.info("will download piece $piece from position $position steal $steal")
+        log.info("will download piece $piece")
+        
+        long start = piece * pieceSize
+        long end = Math.min(fileLength, start + pieceSize) - 1
+        long length = end - start + 1
         
-        long pieceStart = piece * ((long)pieceSize)
-        long end = Math.min(fileLength, pieceStart + pieceSize) - 1
-        long start = pieceStart + position
         String root = Base64.encode(infoHash.getRoot())
                 
+        FileChannel channel
         try {
             os.write("GET $root\r\n".getBytes(StandardCharsets.US_ASCII))
             os.write("Range: $start-$end\r\n".getBytes(StandardCharsets.US_ASCII))
-            os.write("X-Persona: $meB64\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("X-Persona: $meB64\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-            String xHave = DataUtil.encodeXHave(pieces.getDownloaded(), pieces.nPieces)
-            os.write("X-Have: $xHave\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
             os.flush()
-            String codeString = readTillRN(is)
+            String code = readTillRN(is)
-            int space = codeString.indexOf(' ')
+            if (code.startsWith("404 ")) {
-            if (space > 0)
-                codeString = codeString.substring(0, space)
-
-            int code = Integer.parseInt(codeString.trim())
-
-            if (code == 404) {
                 log.warning("file not found")
                 endpoint.close()
-                return false
+                return
             }
                 
-            if (!(code == 200 || code == 416)) {
+            if (code.startsWith("416 ")) {
+                log.warning("range $start-$end cannot be satisfied")
+                return // leave endpoint open
+            }
+            
+            if (!code.startsWith("200 ")) {
                 log.warning("unknown code $code")
                 endpoint.close()
                 return false
             }
 
             // parse all headers
-            Map<String,String> headers = new HashMap<>()
+            Set<String> headers = new HashSet<>()
             String header
-            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) {
+            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) 
-                int colon = header.indexOf(':')
+                headers.add(header)
-                if (colon == -1 || colon == header.length() - 1)
-                    throw new IOException("invalid header $header")
-                String key = header.substring(0, colon)
-                String value = header.substring(colon + 1)
-                headers[key] = value.trim()
-            }
 
-            // prase X-Alt if present
+            long receivedStart = -1
-            if (headers.containsKey("X-Alt")) {
+            long receivedEnd = -1
-                headers["X-Alt"].split(",").each {
+            for (String receivedHeader : headers) {
-                    if (it.length() > 0) {
+                def group = (receivedHeader =~ /^Content-Range: (\d+)-(\d+)$/)
-                        byte [] raw = Base64.decode(it)
+                if (group.size() != 1) {
-                        Persona source = new Persona(new ByteArrayInputStream(raw))
+                    log.info("ignoring header $receivedHeader")
-                        eventBus.publish(new SourceDiscoveredEvent(infoHash : infoHash, source : source))
+                    continue
-                    }
                 } 
+
+                receivedStart = Long.parseLong(group[0][1])
+                receivedEnd = Long.parseLong(group[0][2])
             }
             
-            // parse X-Have if present
-            if (headers.containsKey("X-Have")) {
-                DataUtil.decodeXHave(headers["X-Have"]).each {
-                    available.add(it)
-                }
-                if (!available.contains(piece))
-                    return true // try again next time
-            } else {
-                if (code != 200)
-                    throw new IOException("Code $code but no X-Have")
-                available.clear()
-            }
-
-            if (code != 200)
-                return true
-
-            String range = headers["Content-Range"]
-            if (range == null)
-                throw new IOException("Code 200 but no Content-Range")
-
-            def group = (range =~ /^(\d+)-(\d+)$/)
-            if (group.size() != 1)
-                throw new IOException("invalid Content-Range header $range")
-
-            long receivedStart = Long.parseLong(group[0][1])
-            long receivedEnd = Long.parseLong(group[0][2])
-
             if (receivedStart != start || receivedEnd != end) {
                 log.warning("We don't support mismatching ranges yet")
                 endpoint.close()
@@ -172,45 +135,41 @@ class DownloadSession {
             }
             
             // start the download
-            FileChannel channel
+            channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, 
-            try {
+                StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
-                channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE,
+            mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
-                        StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) 
-                mapped = channel.map(FileChannel.MapMode.READ_WRITE, pieceStart, end - pieceStart + 1)
-                mapped.position(position)
             
-                byte[] tmp = new byte[0x1 << 13]
+            byte[] tmp = new byte[0x1 << 13]
-                while(mapped.hasRemaining()) {
+            while(mapped.hasRemaining()) {
-                    if (mapped.remaining() < tmp.length)
+                if (mapped.remaining() < tmp.length)
-                        tmp = new byte[mapped.remaining()]
+                    tmp = new byte[mapped.remaining()]
-                    int read = is.read(tmp)
+                int read = is.read(tmp)
-                    if (read == -1)
+                if (read == -1)
-                        throw new IOException()
+                    throw new IOException()
-                    synchronized(this) {
+                synchronized(this) {
-                        mapped.put(tmp, 0, read)
+                    mapped.put(tmp, 0, read)
-                        dataSinceLastRead += read
+                    
-                        pieces.markPartial(piece, mapped.position())
+                    if (timestamps.size() == SAMPLES) {
+                        timestamps.removeFirst()
+                        reads.removeFirst()
                     }
+                    timestamps.addLast(System.currentTimeMillis())
+                    reads.addLast(read)
                 }
-
-                mapped.clear()
-                digest.update(mapped)
-                byte [] hash = digest.digest()
-                byte [] expected = new byte[32]
-                System.arraycopy(infoHash.getHashList(), piece * 32, expected, 0, 32)
-                if (hash != expected) {
-                    pieces.markPartial(piece, 0)
-                    throw new BadHashException("bad hash on piece $piece")
-                }
-            } finally {
-                try { channel?.close() } catch (IOException ignore) {}
-                DataUtil.tryUnmap(mapped)
             }
-            pieces.markDownloaded(piece)
+            
-            unclaim = false
+            mapped.clear()
+            digest.update(mapped)
+            byte [] hash = digest.digest()
+            byte [] expected = new byte[32]
+            System.arraycopy(infoHash.getHashList(), piece * 32, expected, 0, 32)    
+            if (hash != expected) 
+                throw new BadHashException()
+            
+            downloaded.markDownloaded(piece)        
         } finally {
-            if (unclaim && !steal) 
+            claimed.clear(piece)
-                pieces.unclaim(piece)
+            try { channel?.close() } catch (IOException ignore) {}
         }
         return true
     }
@@ -222,11 +181,24 @@ class DownloadSession {
     }
     
     synchronized int speed() {
+        if (timestamps.size() < SAMPLES)
+            return 0
+        int totalRead = 0
+        int idx = 0
         final long now = System.currentTimeMillis()
-        long interval = Math.max(1000, now - lastSpeedRead)
+        
-        lastSpeedRead = now;
+        while(idx < SAMPLES && timestamps.get(idx) < now - 1000)
-        int rv = (int) (dataSinceLastRead * 1000.0 / interval)
+            idx++
-        dataSinceLastRead = 0
+        if (idx == SAMPLES)
-        rv
+            return 0
+        if (idx == SAMPLES - 1)
+            return reads[idx]
+            
+        long interval = timestamps.last - timestamps[idx]
+        if (interval == 0) 
+            interval = 1
+        for (int i = idx; i < SAMPLES; i++)
+            totalRead += reads[idx]
+        (int)(totalRead * 1000.0 / interval)
     }
 }

core/src/main/groovy/com/muwire/core/download/Downloader.groovy

@@ -4,14 +4,9 @@ import com.muwire.core.InfoHash
 import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
 
-import java.nio.file.AtomicMoveNotSupportedException
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-import java.time.Instant
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-import java.util.concurrent.atomic.AtomicBoolean
 import java.util.logging.Level
 
 import com.muwire.core.Constants
@@ -19,15 +14,13 @@ import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
-import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
-import net.i2p.util.ConcurrentHashSet
 
 @Log
 public class Downloader {
-    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, PAUSED, FINISHED }
+    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, FINISHED }
     private enum WorkerState { CONNECTING, HASHLIST, DOWNLOADING, FINISHED}
     
     private static final ExecutorService executorService = Executors.newCachedThreadPool({r ->
@@ -41,7 +34,7 @@ public class Downloader {
     private final DownloadManager downloadManager 
     private final Persona me   
     private final File file
-    private final Pieces pieces
+    private final Pieces downloaded, claimed
     private final long length
     private InfoHash infoHash
     private final int pieceSize
@@ -49,25 +42,17 @@ public class Downloader {
     private final Set<Destination> destinations
     private final int nPieces
     private final File piecesFile
-    private final File incompleteFile
     final int pieceSizePow2
     private final Map<Destination, DownloadWorker> activeWorkers = new ConcurrentHashMap<>()
-    private final Set<Destination> successfulDestinations = new ConcurrentHashSet<>()
     
     
-    private volatile boolean cancelled, paused
+    private volatile boolean cancelled
-    private final AtomicBoolean eventFired = new AtomicBoolean()
+    private volatile boolean eventFired
-    private boolean piecesFileClosed
-
-    private ArrayList speedArr = new ArrayList<Integer>()
-    private int speedPos = 0
-    private int speedAvg = 0
-    private long timestamp = Instant.now().toEpochMilli()
 
     public Downloader(EventBus eventBus, DownloadManager downloadManager, 
         Persona me, File file, long length, InfoHash infoHash, 
         int pieceSizePow2, I2PConnector connector, Set<Destination> destinations,
-        File incompletes, Pieces pieces) {
+        File incompletes) {
         this.eventBus = eventBus
         this.me = me
         this.downloadManager = downloadManager
@@ -77,15 +62,18 @@ public class Downloader {
         this.connector = connector
         this.destinations = destinations
         this.piecesFile = new File(incompletes, file.getName()+".pieces")
-        this.incompleteFile = new File(incompletes, file.getName()+".part")
         this.pieceSizePow2 = pieceSizePow2
         this.pieceSize = 1 << pieceSizePow2
-        this.pieces = pieces
-        this.nPieces = pieces.nPieces
         
-        // default size suitable for an average of 5 seconds / 5 elements / 5 interval units
+        int nPieces
-        // it's easily adjustable by resizing the size of speedArr
+        if (length % pieceSize == 0)
-        this.speedArr = [ 0, 0, 0, 0, 0 ]
+            nPieces = length / pieceSize
+        else
+            nPieces = length / pieceSize + 1
+        this.nPieces = nPieces
+        
+        downloaded = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
+        claimed = new Pieces(nPieces)
     }
     
     public synchronized InfoHash getInfoHash() {
@@ -111,76 +99,44 @@ public class Downloader {
         if (!piecesFile.exists())
             return
         piecesFile.eachLine { 
-            String [] split = it.split(",")
+            int piece = Integer.parseInt(it)
-            int piece = Integer.parseInt(split[0])
+            downloaded.markDownloaded(piece)
-            if (split.length == 1)
-                pieces.markDownloaded(piece)
-            else {
-                int position = Integer.parseInt(split[1])
-                pieces.markPartial(piece, position)
-            }
         }
     }
     
     void writePieces() {
-        synchronized(piecesFile) {
+        piecesFile.withPrintWriter { writer ->
-            if (piecesFileClosed)
+            downloaded.getDownloaded().each { piece -> 
-                return
+                writer.println(piece)
-            piecesFile.withPrintWriter { writer ->
-                pieces.write(writer)
             }
         }
     }
     
     public long donePieces() {
-        pieces.donePieces()
+        downloaded.donePieces()
     }
     
     
     public int speed() {
-        int currSpeed = 0
+        int total = 0
         if (getCurrentState() == DownloadState.DOWNLOADING) {
             activeWorkers.values().each {
                 if (it.currentState == WorkerState.DOWNLOADING)
-                    currSpeed += it.speed()
+                    total += it.speed()
             }
         }
-
+        total
-        // normalize to speedArr.size
-        currSpeed /= speedArr.size()
-
-        // compute new speedAvg and update speedArr
-        if ( speedArr[speedPos] > speedAvg ) {
-            speedAvg = 0
-        } else {
-            speedAvg -= speedArr[speedPos]
-        }
-        speedAvg += currSpeed
-        speedArr[speedPos] = currSpeed
-        // this might be necessary due to rounding errors
-        if (speedAvg < 0)
-            speedAvg = 0
-
-        // rolling index over the speedArr
-        speedPos++
-        if (speedPos >= speedArr.size())
-            speedPos=0
-
-        speedAvg
     }
     
     public DownloadState getCurrentState() {
         if (cancelled)
             return DownloadState.CANCELLED
-        if (paused)
-            return DownloadState.PAUSED
-
         boolean allFinished = true
         activeWorkers.values().each { 
             allFinished &= it.currentState == WorkerState.FINISHED
         }
         if (allFinished) {
-            if (pieces.isComplete())
+            if (downloaded.isComplete())
                 return DownloadState.FINISHED
             return DownloadState.FAILED
         }
@@ -214,17 +170,8 @@ public class Downloader {
     public void cancel() {
         cancelled = true
         stop()
-        synchronized(piecesFile) {
+        file.delete()
-            piecesFileClosed = true
+        piecesFile.delete()
-            piecesFile.delete()
-        }
-        incompleteFile.delete()
-        pieces.clearAll()
-    }
-
-    public void pause() {
-        paused = true
-        stop()
     }
     
     void stop() {
@@ -243,8 +190,6 @@ public class Downloader {
     }
     
     public void resume() {
-        paused = false
-        readPieces()
         destinations.each { destination ->
             def worker = activeWorkers.get(destination)
             if (worker != null) {
@@ -261,21 +206,12 @@ public class Downloader {
         }
     }
     
-    void addSource(Destination d) {
-        if (activeWorkers.containsKey(d))
-            return
-        DownloadWorker newWorker = new DownloadWorker(d)
-        activeWorkers.put(d, newWorker)
-        executorService.submit(newWorker)
-    }
-
     class DownloadWorker implements Runnable {
         private final Destination destination
         private volatile WorkerState currentState
         private volatile Thread downloadThread
         private Endpoint endpoint
         private volatile DownloadSession currentSession
-        private final Set<Integer> available = new HashSet<>()
                 
         DownloadWorker(Destination destination) {
             this.destination = destination
@@ -295,38 +231,23 @@ public class Downloader {
                 }
                 currentState = WorkerState.DOWNLOADING
                 boolean requestPerformed
-                while(!pieces.isComplete()) {
+                while(!downloaded.isComplete()) {
-                    currentSession = new DownloadSession(eventBus, me.toBase64(), pieces, getInfoHash(),
+                    currentSession = new DownloadSession(me.toBase64(), downloaded, claimed, getInfoHash(), endpoint, file, pieceSize, length)
-                        endpoint, incompleteFile, pieceSize, length, available)
                     requestPerformed = currentSession.request()
                     if (!requestPerformed)
                         break
-                    successfulDestinations.add(endpoint.destination)
                     writePieces()
                 }
             } catch (Exception bad) {
-                log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
+                log.log(Level.WARNING,"Exception while downloading",bad)
             } finally {
-                writePieces()
                 currentState = WorkerState.FINISHED
-                if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {
+                if (downloaded.isComplete() && !eventFired) {
-                    synchronized(piecesFile) {
+                    piecesFile.delete()
-                        piecesFileClosed = true
+                    eventFired = true
-                        piecesFile.delete()
-                    }
-                    activeWorkers.values().each { 
-                        if (it.destination != destination)
-                            it.cancel()
-                    }
-                    try {
-                        Files.move(incompleteFile.toPath(), file.toPath(), StandardCopyOption.ATOMIC_MOVE)
-                    } catch (AtomicMoveNotSupportedException e) {
-                        Files.copy(incompleteFile.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING)
-                        incompleteFile.delete()
-                    }
                     eventBus.publish(
                         new FileDownloadedEvent(
-                            downloadedFile : new DownloadedFile(file, getInfoHash(), pieceSizePow2, successfulDestinations),
+                            downloadedFile : new DownloadedFile(file, getInfoHash(), pieceSizePow2, Collections.emptySet()),
                         downloader : Downloader.this))
                             
                 } 

core/src/main/groovy/com/muwire/core/download/Pieces.groovy

@@ -1,11 +1,10 @@
 package com.muwire.core.download
 
 class Pieces {
-    private final BitSet done, claimed
+    private final BitSet bitSet
     private final int nPieces
     private final float ratio
     private final Random random = new Random()
-    private final Map<Integer,Integer> partials = new HashMap<>()
     
     Pieces(int nPieces) {
         this(nPieces, 1.0f)
@@ -14,103 +13,52 @@ class Pieces {
     Pieces(int nPieces, float ratio) {
         this.nPieces = nPieces
         this.ratio = ratio
-        done = new BitSet(nPieces)
+        bitSet = new BitSet(nPieces)
-        claimed = new BitSet(nPieces)
     }
     
-    synchronized int[] claim() {
+    synchronized int getRandomPiece() {
-        int claimedCardinality = claimed.cardinality()
+        int cardinality = bitSet.cardinality()
-        if (claimedCardinality == nPieces) {
+        if (cardinality == nPieces)
-            // steal
+            return -1
-            int downloadedCardinality = done.cardinality()
-            if (downloadedCardinality == nPieces)
-                return null
-            int rv = done.nextClearBit(0)
-            return [rv, partials.getOrDefault(rv, 0), 1]
-        }
         
         // if fuller than ratio just do sequential
-        if ( (1.0f * claimedCardinality) / nPieces > ratio) {
+        if ( (1.0f * cardinality) / nPieces > ratio) {
-            int rv = claimed.nextClearBit(0)
+            return bitSet.nextClearBit(0)
-            claimed.set(rv)
-            return [rv, partials.getOrDefault(rv, 0), 0]
         }
         
         while(true) {
             int start = random.nextInt(nPieces)
-            if (claimed.get(start))
+            if (bitSet.get(start))
                 continue
-            claimed.set(start)
+            return start
-            return [start, partials.getOrDefault(start,0), 0]
         }
     }
     
-    synchronized int[] claim(Set<Integer> available) {
+    def getDownloaded() {
-        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1))
-            available.remove(i)
-        if (available.isEmpty())
-            return null
-        Set<Integer> availableCopy = new HashSet<>(available)
-        for (int i = claimed.nextSetBit(0); i >= 0; i = claimed.nextSetBit(i+1))
-            availableCopy.remove(i)
-        if (availableCopy.isEmpty()) {
-            // steal
-            int rv = available.first()
-            return [rv, partials.getOrDefault(rv, 0), 1]
-        }
-        List<Integer> toList = availableCopy.toList()
-        Collections.shuffle(toList)
-        int rv = toList[0]
-        claimed.set(rv)
-        [rv, partials.getOrDefault(rv, 0), 0]
-    }
-
-    synchronized def getDownloaded() {
         def rv = []
-        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1)) {
+        for (int i = bitSet.nextSetBit(0); i >= 0; i = bitSet.nextSetBit(i+1)) {
             rv << i
         }
         rv
     }
     
     synchronized void markDownloaded(int piece) {
-        done.set(piece)
+        bitSet.set(piece)
-        claimed.set(piece)
-        partials.remove(piece)
     }
     
-    synchronized void markPartial(int piece, int position) {
+    synchronized void clear(int piece) {
-        partials.put(piece, position)
+        bitSet.clear(piece)
-    }
-
-    synchronized void unclaim(int piece) {
-        claimed.clear(piece)
     }
     
     synchronized boolean isComplete() {
-        done.cardinality() == nPieces
+        bitSet.cardinality() == nPieces
+    }
+    
+    synchronized boolean isMarked(int piece) {
+        bitSet.get(piece)
     }
     
     synchronized int donePieces() {
-        done.cardinality()
+        bitSet.cardinality()
-    }
-
-    synchronized boolean isDownloaded(int piece) {
-        done.get(piece)
-    }
-
-    synchronized void clearAll() {
-        done.clear()
-        claimed.clear()
-        partials.clear()
-    }
-    
-    synchronized void write(PrintWriter writer) {
-        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1)) {
-            writer.println(i)
-        }
-        partials.each { piece, position ->
-            writer.println("$piece,$position")
-        }
     }
 }

core/src/main/groovy/com/muwire/core/download/SourceDiscoveredEvent.groovy

@@ -1,10 +0,0 @@
-package com.muwire.core.download
-
-import com.muwire.core.Event
-import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-
-class SourceDiscoveredEvent extends Event {
-    InfoHash infoHash
-    Persona source
-}

core/src/main/groovy/com/muwire/core/download/UIDownloadEvent.groovy

@@ -3,11 +3,8 @@ package com.muwire.core.download
 import com.muwire.core.Event
 import com.muwire.core.search.UIResultEvent
 
-import net.i2p.data.Destination
-
 class UIDownloadEvent extends Event {
     
     UIResultEvent[] result
-    Set<Destination> sources
     File target
 }

core/src/main/groovy/com/muwire/core/download/UIDownloadPausedEvent.groovy

@@ -1,6 +0,0 @@
-package com.muwire.core.download
-
-import com.muwire.core.Event
-
-class UIDownloadPausedEvent extends Event {
-}

core/src/main/groovy/com/muwire/core/download/UIDownloadResumedEvent.groovy

@@ -1,6 +0,0 @@
-package com.muwire.core.download
-
-import com.muwire.core.Event
-
-class UIDownloadResumedEvent extends Event {
-}

core/src/main/groovy/com/muwire/core/files/DirectoryUnsharedEvent.groovy

@@ -1,7 +0,0 @@
-package com.muwire.core.files
-
-import com.muwire.core.Event
-
-class DirectoryUnsharedEvent extends Event {
-    File directory
-}

core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy

@@ -1,148 +1,4 @@
 package com.muwire.core.files
 
-import java.nio.file.FileSystem
-import java.nio.file.FileSystems
-import java.nio.file.Path
-import java.nio.file.Paths
-import static java.nio.file.StandardWatchEventKinds.*
-
-import java.nio.file.ClosedWatchServiceException
-import java.nio.file.WatchEvent
-import java.nio.file.WatchKey
-import java.nio.file.WatchService
-import java.util.concurrent.ConcurrentHashMap
-
-import com.muwire.core.EventBus
-import com.muwire.core.SharedFile
-
-import groovy.util.logging.Log
-import net.i2p.util.SystemVersion
-
-@Log
 class DirectoryWatcher {
-
-    private static final long WAIT_TIME = 1000
-
-    private static final WatchEvent.Kind[] kinds
-    static {
-        if (SystemVersion.isMac())
-            kinds = [ENTRY_MODIFY, ENTRY_DELETE]
-        else
-            kinds = [ENTRY_CREATE, ENTRY_MODIFY, ENTRY_DELETE]
-    }
-
-    private final EventBus eventBus
-    private final FileManager fileManager
-    private final Thread watcherThread, publisherThread
-    private final Map<File, Long> waitingFiles = new ConcurrentHashMap<>()
-    private final Map<File, WatchKey> watchedDirectories = new ConcurrentHashMap<>()
-    private WatchService watchService
-    private volatile boolean shutdown
-
-    DirectoryWatcher(EventBus eventBus, FileManager fileManager) {
-        this.eventBus = eventBus
-        this.fileManager = fileManager
-        this.watcherThread = new Thread({watch() } as Runnable, "directory-watcher")
-        watcherThread.setDaemon(true)
-        this.publisherThread = new Thread({publish()} as Runnable, "watched-files-publisher")
-        publisherThread.setDaemon(true)
-    }
-
-    void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
-        watchService = FileSystems.getDefault().newWatchService()
-        watcherThread.start()
-        publisherThread.start()
-    }
-
-    void stop() {
-        shutdown = true
-        watcherThread?.interrupt()
-        publisherThread?.interrupt()
-        watchService?.close()
-    }
-
-    void onFileSharedEvent(FileSharedEvent e) {
-        if (!e.file.isDirectory())
-            return
-        Path path = e.file.getCanonicalFile().toPath()
-        WatchKey wk = path.register(watchService, kinds)
-        watchedDirectories.put(e.file, wk)
-
-    }
-
-    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
-        WatchKey wk = watchedDirectories.remove(e.directory)
-        wk?.cancel()
-    }
-
-    private void watch() {
-        try {
-            while(!shutdown) {
-                WatchKey key = watchService.take()
-                key.pollEvents().each {
-                    switch(it.kind()) {
-                        case ENTRY_CREATE: processCreated(key.watchable(), it.context()); break
-                        case ENTRY_MODIFY: processModified(key.watchable(), it.context()); break
-                        case ENTRY_DELETE: processDeleted(key.watchable(), it.context()); break
-                    }
-                }
-                key.reset()
-            }
-        } catch (InterruptedException|ClosedWatchServiceException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
-
-
-    private void processCreated(Path parent, Path path) {
-        File f= join(parent, path)
-        log.fine("created entry $f")
-        if (f.isDirectory())
-            f.toPath().register(watchService, kinds)
-        else
-            waitingFiles.put(f, System.currentTimeMillis())
-    }
-
-    private void processModified(Path parent, Path path) {
-        File f = join(parent, path)
-        log.fine("modified entry $f")
-        waitingFiles.put(f, System.currentTimeMillis())
-    }
-
-    private void processDeleted(Path parent, Path path) {
-        File f = join(parent, path)
-        log.fine("deleted entry $f")
-        SharedFile sf = fileManager.fileToSharedFile.get(f)
-        if (sf != null)
-            eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-    }
-
-    private static File join(Path parent, Path path) {
-        File parentFile = parent.toFile().getCanonicalFile()
-        new File(parentFile, path.toFile().getName()).getCanonicalFile()
-    }
-
-    private void publish() {
-        try {
-            while(!shutdown) {
-                Thread.sleep(WAIT_TIME)
-                long now = System.currentTimeMillis()
-                def published = []
-                waitingFiles.each { file, timestamp ->
-                    if (now - timestamp > WAIT_TIME) {
-                        log.fine("publishing file $file")
-                        eventBus.publish new FileSharedEvent(file : file)
-                        published << file
-                    }
-                }
-                published.each {
-                    waitingFiles.remove(it)
-                }
-            }
-        } catch (InterruptedException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
 }

core/src/main/groovy/com/muwire/core/files/FileDownloadedEvent.groovy

@@ -8,5 +8,5 @@ import net.i2p.data.Destination
 
 class FileDownloadedEvent extends Event {
     Downloader downloader
-    DownloadedFile downloadedFile
+	DownloadedFile downloadedFile
 }

core/src/main/groovy/com/muwire/core/files/FileHashedEvent.groovy

@@ -5,12 +5,6 @@ import com.muwire.core.SharedFile
 
 class FileHashedEvent extends Event {
 
-    SharedFile sharedFile
+	SharedFile sharedFile
-    String error
+	String error
-
-    @Override
-    public String toString() {
-        super.toString() + " sharedFile " + sharedFile?.file.getAbsolutePath() + " error: $error"
-    }
-
 }

core/src/main/groovy/com/muwire/core/files/FileHasher.groovy

@@ -1,7 +1,6 @@
 package com.muwire.core.files
 
 import com.muwire.core.InfoHash
-import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
 
@@ -13,67 +12,64 @@ import java.security.NoSuchAlgorithmException
 
 class FileHasher {
 
-    /** max size of shared file is 128 GB */
+	/** max size of shared file is 128 GB */
-    public static final long MAX_SIZE = 0x1L << 37
+	public static final long MAX_SIZE = 0x1L << 37
 	
-    /**
+	/**
-     * @param size of the file to be shared
+	 * @param size of the file to be shared
-     * @return the size of each piece in power of 2
+	 * @return the size of each piece in power of 2
-     * piece size is minimum 128 KBytees and maximum 16 MBytes in power of 2 steps (2^17 - 2^24)
+	 */
-     * there can be up to 8192 pieces maximum per file
+	static int getPieceSize(long size) {
-     */
+		if (size <= 0x1 << 30)
-    static int getPieceSize(long size) {
+			return 17
-        if (size <= 0x1 << 30)
-            return 17
 		
-        for (int i = 31; i <= 37; i++) {
+		for (int i = 31; i <= 37; i++) {
-            if (size <= 0x1L << i) {
+			if (size <= 0x1L << i) {
-                return i-13
+				return i-13
-            }
+			}
-        }
+		}
 		
-        throw new IllegalArgumentException("File too large $size")
+		throw new IllegalArgumentException("File too large $size")
-    }
+	}
 	
-    final MessageDigest digest
+	final MessageDigest digest
 	
-    FileHasher() {
+	FileHasher() {
-        try {
+		try {
-            digest = MessageDigest.getInstance("SHA-256")
+			digest = MessageDigest.getInstance("SHA-256")
-        } catch (NoSuchAlgorithmException impossible) {
+		} catch (NoSuchAlgorithmException impossible) {
-            digest = null
+			digest = null
-            System.exit(1)
+			System.exit(1)
-        }
+		}
-    }
+	}
 	
-    InfoHash hashFile(File file) {
+	InfoHash hashFile(File file) {
-        final long length = file.length()
+		final long length = file.length()
-        final int size = 0x1 << getPieceSize(length)
+		final int size = 0x1 << getPieceSize(length)
-        int numPieces = (int) (length / size)
+		int numPieces = (int) (length / size)
-        if (numPieces * size < length)
+		if (numPieces * size < length)
-            numPieces++
+			numPieces++
 			
-        def output = new ByteArrayOutputStream()
+		def output = new ByteArrayOutputStream()
-        RandomAccessFile raf = new RandomAccessFile(file, "r")
+		RandomAccessFile raf = new RandomAccessFile(file, "r")
-        try {
+		try {
-            MappedByteBuffer buf
+			MappedByteBuffer buf
-            for (int i = 0; i < numPieces - 1; i++) {
+			for (int i = 0; i < numPieces - 1; i++) {
-                buf = raf.getChannel().map(MapMode.READ_ONLY, ((long)size) * i, size)
+				buf = raf.getChannel().map(MapMode.READ_ONLY, ((long)size) * i, size)
-                digest.update buf
+				digest.update buf
-                DataUtil.tryUnmap(buf)
+				output.write(digest.digest(), 0, 32)
-                output.write(digest.digest(), 0, 32)
+			}
-            }
+			def lastPieceLength = length - (numPieces - 1) * ((long)size)
-            def lastPieceLength = length - (numPieces - 1) * ((long)size)
+			buf = raf.getChannel().map(MapMode.READ_ONLY, length - lastPieceLength, lastPieceLength)
-            buf = raf.getChannel().map(MapMode.READ_ONLY, length - lastPieceLength, lastPieceLength)
+			digest.update buf
-            digest.update buf
+			output.write(digest.digest(), 0, 32)
-            output.write(digest.digest(), 0, 32)
+		} finally {
-        } finally {
+			raf.close()
-            raf.close()
+		}
-        }
 		
-        byte [] hashList = output.toByteArray()
+		byte [] hashList = output.toByteArray()
-        InfoHash.fromHashList(hashList)
+		InfoHash.fromHashList(hashList)
-    }
+	}
     
     public static void main(String[] args) {
         if (args.length != 1) {

core/src/main/groovy/com/muwire/core/files/FileHashingEvent.groovy

@@ -1,15 +0,0 @@
-package com.muwire.core.files
-
-import com.muwire.core.Event
-import com.muwire.core.SharedFile
-
-class FileHashingEvent extends Event {
-
-    File hashingFile
-
-    @Override
-    public String toString() {
-        super.toString() + " hashingFile " + hashingFile.getAbsolutePath()
-    }
-
-}

core/src/main/groovy/com/muwire/core/files/FileLoadedEvent.groovy

@@ -5,5 +5,5 @@ import com.muwire.core.SharedFile
 
 class FileLoadedEvent extends Event {
 
-    SharedFile loadedFile
+	SharedFile loadedFile
 }

core/src/main/groovy/com/muwire/core/files/FileManager.groovy

@@ -15,26 +15,26 @@ import groovy.util.logging.Log
 class FileManager {
 
 
-    final EventBus eventBus
+	final EventBus eventBus
     final MuWireSettings settings
-    final Map<InfoHash, Set<SharedFile>> rootToFiles = Collections.synchronizedMap(new HashMap<>())
+	final Map<InfoHash, Set<SharedFile>> rootToFiles = Collections.synchronizedMap(new HashMap<>())
-    final Map<File, SharedFile> fileToSharedFile = Collections.synchronizedMap(new HashMap<>())
+	final Map<File, SharedFile> fileToSharedFile = Collections.synchronizedMap(new HashMap<>())
-    final Map<String, Set<File>> nameToFiles = new HashMap<>()
+	final Map<String, Set<File>> nameToFiles = new HashMap<>()
-    final SearchIndex index = new SearchIndex()
+	final SearchIndex index = new SearchIndex()
 	
-    FileManager(EventBus eventBus, MuWireSettings settings) {
+	FileManager(EventBus eventBus, MuWireSettings settings) {
         this.settings = settings
-        this.eventBus = eventBus
+		this.eventBus = eventBus
-    }
+	}
 	
     void onFileHashedEvent(FileHashedEvent e) {
         if (e.sharedFile != null)
             addToIndex(e.sharedFile)
     }
 	
-    void onFileLoadedEvent(FileLoadedEvent e) {
+	void onFileLoadedEvent(FileLoadedEvent e) {
-        addToIndex(e.loadedFile)
+		addToIndex(e.loadedFile)
-    }
+	}
 	
     void onFileDownloadedEvent(FileDownloadedEvent e) {
         if (settings.shareDownloadedFiles) {
@@ -42,88 +42,88 @@ class FileManager {
         }
     }
 	
-    private void addToIndex(SharedFile sf) {
+	private void addToIndex(SharedFile sf) {
         log.info("Adding shared file " + sf.getFile())
-        InfoHash infoHash = sf.getInfoHash()
+		InfoHash infoHash = sf.getInfoHash()
-        Set<SharedFile> existing = rootToFiles.get(infoHash)
+		Set<SharedFile> existing = rootToFiles.get(infoHash)
-        if (existing == null) {
+		if (existing == null) {
             log.info("adding new root")
-            existing = new HashSet<>()
+			existing = new HashSet<>()
-            rootToFiles.put(infoHash, existing);
+			rootToFiles.put(infoHash, existing);
-        }
+		}
-        existing.add(sf)
+		existing.add(sf)
-        fileToSharedFile.put(sf.file, sf)
+		fileToSharedFile.put(sf.file, sf)
 		
-        String name = sf.getFile().getName()
+		String name = sf.getFile().getName()
-        Set<File> existingFiles = nameToFiles.get(name)
+		Set<File> existingFiles = nameToFiles.get(name)
-        if (existingFiles == null) {
+		if (existingFiles == null) {
-            existingFiles = new HashSet<>()
+			existingFiles = new HashSet<>()
-            nameToFiles.put(name, existingFiles)
+			nameToFiles.put(name, existingFiles)
-        }
+		}
-        existingFiles.add(sf.getFile())
+		existingFiles.add(sf.getFile())
 		
-        index.add(name)
+		index.add(name)
-    }
+	}
 	
-    void onFileUnsharedEvent(FileUnsharedEvent e) {
+	void onFileUnsharedEvent(FileUnsharedEvent e) {
-        SharedFile sf = e.unsharedFile
+		SharedFile sf = e.unsharedFile
-        InfoHash infoHash = sf.getInfoHash()
+		InfoHash infoHash = sf.getInfoHash()
-        Set<SharedFile> existing = rootToFiles.get(infoHash)
+		Set<SharedFile> existing = rootToFiles.get(infoHash)
-        if (existing != null) {
+		if (existing != null) {
-            existing.remove(sf)
+			existing.remove(sf)
-            if (existing.isEmpty()) {
+			if (existing.isEmpty()) {
-                rootToFiles.remove(infoHash)
+				rootToFiles.remove(infoHash)
-            }
+			}
-        }
+		}
 		
-        fileToSharedFile.remove(sf.file)
+		fileToSharedFile.remove(sf.file)
 		
-        String name = sf.getFile().getName()
+		String name = sf.getFile().getName()
-        Set<File> existingFiles = nameToFiles.get(name)
+		Set<File> existingFiles = nameToFiles.get(name)
-        if (existingFiles != null) {
+		if (existingFiles != null) {
-            existingFiles.remove(sf.file)
+			existingFiles.remove(sf.file)
-            if (existingFiles.isEmpty()) {
+			if (existingFiles.isEmpty()) {
-                nameToFiles.remove(name)
+				nameToFiles.remove(name)
-            }
+			}
-        }
+		}
 		
-        index.remove(name)
+		index.remove(name)
-    }
+	}
 	
-    Map<File, SharedFile> getSharedFiles() {
+	Map<File, SharedFile> getSharedFiles() {
         synchronized(fileToSharedFile) {
             return new HashMap<>(fileToSharedFile)
         }
-    }
+	}
     
     Set<SharedFile> getSharedFiles(byte []root) {
             return rootToFiles.get(new InfoHash(root))
     }
 	
-    void onSearchEvent(SearchEvent e) {
+	void onSearchEvent(SearchEvent e) {
-        // hash takes precedence
+		// hash takes precedence
-        ResultsEvent re = null
+		ResultsEvent re = null
-        if (e.searchHash != null) {
+		if (e.searchHash != null) {
             Set<SharedFile> found
             found = rootToFiles.get new InfoHash(e.searchHash)
             found = filter(found, e.oobInfohash)
-            if (found != null && !found.isEmpty())
+			if (found != null && !found.isEmpty())
-                re = new ResultsEvent(results: found.asList(), uuid: e.uuid, searchEvent: e)
+				re = new ResultsEvent(results: found.asList(), uuid: e.uuid, searchEvent: e)
-        } else {
+		} else {
-            def names = index.search e.searchTerms
+			def names = index.search e.searchTerms
-            Set<File> files = new HashSet<>()
+			Set<File> files = new HashSet<>()
-            names.each { files.addAll nameToFiles.getOrDefault(it, []) }
+			names.each { files.addAll nameToFiles.getOrDefault(it, []) }
-            Set<SharedFile> sharedFiles = new HashSet<>()
+			Set<SharedFile> sharedFiles = new HashSet<>()
-            files.each { sharedFiles.add fileToSharedFile[it] }
+			files.each { sharedFiles.add fileToSharedFile[it] }
             files = filter(sharedFiles, e.oobInfohash)
-            if (!sharedFiles.isEmpty())
+			if (!sharedFiles.isEmpty())
-                re = new ResultsEvent(results: sharedFiles.asList(), uuid: e.uuid, searchEvent: e)
+				re = new ResultsEvent(results: sharedFiles.asList(), uuid: e.uuid, searchEvent: e)
 			
-        }
+		}
 		
-        if (re != null)
+		if (re != null)
-            eventBus.publish(re)
+			eventBus.publish(re)
-    }
+	}
     
     private static Set<SharedFile> filter(Set<SharedFile> files, boolean oob) {
         if (!oob)
@@ -135,16 +135,4 @@ class FileManager {
         }
         rv
     }
-
-    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
-        e.directory.listFiles().each {
-            if (it.isDirectory())
-                eventBus.publish(new DirectoryUnsharedEvent(directory : it))
-            else {
-                SharedFile sf = fileToSharedFile.get(it)
-                if (sf != null)
-                    eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-            }
-        }
-    }
 }

core/src/main/groovy/com/muwire/core/files/FileSharedEvent.groovy

@@ -4,10 +4,5 @@ import com.muwire.core.Event
 
 class FileSharedEvent extends Event {
 
-    File file
+	File file
-
-    @Override
-    public String toString() {
-        return super.toString() + " file: "+file.getAbsolutePath()
-    }
 }

core/src/main/groovy/com/muwire/core/files/FileUnsharedEvent.groovy

@@ -4,5 +4,5 @@ import com.muwire.core.Event
 import com.muwire.core.SharedFile
 
 class FileUnsharedEvent extends Event {
-    SharedFile unsharedFile
+	SharedFile unsharedFile
 }

core/src/main/groovy/com/muwire/core/files/HasherService.groovy

@@ -8,41 +8,40 @@ import com.muwire.core.SharedFile
 
 class HasherService {
 
-    final FileHasher hasher
+	final FileHasher hasher
-    final EventBus eventBus
+	final EventBus eventBus
     final FileManager fileManager
-    Executor executor
+	Executor executor
 	
-    HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager) {
+	HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager) {
-        this.hasher = hasher
+		this.hasher = hasher
-        this.eventBus = eventBus
+		this.eventBus = eventBus
         this.fileManager = fileManager
-    }
+	}
 	
-    void start() {
+	void start() {
-        executor = Executors.newSingleThreadExecutor()
+		executor = Executors.newSingleThreadExecutor()
-    }
+	}
 	
-    void onFileSharedEvent(FileSharedEvent evt) {
+	void onFileSharedEvent(FileSharedEvent evt) {
-        if (fileManager.fileToSharedFile.containsKey(evt.file.getCanonicalFile()))
+        if (fileManager.fileToSharedFile.containsKey(evt.file))
             return
-        executor.execute( { -> process(evt.file) } as Runnable)
+		executor.execute( { -> process(evt.file) } as Runnable)
-    }
+	}
 	
-    private void process(File f) {
+	private void process(File f) {
-        f = f.getCanonicalFile()
+		f = f.getCanonicalFile()
-        if (f.isDirectory()) {
+		if (f.isDirectory()) {
-            f.listFiles().each {eventBus.publish new FileSharedEvent(file: it) }
+			f.listFiles().each {onFileSharedEvent new FileSharedEvent(file: it) }
-        } else {
+		} else {
-            if (f.length() == 0) {
+			if (f.length() == 0) {
-                eventBus.publish new FileHashedEvent(error: "Not sharing empty file $f")
+				eventBus.publish new FileHashedEvent(error: "Not sharing empty file $f")
-            } else if (f.length() > FileHasher.MAX_SIZE) {
+			} else if (f.length() > FileHasher.MAX_SIZE) {
-                eventBus.publish new FileHashedEvent(error: "$f is too large to be shared ${f.length()}")
+				eventBus.publish new FileHashedEvent(error: "$f is too large to be shared ${f.length()}")
-            } else {
+			} else {
-                eventBus.publish new FileHashingEvent(hashingFile: f)
+				def hash = hasher.hashFile f
-                def hash = hasher.hashFile f
+				eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
-                eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
+			}
-            }
+		}
-        }
+	}
-    }
 }

core/src/main/groovy/com/muwire/core/files/PersisterService.groovy

@@ -11,7 +11,6 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.Service
 import com.muwire.core.SharedFile
-import com.muwire.core.UILoadedEvent
 import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonOutput
@@ -23,135 +22,135 @@ import net.i2p.data.Destination
 @Log
 class PersisterService extends Service {
 
-    final File location
+	final File location
-    final EventBus listener
+	final EventBus listener
-    final int interval
+	final int interval
-    final Timer timer
+	final Timer timer
-    final FileManager fileManager
+	final FileManager fileManager
 	
-    PersisterService(File location, EventBus listener, int interval, FileManager fileManager) {
+	PersisterService(File location, EventBus listener, int interval, FileManager fileManager) {
-        this.location = location
+		this.location = location
-        this.listener = listener
+		this.listener = listener
-        this.interval = interval
+		this.interval = interval
-        this.fileManager = fileManager
+		this.fileManager = fileManager
-        timer = new Timer("file persister", true)
+		timer = new Timer("file persister", true)
-    }
+	}
 	
-    void stop() {
+	void start() {
-        timer.cancel()
+		timer.schedule({load()} as TimerTask, 1)
-    }
+	}
 	
-    void onUILoadedEvent(UILoadedEvent e) {
+	void stop() {
-        timer.schedule({load()} as TimerTask, 1)
+		timer.cancel()
-    }
+	}
 	
-    void load() {
+	void load() {
-        if (location.exists() && location.isFile()) {
+		if (location.exists() && location.isFile()) {
-            def slurper = new JsonSlurper()
+			def slurper = new JsonSlurper()
-            try {
+			try {
-                location.eachLine {
+				location.eachLine {
-                    if (it.trim().length() > 0) {
+					if (it.trim().length() > 0) {
-                        def parsed = slurper.parseText it
+						def parsed = slurper.parseText it
-                        def event = fromJson parsed
+						def event = fromJson parsed
-                        if (event != null) {
+						if (event != null) {
                             log.fine("loaded file $event.loadedFile.file")
-                            listener.publish event
+							listener.publish event
-                        }
+						}
-                    }
+					}
-                }
+				}
                 listener.publish(new AllFilesLoadedEvent())
-            } catch (IllegalArgumentException|NumberFormatException e) {
+			} catch (IllegalArgumentException|NumberFormatException e) {
                 log.log(Level.WARNING, "couldn't load files",e)
-            }
+			}
-        } else {
+		} else {
             listener.publish(new AllFilesLoadedEvent())
         }
-        timer.schedule({persistFiles()} as TimerTask, 0, interval)
+		timer.schedule({persistFiles()} as TimerTask, 0, interval)
-        loaded = true
+		loaded = true
-    }
+	}
 	
-    private static FileLoadedEvent fromJson(def json) {
+	private static FileLoadedEvent fromJson(def json) {
-        if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
+		if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
-            throw new IllegalArgumentException()
+			throw new IllegalArgumentException()
-        if (!(json.hashList instanceof List))
+		if (!(json.hashList instanceof List))
-            throw new IllegalArgumentException()
+			throw new IllegalArgumentException()
 			
-        def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+		def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
-        file = file.getCanonicalFile()
+		file = file.getCanonicalFile()
-        if (!file.exists() || file.isDirectory())
+		if (!file.exists() || file.isDirectory())
-            return null
+			return null
-        long length = Long.valueOf(json.length)
+		long length = Long.valueOf(json.length)
-        if (length != file.length())
+		if (length != file.length())
-            return null
+			return null
 		
-        List hashList = (List) json.hashList
+		List hashList = (List) json.hashList
-        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+		ByteArrayOutputStream baos = new ByteArrayOutputStream()
-        hashList.each {
+		hashList.each {
-            byte [] hash = Base64.decode it.toString()
+			byte [] hash = Base64.decode it.toString()
-            if (hash == null)
+			if (hash == null)
-                throw new IllegalArgumentException()
+				throw new IllegalArgumentException()
-            baos.write hash
+			baos.write hash
-        }
+		}
-        byte[] hashListBytes = baos.toByteArray()
+		byte[] hashListBytes = baos.toByteArray()
 		
-        InfoHash ih = InfoHash.fromHashList(hashListBytes)
+		InfoHash ih = InfoHash.fromHashList(hashListBytes)
-        byte [] root = Base64.decode(json.infoHash.toString())
+		byte [] root = Base64.decode(json.infoHash.toString())
-        if (root == null)
+		if (root == null)
-            throw new IllegalArgumentException()
+			throw new IllegalArgumentException()
-        if (!Arrays.equals(root, ih.getRoot()))
+		if (!Arrays.equals(root, ih.getRoot()))
-            return null
+			return null
 			
         int pieceSize = 0
         if (json.pieceSize != null)
             pieceSize = json.pieceSize
             
         if (json.sources != null) {
-            List sources = (List)json.sources
+			List sources = (List)json.sources
-            Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
+			Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
-            DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
+			DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
-            return new FileLoadedEvent(loadedFile : df)
+			return new FileLoadedEvent(loadedFile : df)
-        }
+		}
         
 		 
-        SharedFile sf = new SharedFile(file, ih, pieceSize)
+		SharedFile sf = new SharedFile(file, ih, pieceSize)
-        return new FileLoadedEvent(loadedFile: sf)
+		return new FileLoadedEvent(loadedFile: sf)
 		
-    }
+	}
 	
-    private void persistFiles() {
+	private void persistFiles() {
-        def sharedFiles = fileManager.getSharedFiles()
+		def sharedFiles = fileManager.getSharedFiles()
         
         File tmp = File.createTempFile("muwire-files", "tmp")
         tmp.deleteOnExit()
-        tmp.withPrintWriter { writer ->
+		tmp.withPrintWriter { writer ->
-            sharedFiles.each { k, v ->
+			sharedFiles.each { k, v ->
-                def json = toJson(k,v)
+				def json = toJson(k,v)
-                json = JsonOutput.toJson(json)
+				json = JsonOutput.toJson(json)
-                writer.println json
+				writer.println json
-            }
+			}
-        }
+		}
         Files.copy(tmp.toPath(), location.toPath(), StandardCopyOption.REPLACE_EXISTING)
         tmp.delete()
-    }
+	}
 	
-    private def toJson(File f, SharedFile sf) {
+	private def toJson(File f, SharedFile sf) {
-        def json = [:]
+		def json = [:]
-        json.file = Base64.encode DataUtil.encodei18nString(f.getCanonicalFile().toString())
+		json.file = Base64.encode DataUtil.encodei18nString(f.getCanonicalFile().toString())
-        json.length = f.length()
+		json.length = f.length()
-        InfoHash ih = sf.getInfoHash()
+		InfoHash ih = sf.getInfoHash()
-        json.infoHash = Base64.encode ih.getRoot()
+		json.infoHash = Base64.encode ih.getRoot()
         json.pieceSize = sf.getPieceSize()
-        byte [] tmp = new byte [32]
+		byte [] tmp = new byte [32]
-        json.hashList = []
+		json.hashList = []
-        for (int i = 0;i < ih.getHashList().length / 32; i++) {
+		for (int i = 0;i < ih.getHashList().length / 32; i++) {
-            System.arraycopy(ih.getHashList(), i * 32, tmp, 0, 32)
+			System.arraycopy(ih.getHashList(), i * 32, tmp, 0, 32)
-            json.hashList.add Base64.encode(tmp)
+			json.hashList.add Base64.encode(tmp)
-        }
+		}
 		
-        if (sf instanceof DownloadedFile) {
+		if (sf instanceof DownloadedFile) {
-            json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
+			json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
-        }
+		}
 		
-        json
+		json
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/hostcache/CacheClient.groovy

@@ -18,176 +18,176 @@ import net.i2p.data.Destination
 @Log
 class CacheClient {
 	
-    private static final int CRAWLER_RETURN = 10
+	private static final int CRAWLER_RETURN = 10
 	
-    final EventBus eventBus
+	final EventBus eventBus
-    final HostCache cache
+	final HostCache cache
-    final ConnectionManager manager
+	final ConnectionManager manager
-    final I2PSession session
+	final I2PSession session
-    final long interval
+	final long interval
-    final MuWireSettings settings
+	final MuWireSettings settings
-    final Timer timer
+	final Timer timer
 
-    public CacheClient(EventBus eventBus, HostCache cache,
+	public CacheClient(EventBus eventBus, HostCache cache, 
-        ConnectionManager manager, I2PSession session,
+		ConnectionManager manager, I2PSession session,
-        MuWireSettings settings, long interval) {
+		MuWireSettings settings, long interval) {
-        this.eventBus = eventBus
+		this.eventBus = eventBus
-        this.cache = cache
+		this.cache = cache
-        this.manager = manager
+		this.manager = manager
-        this.session = session
+		this.session = session
-        this.settings = settings
+		this.settings = settings
-        this.interval = interval
+		this.interval = interval
-        this.timer = new Timer("hostcache-client",true)
+		this.timer = new Timer("hostcache-client",true)
-    }
+	}
 	
-    void start() {
+	void start() {
-        session.addMuxedSessionListener(new Listener(), I2PSession.PROTO_DATAGRAM, 0)
+		session.addMuxedSessionListener(new Listener(), I2PSession.PROTO_DATAGRAM, 0)
-        timer.schedule({queryIfNeeded()} as TimerTask, 1, interval)
+		timer.schedule({queryIfNeeded()} as TimerTask, 1, interval)
-    }
+	}
 	
-    void stop() {
+	void stop() {
-        timer.cancel()
+		timer.cancel()
-    }
+	}
 	
-    private void queryIfNeeded() {
+	private void queryIfNeeded() {
-        if (!manager.getConnections().isEmpty())
+		if (!manager.getConnections().isEmpty())
-            return
+			return
-        if (!cache.getHosts(1).isEmpty())
+		if (!cache.getHosts(1).isEmpty())
-            return
+			return
 		
-        log.info "Will query hostcaches"
+		log.info "Will query hostcaches"	
 		
-        def ping = [type: "Ping", version: 1, leaf: settings.isLeaf()]
+		def ping = [type: "Ping", version: 1, leaf: settings.isLeaf()]
-        ping = JsonOutput.toJson(ping)
+		ping = JsonOutput.toJson(ping)
-        def maker = new I2PDatagramMaker(session)
+		def maker = new I2PDatagramMaker(session)
-        ping = maker.makeI2PDatagram(ping.bytes)
+		ping = maker.makeI2PDatagram(ping.bytes)
-        def options = new SendMessageOptions()
+		def options = new SendMessageOptions()
-        options.setSendLeaseSet(true)
+		options.setSendLeaseSet(true)
-        CacheServers.getCacheServers().each {
+		CacheServers.getCacheServers().each {
-            log.info "Querying hostcache ${it.toBase32()}"
+			log.info "Querying hostcache ${it.toBase32()}"
-            session.sendMessage(it, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 1, 0, options)
+			session.sendMessage(it, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 1, 0, options)
-        }
+		}
-    }
+	}
 	
-    class Listener implements I2PSessionMuxedListener {
+	class Listener implements I2PSessionMuxedListener {
 		
-        private final JsonSlurper slurper = new JsonSlurper()
+		private final JsonSlurper slurper = new JsonSlurper()
 
-        @Override
+		@Override
-        public void messageAvailable(I2PSession session, int msgId, long size) {
+		public void messageAvailable(I2PSession session, int msgId, long size) {
-        }
+		}
 
-        @Override
+		@Override
-        public void messageAvailable(I2PSession session, int msgId, long size, int proto, int fromport, int toport) {
+		public void messageAvailable(I2PSession session, int msgId, long size, int proto, int fromport, int toport) {
 			
-            if (proto != I2PSession.PROTO_DATAGRAM) {
+			if (proto != I2PSession.PROTO_DATAGRAM) {
-                log.warning "Received unexpected protocol $proto"
+				log.warning "Received unexpected protocol $proto"
-                return
+				return
-            }
+			}
 			
-            def payload = session.receiveMessage(msgId)
+			def payload = session.receiveMessage(msgId)
-            def dissector = new I2PDatagramDissector()
+			def dissector = new I2PDatagramDissector()
-            try {
+			try {
-                dissector.loadI2PDatagram(payload)
+				dissector.loadI2PDatagram(payload)
-                def sender = dissector.getSender()
+				def sender = dissector.getSender()
-                log.info("Received something from ${sender.toBase32()}")
+				log.info("Received something from ${sender.toBase32()}")
 				
-                payload = dissector.getPayload()
+				payload = dissector.getPayload()
-                payload = slurper.parse(payload)
+				payload = slurper.parse(payload)
 				
-                if (payload.type == null) {
+				if (payload.type == null) {
-                    log.warning("type missing")
+					log.warning("type missing")
-                    return
+					return
-                }
+				}
 				
-                switch(payload.type) {
+				switch(payload.type) {
-                    case "Pong" : handlePong(sender, payload); break
+					case "Pong" : handlePong(sender, payload); break
-                    case "CrawlerPing": handleCrawlerPing(session, sender, payload); break
+					case "CrawlerPing": handleCrawlerPing(session, sender, payload); break
-                    default : log.warning("unknown type ${payload.type}")
+					default : log.warning("unknown type ${payload.type}")
-                }
+				}
-            } catch (Exception e) {
+			} catch (Exception e) {
-                log.warning("Invalid datagram $e")
+				log.warning("Invalid datagram $e")
-            }
+			}
-        }
+		}
 
-        @Override
+		@Override
-        public void reportAbuse(I2PSession session, int severity) {
+		public void reportAbuse(I2PSession session, int severity) {
-        }
+		}
 
-        @Override
+		@Override
-        public void disconnected(I2PSession session) {
+		public void disconnected(I2PSession session) {
-            log.severe "I2P session disconnected"
+			log.severe "I2P session disconnected"
-        }
+		}
 
-        @Override
+		@Override
-        public void errorOccurred(I2PSession session, String message, Throwable error) {
+		public void errorOccurred(I2PSession session, String message, Throwable error) {
-            log.severe "I2P error occured $message $error"
+			log.severe "I2P error occured $message $error"
-        }
+		}
 		
-    }
+	}
 	
-    private void handlePong(Destination from, def pong) {
+	private void handlePong(Destination from, def pong) {
-        if (!CacheServers.isRegistered(from)) {
+		if (!CacheServers.isRegistered(from)) {
-            log.warning("received pong from non-registered destination")
+			log.warning("received pong from non-registered destination")
-            return
+			return
-        }
+		}
 		
-        if (pong.pongs == null) {
+		if (pong.pongs == null) {
-            log.warning("malformed pong - no pongs")
+			log.warning("malformed pong - no pongs")
-            return
+			return
-        }
+		}
 		
-        pong.pongs.asList().each {
+		pong.pongs.asList().each { 
-            Destination dest = new Destination(it)
+			Destination dest = new Destination(it)
-            if (!session.getMyDestination().equals(dest))
+			if (!session.getMyDestination().equals(dest))
-                eventBus.publish(new HostDiscoveredEvent(destination: dest, fromHostcache : true))
+				eventBus.publish(new HostDiscoveredEvent(destination: dest, fromHostcache : true)) 
-        }
+		}
 		
-    }
+	}
 	
-    private void handleCrawlerPing(I2PSession session, Destination from, def ping) {
+	private void handleCrawlerPing(I2PSession session, Destination from, def ping) {
-        if (settings.isLeaf()) {
+		if (settings.isLeaf()) {
-            log.warning("Received crawler ping but I'm a leaf")
+			log.warning("Received crawler ping but I'm a leaf")
-            return
+			return
-        }
+		}
 		
-        switch(settings.getCrawlerResponse()) {
+		switch(settings.getCrawlerResponse()) {
-            case CrawlerResponse.NONE:
+			case CrawlerResponse.NONE:
-                log.info("Responding to crawlers is disabled by user")
+				log.info("Responding to crawlers is disabled by user")
-                break
+				break
-            case CrawlerResponse.ALL:
+			case CrawlerResponse.ALL:
-                respondToCrawler(session, from, ping)
+				respondToCrawler(session, from, ping)
-                break;
+				break;
-            case CrawlerResponse.REGISTERED:
+			case CrawlerResponse.REGISTERED:
-                if (CacheServers.isRegistered(from))
+				if (CacheServers.isRegistered(from))
-                    respondToCrawler(session, from, ping)
+					respondToCrawler(session, from, ping)
-                else
+				else
-                    log.warning("Ignoring crawler ping from non-registered crawler")
+					log.warning("Ignoring crawler ping from non-registered crawler")
-                break
+				break
-        }
+		}
-    }
+	}
 	
-    private void respondToCrawler(I2PSession session, Destination from, def ping) {
+	private void respondToCrawler(I2PSession session, Destination from, def ping) {
-        log.info "responding to crawler ping"
+		log.info "responding to crawler ping"
 		
-        def neighbors = manager.getConnections().collect { c -> c.endpoint.destination.toBase64() }
+		def neighbors = manager.getConnections().collect { c -> c.endpoint.destination.toBase64() }
-        Collections.shuffle(neighbors)
+		Collections.shuffle(neighbors)
-        if (neighbors.size() > CRAWLER_RETURN)
+		if (neighbors.size() > CRAWLER_RETURN)
-            neighbors = neighbors[0..CRAWLER_RETURN - 1]
+			neighbors = neighbors[0..CRAWLER_RETURN - 1]
 		
-        def upManager = (UltrapeerConnectionManager) manager;
+		def upManager = (UltrapeerConnectionManager) manager;
-        def pong = [:]
+		def pong = [:]
-        pong.peers = neighbors
+		pong.peers = neighbors
-        pong.uuid = ping.uuid
+		pong.uuid = ping.uuid
-        pong.type = "CrawlerPong"
+		pong.type = "CrawlerPong"
-        pong.version = 1
+		pong.version = 1
-        pong.leafSlots = upManager.hasLeafSlots()
+		pong.leafSlots = upManager.hasLeafSlots()
-        pong.peerSlots = upManager.hasPeerSlots()
+		pong.peerSlots = upManager.hasPeerSlots()
-        pong = JsonOutput.toJson(pong)
+		pong = JsonOutput.toJson(pong)
 		
-        def maker = new I2PDatagramMaker(session)
+		def maker = new I2PDatagramMaker(session)
-        pong = maker.makeI2PDatagram(pong.bytes)
+		pong = maker.makeI2PDatagram(pong.bytes)
-        session.sendMessage(from, pong, I2PSession.PROTO_DATAGRAM, 0, 0)
+		session.sendMessage(from, pong, I2PSession.PROTO_DATAGRAM, 0, 0)
-    }
+	}
 
 }

core/src/main/groovy/com/muwire/core/hostcache/CacheServers.groovy

@@ -4,21 +4,20 @@ import net.i2p.data.Destination
 
 class CacheServers {
 
-    private static final int TO_GIVE = 3
+	private static final int TO_GIVE = 3
-    private static Set<Destination> CACHES = [
+	private static Set<Destination> CACHES = [
-            new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA"),
+			new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA")
-            new Destination("JC63wJNOqSJmymkj4~UJWywBTvDGikKMoYP0HX2Wz9c5l3otXSkwnxWAFL4cKr~Ygh3BNNi2t93vuLIiI1W8AsE42kR~PwRx~Y-WvIHXR6KUejRmOp-n8WidtjKg9k4aDy428uSOedqXDxys5mpoeQXwDsv1CoPTTwnmb1GWFy~oTGIsCguCl~aJWGnqiKarPO3GJQ~ev-NbvAQzUfC3HeP1e6pdI5CGGjExahTCID5UjpJw8GaDXWlGmYWWH303Xu4x-vAHQy1dJLsOBCn8dZravsn5BKJk~j0POUon45CCx-~NYtaPe0Itt9cMdD2ciC76Rep1D0X0sm1SjlSs8sZ52KmF3oaLZ6OzgI9QLMIyBUrfi41sK5I0qTuUVBAkvW1xr~L-20dYJ9TrbOaOb2-vDIfKaxVi6xQOuhgQDiSBhd3qv2m0xGu-BM9DQYfNA0FdMjnZmqjmji9RMavzQSsVFIbQGLbrLepiEFlb7TseCK5UtRp8TxnG7L4gbYevBQAEAAcAAA==")
+		]
-        ]
 
-    static List<Destination> getCacheServers() {
+	static List<Destination> getCacheServers() {
-        List<Destination> allCaches = new ArrayList<>(CACHES)
+		List<Destination> allCaches = new ArrayList<>(CACHES)
-        Collections.shuffle(allCaches)
+		Collections.shuffle(allCaches)
-        if (allCaches.size() <= TO_GIVE)
+		if (allCaches.size() <= TO_GIVE)
-            return allCaches
+			return allCaches
-        allCaches[0..TO_GIVE-1]
+		allCaches[0..TO_GIVE-1]
-    }
+	}
 	
-    static boolean isRegistered(Destination d) {
+	static boolean isRegistered(Destination d) {
-        return CACHES.contains(d)
+		return CACHES.contains(d)
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/hostcache/Host.groovy

@@ -4,43 +4,34 @@ import net.i2p.data.Destination
 
 class Host {
 
-    private static final int MAX_FAILURES = 3
+	private static final int MAX_FAILURES = 3
 	
-    final Destination destination
+	final Destination destination
-    private final int clearInterval
+	int failures,successes
-    int failures,successes
-    long lastAttempt
 	
-    public Host(Destination destination, int clearInterval) {
+	public Host(Destination destination) {
-        this.destination = destination
+		this.destination = destination
-        this.clearInterval = clearInterval
+	}
-    }
 
-    synchronized void onConnect() {
+	synchronized void onConnect() {
-        failures = 0
+		failures = 0
-        successes++
+		successes++
-        lastAttempt = System.currentTimeMillis()
+	}
-    }
 	
-    synchronized void onFailure() {
+	synchronized void onFailure() {
-        failures++
+		failures++
-        successes = 0
+		successes = 0
-        lastAttempt = System.currentTimeMillis()
+	}
-    }
 	
-    synchronized boolean isFailed() {
+	synchronized boolean isFailed() {
-        failures >= MAX_FAILURES
+		failures >= MAX_FAILURES
-    }
+	}
 	
-    synchronized boolean hasSucceeded() {
+	synchronized boolean hasSucceeded() {
-        successes > 0
+		successes > 0
-    }
+	}
     
     synchronized void clearFailures() {
         failures = 0
     }
-
-    synchronized void canTryAgain() {
-        System.currentTimeMillis() - lastAttempt > (clearInterval * 60 * 1000)
-    }
 }

core/src/main/groovy/com/muwire/core/hostcache/HostCache.groovy

@@ -15,141 +15,138 @@ import net.i2p.data.Destination
 
 class HostCache extends Service {
 
-    final TrustService trustService
+	final TrustService trustService
-    final File storage
+	final File storage
-    final int interval
+	final int interval
-    final Timer timer
+	final Timer timer
-    final MuWireSettings settings
+	final MuWireSettings settings
-    final Destination myself
+	final Destination myself
-    final Map<Destination, Host> hosts = new ConcurrentHashMap<>()
+	final Map<Destination, Host> hosts = new ConcurrentHashMap<>()
 	
-    HostCache(){}
+	HostCache(){}
 	
-    public HostCache(TrustService trustService, File storage, int interval,
+	public HostCache(TrustService trustService, File storage, int interval, 
-        MuWireSettings settings, Destination myself) {
+		MuWireSettings settings, Destination myself) {
-        this.trustService = trustService
+		this.trustService = trustService
-        this.storage = storage
+		this.storage = storage
-        this.interval = interval
+		this.interval = interval
-        this.settings = settings
+		this.settings = settings
-        this.myself = myself
+		this.myself = myself
-        this.timer = new Timer("host-persister",true)
+		this.timer = new Timer("host-persister",true)
-    }
+	}
 
-    void start() {
+	void start() {
-        timer.schedule({load()} as TimerTask, 1)
+		timer.schedule({load()} as TimerTask, 1)
-    }
+	}
 	
-    void stop() {
+	void stop() {
-        timer.cancel()
+		timer.cancel()
-    }
+	}
 	
-    void onHostDiscoveredEvent(HostDiscoveredEvent e) {
+	void onHostDiscoveredEvent(HostDiscoveredEvent e) {
-        if (myself == e.destination)
+		if (myself == e.destination)
-            return
+			return
-        if (hosts.containsKey(e.destination)) {
+		if (hosts.containsKey(e.destination)) {
             if (!e.fromHostcache)
                 return
             hosts.get(e.destination).clearFailures()
             return
-        }
+		}
-        Host host = new Host(e.destination, settings.hostClearInterval)
+		Host host = new Host(e.destination)
-        if (allowHost(host)) {
+		if (allowHost(host)) {
-            hosts.put(e.destination, host)
+			hosts.put(e.destination, host)
-        }
+		}
-    }
+	}
 	
-    void onConnectionEvent(ConnectionEvent e) {
+	void onConnectionEvent(ConnectionEvent e) {
-        if (e.leaf)
+		if (e.leaf)
-            return
+			return
-        Destination dest = e.endpoint.destination
+		Destination dest = e.endpoint.destination
-        Host host = hosts.get(dest)
+		Host host = hosts.get(dest)
-        if (host == null) {
+		if (host == null) {
-            host = new Host(dest, settings.hostClearInterval)
+			host = new Host(dest)
-            hosts.put(dest, host)
+			hosts.put(dest, host)
-        }
+		}
 
-        switch(e.status) {
+		switch(e.status) {
-            case ConnectionAttemptStatus.SUCCESSFUL:
+			case ConnectionAttemptStatus.SUCCESSFUL:
-            case ConnectionAttemptStatus.REJECTED:
+			case ConnectionAttemptStatus.REJECTED:
-                host.onConnect()
+				host.onConnect()
-                break
+				break
-            case ConnectionAttemptStatus.FAILED:
+			case ConnectionAttemptStatus.FAILED:
-                host.onFailure()
+				host.onFailure()
-                break
+				break
-        }
+		}
-    }
+	}
 	
-    List<Destination> getHosts(int n) {
+	List<Destination> getHosts(int n) {
-        List<Destination> rv = new ArrayList<>(hosts.keySet())
+		List<Destination> rv = new ArrayList<>(hosts.keySet())
-        rv.retainAll {allowHost(hosts[it])}
+		rv.retainAll {allowHost(hosts[it])}
-        if (rv.size() <= n)
+		if (rv.size() <= n)
-            return rv
+			return rv
-        Collections.shuffle(rv)
+		Collections.shuffle(rv)
-        rv[0..n-1]
+		rv[0..n-1]
-    }
+	}
 	
-    List<Destination> getGoodHosts(int n) {
+	List<Destination> getGoodHosts(int n) {
-        List<Destination> rv = new ArrayList<>(hosts.keySet())
+		List<Destination> rv = new ArrayList<>(hosts.keySet())
-        rv.retainAll {
+		rv.retainAll {
-            Host host = hosts[it]
+			Host host = hosts[it]
-            allowHost(host) && host.hasSucceeded()
+			allowHost(host) && host.hasSucceeded()
-        }
+		}
-        if (rv.size() <= n)
+		if (rv.size() <= n)
-            return rv
+			return rv
-        Collections.shuffle(rv)
+		Collections.shuffle(rv)
-        rv[0..n-1]
+		rv[0..n-1]
-    }
+	}
 	
-    void load() {
+	void load() {
-        if (storage.exists()) {
+		if (storage.exists()) {
-            JsonSlurper slurper = new JsonSlurper()
+			JsonSlurper slurper = new JsonSlurper()
-            storage.eachLine {
+			storage.eachLine {
-                def entry = slurper.parseText(it)
+				def entry = slurper.parseText(it)
-                Destination dest = new Destination(entry.destination)
+				Destination dest = new Destination(entry.destination)
-                Host host = new Host(dest, settings.hostClearInterval)
+				Host host = new Host(dest)
-                host.failures = Integer.valueOf(String.valueOf(entry.failures))
+				host.failures = Integer.valueOf(String.valueOf(entry.failures))
-                host.successes = Integer.valueOf(String.valueOf(entry.successes))
+				host.successes = Integer.valueOf(String.valueOf(entry.successes))
-                if (entry.lastAttempt != null)
+				if (allowHost(host))
-                    host.lastAttempt = entry.lastAttempt
+					hosts.put(dest, host)
-                if (allowHost(host))
+			}
-                    hosts.put(dest, host)
+		}
-            }
+		timer.schedule({save()} as TimerTask, interval, interval)
-        }
+		loaded = true
-        timer.schedule({save()} as TimerTask, interval, interval)
+	}
-        loaded = true
-    }
 	
-    private boolean allowHost(Host host) {
+	private boolean allowHost(Host host) {
-        if (host.isFailed() && !host.canTryAgain())
+		if (host.isFailed())
-            return false
+			return false
-        if (host.destination == myself)
+		if (host.destination == myself)
-            return false
+			return false
-        TrustLevel trust = trustService.getLevel(host.destination)
+		TrustLevel trust = trustService.getLevel(host.destination)
-        switch(trust) {
+		switch(trust) {
-            case TrustLevel.DISTRUSTED :
+			case TrustLevel.DISTRUSTED :
-                return false
+				return false
-            case TrustLevel.TRUSTED :
+			case TrustLevel.TRUSTED :
-                return true
+				return true
-            case TrustLevel.NEUTRAL :
+			case TrustLevel.NEUTRAL :
-                return settings.allowUntrusted()
+				return settings.allowUntrusted()
-        }
+		}
-        false
+		false
-    }
+	}
 	
-    private void save() {
+	private void save() {
-        storage.delete()
+		storage.delete()
-        storage.withPrintWriter { writer ->
+		storage.withPrintWriter { writer ->
-            hosts.each { dest, host ->
+			hosts.each { dest, host ->
-                if (allowHost(host)) {
+				if (allowHost(host)) {
-                    def map = [:]
+					def map = [:]
-                    map.destination = dest.toBase64()
+					map.destination = dest.toBase64()
-                    map.failures = host.failures
+					map.failures = host.failures
-                    map.successes = host.successes
+					map.successes = host.successes
-                    map.lastAttempt = host.lastAttempt
+					def json = JsonOutput.toJson(map)
-                    def json = JsonOutput.toJson(map)
+					writer.println json
-                    writer.println json
+				}
-                }
+			}
-            }
+		}
-        }
+	}
-    }
 }

core/src/main/groovy/com/muwire/core/hostcache/HostDiscoveredEvent.groovy

@@ -6,11 +6,11 @@ import net.i2p.data.Destination
 
 class HostDiscoveredEvent extends Event {
 
-    Destination destination
+	Destination destination
     boolean fromHostcache
     
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "HostDiscoveredEvent ${super.toString()} destination:${destination.toBase32()} from hostcache $fromHostcache"
+		"HostDiscoveredEvent ${super.toString()} destination:${destination.toBase32()} from hostcache $fromHostcache"
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/mesh/Mesh.groovy

@@ -1,28 +0,0 @@
-package com.muwire.core.mesh
-
-import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-import com.muwire.core.download.Pieces
-
-import net.i2p.data.Destination
-import net.i2p.util.ConcurrentHashSet
-
-class Mesh {
-    private final InfoHash infoHash
-    private final Set<Persona> sources = new ConcurrentHashSet<>()
-    private final Pieces pieces
-
-    Mesh(InfoHash infoHash, Pieces pieces) {
-        this.infoHash = infoHash
-        this.pieces = pieces
-    }
-
-    Set<Persona> getRandom(int n, Persona exclude) {
-        List<Persona> tmp = new ArrayList<>(sources)
-        tmp.remove(exclude)
-        Collections.shuffle(tmp)
-        if (tmp.size() < n)
-            return tmp
-        tmp[0..n-1]
-    }
-}

core/src/main/groovy/com/muwire/core/mesh/MeshManager.groovy

@@ -1,102 +0,0 @@
-package com.muwire.core.mesh
-
-import java.util.stream.Collectors
-
-import com.muwire.core.Constants
-import com.muwire.core.InfoHash
-import com.muwire.core.MuWireSettings
-import com.muwire.core.Persona
-import com.muwire.core.download.Pieces
-import com.muwire.core.download.SourceDiscoveredEvent
-import com.muwire.core.files.FileManager
-import com.muwire.core.util.DataUtil
-
-import groovy.json.JsonOutput
-import groovy.json.JsonSlurper
-import net.i2p.data.Base64
-
-class MeshManager {
-
-    private final Map<InfoHash, Mesh> meshes = Collections.synchronizedMap(new HashMap<>())
-    private final FileManager fileManager
-    private final File home
-    private final MuWireSettings settings
-
-    MeshManager(FileManager fileManager, File home, MuWireSettings settings) {
-        this.fileManager = fileManager
-        this.home = home
-        this.settings = settings
-        load()
-    }
-
-    Mesh get(InfoHash infoHash) {
-        meshes.get(infoHash)
-    }
-
-    Mesh getOrCreate(InfoHash infoHash, int nPieces) {
-        synchronized(meshes) {
-            if (meshes.containsKey(infoHash))
-                return meshes.get(infoHash)
-            Pieces pieces = new Pieces(nPieces, settings.downloadSequentialRatio)
-            if (fileManager.rootToFiles.containsKey(infoHash)) {
-                for (int i = 0; i < nPieces; i++)
-                    pieces.markDownloaded(i)
-            }
-            Mesh rv = new Mesh(infoHash, pieces)
-            meshes.put(infoHash, rv)
-            return rv
-        }
-    }
-
-    void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-        Mesh mesh = meshes.get(e.infoHash)
-        if (mesh == null)
-            return
-       mesh.sources.add(e.source)
-       save()
-    }
-
-    private void save() {
-        File meshFile = new File(home, "mesh.json")
-        synchronized(meshes) {
-            meshFile.withPrintWriter { writer ->
-                meshes.values().each { mesh ->
-                    def json = [:]
-                    json.timestamp = System.currentTimeMillis()
-                    json.infoHash = Base64.encode(mesh.infoHash.getRoot())
-                    json.sources = mesh.sources.stream().map({it.toBase64()}).collect(Collectors.toList())
-                    json.nPieces = mesh.pieces.nPieces
-                    json.xHave = DataUtil.encodeXHave(mesh.pieces.downloaded, mesh.pieces.nPieces)
-                    writer.println(JsonOutput.toJson(json))
-                }
-            }
-        }
-    }
-
-    private void load() {
-        File meshFile = new File(home, "mesh.json")
-        if (!meshFile.exists())
-            return
-        long now = System.currentTimeMillis()
-        JsonSlurper slurper = new JsonSlurper()
-        meshFile.eachLine {
-            def json = slurper.parseText(it)
-            if (now - json.timestamp > settings.meshExpiration * 60 * 1000)
-                return
-            InfoHash infoHash = new InfoHash(Base64.decode(json.infoHash))
-            Pieces pieces = new Pieces(json.nPieces, settings.downloadSequentialRatio)
-
-            Mesh mesh = new Mesh(infoHash, pieces)
-            json.sources.each { source ->
-                Persona persona = new Persona(new ByteArrayInputStream(Base64.decode(source)))
-                mesh.sources.add(persona)
-            }
-
-            if (json.xHave != null)
-                DataUtil.decodeXHave(json.xHave).each { pieces.markDownloaded(it) }
-
-            if (!mesh.sources.isEmpty())
-                meshes.put(infoHash, mesh)
-        }
-    }
-}

core/src/main/groovy/com/muwire/core/search/DeleteEvent.groovy

@@ -6,11 +6,11 @@ import net.i2p.data.Base32
 import net.i2p.data.Destination
 
 class DeleteEvent extends Event {
-    byte [] infoHash
+	byte [] infoHash
-    Destination leaf
+	Destination leaf
 	
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "DeleteEvent ${super.toString()} infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
+		"DeleteEvent ${super.toString()} infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/search/LeafSearcher.groovy

@@ -7,32 +7,32 @@ import net.i2p.data.Destination
 
 class LeafSearcher {
 	
-    final UltrapeerConnectionManager connectionManager
+	final UltrapeerConnectionManager connectionManager
-    final SearchIndex searchIndex = new SearchIndex()
+	final SearchIndex searchIndex = new SearchIndex()
 	
-    final Map<String, Set<byte[]>> fileNameToHashes = new HashMap<>()
+	final Map<String, Set<byte[]>> fileNameToHashes = new HashMap<>()
-    final Map<byte[], Set<Destination>> hashToLeafs = new HashMap<>()
+	final Map<byte[], Set<Destination>> hashToLeafs = new HashMap<>()
 	
-    final Map<Destination, Map<byte[], Set<String>>> leafToFiles = new HashMap<>()
+	final Map<Destination, Map<byte[], Set<String>>> leafToFiles = new HashMap<>()
 	
-    LeafSearcher(UltrapeerConnectionManager connectionManager) {
+	LeafSearcher(UltrapeerConnectionManager connectionManager) {
-        this.connectionManager = connectionManager
+		this.connectionManager = connectionManager
-    }
+	}
 	
-    void onUpsertEvent(UpsertEvent e) {
+	void onUpsertEvent(UpsertEvent e) {
-        // TODO: implement
+		// TODO: implement
-    }
+	}
 	
-    void onDeleteEvent(DeleteEvent e) {
+	void onDeleteEvent(DeleteEvent e) {
-        // TODO: implement
+		// TODO: implement
-    }
+	}
 	
-    void onDisconnectionEvent(DisconnectionEvent e) {
+	void onDisconnectionEvent(DisconnectionEvent e) {
-        // TODO: implement
+		// TODO: implement
-    }
+	}
 	
-    void onQueryEvent(QueryEvent e) {
+	void onQueryEvent(QueryEvent e) {
-        // TODO: implement
+		// TODO: implement
-    }
+	}
 	
 }

core/src/main/groovy/com/muwire/core/search/QueryEvent.groovy

@@ -8,10 +8,10 @@ import net.i2p.data.Destination
 class QueryEvent extends Event {
 	
     SearchEvent searchEvent
-    boolean firstHop
+	boolean firstHop
-    Destination replyTo
+	Destination replyTo
     Persona originator
-    Destination receivedOn
+	Destination receivedOn
 
     String toString() {
         "searchEvent: $searchEvent firstHop:$firstHop, replyTo:${replyTo.toBase32()}" +

core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy

@@ -6,6 +6,6 @@ import com.muwire.core.SharedFile
 class ResultsEvent extends Event {
 
     SearchEvent searchEvent
-    SharedFile[] results
+	SharedFile[] results
-    UUID uuid
+	UUID uuid
 }

core/src/main/groovy/com/muwire/core/search/ResultsParser.groovy

@@ -1,7 +1,5 @@
 package com.muwire.core.search
 
-import java.util.stream.Collectors
-
 import javax.naming.directory.InvalidSearchControlsException
 
 import com.muwire.core.InfoHash
@@ -9,7 +7,6 @@ import com.muwire.core.Persona
 import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
-import net.i2p.data.Destination
 
 class ResultsParser {
     public static UIResultEvent parse(Persona p, UUID uuid, def json) throws InvalidSearchResultException {
@@ -61,7 +58,6 @@ class ResultsParser {
                  size : size,
                  infohash : parsedIH,
                  pieceSize : pieceSize,
-                 sources : Collections.emptySet(),
                  uuid : uuid)
         } catch (Exception e) {
             throw new InvalidSearchResultException("parsing search result failed",e)
@@ -86,17 +82,11 @@ class ResultsParser {
             if (infoHash.length != InfoHash.SIZE)
                 throw new InvalidSearchResultException("invalid infohash size $infoHash.length")
             int pieceSize = json.pieceSize
-
-            Set<Destination> sources = Collections.emptySet()
-            if (json.sources != null)
-                sources = json.sources.stream().map({new Destination(it)}).collect(Collectors.toSet())
-
             return new UIResultEvent( sender : p,
                 name : name,
                 size : size,
                 infohash : new InfoHash(infoHash),
                 pieceSize : pieceSize,
-                sources : sources,
                 uuid: uuid)
         } catch (Exception e) {
             throw new InvalidSearchResultException("parsing search result failed",e)

core/src/main/groovy/com/muwire/core/search/ResultsSender.groovy

@@ -11,10 +11,7 @@ import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger
-import java.util.logging.Level
-import java.util.stream.Collectors
 
-import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 
@@ -57,16 +54,12 @@ class ResultsSender {
                 int pieceSize = it.getPieceSize()
                 if (pieceSize == 0)
                     pieceSize = FileHasher.getPieceSize(length)
-                Set<Destination> suggested = Collections.emptySet()
-                if (it instanceof DownloadedFile)
-                    suggested = it.sources
                 def uiResultEvent = new UIResultEvent( sender : me,
                     name : it.getFile().getName(),
                     size : length,
                     infohash : it.getInfoHash(),
                     pieceSize : pieceSize,
-                    uuid : uuid,
+                    uuid : uuid
-                    sources : suggested
                     )
                     eventBus.publish(uiResultEvent)
             }
@@ -84,54 +77,46 @@ class ResultsSender {
         
         @Override
         public void run() {
+            byte [] tmp = new byte[InfoHash.SIZE]
+            JsonOutput jsonOutput = new JsonOutput()
+            Endpoint endpoint = null;
             try {
-                byte [] tmp = new byte[InfoHash.SIZE]
+                endpoint = connector.connect(target)
-                JsonOutput jsonOutput = new JsonOutput()
+                DataOutputStream os = new DataOutputStream(endpoint.getOutputStream())
-                Endpoint endpoint = null;
+                os.write("POST $uuid\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-                try {
+                me.write(os)
-                    endpoint = connector.connect(target)
+                os.writeShort((short)results.length)
-                    DataOutputStream os = new DataOutputStream(endpoint.getOutputStream())
+                results.each {
-                    os.write("POST $uuid\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                    byte [] name = it.getFile().getName().getBytes(StandardCharsets.UTF_8)
-                    me.write(os)
+                    def baos = new ByteArrayOutputStream()
-                    os.writeShort((short)results.length)
+                    def daos = new DataOutputStream(baos)
-                    results.each {
+                    daos.writeShort((short) name.length)
-                        byte [] name = it.getFile().getName().getBytes(StandardCharsets.UTF_8)
+                    daos.write(name)
-                        def baos = new ByteArrayOutputStream()
+                    daos.flush()
-                        def daos = new DataOutputStream(baos)
+                    String encodedName = Base64.encode(baos.toByteArray())
-                        daos.writeShort((short) name.length)
+                    def obj = [:]
-                        daos.write(name)
+                    obj.type = "Result"
-                        daos.flush()
+                    obj.version = oobInfohash ? 2 : 1
-                        String encodedName = Base64.encode(baos.toByteArray())
+                    obj.name = encodedName
-                        def obj = [:]
+                    obj.infohash = Base64.encode(it.getInfoHash().getRoot())
-                        obj.type = "Result"
+                    obj.size = it.getFile().length()
-                        obj.version = oobInfohash ? 2 : 1
+                    obj.pieceSize = it.getPieceSize()
-                        obj.name = encodedName
+                    if (!oobInfohash) {
-                        obj.infohash = Base64.encode(it.getInfoHash().getRoot())
+                        byte [] hashList = it.getInfoHash().getHashList()
-                        obj.size = it.getFile().length()
+                        def hashListB64 = []
-                        obj.pieceSize = it.getPieceSize()
+                        for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) {
-                        if (!oobInfohash) {
+                            System.arraycopy(hashList, InfoHash.SIZE * i, tmp, 0, InfoHash.SIZE)
-                            byte [] hashList = it.getInfoHash().getHashList()
+                            hashListB64 << Base64.encode(tmp)
-                            def hashListB64 = []
-                            for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) {
-                                System.arraycopy(hashList, InfoHash.SIZE * i, tmp, 0, InfoHash.SIZE)
-                                hashListB64 << Base64.encode(tmp)
-                            }
-                            obj.hashList = hashListB64
                         }
-
+                        obj.hashList = hashListB64
-                        if (it instanceof DownloadedFile)
-                            obj.sources = it.sources.stream().map({dest -> dest.toBase64()}).collect(Collectors.toSet())
-
-                        def json = jsonOutput.toJson(obj)
-                        os.writeShort((short)json.length())
-                        os.write(json.getBytes(StandardCharsets.US_ASCII))
                     }
-                    os.flush()
+                    def json = jsonOutput.toJson(obj)
-                } finally {
+                    os.writeShort((short)json.length())
-                    endpoint?.close()
+                    os.write(json.getBytes(StandardCharsets.US_ASCII))
                 }
-            } catch (Exception e) {
+                os.flush()
-                log.log(Level.WARNING, "problem sending results",e)
+            } finally {
+                endpoint?.close()
             }
         }
     }

core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy

@@ -5,9 +5,9 @@ import com.muwire.core.InfoHash
 
 class SearchEvent extends Event {
 
-    List<String> searchTerms
+	List<String> searchTerms
-    byte [] searchHash
+	byte [] searchHash
-    UUID uuid
+	UUID uuid
     boolean oobInfohash
     
     String toString() {

core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy

@@ -4,56 +4,53 @@ import com.muwire.core.Constants
 
 class SearchIndex {
 
-    final Map<String, Set<String>> keywords = new HashMap<>()
+	final Map<String, Set<String>> keywords = new HashMap<>()
 	
-    void add(String string) {
+	void add(String string) {
-        String [] split = split(string)
+		String [] split = split(string)
-        split.each {
+		split.each {
-            Set<String> existing = keywords.get(it)
+			Set<String> existing = keywords.get(it)
-            if (existing == null) {
+			if (existing == null) {
-                existing = new HashSet<>()
+				existing = new HashSet<>()
-                keywords.put(it, existing)
+				keywords.put(it, existing)
-            }
+			}
-            existing.add(string)
+			existing.add(string)
-        }
+		}
-    }
+	}
 	
-    void remove(String string) {
+	void remove(String string) {
-        String [] split = split(string)
+		String [] split = split(string)
-        split.each {
+		split.each {
-            Set<String> existing = keywords.get it
+			Set<String> existing = keywords.get it
-            if (existing != null) {
+			if (existing != null) {
-                existing.remove(string)
+				existing.remove(string)
-                if (existing.isEmpty()) {
+				if (existing.isEmpty()) {
-                    keywords.remove(it)
+					keywords.remove(it)
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
 	
-    private static String[] split(String source) {
+	private static String[] split(String source) {
-        source = source.replaceAll(Constants.SPLIT_PATTERN, " ").toLowerCase()
+		source = source.replaceAll(Constants.SPLIT_PATTERN, " ").toLowerCase()
-        String [] split = source.split(" ")
+		source.split(" ")
-        def rv = []
+	}
-        split.each { if (it.length() > 0) rv << it }
-        rv.toArray(new String[0])
-    }
 	
-    String[] search(List<String> terms) {
+	String[] search(List<String> terms) {
-        Set<String> rv = null;
+		Set<String> rv = null;
 		
-        terms.each {
+		terms.each {
-            Set<String> forWord = keywords.getOrDefault(it,[])
+			Set<String> forWord = keywords.getOrDefault(it,[])
-            if (rv == null) {
+			if (rv == null) {
-                rv = new HashSet<>(forWord)
+				rv = new HashSet<>(forWord)
-            } else {
+			} else {
-                rv.retainAll(forWord)
+				rv.retainAll(forWord)
-            }
+			}
 				
-        }
+		}
 		
-        if (rv != null)
+		if (rv != null)
-            return rv.asList()
+			return rv.asList()
-        []
+		[]
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/search/UIResultBatchEvent.groovy

@@ -1,8 +0,0 @@
-package com.muwire.core.search
-
-import com.muwire.core.Event
-
-class UIResultBatchEvent extends Event {
-    UUID uuid
-    UIResultEvent[] results
-}

core/src/main/groovy/com/muwire/core/search/UIResultEvent.groovy

@@ -4,11 +4,8 @@ import com.muwire.core.Event
 import com.muwire.core.InfoHash
 import com.muwire.core.Persona
 
-import net.i2p.data.Destination
-
 class UIResultEvent extends Event {
     Persona sender
-    Set<Destination> sources
     UUID uuid
     String name
     long size

core/src/main/groovy/com/muwire/core/search/UpsertEvent.groovy

@@ -7,12 +7,12 @@ import net.i2p.data.Destination
 
 class UpsertEvent extends Event {
 
-    Set<String> names
+	Set<String> names
-    byte [] infoHash
+	byte [] infoHash
-    Destination leaf
+	Destination leaf
 	
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        "UpsertEvent ${super.toString()} names:$names infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
+		"UpsertEvent ${super.toString()} names:$names infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/trust/RemoteTrustList.groovy

@@ -1,31 +0,0 @@
-package com.muwire.core.trust
-
-import java.util.concurrent.ConcurrentHashMap
-
-import com.muwire.core.Persona
-
-import net.i2p.util.ConcurrentHashSet
-
-class RemoteTrustList {
-    public enum Status { NEW, UPDATING, UPDATED, UPDATE_FAILED }
-
-    private final Persona persona
-    private final Set<Persona> good, bad
-    volatile long timestamp
-    volatile boolean forceUpdate
-    Status status = Status.NEW
-
-    RemoteTrustList(Persona persona) {
-        this.persona = persona
-        good = new ConcurrentHashSet<>()
-        bad = new ConcurrentHashSet<>()
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof RemoteTrustList))
-            return false
-        RemoteTrustList other = (RemoteTrustList)o
-        persona == other.persona
-    }
-}

core/src/main/groovy/com/muwire/core/trust/TrustEvent.groovy

@@ -5,6 +5,6 @@ import com.muwire.core.Persona
 
 class TrustEvent extends Event {
 
-    Persona persona
+	Persona persona
-    TrustLevel level
+	TrustLevel level
 }

core/src/main/groovy/com/muwire/core/trust/TrustService.groovy

@@ -11,87 +11,87 @@ import net.i2p.util.ConcurrentHashSet
 
 class TrustService extends Service {
 
-    final File persistGood, persistBad
+	final File persistGood, persistBad
-    final long persistInterval
+	final long persistInterval
 	
-    final Map<Destination, Persona> good = new ConcurrentHashMap<>()
+	final Map<Destination, Persona> good = new ConcurrentHashMap<>()
-    final Map<Destination, Persona> bad = new ConcurrentHashMap<>()
+	final Map<Destination, Persona> bad = new ConcurrentHashMap<>()
 	
-    final Timer timer
+	final Timer timer
 	
-    TrustService() {}
+	TrustService() {}
 	
-    TrustService(File persistGood, File persistBad, long persistInterval) {
+	TrustService(File persistGood, File persistBad, long persistInterval) {
-        this.persistBad = persistBad
+		this.persistBad = persistBad
-        this.persistGood = persistGood
+		this.persistGood = persistGood
-        this.persistInterval = persistInterval
+		this.persistInterval = persistInterval
-        this.timer = new Timer("trust-persister",true)
+		this.timer = new Timer("trust-persister",true)
-    }
+	}
 	
-    void start() {
+	void start() {
-        timer.schedule({load()} as TimerTask, 1)
+		timer.schedule({load()} as TimerTask, 1)
-    }
+	}
 	
-    void stop() {
+	void stop() {
-        timer.cancel()
+		timer.cancel()
-    }
+	}
 	
-    void load() {
+	void load() {
-        if (persistGood.exists()) {
+		if (persistGood.exists()) {
-            persistGood.eachLine {
+			persistGood.eachLine {
                 byte [] decoded = Base64.decode(it)
                 Persona persona = new Persona(new ByteArrayInputStream(decoded))
-                good.put(persona.destination, persona)
+				good.put(persona.destination, persona)
-            }
+			}
-        }
+		}
-        if (persistBad.exists()) {
+		if (persistBad.exists()) {
-            persistBad.eachLine {
+			persistBad.eachLine {
                 byte [] decoded = Base64.decode(it)
                 Persona persona = new Persona(new ByteArrayInputStream(decoded))
                 bad.put(persona.destination, persona)
-            }
+			}
-        }
+		}
-        timer.schedule({persist()} as TimerTask, persistInterval, persistInterval)
+		timer.schedule({persist()} as TimerTask, persistInterval, persistInterval)
-        loaded = true
+		loaded = true
-    }
+	}
 	
-    private void persist() {
+	private void persist() {
-        persistGood.delete()
+		persistGood.delete()
-        persistGood.withPrintWriter { writer ->
+		persistGood.withPrintWriter { writer ->
-            good.each {k,v ->
+			good.each {k,v ->
-                writer.println v.toBase64()
+				writer.println v.toBase64()
-            }
+			}
-        }
+		}
-        persistBad.delete()
+		persistBad.delete()
-        persistBad.withPrintWriter { writer ->
+		persistBad.withPrintWriter { writer ->
-            bad.each { k,v ->
+			bad.each { k,v ->
-                writer.println v.toBase64()
+				writer.println v.toBase64()
-            }
+			}
-        }
+		}
-    }
+	}
 	
-    TrustLevel getLevel(Destination dest) {
+	TrustLevel getLevel(Destination dest) {
-        if (good.containsKey(dest))
+		if (good.containsKey(dest))
-            return TrustLevel.TRUSTED
+			return TrustLevel.TRUSTED
-        else if (bad.containsKey(dest))
+		else if (bad.containsKey(dest))
-            return TrustLevel.DISTRUSTED
+			return TrustLevel.DISTRUSTED
-        TrustLevel.NEUTRAL
+		TrustLevel.NEUTRAL
-    }
+	}
 	
-    void onTrustEvent(TrustEvent e) {
+	void onTrustEvent(TrustEvent e) {
-        switch(e.level) {
+		switch(e.level) {
-            case TrustLevel.TRUSTED:
+			case TrustLevel.TRUSTED:
-                bad.remove(e.persona.destination)
+				bad.remove(e.persona.destination)
-                good.put(e.persona.destination, e.persona)
+				good.put(e.persona.destination, e.persona)
-                break
+				break
-            case TrustLevel.DISTRUSTED:
+			case TrustLevel.DISTRUSTED:
-                good.remove(e.persona.destination)
+				good.remove(e.persona.destination)
-                bad.put(e.persona.destination, e.persona)
+				bad.put(e.persona.destination, e.persona)
-                break
+				break
-            case TrustLevel.NEUTRAL:
+			case TrustLevel.NEUTRAL:
-                good.remove(e.persona.destination)
+				good.remove(e.persona.destination)
-                bad.remove(e.persona.destination)
+				bad.remove(e.persona.destination)
-                break
+				break
-        }
+		}
-    }
+	}
 }

core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy

@@ -1,161 +0,0 @@
-package com.muwire.core.trust
-
-import java.nio.charset.StandardCharsets
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import java.util.logging.Level
-
-import com.muwire.core.EventBus
-import com.muwire.core.MuWireSettings
-import com.muwire.core.Persona
-import com.muwire.core.UILoadedEvent
-import com.muwire.core.connection.Endpoint
-import com.muwire.core.connection.I2PConnector
-import com.muwire.core.util.DataUtil
-
-import groovy.util.logging.Log
-import net.i2p.data.Destination
-
-@Log
-class TrustSubscriber {
-    private final EventBus eventBus
-    private final I2PConnector i2pConnector
-    private final MuWireSettings settings
-
-    private final Map<Destination, RemoteTrustList> remoteTrustLists = new ConcurrentHashMap<>()
-
-    private final Object waitLock = new Object()
-    private volatile boolean shutdown
-    private volatile Thread thread
-    private final ExecutorService updateThreads = Executors.newCachedThreadPool()
-
-    TrustSubscriber(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings) {
-        this.eventBus = eventBus
-        this.i2pConnector = i2pConnector
-        this.settings = settings
-    }
-
-    void onUILoadedEvent(UILoadedEvent e) {
-        thread = new Thread({checkLoop()} as Runnable, "trust-subscriber")
-        thread.setDaemon(true)
-        thread.start()
-    }
-
-    void stop() {
-        shutdown = true
-        thread?.interrupt()
-        updateThreads.shutdownNow()
-    }
-
-    void onTrustSubscriptionEvent(TrustSubscriptionEvent e) {
-        if (!e.subscribe) {
-            remoteTrustLists.remove(e.persona.destination)
-        } else {
-            RemoteTrustList trustList = remoteTrustLists.putIfAbsent(e.persona.destination, new RemoteTrustList(e.persona))
-            trustList?.forceUpdate = true
-            synchronized(waitLock) {
-                waitLock.notify()
-            }
-        }
-    }
-
-    private void checkLoop() {
-        try {
-            while(!shutdown) {
-                synchronized(waitLock) {
-                    waitLock.wait(60 * 1000)
-                }
-                final long now = System.currentTimeMillis()
-                remoteTrustLists.values().each { trustList ->
-                    if (trustList.status == RemoteTrustList.Status.UPDATING)
-                        return
-                    if (!trustList.forceUpdate &&
-                        now - trustList.timestamp < settings.trustListInterval * 60 * 60 * 1000)
-                        return
-                    trustList.forceUpdate = false
-                    updateThreads.submit(new UpdateJob(trustList))
-                }
-            }
-        } catch (InterruptedException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
-
-    private class UpdateJob implements Runnable {
-
-        private final RemoteTrustList trustList
-
-        UpdateJob(RemoteTrustList trustList) {
-            this.trustList = trustList
-        }
-
-        public void run() {
-            trustList.status = RemoteTrustList.Status.UPDATING
-            eventBus.publish(new TrustSubscriptionUpdatedEvent(trustList : trustList))
-            if (check(trustList, System.currentTimeMillis()))
-                trustList.status = RemoteTrustList.Status.UPDATED
-            else
-                trustList.status = RemoteTrustList.Status.UPDATE_FAILED
-            eventBus.publish(new TrustSubscriptionUpdatedEvent(trustList : trustList))
-        }
-    }
-
-    private boolean check(RemoteTrustList trustList, long now) {
-        log.info("fetching trust list from ${trustList.persona.getHumanReadableName()}")
-        Endpoint endpoint = null
-        try {
-            endpoint = i2pConnector.connect(trustList.persona.destination)
-            OutputStream os = endpoint.getOutputStream()
-            InputStream is = endpoint.getInputStream()
-            os.write("TRUST\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-            os.flush()
-
-            String codeString = DataUtil.readTillRN(is)
-            int space = codeString.indexOf(' ')
-            if (space > 0)
-                codeString = codeString.substring(0,space)
-            int code = Integer.parseInt(codeString.trim())
-
-            if (code != 200) {
-                log.info("couldn't fetch trust list, code $code")
-                return false
-            }
-
-            // swallow any headers
-            String header
-            while (( header = DataUtil.readTillRN(is)) != "");
-
-            DataInputStream dis = new DataInputStream(is)
-
-            Set<Persona> good = new HashSet<>()
-            int nGood = dis.readUnsignedShort()
-            for (int i = 0; i < nGood; i++) {
-                Persona p = new Persona(dis)
-                good.add(p)
-            }
-
-            Set<Persona> bad = new HashSet<>()
-            int nBad = dis.readUnsignedShort()
-            for (int i = 0; i < nBad; i++) {
-                Persona p = new Persona(dis)
-                bad.add(p)
-            }
-
-            trustList.timestamp = now
-            trustList.good.clear()
-            trustList.good.addAll(good)
-            trustList.bad.clear()
-            trustList.bad.addAll(bad)
-
-            return true
-        } catch (Exception e) {
-            log.log(Level.WARNING,"exception fetching trust list from ${trustList.persona.getHumanReadableName()}",e)
-            return false
-        } finally {
-            endpoint?.close()
-        }
-
-    }
-}

core/src/main/groovy/com/muwire/core/trust/TrustSubscriptionEvent.groovy

@@ -1,9 +0,0 @@
-package com.muwire.core.trust
-
-import com.muwire.core.Event
-import com.muwire.core.Persona
-
-class TrustSubscriptionEvent extends Event {
-    Persona persona
-    boolean subscribe
-}

core/src/main/groovy/com/muwire/core/trust/TrustSubscriptionUpdatedEvent.groovy

@@ -1,7 +0,0 @@
-package com.muwire.core.trust
-
-import com.muwire.core.Event
-
-class TrustSubscriptionUpdatedEvent extends Event {
-    RemoteTrustList trustList
-}

core/src/main/groovy/com/muwire/core/update/UpdateClient.groovy

@@ -3,15 +3,7 @@ package com.muwire.core.update
 import java.util.logging.Level
 
 import com.muwire.core.EventBus
-import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
-import com.muwire.core.Persona
-import com.muwire.core.download.UIDownloadEvent
-import com.muwire.core.files.FileDownloadedEvent
-import com.muwire.core.files.FileManager
-import com.muwire.core.search.QueryEvent
-import com.muwire.core.search.SearchEvent
-import com.muwire.core.search.UIResultBatchEvent
 
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
@@ -21,7 +13,6 @@ import net.i2p.client.I2PSessionMuxedListener
 import net.i2p.client.SendMessageOptions
 import net.i2p.client.datagram.I2PDatagramDissector
 import net.i2p.client.datagram.I2PDatagramMaker
-import net.i2p.data.Base64
 import net.i2p.util.VersionComparator
 
 @Log
@@ -30,24 +21,16 @@ class UpdateClient {
     final I2PSession session
     final String myVersion
     final MuWireSettings settings
-    final FileManager fileManager
-    final Persona me
     
     private final Timer timer
     
     private long lastUpdateCheckTime
     
-    private volatile InfoHash updateInfoHash
+    UpdateClient(EventBus eventBus, I2PSession session, String myVersion, MuWireSettings settings) {
-    private volatile String version, signer
-    private volatile boolean updateDownloading
-
-    UpdateClient(EventBus eventBus, I2PSession session, String myVersion, MuWireSettings settings, FileManager fileManager, Persona me) {
         this.eventBus = eventBus
         this.session = session
         this.myVersion = myVersion
         this.settings = settings
-        this.fileManager = fileManager
-        this.me = me
         timer = new Timer("update-client",true)
     }
     
@@ -60,24 +43,6 @@ class UpdateClient {
         timer.cancel()
     }
     
-    void onUIResultBatchEvent(UIResultBatchEvent results) {
-        if (results.results[0].infohash != updateInfoHash)
-            return
-        if (updateDownloading)
-            return
-        updateDownloading = true
-        def file = new File(settings.downloadLocation, results.results[0].name)
-        def downloadEvent = new UIDownloadEvent(result: results.results[0], sources : results.results[0].sources, target : file)
-        eventBus.publish(downloadEvent)
-    }
-
-    void onFileDownloadedEvent(FileDownloadedEvent e) {
-        if (e.downloadedFile.infoHash != updateInfoHash)
-            return
-        updateDownloading = false
-        eventBus.publish(new UpdateDownloadedEvent(version : version, signer : signer))
-    }
-
     private void checkUpdate() {
         final long now = System.currentTimeMillis()
         if (lastUpdateCheckTime > 0) {
@@ -141,32 +106,8 @@ class UpdateClient {
                     return
                 }
                 
-                String infoHash
+                log.info("new version $payload.version available, publishing event")
-                if (settings.updateType == "jar") {
+                eventBus.publish(new UpdateAvailableEvent(version : payload.version, signer : payload.signer, infoHash : payload.infoHash))
-                    infoHash = payload.infoHash
-                } else
-                    infoHash = payload[settings.updateType]
-
-
-                if (!settings.autoDownloadUpdate) {
-                    log.info("new version $payload.version available, publishing event")
-                    eventBus.publish(new UpdateAvailableEvent(version : payload.version, signer : payload.signer, infoHash : infoHash))
-                } else {
-                    log.info("new version $payload.version available")
-                    updateInfoHash = new InfoHash(Base64.decode(infoHash))
-                    if (fileManager.rootToFiles.containsKey(updateInfoHash))
-                        eventBus.publish(new UpdateDownloadedEvent(version : payload.version, signer : payload.signer))
-                    else {
-                        updateDownloading = false
-                        version = payload.version
-                        signer = payload.signer
-                        log.info("starting search for new version hash $payload.infoHash")
-                        def searchEvent = new SearchEvent(searchHash : updateInfoHash.getRoot(), uuid : UUID.randomUUID(), oobInfohash : true)
-                        def queryEvent = new QueryEvent(searchEvent : searchEvent, firstHop : true, replyTo : me.destination,
-                            receivedOn : me.destination, originator : me)
-                        eventBus.publish(queryEvent)
-                    }
-                }
                 
             } catch (Exception e) {
                 log.log(Level.WARNING,"Invalid datagram",e)

core/src/main/groovy/com/muwire/core/update/UpdateDownloadedEvent.groovy

@@ -1,8 +0,0 @@
-package com.muwire.core.update
-
-import com.muwire.core.Event
-
-class UpdateDownloadedEvent extends Event {
-    String version
-    String signer
-}

core/src/main/groovy/com/muwire/core/upload/ContentRequest.groovy

@@ -2,5 +2,4 @@ package com.muwire.core.upload
 
 class ContentRequest extends Request {
     Range range
-    int have
 }

core/src/main/groovy/com/muwire/core/upload/ContentUploader.groovy

@@ -5,58 +5,34 @@ import java.nio.channels.FileChannel
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption
-import java.util.stream.Collectors
 
-import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.util.DataUtil
-
-import net.i2p.data.Destination
 
 class ContentUploader extends Uploader {
     
     private final File file
     private final ContentRequest request
-    private final Mesh mesh
-    private final int pieceSize
     
-    ContentUploader(File file, ContentRequest request, Endpoint endpoint, Mesh mesh, int pieceSize) {
+    ContentUploader(File file, ContentRequest request, Endpoint endpoint) {
         super(endpoint)
         this.file = file
         this.request = request
-        this.mesh = mesh
-        this.pieceSize = pieceSize
     }
     
     @Override
     void respond() {
         OutputStream os = endpoint.getOutputStream()
         Range range = request.getRange()
-        boolean satisfiable = true
+        if (range.start >= file.length() || range.end >= file.length()) {
-        final long length = file.length()
+            os.write("416 Range Not Satisfiable\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-        if (range.start >= length || range.end >= length)
-            satisfiable = false
-        if (satisfiable) {
-            int startPiece = range.start / (0x1 << pieceSize)
-            int endPiece = range.end / (0x1 << pieceSize)
-            for (int i = startPiece; i <= endPiece; i++)
-                satisfiable &= mesh.pieces.isDownloaded(i)
-        }
-        if (!satisfiable) {
-            os.write("416 Range Not Satisfiable\r\n".getBytes(StandardCharsets.US_ASCII))
-            writeMesh(request.downloader)
-            os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
             os.flush()
             return
         }
 
         os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
-        os.write("Content-Range: $range.start-$range.end\r\n".getBytes(StandardCharsets.US_ASCII))
+        os.write("Content-Range: $range.start-$range.end\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-        writeMesh(request.downloader)
-        os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
 
-        FileChannel channel = null
+        FileChannel channel
         try {
             channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ))
             mapped = channel.map(FileChannel.MapMode.READ_ONLY, range.start, range.end - range.start + 1)
@@ -72,55 +48,7 @@ class ContentUploader extends Uploader {
         } finally {
             try {channel?.close() } catch (IOException ignored) {}
             endpoint.getOutputStream().flush()
-            synchronized(this) {
-                DataUtil.tryUnmap(mapped)
-                mapped = null
-            }
         }
     }
 
-    private void writeMesh(Persona toExclude) {
-        String xHave = DataUtil.encodeXHave(mesh.pieces.getDownloaded(), mesh.pieces.nPieces)
-        endpoint.getOutputStream().write("X-Have: $xHave\r\n".getBytes(StandardCharsets.US_ASCII))
-
-        Set<Persona> sources = mesh.getRandom(9, toExclude)
-        if (!sources.isEmpty()) {
-            String xAlts = sources.stream().map({ it.toBase64() }).collect(Collectors.joining(","))
-            endpoint.getOutputStream().write("X-Alt: $xAlts\r\n".getBytes(StandardCharsets.US_ASCII))
-        }
-    }
-
-    @Override
-    public String getName() {
-        return file.getName();
-    }
-
-    @Override
-    public synchronized int getProgress() {
-        if (mapped == null)
-            return 0
-        int position = mapped.position()
-        int total = request.getRange().end - request.getRange().start
-        (int)(position * 100.0 / total)
-    }
-
-    @Override
-    public String getDownloader() {
-        request.downloader.getHumanReadableName()
-    }
-
-    @Override
-    public int getDonePieces() {
-        return request.have;
-    }
-
-    @Override
-    public int getTotalPieces() {
-        return mesh.pieces.nPieces;
-    }
-
-    @Override
-    public long getTotalSize() {
-        return file.length();
-    }
 }

core/src/main/groovy/com/muwire/core/upload/HashListUploader.groovy

@@ -6,8 +6,6 @@ import java.nio.charset.StandardCharsets
 import com.muwire.core.InfoHash
 import com.muwire.core.connection.Endpoint
 
-import net.i2p.data.Base64
-
 class HashListUploader extends Uploader {
     private final InfoHash infoHash
     private final HashListRequest request
@@ -16,7 +14,6 @@ class HashListUploader extends Uploader {
         super(endpoint)
         this.infoHash = infoHash
         mapped = ByteBuffer.wrap(infoHash.getHashList())
-        this.request = request
     }
     
     void respond() {
@@ -35,34 +32,4 @@ class HashListUploader extends Uploader {
         }
         endpoint.getOutputStream().flush()
     }
-
-    @Override
-    public String getName() {
-        return "Hash list for " + Base64.encode(infoHash.getRoot());
-    }
-
-    @Override
-    public synchronized int getProgress() {
-        (int)(mapped.position() * 100.0 / mapped.capacity())
-    }
-
-    @Override
-    public String getDownloader() {
-        request.downloader.getHumanReadableName()
-    }
-
-    @Override
-    public int getDonePieces() {
-        return 0;
-    }
-
-    @Override
-    public int getTotalPieces() {
-        return 1;
-    }
-
-    @Override
-    public long getTotalSize() {
-        return -1;
-    }
 }

core/src/main/groovy/com/muwire/core/upload/Request.groovy

@@ -5,7 +5,6 @@ import java.nio.charset.StandardCharsets
 import com.muwire.core.Constants
 import com.muwire.core.InfoHash
 import com.muwire.core.Persona
-import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
 import net.i2p.data.Base64
@@ -49,14 +48,8 @@ class Request {
             def decoded = Base64.decode(encoded)
             downloader = new Persona(new ByteArrayInputStream(decoded))
         }
-
-        int have = 0
-        if (headers.containsKey("X-Have")) {
-            def encoded = headers["X-Have"].trim()
-            have = DataUtil.decodeXHave(encoded).size()
-        }
         new ContentRequest( infoHash : infoHash, range : new Range(start, end), 
-            headers : headers, downloader : downloader, have : have)
+            headers : headers, downloader : downloader)
     }
     
     static Request parseHashListRequest(InfoHash infoHash, InputStream is) throws IOException {

core/src/main/groovy/com/muwire/core/upload/UploadManager.groovy

@@ -6,12 +6,7 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.download.DownloadManager
-import com.muwire.core.download.Downloader
-import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.files.FileManager
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.mesh.MeshManager
 
 import groovy.util.logging.Log
 import net.i2p.data.Base64
@@ -20,17 +15,12 @@ import net.i2p.data.Base64
 public class UploadManager {
     private final EventBus eventBus
     private final FileManager fileManager
-    private final MeshManager meshManager
-    private final DownloadManager downloadManager
     
     public UploadManager() {}
     
-    public UploadManager(EventBus eventBus, FileManager fileManager,
+    public UploadManager(EventBus eventBus, FileManager fileManager) {
-        MeshManager meshManager, DownloadManager downloadManager) {
         this.eventBus = eventBus
         this.fileManager = fileManager
-        this.meshManager = meshManager
-        this.downloadManager = downloadManager
     }
     
     public void processGET(Endpoint e) throws IOException {
@@ -54,10 +44,8 @@ public class UploadManager {
             log.info("Responding to upload request for root $infoHashString")
 
             byte [] infoHashRoot = Base64.decode(infoHashString)
-            InfoHash infoHash = new InfoHash(infoHashRoot)
             Set<SharedFile> sharedFiles = fileManager.getSharedFiles(infoHashRoot)
-            Downloader downloader = downloadManager.downloaders.get(infoHash)
+            if (sharedFiles == null || sharedFiles.isEmpty()) {
-            if (downloader == null && (sharedFiles == null || sharedFiles.isEmpty())) {
                 log.info "file not found"
                 e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
                 e.getOutputStream().flush()
@@ -73,31 +61,13 @@ public class UploadManager {
                 return
             }
 
-            ContentRequest request = Request.parseContentRequest(infoHash, e.getInputStream())
+            Request request = Request.parseContentRequest(new InfoHash(infoHashRoot), e.getInputStream())
             if (request.downloader != null && request.downloader.destination != e.destination) {
                 log.info("Downloader persona doesn't match their destination")
                 e.close()
                 return
             }
-
+            Uploader uploader = new ContentUploader(sharedFiles.iterator().next().file, request, e)
-            if (request.have > 0)
-                eventBus.publish(new SourceDiscoveredEvent(infoHash : request.infoHash, source : request.downloader))
-
-            Mesh mesh
-            File file
-            int pieceSize
-            if (downloader != null) {
-                mesh = meshManager.get(infoHash)
-                file = downloader.incompleteFile
-                pieceSize = downloader.pieceSizePow2
-            } else {
-                SharedFile sharedFile = sharedFiles.iterator().next();
-                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces)
-                file = sharedFile.file
-                pieceSize = sharedFile.pieceSize
-            }
-
-            Uploader uploader = new ContentUploader(file, request, e, mesh, pieceSize)
             eventBus.publish(new UploadEvent(uploader : uploader))
             try {
                 uploader.respond()
@@ -115,10 +85,8 @@ public class UploadManager {
         log.info("Responding to hashlist request for root $infoHashString")
         
         byte [] infoHashRoot = Base64.decode(infoHashString)
-        InfoHash infoHash = new InfoHash(infoHashRoot)
-        Downloader downloader = downloadManager.downloaders.get(infoHash)
         Set<SharedFile> sharedFiles = fileManager.getSharedFiles(infoHashRoot)
-        if (downloader == null && (sharedFiles == null || sharedFiles.isEmpty())) {
+        if (sharedFiles == null || sharedFiles.isEmpty()) {
             log.info "file not found"
             e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
             e.getOutputStream().flush()
@@ -134,30 +102,13 @@ public class UploadManager {
             return
         }
         
-        Request request = Request.parseHashListRequest(infoHash, e.getInputStream())
+        Request request = Request.parseHashListRequest(new InfoHash(infoHashRoot), e.getInputStream())
         if (request.downloader != null && request.downloader.destination != e.destination) {
             log.info("Downloader persona doesn't match their destination")
             e.close()
             return
         }
-
+        Uploader uploader = new HashListUploader(e, sharedFiles.iterator().next().infoHash, request)
-        InfoHash fullInfoHash
-        if (downloader == null) {
-            fullInfoHash = sharedFiles.iterator().next().infoHash
-        } else {
-            byte [] hashList = downloader.getInfoHash().getHashList()
-            if (hashList != null && hashList.length > 0)
-                fullInfoHash = downloader.getInfoHash()
-            else {
-                log.info("infohash not found in downloader")
-                e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-                e.getOutputStream().flush()
-                e.close()
-                return
-            }
-        }
-
-        Uploader uploader = new HashListUploader(e, fullInfoHash, request)
         eventBus.publish(new UploadEvent(uploader : uploader))
         try {
             uploader.respond()
@@ -179,10 +130,8 @@ public class UploadManager {
             log.info("Responding to upload request for root $infoHashString")
 
             infoHashRoot = Base64.decode(infoHashString)
-            infoHash = new InfoHash(infoHashRoot)
             sharedFiles = fileManager.getSharedFiles(infoHashRoot)
-            downloader = downloadManager.downloaders.get(infoHash)
+            if (sharedFiles == null || sharedFiles.isEmpty()) {
-            if (downloader == null && (sharedFiles == null || sharedFiles.isEmpty())) {
                 log.info "file not found"
                 e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
                 e.getOutputStream().flush()
@@ -204,25 +153,7 @@ public class UploadManager {
                 e.close()
                 return
             }
-
+            uploader = new ContentUploader(sharedFiles.iterator().next().file, request, e)
-            if (request.have > 0)
-                eventBus.publish(new SourceDiscoveredEvent(infoHash : request.infoHash, source : request.downloader))
-
-            Mesh mesh
-            File file
-            int pieceSize
-            if (downloader != null) {
-                mesh = meshManager.get(infoHash)
-                file = downloader.incompleteFile
-                pieceSize = downloader.pieceSizePow2
-            } else {
-                SharedFile sharedFile = sharedFiles.iterator().next();
-                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces)
-                file = sharedFile.file
-                pieceSize = sharedFile.pieceSize
-            }
-
-            uploader = new ContentUploader(file, request, e, mesh, pieceSize)
             eventBus.publish(new UploadEvent(uploader : uploader))
             try {
                 uploader.respond()

core/src/main/groovy/com/muwire/core/upload/Uploader.groovy

@@ -23,19 +23,4 @@ abstract class Uploader {
             return -1
         mapped.position()
     }
-
-    abstract String getName();
-
-    /**
-     * @return an integer between 0 and 100
-     */
-    abstract int getProgress();
-
-    abstract String getDownloader();
-
-    abstract int getDonePieces();
-
-    abstract int getTotalPieces();
-
-    abstract long getTotalSize();
 }

core/src/main/groovy/com/muwire/core/util/DataUtil.groovy

@@ -1,50 +1,45 @@
 package com.muwire.core.util
 
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.nio.ByteBuffer
 import java.nio.charset.StandardCharsets
 
 import com.muwire.core.Constants
 
-import net.i2p.data.Base64
-
 class DataUtil {
 	
-    private final static int MAX_SHORT = (0x1 << 16) - 1
+	private final static int MAX_SHORT = (0x1 << 16) - 1
 
-    static void writeUnsignedShort(int value, OutputStream os) {
+	static void writeUnsignedShort(int value, OutputStream os) {
-        if (value > MAX_SHORT || value < 0)
+		if (value > MAX_SHORT || value < 0)
-            throw new IllegalArgumentException("$value invalid")
+			throw new IllegalArgumentException("$value invalid")
 		
-        byte lsb = (byte) (value & 0xFF)
+		byte lsb = (byte) (value & 0xFF)
-        byte msb = (byte) (value >> 8)
+		byte msb = (byte) (value >> 8)
 		
-        os.write(msb)
+		os.write(msb)
-        os.write(lsb)
+		os.write(lsb)	
-    }
+	}
 	
-    private final static int MAX_HEADER = 0x7FFFFF
+	private final static int MAX_HEADER = 0x7FFFFF
 	
-    static void packHeader(int length, byte [] header) {
+	static void packHeader(int length, byte [] header) {
-        if (header.length != 3)
+		if (header.length != 3)
-            throw new IllegalArgumentException("header length $header.length")
+			throw new IllegalArgumentException("header length $header.length")
-        if (length < 0 || length > MAX_HEADER)
+		if (length < 0 || length > MAX_HEADER)
-            throw new IllegalArgumentException("length $length")
+			throw new IllegalArgumentException("length $length")
 		
-        header[2] = (byte) (length & 0xFF)
+		header[2] = (byte) (length & 0xFF)
-        header[1] = (byte) ((length >> 8) & 0xFF)
+		header[1] = (byte) ((length >> 8) & 0xFF)
-        header[0] = (byte) ((length >> 16) & 0x7F)
+		header[0] = (byte) ((length >> 16) & 0x7F)
-    }
+	}
 	
-    static int readLength(byte [] header) {
+	static int readLength(byte [] header) {
-        if (header.length != 3)
+		if (header.length != 3)
-            throw new IllegalArgumentException("header length $header.length")
+			throw new IllegalArgumentException("header length $header.length")
 			
-        return (((int)(header[0] & 0x7F)) << 16) |
+		return (((int)(header[0] & 0x7F)) << 16) |
-                (((int)(header[1] & 0xFF) << 8)) |
+				(((int)(header[1] & 0xFF) << 8)) |
-                ((int)header[2] & 0xFF)
+				((int)header[2] & 0xFF)
-    }
+	}
     
     static String readi18nString(byte [] encoded) {
         if (encoded.length < 2)
@@ -84,73 +79,4 @@ class DataUtil {
         }
         new String(baos.toByteArray(), StandardCharsets.US_ASCII)
     }
-
-    public static String encodeXHave(List<Integer> pieces, int totalPieces) {
-        int bytes = totalPieces / 8
-        if (totalPieces % 8 != 0)
-            bytes++
-        byte[] raw = new byte[bytes]
-        pieces.each {
-            int byteIdx = it / 8
-            int offset = it % 8
-            int mask = 0x80 >>> offset
-            raw[byteIdx] |= mask
-        }
-        Base64.encode(raw)
-    }
-
-    public static List<Integer> decodeXHave(String xHave) {
-        byte [] availablePieces = Base64.decode(xHave)
-        List<Integer> available = new ArrayList<>()
-        availablePieces.eachWithIndex {b, i ->
-            for (int j = 0; j < 8 ; j++) {
-                byte mask = 0x80 >>> j
-                if ((b & mask) == mask) {
-                    available.add(i * 8 + j)
-                }
-            }
-        }
-        available
-    }
-
-    public static Exception findRoot(Exception e) {
-        while(e.getCause() != null)
-            e = e.getCause()
-        e
-    }
-
-    public static void tryUnmap(ByteBuffer cb) {
-        if (cb==null || !cb.isDirect()) return;
-        // we could use this type cast and call functions without reflection code,
-        // but static import from sun.* package is risky for non-SUN virtual machine.
-        //try { ((sun.nio.ch.DirectBuffer)cb).cleaner().clean(); } catch (Exception ex) { }
-
-        // JavaSpecVer: 1.6, 1.7, 1.8, 9, 10
-        boolean isOldJDK = System.getProperty("java.specification.version","99").startsWith("1.");
-        try {
-            if (isOldJDK) {
-                Method cleaner = cb.getClass().getMethod("cleaner");
-                cleaner.setAccessible(true);
-                Method clean = Class.forName("sun.misc.Cleaner").getMethod("clean");
-                clean.setAccessible(true);
-                clean.invoke(cleaner.invoke(cb));
-            } else {
-                Class unsafeClass;
-                try {
-                    unsafeClass = Class.forName("sun.misc.Unsafe");
-                } catch(Exception ex) {
-                    // jdk.internal.misc.Unsafe doesn't yet have an invokeCleaner() method,
-                    // but that method should be added if sun.misc.Unsafe is removed.
-                    unsafeClass = Class.forName("jdk.internal.misc.Unsafe");
-                }
-                Method clean = unsafeClass.getMethod("invokeCleaner", ByteBuffer.class);
-                clean.setAccessible(true);
-                Field theUnsafeField = unsafeClass.getDeclaredField("theUnsafe");
-                theUnsafeField.setAccessible(true);
-                Object theUnsafe = theUnsafeField.get(null);
-                clean.invoke(theUnsafe, cb);
-            }
-        } catch(Exception ex) { }
-        cb = null;
-    }
 }

core/src/main/java/com/muwire/core/DownloadedFile.java

@@ -1,23 +1,21 @@
 package com.muwire.core;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Set;
 
 import net.i2p.data.Destination;
 
 public class DownloadedFile extends SharedFile {
 	
-    private final Set<Destination> sources;
+	private final Set<Destination> sources;
 
-    public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources)
+	public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) {
-    throws IOException {
+		super(file, infoHash, pieceSize);
-        super(file, infoHash, pieceSize);
+		this.sources = sources;
-        this.sources = sources;
+	}
-    }
 	
-    public Set<Destination> getSources() {
+	public Set<Destination> getSources() {
-        return sources;
+		return sources;
-    }
+	}
 
 }

core/src/main/java/com/muwire/core/InfoHash.java

@@ -11,83 +11,83 @@ import net.i2p.data.Base64;
 
 public class InfoHash {
 
-    public static final int SIZE = 0x1 << 5;
+	public static final int SIZE = 0x1 << 5;
 	
-    private final byte[] root;
+	private final byte[] root;
-    private final byte[] hashList;
+	private final byte[] hashList;
 	
-    private final int hashCode;
+	private final int hashCode;
 	
-    public InfoHash(byte[] root, byte[] hashList) {
+	public InfoHash(byte[] root, byte[] hashList) {
-        if (root.length != SIZE)
+		if (root.length != SIZE)
-            throw new IllegalArgumentException("invalid root size "+root.length);
+			throw new IllegalArgumentException("invalid root size "+root.length);
-        if (hashList != null && hashList.length % SIZE != 0)
+		if (hashList != null && hashList.length % SIZE != 0) 
-            throw new IllegalArgumentException("invalid hashList size " + hashList.length);
+			throw new IllegalArgumentException("invalid hashList size " + hashList.length);
-        this.root = root;
+		this.root = root;
-        this.hashList = hashList;
+		this.hashList = hashList;
-        hashCode = root[0] << 24 |
+		hashCode = root[0] << 24 |
-                root[1] << 16 |
+				root[1] << 16 |
-                root[2] << 8 |
+				root[2] << 8 |
-                root[3];
+				root[3];
-    }
+	}
 	
-    public InfoHash(byte[] root) {
+	public InfoHash(byte[] root) {
-        this(root, null);
+		this(root, null);
-    }
+	}
 	
-    public InfoHash(String base32) {
+	public InfoHash(String base32) {
-        this(Base32.decode(base32));
+		this(Base32.decode(base32));
-    }
+	}
 	
-    public static InfoHash fromHashList(byte []hashList) {
+	public static InfoHash fromHashList(byte []hashList) {
-        try {
+		try {
-            MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+			MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
-            byte[] root = sha256.digest(hashList);
+			byte[] root = sha256.digest(hashList);
-            return new InfoHash(root, hashList);
+			return new InfoHash(root, hashList);
-        } catch (NoSuchAlgorithmException impossible) {
+		} catch (NoSuchAlgorithmException impossible) {
-            impossible.printStackTrace();
+			impossible.printStackTrace();
-            System.exit(1);
+			System.exit(1);
-        }
+		}
-        return null;
+		return null;
-    }
+	}
 	
-    public byte[] getRoot() {
+	public byte[] getRoot() {
-        return root;
+		return root;
-    }
+	}
 	
-    public byte[] getHashList() {
+	public byte[] getHashList() {
-        return hashList;
+		return hashList;
-    }
+	}
 	
-    @Override
+	@Override
-    public int hashCode() {
+	public int hashCode() {
-        return hashCode;
+		return hashCode;
-    }
+	}
 	
-    @Override
+	@Override
-    public boolean equals(Object o) {
+	public boolean equals(Object o) {
-        if (this == o) {
+		if (this == o) {
-            return true;
+			return true;
-        }
+		}
-        if (!(o instanceof InfoHash)) {
+		if (!(o instanceof InfoHash)) {
-            return false;
+			return false;
-        }
+		}
-        InfoHash other = (InfoHash) o;
+		InfoHash other = (InfoHash) o;
-        return Arrays.equals(root, other.root);
+		return Arrays.equals(root, other.root);
-    }
+	}
 	
-    public String toString() {
+	public String toString() {
-        String rv = "InfoHash[root:"+Base64.encode(root) + " hashList:";
+		String rv = "InfoHash[root:"+Base64.encode(root) + " hashList:";
-        List<String> b64HashList = new ArrayList<>();
+		List<String> b64HashList = new ArrayList<>();
-        if (hashList != null) {
+		if (hashList != null) {       
-            byte [] tmp = new byte[SIZE];
+		    byte [] tmp = new byte[SIZE];
-            for (int i = 0; i < hashList.length / SIZE; i++) {
+		    for (int i = 0; i < hashList.length / SIZE; i++) {
-                System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
+		        System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
-                b64HashList.add(Base64.encode(tmp));
+		        b64HashList.add(Base64.encode(tmp));
-            }
+		    }
-        }
+		}
-        rv += b64HashList.toString();
+		rv += b64HashList.toString();
-        rv += "]";
+		rv += "]";
-        return rv;
+		return rv;
-    }
+	}
 }

core/src/main/java/com/muwire/core/SharedFile.java

@@ -1,64 +1,28 @@
 package com.muwire.core;
 
 import java.io.File;
-import java.io.IOException;
 
 public class SharedFile {
 
-    private final File file;
+	private final File file;
-    private final InfoHash infoHash;
+	private final InfoHash infoHash;
-    private final int pieceSize;
+	private final int pieceSize;
 	
-    private final String cachedPath;
+	public SharedFile(File file, InfoHash infoHash, int pieceSize) {
-    private final long cachedLength;
+		this.file = file;
+		this.infoHash = infoHash;
+		this.pieceSize = pieceSize;
+	}
 
-    public SharedFile(File file, InfoHash infoHash, int pieceSize) throws IOException {
+	public File getFile() {
-        this.file = file;
+		return file;
-        this.infoHash = infoHash;
+	}
-        this.pieceSize = pieceSize;
-        this.cachedPath = file.getAbsolutePath();
-        this.cachedLength = file.length();
-    }
 
-    public File getFile() {
+	public InfoHash getInfoHash() {
-        return file;
+		return infoHash;
-    }
+	}
 	
-    public InfoHash getInfoHash() {
+	public int getPieceSize() {
-        return infoHash;
+	    return pieceSize;
-    }
+	}
-
-    public int getPieceSize() {
-        return pieceSize;
-    }
-
-    public int getNPieces() {
-        long length = file.length();
-        int rawPieceSize = 0x1 << pieceSize;
-        int rv = (int) (length / rawPieceSize);
-        if (length % rawPieceSize != 0)
-            rv++;
-        return rv;
-    }
-
-    public String getCachedPath() {
-        return cachedPath;
-    }
-
-    public long getCachedLength() {
-        return cachedLength;
-    }
-
-    @Override
-    public int hashCode() {
-        return file.hashCode() ^ infoHash.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof SharedFile))
-            return false;
-        SharedFile other = (SharedFile)o;
-        return file.equals(other.file) && infoHash.equals(other.infoHash);
-    }
 }

core/src/main/java/com/muwire/core/connection/ConnectionAttemptStatus.java

@@ -1,5 +1,5 @@
 package com.muwire.core.connection;
 
 public enum ConnectionAttemptStatus {
-    SUCCESSFUL, REJECTED, FAILED
+	SUCCESSFUL, REJECTED, FAILED
 }

core/src/main/java/com/muwire/core/hostcache/CrawlerResponse.java

@@ -6,5 +6,5 @@ package com.muwire.core.hostcache;
  *
  */
 public enum CrawlerResponse {
-    ALL, REGISTERED, NONE
+	ALL, REGISTERED, NONE
 }

core/src/main/java/com/muwire/core/trust/TrustLevel.java

@@ -1,5 +1,5 @@
 package com.muwire.core.trust;
 
 public enum TrustLevel {
-    TRUSTED, NEUTRAL, DISTRUSTED
+	TRUSTED, NEUTRAL, DISTRUSTED
 }

core/src/test/groovy/com/muwire/core/Destinations.groovy

@@ -4,6 +4,6 @@ import net.i2p.data.Destination
 
 class Destinations {
 
-    Destination dest1 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul9AAAA")
+	Destination dest1 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul9AAAA")
-    Destination dest2 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul8AAAA")
+	Destination dest2 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul8AAAA")
 }

core/src/test/groovy/com/muwire/core/EventBusTest.groovy

@@ -4,23 +4,23 @@ import org.junit.Test
 
 class EventBusTest {
 
-    class FakeEvent extends Event {}
+	class FakeEvent extends Event {}
 	
-    class FakeEventHandler {
+	class FakeEventHandler {
-        def onFakeEvent(FakeEvent e) {
+		def onFakeEvent(FakeEvent e) {
-            assert e == fakeEvent
+			assert e == fakeEvent
-        }
+		}
-    }
+	}
 	
-    FakeEvent fakeEvent = new FakeEvent()
+	FakeEvent fakeEvent = new FakeEvent()
 	
-    EventBus bus = new EventBus()
+	EventBus bus = new EventBus()
-    def handler = new FakeEventHandler()
+	def handler = new FakeEventHandler()
 	
-    @Test
+	@Test
-    void testDynamicEvent() {
+	void testDynamicEvent() {
-        bus.register(FakeEvent.class, handler)
+		bus.register(FakeEvent.class, handler)
-        bus.publish(fakeEvent)
+		bus.publish(fakeEvent)
-    }
+	}
 
 }

core/src/test/groovy/com/muwire/core/InfoHashTest.groovy

@@ -6,11 +6,11 @@ import org.junit.Test
 
 class InfoHashTest {
 
-    @Test
+	@Test
-    void testEmpty() {
+	void testEmpty() {
-        byte [] empty = new byte[0x1 << 6];
+		byte [] empty = new byte[0x1 << 6];
-        def ih = InfoHash.fromHashList(empty)
+		def ih = InfoHash.fromHashList(empty)
-        def ih2 = new InfoHash("6ws72qwrniqdaj4y55xngcmxtnbqapjdedm7b2hktay2sj2z7nfq");
+		def ih2 = new InfoHash("6ws72qwrniqdaj4y55xngcmxtnbqapjdedm7b2hktay2sj2z7nfq");
-        assertEquals(ih, ih2);
+		assertEquals(ih, ih2);
-    }
+	}
 }

core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy

@@ -22,21 +22,21 @@ import groovy.mock.interceptor.MockFor
 
 class ConnectionAcceptorTest {
 
-    EventBus eventBus
+	EventBus eventBus
-    final Destinations destinations = new Destinations()
+	final Destinations destinations = new Destinations()
-    def settings
+	def settings
 	
-    def connectionManagerMock
+	def connectionManagerMock
-    UltrapeerConnectionManager connectionManager
+	UltrapeerConnectionManager connectionManager
 	
-    def i2pAcceptorMock
+	def i2pAcceptorMock
-    I2PAcceptor i2pAcceptor
+	I2PAcceptor i2pAcceptor
 	
-    def hostCacheMock
+	def hostCacheMock
-    HostCache hostCache
+	HostCache hostCache
 	
-    def trustServiceMock
+	def trustServiceMock
-    TrustService trustService
+	TrustService trustService
     
     def searchManagerMock
     SearchManager searchManager
@@ -47,361 +47,361 @@ class ConnectionAcceptorTest {
     def connectionEstablisherMock
     ConnectionEstablisher connectionEstablisher
 	
-    ConnectionAcceptor acceptor
+	ConnectionAcceptor acceptor
-    List<ConnectionEvent> connectionEvents
+	List<ConnectionEvent> connectionEvents
-    InputStream inputStream
+	InputStream inputStream
-    OutputStream outputStream
+	OutputStream outputStream
 	
-    @Before
+	@Before
-    void before() {
+	void before() {
-        connectionManagerMock = new MockFor(UltrapeerConnectionManager.class)
+		connectionManagerMock = new MockFor(UltrapeerConnectionManager.class)
-        i2pAcceptorMock = new MockFor(I2PAcceptor.class)
+		i2pAcceptorMock = new MockFor(I2PAcceptor.class)
-        hostCacheMock = new MockFor(HostCache.class)
+		hostCacheMock = new MockFor(HostCache.class)
-        trustServiceMock = new MockFor(TrustService.class)
+		trustServiceMock = new MockFor(TrustService.class)
         searchManagerMock = new MockFor(SearchManager.class)
         uploadManagerMock = new MockFor(UploadManager.class)
         connectionEstablisherMock = new MockFor(ConnectionEstablisher.class)
-    }
+	}
 	
-    @After
+	@After
-    void after() {
+	void after() {
-        acceptor?.stop()
+		acceptor?.stop()
-        connectionManagerMock.verify connectionManager
+		connectionManagerMock.verify connectionManager
-        i2pAcceptorMock.verify i2pAcceptor
+		i2pAcceptorMock.verify i2pAcceptor
-        hostCacheMock.verify hostCache
+		hostCacheMock.verify hostCache
-        trustServiceMock.verify trustService
+		trustServiceMock.verify trustService
         searchManagerMock.verify searchManager
         uploadManagerMock.verify uploadManager
         connectionEstablisherMock.verify connectionEstablisher
-        Thread.sleep(100)
+		Thread.sleep(100)
-    }
+	}
 	
-    private void initMocks() {
+	private void initMocks() {
-        connectionEvents = new CopyOnWriteArrayList()
+		connectionEvents = new CopyOnWriteArrayList()
-        eventBus = new EventBus()
+		eventBus = new EventBus()
-        def listener = new Object() {
+		def listener = new Object() {
-            void onConnectionEvent(ConnectionEvent e) {
+			void onConnectionEvent(ConnectionEvent e) {
-                connectionEvents.add e
+				connectionEvents.add e
-            }
+			}
-        }
+		}
-        eventBus.register(ConnectionEvent.class, listener)
+		eventBus.register(ConnectionEvent.class, listener)
 		
-        connectionManager = connectionManagerMock.proxyInstance()
+		connectionManager = connectionManagerMock.proxyInstance()
-        i2pAcceptor = i2pAcceptorMock.proxyInstance()
+		i2pAcceptor = i2pAcceptorMock.proxyInstance()
-        hostCache = hostCacheMock.proxyInstance()
+		hostCache = hostCacheMock.proxyInstance()
-        trustService = trustServiceMock.proxyInstance()
+		trustService = trustServiceMock.proxyInstance()
         searchManager = searchManagerMock.proxyInstance()
         uploadManager = uploadManagerMock.proxyInstance()
         connectionEstablisher = connectionEstablisherMock.proxyInstance()
 		
-        acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor,
+		acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor, 
             hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
-        acceptor.start()
+		acceptor.start()
-        Thread.sleep(100)
+		Thread.sleep(100)
-    }
+	}
 	
-    @Test
+	@Test
-    void testSuccessfulLeaf() {
+	void testSuccessfulLeaf() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                false
+				false
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasLeafSlots() { true }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire leaf".bytes)
+		outputStream.write("MuWire leaf".bytes)
-        byte [] OK = new byte[2]
+		byte [] OK = new byte[2]
-        def dis = new DataInputStream(inputStream)
+		def dis = new DataInputStream(inputStream)
-        dis.readFully(OK)
+		dis.readFully(OK)
-        assert OK == "OK".bytes
+		assert OK == "OK".bytes
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
-        assert event.incoming == true
+		assert event.incoming == true
-        assert event.leaf == true
+		assert event.leaf == true
-    }
+	}
 	
-    @Test
+	@Test
-    void testSuccessfulPeer() {
+	void testSuccessfulPeer() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                false
+				false
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasPeerSlots() { true }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire peer".bytes)
+		outputStream.write("MuWire peer".bytes)
-        byte [] OK = new byte[2]
+		byte [] OK = new byte[2]
-        def dis = new DataInputStream(inputStream)
+		def dis = new DataInputStream(inputStream)
-        dis.readFully(OK)
+		dis.readFully(OK)
-        assert OK == "OK".bytes
+		assert OK == "OK".bytes
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
-        assert event.incoming == true
+		assert event.incoming == true
-        assert event.leaf == false
+		assert event.leaf == false
-    }
+	}
 	
-    @Test
+	@Test
-    void testLeafRejectsLeaf() {
+	void testLeafRejectsLeaf() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                true
+				true
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire leaf".bytes)
+		outputStream.write("MuWire leaf".bytes)
-        outputStream.flush()
+		outputStream.flush()
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert inputStream.read() == -1
+		assert inputStream.read() == -1
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.FAILED
+		assert event.status == ConnectionAttemptStatus.FAILED
-        assert event.incoming == true
+		assert event.incoming == true
-        assert event.leaf == null
+		assert event.leaf == null
-    }
+	}
 	
-    @Test
+	@Test
-    void testLeafRejectsPeer() {
+	void testLeafRejectsPeer() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                true
+				true
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire peer".bytes)
+		outputStream.write("MuWire peer".bytes)
-        outputStream.flush()
+		outputStream.flush()
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert inputStream.read() == -1
+		assert inputStream.read() == -1
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.FAILED
+		assert event.status == ConnectionAttemptStatus.FAILED
-        assert event.incoming == true
+		assert event.incoming == true
-        assert event.leaf == null
+		assert event.leaf == null
-    }
+	}
 	
-    @Test
+	@Test
-    void testPeerRejectsPeerSlots() {
+	void testPeerRejectsPeerSlots() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                false
+				false
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasPeerSlots() { false }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
-        hostCacheMock.ignore.getGoodHosts { n -> [] }
+		hostCacheMock.ignore.getGoodHosts { n -> [] }
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire peer".bytes)
+		outputStream.write("MuWire peer".bytes)
-        byte [] OK = new byte[6]
+		byte [] OK = new byte[6]
-        def dis = new DataInputStream(inputStream)
+		def dis = new DataInputStream(inputStream)
-        dis.readFully(OK)
+		dis.readFully(OK)
-        assert OK == "REJECT".bytes
+		assert OK == "REJECT".bytes
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert dis.read() == -1
+		assert dis.read() == -1
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.REJECTED
+		assert event.status == ConnectionAttemptStatus.REJECTED
-        assert event.incoming == true
+		assert event.incoming == true
-        assert event.leaf == false
+		assert event.leaf == false
-    }
+	}
 	
-    @Test
+	@Test
-    void testPeerRejectsLeafSlots() {
+	void testPeerRejectsLeafSlots() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                false
+				false
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasLeafSlots() { false }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
-        hostCacheMock.ignore.getGoodHosts { n -> [] }
+		hostCacheMock.ignore.getGoodHosts { n -> [] }
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire leaf".bytes)
+		outputStream.write("MuWire leaf".bytes)
-        byte [] OK = new byte[6]
+		byte [] OK = new byte[6]
-        def dis = new DataInputStream(inputStream)
+		def dis = new DataInputStream(inputStream)
-        dis.readFully(OK)
+		dis.readFully(OK)
-        assert OK == "REJECT".bytes
+		assert OK == "REJECT".bytes
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert dis.read() == -1
+		assert dis.read() == -1
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.REJECTED
+		assert event.status == ConnectionAttemptStatus.REJECTED
-        assert event.incoming == true
+		assert event.incoming == true
-        assert event.leaf == true
+		assert event.leaf == true
-    }
+	}
 	
-    @Test
+	@Test
-    void testPeerRejectsPeerSuggests() {
+	void testPeerRejectsPeerSuggests() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {
+			boolean isLeaf() {
-                false
+				false
-            }
+			}
-        }
+		}
-        i2pAcceptorMock.demand.accept {
+		i2pAcceptorMock.demand.accept {
-            def is = new PipedInputStream()
+			def is = new PipedInputStream()
-            outputStream = new PipedOutputStream(is)
+			outputStream = new PipedOutputStream(is)
-            def os = new PipedOutputStream()
+			def os = new PipedOutputStream()
-            inputStream = new PipedInputStream(os)
+			inputStream = new PipedInputStream(os)
-            new Endpoint(destinations.dest1, is, os, null)
+			new Endpoint(destinations.dest1, is, os, null)
-        }
+		}
-        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasPeerSlots() { false }
-        trustServiceMock.demand.getLevel { dest ->
+		trustServiceMock.demand.getLevel { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            TrustLevel.TRUSTED
+			TrustLevel.TRUSTED
-        }
+		}
-        hostCacheMock.ignore.getGoodHosts { n -> [destinations.dest2] }
+		hostCacheMock.ignore.getGoodHosts { n -> [destinations.dest2] }
 		
-        initMocks()
+		initMocks()
 		
-        outputStream.write("MuWire peer".bytes)
+		outputStream.write("MuWire peer".bytes)
-        byte [] OK = new byte[6]
+		byte [] OK = new byte[6]
-        def dis = new DataInputStream(inputStream)
+		def dis = new DataInputStream(inputStream)
-        dis.readFully(OK)
+		dis.readFully(OK)
-        assert OK == "REJECT".bytes
+		assert OK == "REJECT".bytes
 		
-        short payloadSize = dis.readUnsignedShort()
+		short payloadSize = dis.readUnsignedShort()
-        byte[] payload = new byte[payloadSize]
+		byte[] payload = new byte[payloadSize]
-        dis.readFully(payload)
+		dis.readFully(payload)
-        assert dis.read() == -1
+		assert dis.read() == -1
 		
-        def json = new JsonSlurper()
+		def json = new JsonSlurper()
-        json = json.parse(payload)
+		json = json.parse(payload)
-        assert json.tryHosts != null
+		assert json.tryHosts != null
-        assert json.tryHosts.size() == 1
+		assert json.tryHosts.size() == 1
-        assert json.tryHosts.contains(destinations.dest2.toBase64())
+		assert json.tryHosts.contains(destinations.dest2.toBase64())
 		
-        Thread.sleep(50)
+		Thread.sleep(50)
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.status == ConnectionAttemptStatus.REJECTED
+		assert event.status == ConnectionAttemptStatus.REJECTED
-    }
+	}
 }

core/src/test/groovy/com/muwire/core/connection/ConnectionEstablisherTest.groovy

@@ -17,271 +17,271 @@ import groovy.mock.interceptor.MockFor
 
 class ConnectionEstablisherTest {
 
-    EventBus eventBus
+	EventBus eventBus
-    final Destinations destinations = new Destinations()
+	final Destinations destinations = new Destinations()
-    List<ConnectionEvent> connectionEvents
+	List<ConnectionEvent> connectionEvents
-    List<HostDiscoveredEvent> discoveredEvents
+	List<HostDiscoveredEvent> discoveredEvents
-    DataInputStream inputStream
+	DataInputStream inputStream
-    DataOutputStream outputStream
+	DataOutputStream outputStream
 	
-    def i2pConnectorMock
+	def i2pConnectorMock
-    I2PConnector i2pConnector
+	I2PConnector i2pConnector
 	
-    MuWireSettings settings
+	MuWireSettings settings
 	
-    def connectionManagerMock
+	def connectionManagerMock
-    ConnectionManager connectionManager
+	ConnectionManager connectionManager
 	
-    def hostCacheMock
+	def hostCacheMock
-    HostCache hostCache
+	HostCache hostCache
 	
-    ConnectionEstablisher establisher
+	ConnectionEstablisher establisher
 	
 	
-    @Before
+	@Before
-    void before() {
+	void before() {
-        connectionEvents = new CopyOnWriteArrayList()
+		connectionEvents = new CopyOnWriteArrayList()
-        discoveredEvents = new CopyOnWriteArrayList()
+		discoveredEvents = new CopyOnWriteArrayList()
-        def listener = new Object() {
+		def listener = new Object() {
-            void onConnectionEvent(ConnectionEvent e) {
+			void onConnectionEvent(ConnectionEvent e) {
-                connectionEvents.add(e)
+				connectionEvents.add(e)
-            }
+			}
-            void onHostDiscoveredEvent(HostDiscoveredEvent e) {
+			void onHostDiscoveredEvent(HostDiscoveredEvent e) {
-                discoveredEvents.add e
+				discoveredEvents.add e
-            }
+			}
-        }
+		}
-        eventBus = new EventBus()
+		eventBus = new EventBus()
-        eventBus.register(ConnectionEvent.class, listener)
+		eventBus.register(ConnectionEvent.class, listener)
-        eventBus.register(HostDiscoveredEvent.class, listener)
+		eventBus.register(HostDiscoveredEvent.class, listener)
-        i2pConnectorMock = new MockFor(I2PConnector.class)
+		i2pConnectorMock = new MockFor(I2PConnector.class)
-        connectionManagerMock = new MockFor(ConnectionManager.class)
+		connectionManagerMock = new MockFor(ConnectionManager.class)
-        hostCacheMock = new MockFor(HostCache.class)
+		hostCacheMock = new MockFor(HostCache.class)
-    }
+	}
 	
-    @After
+	@After
-    void after() {
+	void after() {
-        establisher?.stop()
+		establisher?.stop()
-        i2pConnectorMock.verify i2pConnector
+		i2pConnectorMock.verify i2pConnector
-        connectionManagerMock.verify connectionManager
+		connectionManagerMock.verify connectionManager
-        hostCacheMock.verify hostCache
+		hostCacheMock.verify hostCache
-        Thread.sleep(100)
+		Thread.sleep(100)
-    }
+	}
 	
-    private void initMocks() {
+	private void initMocks() {
-        i2pConnector = i2pConnectorMock.proxyInstance()
+		i2pConnector = i2pConnectorMock.proxyInstance()
-        connectionManager = connectionManagerMock.proxyInstance()
+		connectionManager = connectionManagerMock.proxyInstance()
-        hostCache = hostCacheMock.proxyInstance()
+		hostCache = hostCacheMock.proxyInstance()
-        establisher = new ConnectionEstablisher(eventBus, i2pConnector, settings, connectionManager, hostCache)
+		establisher = new ConnectionEstablisher(eventBus, i2pConnector, settings, connectionManager, hostCache)
-        establisher.start()
+		establisher.start()
-        Thread.sleep(250)
+		Thread.sleep(250)
-    }
+	}
 	
 	
-    @Test
+	@Test
-    void testConnectFails() {
+	void testConnectFails() {
-        settings = new MuWireSettings()
+		settings = new MuWireSettings()
-        connectionManagerMock.ignore.needsConnections {
+		connectionManagerMock.ignore.needsConnections {
-            true
+			true 
-        }
+		}
-        hostCacheMock.ignore.getHosts { num ->
+		hostCacheMock.ignore.getHosts { num ->
-            assert num == 1
+			assert num == 1
-            [destinations.dest1]
+			[destinations.dest1]
-        }
+		}
-        connectionManagerMock.ignore.isConnected { dest ->
+		connectionManagerMock.ignore.isConnected { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            false
+			false
-        }
+		}
-        i2pConnectorMock.demand.connect { dest ->
+		i2pConnectorMock.demand.connect { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            throw new IOException()
+			throw new IOException()
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.incoming == false
+		assert event.incoming == false
-        assert event.status == ConnectionAttemptStatus.FAILED
+		assert event.status == ConnectionAttemptStatus.FAILED
-    }
+	}
 	
-    @Test
+	@Test
-    void testConnectionSucceedsPeer() {
+	void testConnectionSucceedsPeer() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {false}
+			boolean isLeaf() {false}
-        }
+		}
-        connectionManagerMock.ignore.needsConnections {
+		connectionManagerMock.ignore.needsConnections {
-            true
+			true
-        }
+		}
-        hostCacheMock.ignore.getHosts { num ->
+		hostCacheMock.ignore.getHosts { num ->
-            assert num == 1
+			assert num == 1
-            [destinations.dest1]
+			[destinations.dest1]
-        }
+		}
-        connectionManagerMock.ignore.isConnected { dest ->
+		connectionManagerMock.ignore.isConnected { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            false
+			false
-        }
+		}
-        i2pConnectorMock.demand.connect { dest ->
+		i2pConnectorMock.demand.connect { dest ->
-            PipedOutputStream os = new PipedOutputStream()
+			PipedOutputStream os = new PipedOutputStream()
-            inputStream = new DataInputStream(new PipedInputStream(os))
+			inputStream = new DataInputStream(new PipedInputStream(os))
-            PipedInputStream is = new PipedInputStream()
+			PipedInputStream is = new PipedInputStream()
-            outputStream = new DataOutputStream(new PipedOutputStream(is))
+			outputStream = new DataOutputStream(new PipedOutputStream(is))
-            new Endpoint(dest, is, os, null)
+			new Endpoint(dest, is, os, null)
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        byte [] header = new byte[11]
+		byte [] header = new byte[11]
-        inputStream.readFully(header)
+		inputStream.readFully(header)
-        assert header == "MuWire peer".bytes
+		assert header == "MuWire peer".bytes
 		
-        outputStream.write("OK".bytes)
+		outputStream.write("OK".bytes)
-        outputStream.flush()
+		outputStream.flush()
 		
-        Thread.sleep(100)
+		Thread.sleep(100)
 		
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.incoming == false
+		assert event.incoming == false
-        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
 		
-    }
+	}
 	
-    @Test
+	@Test
-    void testConnectionSucceedsLeaf() {
+	void testConnectionSucceedsLeaf() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {true}
+			boolean isLeaf() {true}
-        }
+		}
-        connectionManagerMock.ignore.needsConnections {
+		connectionManagerMock.ignore.needsConnections {
-            true
+			true
-        }
+		}
-        hostCacheMock.ignore.getHosts { num ->
+		hostCacheMock.ignore.getHosts { num ->
-            assert num == 1
+			assert num == 1
-            [destinations.dest1]
+			[destinations.dest1]
-        }
+		}
-        connectionManagerMock.ignore.isConnected { dest ->
+		connectionManagerMock.ignore.isConnected { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            false
+			false
-        }
+		}
-        i2pConnectorMock.demand.connect { dest ->
+		i2pConnectorMock.demand.connect { dest ->
-            PipedOutputStream os = new PipedOutputStream()
+			PipedOutputStream os = new PipedOutputStream()
-            inputStream = new DataInputStream(new PipedInputStream(os))
+			inputStream = new DataInputStream(new PipedInputStream(os))
-            PipedInputStream is = new PipedInputStream()
+			PipedInputStream is = new PipedInputStream()
-            outputStream = new DataOutputStream(new PipedOutputStream(is))
+			outputStream = new DataOutputStream(new PipedOutputStream(is))
-            new Endpoint(dest, is, os, null)
+			new Endpoint(dest, is, os, null)
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        byte [] header = new byte[11]
+		byte [] header = new byte[11]
-        inputStream.readFully(header)
+		inputStream.readFully(header)
-        assert header == "MuWire leaf".bytes
+		assert header == "MuWire leaf".bytes
 		
-        outputStream.write("OK".bytes)
+		outputStream.write("OK".bytes)
-        outputStream.flush()
+		outputStream.flush()
 		
-        Thread.sleep(100)
+		Thread.sleep(100)
 		
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.incoming == false
+		assert event.incoming == false
-        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
-    }
+	}
 	
-    @Test
+	@Test
-    void testConnectionRejected() {
+	void testConnectionRejected() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {false}
+			boolean isLeaf() {false}
-        }
+		}
-        connectionManagerMock.ignore.needsConnections {
+		connectionManagerMock.ignore.needsConnections {
-            true
+			true
-        }
+		}
-        hostCacheMock.ignore.getHosts { num ->
+		hostCacheMock.ignore.getHosts { num ->
-            assert num == 1
+			assert num == 1
-            [destinations.dest1]
+			[destinations.dest1]
-        }
+		}
-        connectionManagerMock.ignore.isConnected { dest ->
+		connectionManagerMock.ignore.isConnected { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            false
+			false
-        }
+		}
-        i2pConnectorMock.demand.connect { dest ->
+		i2pConnectorMock.demand.connect { dest ->
-            PipedOutputStream os = new PipedOutputStream()
+			PipedOutputStream os = new PipedOutputStream()
-            inputStream = new DataInputStream(new PipedInputStream(os))
+			inputStream = new DataInputStream(new PipedInputStream(os))
-            PipedInputStream is = new PipedInputStream()
+			PipedInputStream is = new PipedInputStream()
-            outputStream = new DataOutputStream(new PipedOutputStream(is))
+			outputStream = new DataOutputStream(new PipedOutputStream(is))
-            new Endpoint(dest, is, os, null)
+			new Endpoint(dest, is, os, null)
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        byte [] header = new byte[11]
+		byte [] header = new byte[11]
-        inputStream.readFully(header)
+		inputStream.readFully(header)
-        assert header == "MuWire peer".bytes
+		assert header == "MuWire peer".bytes
 		
-        outputStream.write("REJECT".bytes)
+		outputStream.write("REJECT".bytes)
-        outputStream.flush()
+		outputStream.flush()
 		
-        Thread.sleep(100)
+		Thread.sleep(100)
 		
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.incoming == false
+		assert event.incoming == false
-        assert event.status == ConnectionAttemptStatus.REJECTED
+		assert event.status == ConnectionAttemptStatus.REJECTED
-        assert discoveredEvents.isEmpty()
+		assert discoveredEvents.isEmpty()
-    }
+	}
 	
-    @Test
+	@Test
-    void testConnectionRejectedSuggestions() {
+	void testConnectionRejectedSuggestions() {
-        settings = new MuWireSettings() {
+		settings = new MuWireSettings() {
-            boolean isLeaf() {false}
+			boolean isLeaf() {false}
-        }
+		}
-        connectionManagerMock.ignore.needsConnections {
+		connectionManagerMock.ignore.needsConnections {
-            true
+			true
-        }
+		}
-        hostCacheMock.ignore.getHosts { num ->
+		hostCacheMock.ignore.getHosts { num ->
-            assert num == 1
+			assert num == 1
-            [destinations.dest1]
+			[destinations.dest1]
-        }
+		}
-        connectionManagerMock.ignore.isConnected { dest ->
+		connectionManagerMock.ignore.isConnected { dest ->
-            assert dest == destinations.dest1
+			assert dest == destinations.dest1
-            false
+			false
-        }
+		}
-        i2pConnectorMock.demand.connect { dest ->
+		i2pConnectorMock.demand.connect { dest ->
-            PipedOutputStream os = new PipedOutputStream()
+			PipedOutputStream os = new PipedOutputStream()
-            inputStream = new DataInputStream(new PipedInputStream(os))
+			inputStream = new DataInputStream(new PipedInputStream(os))
-            PipedInputStream is = new PipedInputStream()
+			PipedInputStream is = new PipedInputStream()
-            outputStream = new DataOutputStream(new PipedOutputStream(is))
+			outputStream = new DataOutputStream(new PipedOutputStream(is))
-            new Endpoint(dest, is, os, null)
+			new Endpoint(dest, is, os, null)
-        }
+		}
 		
-        initMocks()
+		initMocks()
 		
-        byte [] header = new byte[11]
+		byte [] header = new byte[11]
-        inputStream.readFully(header)
+		inputStream.readFully(header)
-        assert header == "MuWire peer".bytes
+		assert header == "MuWire peer".bytes
 		
-        outputStream.write("REJECT".bytes)
+		outputStream.write("REJECT".bytes)
-        outputStream.flush()
+		outputStream.flush()
 		
-        def json = [:]
+		def json = [:]
-        json.tryHosts = [destinations.dest2.toBase64()]
+		json.tryHosts = [destinations.dest2.toBase64()]
-        json = JsonOutput.toJson(json)
+		json = JsonOutput.toJson(json)
-        outputStream.writeShort(json.bytes.length)
+		outputStream.writeShort(json.bytes.length)
-        outputStream.write(json.bytes)
+		outputStream.write(json.bytes)
-        outputStream.flush()
+		outputStream.flush()
-        Thread.sleep(100)
+		Thread.sleep(100)
 		
-        assert connectionEvents.size() == 1
+		assert connectionEvents.size() == 1
-        def event = connectionEvents[0]
+		def event = connectionEvents[0]
-        assert event.endpoint.destination == destinations.dest1
+		assert event.endpoint.destination == destinations.dest1
-        assert event.incoming == false
+		assert event.incoming == false
-        assert event.status == ConnectionAttemptStatus.REJECTED
+		assert event.status == ConnectionAttemptStatus.REJECTED
 		
-        assert discoveredEvents.size() == 1
+		assert discoveredEvents.size() == 1
-        event = discoveredEvents[0]
+		event = discoveredEvents[0]
-        assert event.destination == destinations.dest2
+		assert event.destination == destinations.dest2
-    }
+	}
 }

core/src/test/groovy/com/muwire/core/download/DownloadSessionTest.groovy

@@ -1,30 +1,21 @@
 package com.muwire.core.download
 
-import static org.junit.Assert.fail
-
 import org.junit.After
-import org.junit.Before
 import org.junit.Test
 
-import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-import com.muwire.core.Personas
 import com.muwire.core.connection.Endpoint
 import com.muwire.core.files.FileHasher
 import static com.muwire.core.util.DataUtil.readTillRN
-import static com.muwire.core.util.DataUtil.encodeXHave
 
 import net.i2p.data.Base64
-import net.i2p.util.ConcurrentHashSet
 
 class DownloadSessionTest {
     
-    private EventBus eventBus
     private File source, target
     private InfoHash infoHash
     private Endpoint endpoint
-    private Pieces pieces
+    private Pieces pieces, claimed
     private String rootBase64
     
     private DownloadSession session
@@ -33,16 +24,6 @@ class DownloadSessionTest {
     private InputStream fromDownloader, fromUploader
     private OutputStream toDownloader, toUploader
     
-    private volatile boolean performed
-    private Set<Integer> available = new ConcurrentHashSet<>()
-    private volatile IOException thrown
-
-
-    @Before
-    public void setUp() {
-        eventBus = new EventBus()
-    }
-
     private void initSession(int size, def claimedPieces = []) {
         Random r = new Random()
         byte [] content = new byte[size]
@@ -67,7 +48,8 @@ class DownloadSessionTest {
         else
             nPieces = size / pieceSize + 1
         pieces = new Pieces(nPieces)
-        claimedPieces.each {pieces.claimed.set(it)}
+        claimed = new Pieces(nPieces)
+        claimedPieces.each {claimed.markDownloaded(it)}
         
         fromDownloader = new PipedInputStream()
         fromUploader = new PipedInputStream()
@@ -75,20 +57,12 @@ class DownloadSessionTest {
         toUploader = new PipedOutputStream(fromDownloader)
         endpoint = new Endpoint(null, fromUploader, toUploader, null)
         
-        session = new DownloadSession(eventBus, "",pieces, infoHash, endpoint, target, pieceSize, size, available)
+        session = new DownloadSession("",pieces, claimed, infoHash, endpoint, target, pieceSize, size)
-        downloadThread = new Thread( { perform() } as Runnable)
+        downloadThread = new Thread( { session.request() } as Runnable)
         downloadThread.setDaemon(true)
         downloadThread.start()
     }
     
-    private void perform() {
-        try {
-            performed = session.request()
-        } catch (IOException e) {
-            thrown = e
-        }
-    }
-
     @After
     public void teardown() {
         source?.delete()
@@ -103,7 +77,6 @@ class DownloadSessionTest {
         assert "GET $rootBase64" == readTillRN(fromDownloader)
         assert "Range: 0-19" == readTillRN(fromDownloader)
         readTillRN(fromDownloader)
-        readTillRN(fromDownloader)
         assert "" == readTillRN(fromDownloader)
         
         toDownloader.write("200 OK\r\n".bytes)
@@ -115,9 +88,6 @@ class DownloadSessionTest {
         
         assert pieces.isComplete()
         assert target.bytes == source.bytes
-        assert performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -129,7 +99,6 @@ class DownloadSessionTest {
         assert "GET $rootBase64" == readTillRN(fromDownloader)
         readTillRN(fromDownloader)
         readTillRN(fromDownloader)
-        readTillRN(fromDownloader)
         assert "" == readTillRN(fromDownloader)
         
         toDownloader.write("200 OK\r\n".bytes)
@@ -140,9 +109,6 @@ class DownloadSessionTest {
         Thread.sleep(150)
         assert pieces.isComplete()
         assert target.bytes == source.bytes
-        assert performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -160,7 +126,6 @@ class DownloadSessionTest {
         assert (start == 0 && end == ((1 << pieceSize) - 1)) || 
             (start == (1 << pieceSize) && end == (1 << pieceSize))
         
-        readTillRN(fromDownloader)
         readTillRN(fromDownloader)
         assert "" == readTillRN(fromDownloader)
         
@@ -174,9 +139,6 @@ class DownloadSessionTest {
         Thread.sleep(150)
         assert !pieces.isComplete()
         assert 1 == pieces.donePieces()
-        assert performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -184,10 +146,7 @@ class DownloadSessionTest {
         initSession(20, [0])
         long now = System.currentTimeMillis()
         downloadThread.join(100)
-        assert 100 >= (System.currentTimeMillis() - now)
+        assert 100 > (System.currentTimeMillis() - now)
-        assert !performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -195,7 +154,7 @@ class DownloadSessionTest {
         int pieceSize = FileHasher.getPieceSize(1)
         int size = (1 << pieceSize) * 10
         initSession(size, [1,2,3,4,5,6,7,8,9])
-        assert !pieces.claimed.get(0)
+        assert !claimed.isMarked(0)
         
         assert "GET $rootBase64" == readTillRN(fromDownloader)
         String range = readTillRN(fromDownloader)
@@ -203,131 +162,7 @@ class DownloadSessionTest {
         int start = Integer.parseInt(matcher[0][1])
         int end = Integer.parseInt(matcher[0][2])
         
-        assert pieces.claimed.get(0)
+        assert claimed.isMarked(0)
         assert start == 0 && end == (1 << pieceSize) - 1
     }
-
-    @Test
-    public void test416NoHave() {
-        initSession(20)
-        readAllHeaders(fromDownloader)
-
-        toDownloader.write("416 don't have it\r\n\r\n".bytes)
-        toDownloader.flush()
-        Thread.sleep(150)
-        assert !performed
-        assert available.isEmpty()
-        assert thrown != null
-    }
-
-    @Test
-    public void test416Have() {
-        initSession(20)
-        readAllHeaders(fromDownloader)
-
-        toDownloader.write("416 don't have it\r\n".bytes)
-        toDownloader.write("X-Have: ${encodeXHave([0], 1)}\r\n\r\n".bytes)
-        toDownloader.flush()
-
-        Thread.sleep(150)
-        assert performed
-        assert available.contains(0)
-        assert thrown == null
-    }
-
-    @Test
-    public void test416Have2Pieces() {
-        int pieceSize = FileHasher.getPieceSize(1)
-        int size = (1 << pieceSize) + 1
-        initSession(size)
-        readAllHeaders(fromDownloader)
-
-        toDownloader.write("416 don't have it\r\n".bytes)
-        toDownloader.write("X-Have: ${encodeXHave([1], 2)}\r\n\r\n".bytes)
-        toDownloader.flush()
-
-        Thread.sleep(150)
-        assert performed
-        assert available.contains(1)
-        assert thrown == null
-    }
-
-    @Test
-    public void test200TwoPieces1Available() {
-        int pieceSize = FileHasher.getPieceSize(1)
-        int size = (1 << pieceSize) * 9 + 1
-        initSession(size)
-
-        Set<String> headers = readAllHeaders(fromDownloader)
-        def matcher = null
-        headers.each {
-            if (it.startsWith("Range"))
-                matcher = (it =~ /^Range: (\d+)-(\d+)$/)
-        }
-        assert matcher.groupCount() > 0
-        int start = Integer.parseInt(matcher[0][1])
-        int end = Integer.parseInt(matcher[0][2])
-
-        if (start == 0)
-            fail("inconlcusive")
-
-        toDownloader.write("416 don't have it \r\n".bytes)
-        toDownloader.write("X-Have: ${encodeXHave([0],2)}\r\n\r\n".bytes)
-        toDownloader.flush()
-        downloadThread.join()
-
-        assert performed
-        performed = false
-        assert available.contains(0)
-        assert thrown == null
-
-        // request same session
-        downloadThread = new Thread( { perform() } as Runnable)
-        downloadThread.setDaemon(true)
-        downloadThread.start()
-
-        Thread.sleep(150)
-
-        headers = readAllHeaders(fromDownloader)
-        matcher = null
-        headers.each {
-            if (it.startsWith("Range"))
-            matcher = (it =~ /^Range: (\d+)-(\d+)$/)
-        }
-        assert matcher.groupCount() > 0
-        start = Integer.parseInt(matcher[0][1])
-        end = Integer.parseInt(matcher[0][2])
-        assert start == 0
-    }
-
-    @Test
-    public void testXAlt() throws Exception {
-        Personas personas = new Personas()
-        def sources = []
-        def listener = new Object() {
-            public void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-                sources << e.source
-            }
-        }
-        eventBus.register(SourceDiscoveredEvent.class, listener)
-
-        initSession(20)
-        readAllHeaders(fromDownloader)
-        toDownloader.write("416 don't have it\r\n".bytes)
-        toDownloader.write("X-Alt: ${personas.persona1.toBase64()},${personas.persona2.toBase64()}\r\n\r\n".bytes)
-        toDownloader.flush()
-
-        Thread.sleep(150)
-        assert sources.contains(personas.persona1)
-        assert sources.contains(personas.persona2)
-        assert 2 == sources.size()
-    }
-
-    private static Set<String> readAllHeaders(InputStream is) {
-        Set<String> rv = new HashSet<>()
-        String header
-        while((header = readTillRN(is)) != "")
-            rv.add(header)
-        rv
-    }
 }