Release 0.6.5

Bugfix: Update plugin version to fix bug about shadow jar

README.md

@@ -1,39 +1,51 @@
 # MuWire - Easy Anonymous File-Sharing
 
-MuWire is an easy to use file-sharing program which offers anonymity using [I2P technology](http://geti2p.net).
+MuWire is an easy to use file-sharing program which offers anonymity using [I2P technology](http://geti2p.net).  It works on any platform Java works on, including Windows,MacOS,Linux.
 
 It is inspired by the LimeWire Gnutella client and developped by a former LimeWire developer.
 
-The project is in development.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.6.2 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 
 You need JDK 8 or newer.  After installing that and setting up the appropriate paths, just type
 
 ```
-./gradlew assemble 
+./gradlew clean assemble
 ```
 
 If you want to run the unit tests, type
 ```
-./gradlew build
+./gradlew clean build
 ```
 
-Some of the UI tests will fail because they haven't been written yet :-/
+If you want to build binary bundles that do not depend on Java or I2P, see the https://github.com/zlatinb/muwire-pkg project
 
-### Running
+### Running the GUI
 
-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.  
+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 gui-x.y.z-all.jar` in a terminal or command prompt.
 
-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.
+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`
 
-At the moment there are very few nodes on the network, so you will see very few connections and search results.  It is best to leave MuWire running all the time, just like I2P.
-
-
-### Known bugs and limitations
-
-* Any shared files get re-hashed on startup
-* Sometimes the list of shared files gets lost 
-* Many UI features you would expect are not there yet
+[Default I2CP port]\: `7654`
+
+### Running the CLI
+
+Look inside `cli-lanterna/build/distributions`.  Untar/unzip one of the `shadow` files and then run the jar contained inside by typing `java -jar cli-lanterna-x.y.z-all.jar` in a terminal.  The CLI will ask you about the router host and port on startup, no need to edit any files.  However, the CLI does not have an options window yet, so if you need to change any options you will need to edit the configuration files.  The CLI options are documented here https://github.com/zlatinb/muwire/wiki/CLI-Configuration-Options
+
+The CLI is under active development and doesn't have all the features of the GUI.
+
+### Web UI
+
+If you are a Grails/Scala/JRuby/Kotlin developer and are interested in building a Web UI for MuWire, please get in touch.  The MuWire core is written in Groovy and should be easy to integrate with any JVM-based language.
+
+### GPG Fingerprint
+
+```
+471B 9FD4 5517 A5ED 101F  C57D A728 3207 2D52 5E41
+```
+
+You can find the full key at https://keybase.io/zlatinb
 
 
+[Default I2CP port]: https://geti2p.net/en/docs/ports

TODO.md

@@ -0,0 +1,26 @@
+# TODO List
+
+Not in any particular order yet
+
+### Big Items
+
+##### Bloom Filters
+
+This reduces query traffic by not sending last hop queries to peers that definitely do not have the file
+
+##### Two-tier Topology
+
+This helps with scalability
+
+##### 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
+
+* Wrapper of some kind for in-place upgrades
+* Automatic adjustment of number of I2P tunnels

build.gradle

@@ -2,8 +2,8 @@ subprojects {
     apply plugin: 'groovy'
 
     dependencies {
-        compile 'net.i2p:i2p:0.9.40'
-        compile 'org.codehaus.groovy:groovy-all:2.5.7'
+        compile "net.i2p:i2p:${i2pVersion}"
+        compile 'org.codehaus.groovy:groovy-all:2.4.15'
     }
 
     compileGroovy {

cli-lanterna/build.gradle

@@ -0,0 +1,27 @@
+buildscript {
+
+    repositories {
+        jcenter()
+        mavenLocal()
+    }
+
+    dependencies {
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+    }
+}
+
+apply plugin : 'application'
+application {
+    mainClassName = 'com.muwire.clilanterna.CliLanterna'
+    applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties','-Xmx256M']
+    applicationName = 'MuWire-cli'
+}
+
+apply plugin : 'com.github.johnrengelman.shadow'
+
+
+dependencies {
+    compile project(":core")
+    compile 'com.googlecode.lanterna:lanterna:3.0.1'
+}
+

cli-lanterna/src/main/groovy/com/muwire/clilanterna/AddCommentView.groovy

@@ -0,0 +1,73 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.TextBox
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.muwire.core.Constants
+import com.muwire.core.Core
+import com.muwire.core.SharedFile
+import com.muwire.core.files.UICommentEvent
+import com.muwire.core.util.DataUtil
+
+import net.i2p.data.Base64
+
+class AddCommentView extends BasicWindow {
+    private final TextGUI textGUI
+    private final Core core
+    private final TextBox textBox
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+      
+    AddCommentView(TextGUI textGUI, Core core, SharedFile sharedFile, TerminalSize terminalSize) {
+        super("Add Comment To "+sharedFile.getFile().getName())
+        this.textGUI = textGUI
+        this.core = core
+        
+        setHints([Window.Hint.CENTERED])
+
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+                
+        String oldComment = sharedFile.getComment()
+        if (oldComment == null)
+            oldComment = ""
+        else
+            oldComment = DataUtil.readi18nString(Base64.decode(oldComment))
+            
+        TerminalSize boxSize = new TerminalSize((terminalSize.getColumns() / 2).toInteger(), (terminalSize.getRows() / 2).toInteger())
+        textBox = new TextBox(boxSize,oldComment,TextBox.Style.MULTI_LINE)    
+        contentPanel.addComponent(textBox, layoutData)
+        
+        Panel buttonsPanel = new Panel()
+        buttonsPanel.setLayoutManager(new GridLayout(2))
+        contentPanel.addComponent(buttonsPanel, layoutData)
+        
+        Button saveButton = new Button("Save", {
+            String newComment = textBox.getText()
+            if (newComment.length() > Constants.MAX_COMMENT_LENGTH) {
+                String error = "Your comment is too long - ${newComment.length()} bytes.  Maximum is $Constants.MAX_COMMENT_LENGTH bytes"
+                MessageDialog.showMessageDialog(textGUI, "Comment Too Long", error, MessageDialogButton.Close)
+            } else {
+                newComment = Base64.encode(DataUtil.encodei18nString(newComment))
+                String encodedOldComment = sharedFile.getComment()
+                sharedFile.setComment(newComment)
+                core.eventBus.publish(new UICommentEvent(sharedFile : sharedFile, oldComment : encodedOldComment))
+                close()
+            }
+        })
+        Button cancelButton = new Button("Cancel", {close()})
+        
+        buttonsPanel.addComponent(saveButton, layoutData)
+        buttonsPanel.addComponent(cancelButton, layoutData)
+        
+        setComponent(contentPanel)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/BrowseModel.groovy

@@ -0,0 +1,75 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.search.BrowseStatus
+import com.muwire.core.search.BrowseStatusEvent
+import com.muwire.core.search.UIBrowseEvent
+import com.muwire.core.search.UIResultEvent
+
+import net.i2p.data.Base64
+import net.i2p.data.DataHelper
+
+class BrowseModel {
+    private final Persona persona
+    private final Core core
+    private final TextGUIThread guiThread
+    private final TableModel model = new TableModel("Name","Size","Hash","Comment","Certificates")
+    private Map<String, UIResultEvent> rootToResult = new HashMap<>()
+    
+    private int totalResults
+    
+    private Label status
+    private Label percentage
+    
+    BrowseModel(Persona persona, Core core, TextGUIThread guiThread) {
+        this.persona = persona
+        this.core = core
+        this.guiThread = guiThread
+        
+        core.eventBus.register(BrowseStatusEvent.class, this)
+        core.eventBus.register(UIResultEvent.class, this)
+        core.eventBus.publish(new UIBrowseEvent(host : persona))
+    }
+    
+    void unregister() {
+        core.eventBus.unregister(BrowseStatusEvent.class, this)
+        core.eventBus.unregister(UIResultEvent.class, this)
+    }
+    
+    void onBrowseStatusEvent(BrowseStatusEvent e) {
+        guiThread.invokeLater {
+            status.setText(e.status.toString())
+            if (e.status == BrowseStatus.FETCHING)
+                totalResults = e.totalResults
+        }
+    }
+    
+    void onUIResultEvent(UIResultEvent e) {
+        guiThread.invokeLater {
+            String size = DataHelper.formatSize2Decimal(e.size, false) + "B"
+            String infoHash = Base64.encode(e.infohash.getRoot())
+            String comment = String.valueOf(e.comment != null)
+            model.addRow(e.name, size, infoHash, comment, e.certificates)
+            rootToResult.put(infoHash, e)
+            
+            String percentageString = ""
+            if (totalResults != 0) {
+                double percentage = Math.round( (model.getRowCount() * 100 / totalResults).toDouble() )
+                percentageString = String.valueOf(percentage)+"%"
+            }
+            percentage.setText(percentageString)
+        }
+    }
+    
+    void setStatusLabel(Label status) {
+        this.status = status
+    }
+    
+    void setPercentageLabel(Label percentage) {
+        this.percentage = percentage
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/BrowseView.groovy

@@ -0,0 +1,123 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.table.Table
+import com.muwire.core.Core
+import com.muwire.core.download.UIDownloadEvent
+import com.muwire.core.search.UIResultEvent
+
+
+class BrowseView extends BasicWindow {
+    private final BrowseModel model
+    private final TextGUI textGUI
+    private final Core core
+    private final Table table
+    private final TerminalSize terminalSize
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false) 
+    
+    BrowseView(BrowseModel model, TextGUI textGUI, Core core, TerminalSize terminalSize) {
+        super("Browse "+model.persona.getHumanReadableName())
+        this.model = model
+        this.textGUI = textGUI
+        this.core = core
+        this.terminalSize = terminalSize
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        
+        Label statusLabel = new Label("")
+        Label percentageLabel = new Label("")
+        model.setStatusLabel(statusLabel)
+        model.setPercentageLabel(percentageLabel)
+        
+        Panel topPanel = new Panel()
+        topPanel.setLayoutManager(new GridLayout(2))
+        topPanel.addComponent(statusLabel, layoutData)
+        topPanel.addComponent(percentageLabel, layoutData)
+        contentPanel.addComponent(topPanel, layoutData)
+        
+        table = new Table("Name","Size","Hash","Comment","Certificates")
+        table.with { 
+            setCellSelection(false)
+            setTableModel(model.model)
+            setVisibleRows(terminalSize.getRows())
+            setSelectAction({rowSelected()})
+        }
+        contentPanel.addComponent(table, layoutData)
+        
+        Button closeButton = new Button("Close",{
+            model.unregister()
+            close()
+        })
+        contentPanel.addComponent(closeButton, layoutData)
+        setComponent(contentPanel)
+        
+    }
+    
+    private void rowSelected() {
+        int selectedRow = table.getSelectedRow()
+        def row = model.model.getRow(selectedRow)
+        String infoHash = row[2]
+        boolean comment = Boolean.parseBoolean(row[3]) 
+        boolean certificates = row[4] > 0
+        if (comment || certificates) {
+            Window prompt = new BasicWindow("Download Or View Comment")
+            prompt.setHints([Window.Hint.CENTERED])
+            Panel contentPanel = new Panel()
+            contentPanel.setLayoutManager(new GridLayout(4))
+            Button downloadButton = new Button("Download", {download(infoHash)})
+            Button viewButton = new Button("View Comment", {viewComment(infoHash)})
+            Button viewCertificate = new Button("View Certificates",{viewCertificates(infoHash)})
+            Button closeButton = new Button("Cancel", {prompt.close()})
+            
+            contentPanel.with { 
+                addComponent(downloadButton, layoutData)
+                if (comment)
+                    addComponent(viewButton, layoutData)
+                if (certificates)
+                    addComponent(viewCertificate, layoutData)
+                addComponent(closeButton, layoutData)
+            }
+            
+            prompt.setComponent(contentPanel)
+            downloadButton.takeFocus()
+            textGUI.addWindowAndWait(prompt)
+        } else {
+            download(infoHash)
+        }
+    }
+    
+    private void download(String infoHash) {
+        UIResultEvent result = model.rootToResult[infoHash]
+        def file = new File(core.muOptions.downloadLocation, result.name)
+        core.eventBus.publish(new UIDownloadEvent(result : [result], sources : result.sources,
+            target : file, sequential : false))
+        MessageDialog.showMessageDialog(textGUI, "Download started", "Started download of "+result.name, MessageDialogButton.OK)
+    }
+    
+    private void viewComment(String infoHash) {
+        UIResultEvent result = model.rootToResult[infoHash]
+        ViewCommentView view = new ViewCommentView(result.comment, result.name, terminalSize)
+        textGUI.addWindowAndWait(view)
+    }
+    
+    private void viewCertificates(String infoHash) {
+        UIResultEvent result = model.rootToResult[infoHash]
+        ViewCertificatesModel model = new ViewCertificatesModel(result, core, textGUI.getGUIThread())
+        ViewCertificatesView view = new ViewCertificatesView(model, textGUI, core, terminalSize)
+        textGUI.addWindowAndWait(view)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/CertificateWrapper.groovy

@@ -0,0 +1,14 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.filecert.Certificate
+
+class CertificateWrapper {
+    private final Certificate certificate
+    CertificateWrapper(Certificate certificate) {
+        this.certificate = certificate
+    }
+    
+    public String toString() {
+        certificate.issuer.getHumanReadableName()
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliLanterna.groovy

@@ -0,0 +1,193 @@
+package com.muwire.clilanterna
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.CountDownLatch
+import java.util.logging.Level
+import java.util.logging.LogManager
+
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Border
+import com.googlecode.lanterna.gui2.BorderLayout
+import com.googlecode.lanterna.gui2.Borders
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.MultiWindowTextGUI
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.SeparateTextGUIThread
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.WindowBasedTextGUI
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.dialogs.TextInputDialog
+import com.googlecode.lanterna.gui2.dialogs.TextInputDialogBuilder
+import com.googlecode.lanterna.gui2.dialogs.WaitingDialog
+import com.googlecode.lanterna.screen.Screen
+import com.googlecode.lanterna.terminal.DefaultTerminalFactory
+import com.googlecode.lanterna.terminal.Terminal
+import com.muwire.core.Core
+import com.muwire.core.MuWireSettings
+import com.muwire.core.UILoadedEvent
+import com.muwire.core.files.AllFilesLoadedEvent
+
+class CliLanterna {
+    private static final String MW_VERSION = "0.6.5"
+    
+    private static volatile Core core
+    
+    private static WindowBasedTextGUI textGUI
+    
+    public static void main(String[] args) {
+        if (System.getProperty("java.util.logging.config.file") == null) {
+            def names = LogManager.getLogManager().getLoggerNames()
+            while(names.hasMoreElements()) {
+                def name = names.nextElement()
+                LogManager.getLogManager().getLogger(name).setLevel(Level.SEVERE)
+            }
+        }
+        
+        def home = System.getProperty("user.home") + File.separator + ".MuWire"
+        home = new File(home)
+        if (!home.exists())
+            home.mkdirs()
+
+        def propsFile = new File(home,"MuWire.properties")
+        
+        
+        DefaultTerminalFactory terminalFactory = new DefaultTerminalFactory()
+        Screen screen = terminalFactory.createScreen()
+        textGUI = new MultiWindowTextGUI( new SeparateTextGUIThread.Factory(), screen)
+        textGUI.getGUIThread().start()
+        screen.startScreen()
+
+        def props
+        if (!propsFile.exists()) {
+            String nickname = TextInputDialog.showDialog(textGUI, "Select a nickname", "", "")
+            String defaultDownloadLocation = System.getProperty("user.home")+File.separator+"Downloads"
+            String downloadLocation = TextInputDialog.showDialog(textGUI, "Select download location", "", defaultDownloadLocation)
+            String defaultIncompletesLocation = System.getProperty("user.home")+File.separator+".MuWire"+File.separator+"incompletes"
+            String incompletesLocation = TextInputDialog.showDialog(textGUI, "Select incompletes location", "", defaultIncompletesLocation)
+            
+            
+            File downloadLocationFile = new File(downloadLocation)
+            if (!downloadLocationFile.exists())
+                downloadLocationFile.mkdirs()
+            File incompletesLocationFile = new File(incompletesLocation)
+            if (!incompletesLocationFile.exists())
+                incompletesLocationFile.mkdirs()
+            
+            props = new MuWireSettings()
+            props.setNickname(nickname)
+            props.setDownloadLocation(downloadLocationFile)
+            props.incompleteLocation = incompletesLocationFile
+            
+            propsFile.withPrintWriter("UTF-8", { 
+                props.write(it)
+            })
+        } else {
+            props = new Properties()
+            propsFile.withReader("UTF-8", { 
+                props.load(it)
+            })
+            props = new MuWireSettings(props)
+        }
+        props.updateType = "cli-lanterna"
+                
+        def i2pPropsFile = new File(home, "i2p.properties")
+        if (!i2pPropsFile.exists()) {
+            String i2pHost = TextInputDialog.showDialog(textGUI, "I2P router host", "Specifiy the host I2P router is on", "127.0.0.1")
+            int i2pPort = TextInputDialog.showNumberDialog(textGUI, "I2CP port", "Specify the I2CP port", "7654").toInteger()
+            
+            Properties i2pProps = new Properties()
+            i2pProps["i2cp.tcp.host"] = i2pHost
+            i2pProps["i2cp.tcp.port"] = String.valueOf(i2pPort)
+            i2pPropsFile.withOutputStream { i2pProps.store(it, "") }
+        }
+ 
+        def cliProps 
+        def cliPropsFile = new File(home, "cli.properties")
+        if (cliPropsFile.exists()) {
+            Properties p = new Properties()
+            cliPropsFile.withInputStream { 
+                p.load(it)
+            }
+            cliProps = new CliSettings(p)
+        } else
+            cliProps = new CliSettings(new Properties())
+               
+
+        Window window = new BasicWindow("MuWire "+ MW_VERSION)
+        window.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.withBorder(Borders.doubleLine())
+        BorderLayout layout = new BorderLayout()
+        contentPanel.setLayoutManager(layout)
+        
+        Panel welcomeNamePanel = new Panel()
+        contentPanel.addComponent(welcomeNamePanel, BorderLayout.Location.CENTER)
+        welcomeNamePanel.setLayoutManager(new GridLayout(1))
+        Label welcomeLabel = new Label("Welcome to MuWire "+ props.nickname)
+        welcomeNamePanel.addComponent(welcomeLabel, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        
+
+        Panel connectButtonPanel = new Panel()
+        contentPanel.addComponent(connectButtonPanel, BorderLayout.Location.BOTTOM)
+        connectButtonPanel.setLayoutManager(new GridLayout(1))
+        Button connectButton = new Button("Connect", {
+            
+            WaitingDialog waiting = new WaitingDialog("Connecting", "Please wait")
+            waiting.showDialog(textGUI, false)
+            
+            CountDownLatch latch = new CountDownLatch(1)
+            Thread connector = new Thread({
+                try {
+                    core = new Core(props, home, MW_VERSION)
+                } finally {
+                    latch.countDown()
+                }
+            })
+            connector.start()
+            while(latch.getCount() > 0) {
+                textGUI.updateScreen()
+                Thread.sleep(10)
+            }
+            waiting.close()
+            window.close()
+        } as Runnable)
+        welcomeNamePanel.addComponent(connectButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        
+        
+        window.setComponent(contentPanel)
+        textGUI.addWindowAndWait(window)
+
+        if (core == null) {
+            MessageDialog.showMessageDialog(textGUI, "Failed", "MuWire failed to load", MessageDialogButton.Close)
+            System.exit(1)
+        }        
+        
+        window = new MainWindowView("MuWire "+MW_VERSION, core, textGUI, screen, cliProps)
+        core.startServices()
+        
+        core.eventBus.publish(new UILoadedEvent())
+        textGUI.addWindowAndWait(window)
+        
+        CountDownLatch latch = new CountDownLatch(1)
+        Thread stopper = new Thread({
+            core.shutdown()
+            latch.countDown()
+        } as Runnable)
+        WaitingDialog waitingForShutdown = new WaitingDialog("MuWire is shutting down","Please wait")
+        waitingForShutdown.setHints([Window.Hint.CENTERED])
+        waitingForShutdown.showDialog(textGUI, false)
+        stopper.start()
+        while(latch.getCount() > 0) {
+            textGUI.updateScreen()
+            Thread.sleep(10)
+        }
+        waitingForShutdown.close()
+        
+        screen.stopScreen()
+        System.exit(0)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliSettings.groovy

@@ -0,0 +1,25 @@
+package com.muwire.clilanterna
+
+class CliSettings {
+    
+    boolean clearCancelledDownloads
+    boolean clearFinishedDownloads
+    boolean clearUploads
+    
+    CliSettings(Properties props) {
+        clearCancelledDownloads = Boolean.parseBoolean(props.getProperty("clearCancelledDownloads","true"))
+        clearFinishedDownloads = Boolean.parseBoolean(props.getProperty("clearFinishedDownloads", "false"))
+        clearUploads = Boolean.parseBoolean(props.getProperty("clearUploads", "false"))
+    }
+    
+    void write(OutputStream os) {
+        Properties props = new Properties()
+        props.with { 
+            setProperty("clearCancelledDownloads", String.valueOf(clearCancelledDownloads))
+            setProperty("clearFinishedDownloads", String.valueOf(clearFinishedDownloads))
+            setProperty("clearUploads", String.valueOf(clearUploads))
+            
+            store(os, "CLI Properties")
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadDetailsView.groovy

@@ -0,0 +1,67 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.Window
+import com.muwire.core.download.Downloader
+
+
+class DownloadDetailsView extends BasicWindow {
+    private final Downloader downloader
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+    
+    private Label knownSources, activeSources, donePieces
+    DownloadDetailsView(Downloader downloader) {
+        super("Download details for "+downloader.file.getName())
+        this.downloader = downloader
+        
+        setHints([Window.Hint.CENTERED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(2))
+        
+        knownSources = new Label("0")
+        activeSources = new Label("0")
+        donePieces = new Label("0")
+        refresh()
+        
+        Button refreshButton = new Button("Refresh",{refresh()})
+        Button closeButton = new Button("Close", {close()})
+        
+        contentPanel.with { 
+            addComponent(new Label("Target Location"), layoutData)
+            addComponent(new Label(downloader.file.getAbsolutePath()), layoutData)
+            addComponent(new Label("Piece Size"), layoutData)
+            addComponent(new Label(String.valueOf(downloader.pieceSize)), layoutData)
+            addComponent(new Label("Total Pieces"), layoutData)
+            addComponent(new Label(String.valueOf(downloader.nPieces)), layoutData)
+            addComponent(new Label("Done Pieces"), layoutData)
+            addComponent(donePieces, layoutData)
+            addComponent(new Label("Known Sources"), layoutData)
+            addComponent(knownSources, layoutData)
+            addComponent(new Label("Active Sources"), layoutData)
+            addComponent(activeSources, layoutData)
+            addComponent(refreshButton, layoutData)
+            addComponent(closeButton, layoutData)
+        }
+        
+        setComponent(contentPanel)
+        
+    }
+    
+    private void refresh() {
+        int done = downloader.donePieces()
+        int known = downloader.activeWorkers.size()
+        int active = downloader.activeWorkers()
+        
+        knownSources.setText(String.valueOf(known))
+        activeSources.setText(String.valueOf(active))
+        donePieces.setText(String.valueOf(done))
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloaderWrapper.groovy

@@ -0,0 +1,15 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.download.Downloader
+
+class DownloaderWrapper {
+    final Downloader downloader
+    DownloaderWrapper(Downloader downloader) {
+        this.downloader = downloader
+    }
+    
+    @Override
+    public String toString() {
+        downloader.file.getName()
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadsModel.groovy

@@ -0,0 +1,100 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+
+import com.muwire.core.Core
+import com.muwire.core.download.DownloadStartedEvent
+import com.muwire.core.download.Downloader
+import com.muwire.core.files.FileDownloadedEvent
+
+import net.i2p.data.DataHelper
+
+class DownloadsModel {
+    private final TextGUIThread guiThread
+    private final Core core
+    private final CliSettings props
+    private final List<Downloader> downloaders = new ArrayList<>()
+    private final TableModel model = new TableModel("Name", "Status", "Progress", "Speed", "ETA")
+    
+    
+    private long lastRetryTime
+    
+    DownloadsModel(TextGUIThread guiThread, Core core, CliSettings props) {
+        this.guiThread = guiThread
+        this.core = core
+        this.props = props
+        
+        core.eventBus.register(DownloadStartedEvent.class, this)
+        Timer timer = new Timer(true)
+        Runnable guiRunnable = {
+            refreshModel()
+            resumeDownloads()
+        }
+        timer.schedule({
+            if (core.shutdown.get())
+                return
+            guiThread.invokeLater(guiRunnable)
+        } as TimerTask, 1000,1000)
+    }
+    
+    void onDownloadStartedEvent(DownloadStartedEvent e) {
+        guiThread.invokeLater({
+            downloaders.add(e.downloader)
+            refreshModel()
+        })
+    }
+    
+    private void refreshModel() {
+        int rowCount = model.getRowCount()
+        rowCount.times { model.removeRow(0) }
+        
+        if (props.clearCancelledDownloads) {
+            downloaders.removeAll { it.cancelled }
+        }
+        if (props.clearFinishedDownloads) {
+            downloaders.removeAll { it.getCurrentState() == Downloader.DownloadState.FINISHED }
+        }
+        
+        downloaders.each { 
+            String status = it.getCurrentState().toString()
+            int speedInt = it.speed()
+            String speed = DataHelper.formatSize2Decimal(speedInt, false) + "B/sec"
+            
+            int pieces = it.nPieces
+            int done = it.donePieces()
+            int percent = -1
+            if (pieces != 0)
+                percent = (done * 100 / pieces)
+            String totalSize = DataHelper.formatSize2Decimal(it.length, false) + "B"
+            String progress = (String.format("%2d", percent) + "% of ${totalSize}".toString())
+            
+            String ETA
+            if (speedInt == 0)
+                ETA = "Unknown"
+            else {
+                long remaining = (pieces - done) * it.pieceSize / speedInt
+                ETA = DataHelper.formatDuration(remaining * 1000)
+            }
+
+            model.addRow([new DownloaderWrapper(it), status, progress, speed, ETA])
+        }
+        
+    }
+    
+    private void resumeDownloads() {
+        int retryInterval = core.muOptions.downloadRetryInterval
+        if (retryInterval == 0)
+            return
+        retryInterval *= 1000
+        long now = System.currentTimeMillis()
+        if (now - lastRetryTime > retryInterval) {
+            lastRetryTime = now
+            downloaders.each { 
+                def state = it.getCurrentState()
+                if (state == Downloader.DownloadState.FAILED || state == Downloader.DownloadState.DOWNLOADING)
+                    it.resume()
+            }
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadsView.groovy

@@ -0,0 +1,94 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.table.Table
+import com.muwire.core.Core
+import com.muwire.core.download.Downloader
+import com.muwire.core.download.UIDownloadCancelledEvent
+
+class DownloadsView extends BasicWindow {
+    private final Core core
+    private final DownloadsModel model
+    private final TextGUI textGUI
+    private final Table table
+    
+    DownloadsView(Core core, DownloadsModel model, TextGUI textGUI, TerminalSize terminalSize) {
+        this.core = core
+        this.model = model
+        this.textGUI = textGUI
+        
+        setHints([Window.Hint.EXPANDED])
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        table = new Table("Name","Status","Progress","Speed","ETA")
+        table.setCellSelection(false)
+        table.setSelectAction({rowSelected()})
+        table.setTableModel(model.model)
+        table.setVisibleRows(terminalSize.getRows())
+        contentPanel.addComponent(table, layoutData)
+
+        Panel buttonsPanel = new Panel()
+        buttonsPanel.setLayoutManager(new GridLayout(2))
+        
+        Button clearButton = new Button("Clear Done",{clearDone()})
+        buttonsPanel.addComponent(clearButton, layoutData)
+                
+        Button closeButton = new Button("Close",{close()})
+        buttonsPanel.addComponent(closeButton, layoutData)
+        
+        contentPanel.addComponent(buttonsPanel, layoutData)
+        
+        setComponent(contentPanel)
+        closeButton.takeFocus()
+    }
+    
+    private void rowSelected() {
+        int selectedRow = table.getSelectedRow()
+        def row = model.model.getRow(selectedRow)
+        Downloader downloader = row[0].downloader
+        
+        Window prompt = new BasicWindow("Kill Download?")
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(3))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        
+        Button killDownload = new Button("Kill Download", {
+            downloader.cancel()
+            core.eventBus.publish(new UIDownloadCancelledEvent(downloader : downloader))
+            MessageDialog.showMessageDialog(textGUI, "Download Killed", downloader.file.getName()+ " has been killed", MessageDialogButton.OK)
+        })
+        Button viewDetails = new Button("View Details", {
+            textGUI.addWindowAndWait(new DownloadDetailsView(downloader))
+        })
+        Button close = new Button("Close", {
+            prompt.close()  
+        })
+        
+        contentPanel.addComponent(killDownload,layoutData)
+        contentPanel.addComponent(viewDetails, layoutData)
+        contentPanel.addComponent(close, layoutData)
+        prompt.setComponent(contentPanel)
+        close.takeFocus()
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    private void clearDone() {
+        model.downloaders.removeAll {
+            def state = it.getCurrentState() 
+            state == Downloader.DownloadState.CANCELLED || state == Downloader.DownloadState.FINISHED
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesModel.groovy

@@ -0,0 +1,81 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+import com.muwire.core.Core
+import com.muwire.core.SharedFile
+import com.muwire.core.files.AllFilesLoadedEvent
+import com.muwire.core.files.DirectoryWatchedEvent
+import com.muwire.core.files.FileHashedEvent
+import com.muwire.core.files.FileLoadedEvent
+import com.muwire.core.files.FileSharedEvent
+import com.muwire.core.files.FileUnsharedEvent
+import com.muwire.core.trust.TrustSubscriptionEvent
+
+import net.i2p.data.DataHelper
+
+class FilesModel {
+    private final TextGUIThread guiThread
+    private final Core core
+    private final List<SharedFile> sharedFiles = new ArrayList<>()
+    private final TableModel model = new TableModel("Name","Size","Comment","Certified","Search Hits","Downloaders")
+    
+    FilesModel(TextGUIThread guiThread, Core core) {
+        this.guiThread = guiThread
+        this.core = core
+        
+        core.eventBus.register(FileLoadedEvent.class, this)
+        core.eventBus.register(FileUnsharedEvent.class, this)
+        core.eventBus.register(FileHashedEvent.class, this)
+        core.eventBus.register(AllFilesLoadedEvent.class, this)
+        
+        Runnable refreshModel = {refreshModel()}
+        Timer timer = new Timer(true)
+        timer.schedule({
+            guiThread.invokeLater(refreshModel)
+        } as TimerTask, 1000,1000)
+        
+    }
+    
+    void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
+        def eventBus = core.eventBus
+        guiThread.invokeLater {
+            core.muOptions.watchedDirectories.each {
+                eventBus.publish(new FileSharedEvent(file: new File(it)))
+            }
+        }
+    }
+    
+    void onFileLoadedEvent(FileLoadedEvent e) {
+        guiThread.invokeLater {
+            sharedFiles.add(e.loadedFile)
+        }
+    }
+    
+    void onFileHashedEvent(FileHashedEvent e) {
+        guiThread.invokeLater {
+            if (e.sharedFile != null)
+                sharedFiles.add(e.sharedFile)
+        }
+    }
+    
+    void onFileUnsharedEvent(FileUnsharedEvent e) {
+        guiThread.invokeLater {
+            sharedFiles.remove(e.unsharedFile)
+        }
+    }
+    
+    private void refreshModel() {
+        int rowCount = model.getRowCount()
+        rowCount.times { model.removeRow(0) }
+        
+        sharedFiles.each { 
+            long size = it.getCachedLength()
+            boolean comment = it.comment != null
+            boolean certified = core.certificateManager.hasLocalCertificate(it.getInfoHash())
+            String hits = String.valueOf(it.getHits())
+            String downloaders = String.valueOf(it.getDownloaders().size())
+            model.addRow(new SharedFileWrapper(it), DataHelper.formatSize2(size, false)+"B", comment, certified, hits, downloaders)
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesView.groovy

@@ -0,0 +1,137 @@
+package com.muwire.clilanterna
+
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.FileDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.dialogs.TextInputDialog
+import com.googlecode.lanterna.gui2.table.Table
+import com.muwire.core.Core
+import com.muwire.core.SharedFile
+import com.muwire.core.filecert.UICreateCertificateEvent
+import com.muwire.core.files.DirectoryUnsharedEvent
+import com.muwire.core.files.FileSharedEvent
+import com.muwire.core.files.FileUnsharedEvent
+import com.muwire.core.files.UIPersistFilesEvent
+
+class FilesView extends BasicWindow {
+    private final FilesModel model
+    private final TextGUI textGUI
+    private final Core core
+    private final Table table
+    private final TerminalSize terminalSize
+    
+    FilesView(FilesModel model, TextGUI textGUI, Core core, TerminalSize terminalSize) {
+        super("Shared Files")
+        this.model = model
+        this.core = core
+        this.textGUI = textGUI
+        this.terminalSize = terminalSize
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
+        
+        table = new Table("Name","Size","Comment","Certified","Search Hits","Downloaders")
+        table.setCellSelection(false)
+        table.setTableModel(model.model)
+        table.setSelectAction({rowSelected()})
+        table.setVisibleRows(terminalSize.getRows())
+        contentPanel.addComponent(table, layoutData)
+        
+        Panel buttonsPanel = new Panel()
+        buttonsPanel.setLayoutManager(new GridLayout(4))
+        
+        Button shareFile = new Button("Share File", {shareFile()})
+        Button shareDirectory = new Button("Share Directory", {shareDirectory()})
+        Button unshareDirectory = new Button("Unshare Directory",{unshareDirectory()})
+        Button close = new Button("Close", {close()})
+        
+        buttonsPanel.with { 
+            addComponent(shareFile, layoutData)
+            addComponent(shareDirectory, layoutData)
+            addComponent(unshareDirectory, layoutData)
+            addComponent(close, layoutData)
+        }
+        
+        contentPanel.addComponent(buttonsPanel, layoutData)
+        setComponent(contentPanel)
+        close.takeFocus()
+    }
+    
+    private void rowSelected() {
+        int selectedRow = table.getSelectedRow()
+        def row = model.model.getRow(selectedRow)
+        SharedFile sf = row[0].sharedFile
+        
+        Window prompt = new BasicWindow("Unshare or add comment to "+sf.getFile().getName()+" ?")
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(4))
+        
+        Button unshareButton = new Button("Unshare", {
+            core.eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
+            core.eventBus.publish(new UIPersistFilesEvent())
+            MessageDialog.showMessageDialog(textGUI, "File Unshared", "Unshared "+sf.getFile().getName(), MessageDialogButton.OK)
+        } )
+        Button addCommentButton = new Button("Add Comment", {
+            AddCommentView view = new AddCommentView(textGUI, core, sf, terminalSize)
+            textGUI.addWindowAndWait(view)
+        })
+        Button certifyButton = new Button("Certify", {
+            core.eventBus.publish(new UICreateCertificateEvent(sharedFile : sf))
+            MessageDialog.showMessageDialog(textGUI, "Certificate Created", "Certificate has been issued", MessageDialogButton.OK)  
+        })
+        Button closeButton = new Button("Close", {prompt.close()})
+        
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        contentPanel.addComponent(unshareButton, layoutData)
+        contentPanel.addComponent(addCommentButton, layoutData)
+        contentPanel.addComponent(certifyButton, layoutData)
+        contentPanel.addComponent(closeButton, layoutData)
+        
+        prompt.setComponent(contentPanel)
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    
+    private void shareFile() {
+        TerminalSize terminalSize = new TerminalSize(terminalSize.getColumns() - 10, terminalSize.getRows() - 10)
+        FileDialog fileDialog = new FileDialog("Share File", "Select a file to share", "Share", terminalSize, false, null)
+        File f = fileDialog.showDialog(textGUI)
+        f = f.getCanonicalFile()
+        core.eventBus.publish(new FileSharedEvent(file : f))
+        MessageDialog.showMessageDialog(textGUI, "File Shared", f.getName()+" has been shared", MessageDialogButton.OK)
+    }
+    
+    private void shareDirectory() {
+        String directoryName = TextInputDialog.showDialog(textGUI, "Share a directory", "Enter the directory to share", "")
+        if (directoryName == null)
+            return
+        File directory = new File(directoryName)
+        directory = directory.getCanonicalFile()
+        core.eventBus.publish(new FileSharedEvent(file : directory))
+        MessageDialog.showMessageDialog(textGUI, "Directory Shared", directory.getName()+" has been shared", MessageDialogButton.OK)
+    }
+    
+    private void unshareDirectory() {
+        String directoryName = TextInputDialog.showDialog(textGUI, "Unshare a directory", "Enter the directory to unshare", "")
+        if (directoryName == null)
+            return
+        File directory = new File(directoryName)
+        directory = directory.getCanonicalFile()
+        core.eventBus.publish(new DirectoryUnsharedEvent(directory : directory))
+        MessageDialog.showMessageDialog(textGUI, "Directory Unshared", directory.getName()+" has been unshared", MessageDialogButton.OK)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/MainWindowView.groovy

@@ -0,0 +1,311 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalPosition
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.BorderLayout
+import com.googlecode.lanterna.gui2.Borders
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.Panels
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.screen.Screen
+import com.googlecode.lanterna.gui2.TextBox
+import com.muwire.core.Core
+import com.muwire.core.DownloadedFile
+import com.muwire.core.connection.ConnectionEvent
+import com.muwire.core.files.FileDownloadedEvent
+import com.muwire.core.files.FileHashedEvent
+import com.muwire.core.files.FileLoadedEvent
+import com.muwire.core.files.FileUnsharedEvent
+import com.muwire.core.hostcache.HostDiscoveredEvent
+import com.muwire.core.update.UpdateAvailableEvent
+import com.muwire.core.update.UpdateDownloadedEvent
+
+import net.i2p.data.Base64
+import net.i2p.data.DataHelper
+
+class MainWindowView extends BasicWindow {
+    
+    private final Core core
+    private final TextGUI textGUI
+    private final Screen screen
+
+    private final TextBox searchTextBox
+    
+    private final DownloadsModel downloadsModel
+    private final UploadsModel uploadsModel
+    private final FilesModel filesModel
+    private final TrustModel trustModel
+    
+    private final Label connectionCount, incoming, outgoing
+    private final Label known, failing, hopeless
+    private final Label sharedFiles
+    private final Label timesBrowsed
+    private final Label updateStatus
+    private final Label usedRam, totalRam, maxRam
+    
+    public MainWindowView(String title, Core core, TextGUI textGUI, Screen screen, CliSettings props) {
+        super(title);
+        
+        this.core = core
+        this.textGUI = textGUI
+        this.screen = screen
+        
+        downloadsModel = new DownloadsModel(textGUI.getGUIThread(),core, props)
+        uploadsModel = new UploadsModel(textGUI.getGUIThread(), core, props)
+        filesModel = new FilesModel(textGUI.getGUIThread(),core)
+        trustModel = new TrustModel(textGUI.getGUIThread(), core)
+        
+        setHints([Window.Hint.EXPANDED])
+        Panel contentPanel = new Panel()
+        setComponent(contentPanel)
+        
+        BorderLayout borderLayout = new BorderLayout()
+        contentPanel.setLayoutManager(borderLayout)
+        
+        Panel buttonsPanel = new Panel()
+        contentPanel.addComponent(buttonsPanel, BorderLayout.Location.TOP)
+        
+        GridLayout gridLayout = new GridLayout(7)
+        buttonsPanel.setLayoutManager(gridLayout)
+        
+        searchTextBox = new TextBox(new TerminalSize(40, 1))
+        Button searchButton = new Button("Search", { search() })
+        Button downloadsButton = new Button("Downloads", {download()})
+        Button uploadsButton = new Button("Uploads", {upload()})
+        Button filesButton = new Button("Files", { files() })
+        Button trustButton = new Button("Trust", {trust()})
+        Button quitButton = new Button("Quit", {close()})
+        
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        
+        buttonsPanel.with { 
+            addComponent(searchTextBox, layoutData)
+            addComponent(searchButton, layoutData)
+            addComponent(downloadsButton, layoutData)
+            addComponent(uploadsButton, layoutData)
+            addComponent(filesButton, layoutData)
+            addComponent(trustButton, layoutData)
+            addComponent(quitButton, layoutData)
+        }
+        
+        Panel bottomPanel = new Panel()
+        contentPanel.addComponent(bottomPanel, BorderLayout.Location.BOTTOM)
+        BorderLayout bottomLayout = new BorderLayout()
+        bottomPanel.setLayoutManager(bottomLayout)
+        
+        Label persona = new Label(core.me.getHumanReadableName())
+        bottomPanel.addComponent(persona, BorderLayout.Location.LEFT)
+        
+        
+        Panel connectionsPanel = new Panel()
+        connectionsPanel.setLayoutManager(new GridLayout(2))
+        Label connections = new Label("Connections:")
+        connectionsPanel.addComponent(connections, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        connectionCount = new Label("0")
+        connectionsPanel.addComponent(connectionCount, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        
+        bottomPanel.addComponent(connectionsPanel, BorderLayout.Location.RIGHT)
+
+        
+        Panel centralPanel = new Panel()
+        centralPanel.setLayoutManager(new GridLayout(1))
+        contentPanel.addComponent(centralPanel, BorderLayout.Location.CENTER)
+        Panel statusPanel = new Panel()
+        statusPanel.setLayoutManager(new GridLayout(2))
+        statusPanel.withBorder(Borders.doubleLine("Stats"))
+        centralPanel.addComponent(statusPanel, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, true))
+
+        incoming = new Label("0")
+        outgoing = new Label("0")
+        known = new Label("0")
+        failing = new Label("0")
+        hopeless = new Label("0")
+        sharedFiles = new Label("0")
+        timesBrowsed = new Label("0")
+        updateStatus = new Label("Unknown")
+        usedRam = new Label("0")
+        maxRam = new Label("0")
+        totalRam = new Label("0")
+                
+        statusPanel.with { 
+            addComponent(new Label("Incoming Connections: "), layoutData)
+            addComponent(incoming, layoutData)
+            addComponent(new Label("Outgoing Connections: "), layoutData)
+            addComponent(outgoing, layoutData)
+            addComponent(new Label("Known Hosts: "), layoutData)
+            addComponent(known, layoutData)
+            addComponent(new Label("Failing Hosts: "), layoutData)
+            addComponent(failing, layoutData)
+            addComponent(new Label("Hopeless Hosts: "), layoutData)
+            addComponent(hopeless, layoutData)
+            addComponent(new Label("Shared Files: "), layoutData)
+            addComponent(sharedFiles, layoutData)
+            addComponent(new Label("Times Browsed: "), layoutData)
+            addComponent(timesBrowsed, layoutData)
+            addComponent(new Label("Update Status: "), layoutData)
+            addComponent(updateStatus, layoutData)
+            addComponent(new Label("Java Version: "), layoutData)
+            addComponent(new Label(System.getProperty("java.vendor")+ " " + System.getProperty("java.version")), layoutData)
+            addComponent(new Label("Used Memory: "), layoutData)
+            addComponent(usedRam, layoutData)
+            addComponent(new Label("Total Memory: "), layoutData)
+            addComponent(totalRam, layoutData)
+            addComponent(new Label("Maximum Memory: "), layoutData)
+            addComponent(maxRam, layoutData)
+        }
+        
+        refreshStats()
+        
+        searchButton.takeFocus()
+        core.eventBus.register(ConnectionEvent.class, this)
+        core.eventBus.register(HostDiscoveredEvent.class, this)
+        core.eventBus.register(FileLoadedEvent.class, this)
+        core.eventBus.register(FileHashedEvent.class, this)
+        core.eventBus.register(FileUnsharedEvent.class, this)
+        core.eventBus.register(FileDownloadedEvent.class, this)
+        core.eventBus.register(UpdateAvailableEvent.class, this)
+        core.eventBus.register(UpdateDownloadedEvent.class, this)
+    }
+    
+    void onConnectionEvent(ConnectionEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            connectionCount.setText(String.valueOf(core.connectionManager.connections.size()))
+            refreshStats()
+        }
+    }
+    
+    void onHostDiscoveredEvent(HostDiscoveredEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            refreshStats()
+        }
+    }
+    
+    void onFileLoadedEvent(FileLoadedEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            refreshStats()
+        }
+    }
+    
+    void onFileHashedEvent(FileHashedEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            refreshStats()
+        }
+    }
+    
+    void onFileUnsharedEvent(FileUnsharedEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            refreshStats()
+        }
+    }
+    
+    void onFileDownloadedEvent(FileDownloadedEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            refreshStats()
+        }
+    }
+    
+    void onUpdateAvailableEvent(UpdateAvailableEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            String label = "$e.version is available with hash $e.infoHash"
+            updateStatus.setText(label)
+            String message = "Version $e.version is available, with hash $e.infoHash .  Show details?"
+            def button = MessageDialog.showMessageDialog(textGUI, "Update Available", message, MessageDialogButton.Yes, MessageDialogButton.No)
+            if (button == MessageDialogButton.No)
+                return
+            textGUI.addWindowAndWait(new UpdateTextView(e.text, sizeForTables()))
+        }
+    }
+    
+    void onUpdateDownloadedEvent(UpdateDownloadedEvent e) {
+        textGUI.getGUIThread().invokeLater {
+            String label = "$e.version downloaded"
+            updateStatus.setText(label)
+            String message = "MuWire version $e.version has been downloaded.  Show details?."
+            def button = MessageDialog.showMessageDialog(textGUI, "Update Available", message, MessageDialogButton.Yes, MessageDialogButton.No)
+            if (button == MessageDialogButton.No)
+                return
+            textGUI.addWindowAndWait(new UpdateTextView(e.text, sizeForTables()))
+        }
+    }
+    
+    private TerminalSize sizeForTables() {
+        TerminalSize full = screen.getTerminalSize()
+        return new TerminalSize(full.getColumns(), full.getRows() - 10)
+    }
+    
+    private void search() {
+        String query = searchTextBox.getText()
+        query = query.trim()
+        if (query.length() == 0)
+            return
+        if (query.length() > 128)
+            query = query.substring(0, 128)
+        
+        SearchModel model = new SearchModel(query, core, textGUI.getGUIThread())
+        textGUI.addWindowAndWait(new SearchView(model,core, textGUI, sizeForTables()))
+    }
+    
+    
+    private void download() {
+        textGUI.addWindowAndWait(new DownloadsView(core, downloadsModel, textGUI, sizeForTables()))
+    }
+    
+    private void upload() {
+        textGUI.addWindowAndWait(new UploadsView(uploadsModel, sizeForTables()))
+    }
+    
+    private void files() {
+        textGUI.addWindowAndWait(new FilesView(filesModel, textGUI, core, sizeForTables()))
+    }
+    
+    private void trust() {
+        textGUI.addWindowAndWait(new TrustView(trustModel, textGUI, core, sizeForTables()))
+    }
+    
+    private void refreshStats() {
+        int inCon = 0
+        int outCon = 0
+        core.connectionManager.getConnections().each { 
+            if (it.isIncoming())
+                inCon++
+            else
+                outCon++
+        }
+        int knownHosts = core.hostCache.hosts.size()
+        int failingHosts = core.hostCache.countFailingHosts()
+        int hopelessHosts = core.hostCache.countHopelessHosts()
+        int shared = core.fileManager.fileToSharedFile.size()
+        int browsed = core.connectionAcceptor.browsed
+        long freeMemL = Runtime.getRuntime().freeMemory()
+        long totalMemL = Runtime.getRuntime().totalMemory()
+        String usedMem = DataHelper.formatSize2Decimal(freeMemL, false) + "B"
+        String totalMem = DataHelper.formatSize2Decimal(totalMemL, false)+"B"
+        String maxMem
+        long maxMemL = Runtime.getRuntime().maxMemory()
+        if (maxMemL >= Long.MAX_VALUE / 2)
+            maxMem = "Unlimited"
+        else
+            maxMem = DataHelper.formatSize2Decimal(maxMemL, false) + "B"
+            
+        
+        incoming.setText(String.valueOf(inCon))
+        outgoing.setText(String.valueOf(outCon))
+        known.setText(String.valueOf(knownHosts))
+        failing.setText(String.valueOf(failingHosts))
+        hopeless.setText(String.valueOf(hopelessHosts))
+        sharedFiles.setText(String.valueOf(shared))
+        timesBrowsed.setText(String.valueOf(browsed))
+        usedRam.setText(usedMem)
+        totalRam.setText(totalMem)
+        maxRam.setText(maxMem)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/PersonaWrapper.groovy

@@ -0,0 +1,15 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.Persona
+
+class PersonaWrapper {
+    private final Persona persona
+    PersonaWrapper(Persona persona) {
+        this.persona = persona
+    }
+    
+    @Override
+    public String toString() {
+        persona.getHumanReadableName()
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/ResultsModel.groovy

@@ -0,0 +1,28 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.search.UIResultBatchEvent
+import com.muwire.core.search.UIResultEvent
+
+import net.i2p.data.Base64
+import net.i2p.data.DataHelper
+
+import com.googlecode.lanterna.gui2.table.TableModel
+
+class ResultsModel {
+    private final UIResultBatchEvent results
+    final TableModel model
+    final Map<String, UIResultEvent> rootToResult = new HashMap<>()
+    
+    ResultsModel(UIResultBatchEvent results) {
+        this.results = results
+        model = new TableModel("Name","Size","Hash","Sources","Comment","Certificates")
+        results.results.each { 
+            String size = DataHelper.formatSize2Decimal(it.size, false) + "B"
+            String infoHash = Base64.encode(it.infohash.getRoot())
+            String sources = String.valueOf(it.sources.size())
+            String comment = String.valueOf(it.comment != null)
+            model.addRow(it.name, size, infoHash, sources, comment, it.certificates)
+            rootToResult.put(infoHash, it)
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/ResultsView.groovy

@@ -0,0 +1,112 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.table.Table
+
+import com.muwire.core.Core
+import com.muwire.core.download.UIDownloadEvent
+import com.muwire.core.search.UIResultEvent
+
+class ResultsView extends BasicWindow {
+    
+    private final ResultsModel model
+    private final TextGUI textGUI
+    private final Core core
+    private final Table table
+    private final TerminalSize terminalSize
+    
+    ResultsView(ResultsModel model, Core core, TextGUI textGUI, TerminalSize terminalSize) {
+        super(model.results.results[0].sender.getHumanReadableName() + " Results")
+        this.model = model
+        this.core = core
+        this.textGUI = textGUI
+        this.terminalSize = terminalSize
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        
+        table = new Table("Name","Size","Hash","Sources","Comment","Certificates")
+        table.setCellSelection(false)
+        table.setSelectAction({rowSelected()})
+        table.setTableModel(model.model)
+        table.setVisibleRows(terminalSize.getRows())
+        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
+        
+        Button closeButton = new Button("Close", {close()})
+        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
+        
+        setComponent(contentPanel)
+        closeButton.takeFocus()    
+    }
+    
+    private void rowSelected() {
+        int selectedRow = table.getSelectedRow()
+        def rows = model.model.getRow(selectedRow)
+        boolean comment = Boolean.parseBoolean(rows[4])
+        boolean certificates = rows[5] > 0
+        if (comment || certificates) {
+            LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+            
+            Window prompt = new BasicWindow("Download Or View Comment/Certificates")
+            prompt.setHints([Window.Hint.CENTERED])
+            Panel contentPanel = new Panel()
+            contentPanel.setLayoutManager(new GridLayout(4))
+            Button downloadButton = new Button("Download", {download(rows[2])})
+            contentPanel.addComponent(downloadButton, layoutData)
+            
+            
+            if (comment) { 
+                Button viewButton = new Button("View Comment", {viewComment(rows[2])})
+                contentPanel.addComponent(viewButton, layoutData)
+            }
+            if (certificates) {
+                Button certsButton = new Button("View Certificates", {viewCertificates(rows[2])})
+                contentPanel.addComponent(certsButton, layoutData)
+            }
+                
+            Button closeButton = new Button("Cancel", {prompt.close()})
+            
+            contentPanel.addComponent(closeButton, layoutData)
+            prompt.setComponent(contentPanel)
+            downloadButton.takeFocus()
+            textGUI.addWindowAndWait(prompt)    
+        } else {
+            download(rows[2])
+        }
+
+    }
+    
+    private void download(String infohash) {
+        UIResultEvent result = model.rootToResult[infohash]
+        def file = new File(core.muOptions.downloadLocation, result.name)
+        
+        core.eventBus.publish(new UIDownloadEvent(result : [result], sources : result.sources,
+            target : file, sequential : false))
+        MessageDialog.showMessageDialog(textGUI, "Download Started", "Started download of "+result.name, MessageDialogButton.OK)
+    }
+    
+    private void viewComment(String infohash) {
+        UIResultEvent result = model.rootToResult[infohash]
+        ViewCommentView view = new ViewCommentView(result.comment, result.name, terminalSize)
+        textGUI.addWindowAndWait(view)
+    }
+    
+    private void viewCertificates(String infohash) {
+        UIResultEvent result = model.rootToResult[infohash]
+        ViewCertificatesModel model = new ViewCertificatesModel(result, core, textGUI.getGUIThread())
+        ViewCertificatesView view = new ViewCertificatesView(model, textGUI, core, terminalSize)
+        textGUI.addWindowAndWait(view)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/SearchModel.groovy

@@ -0,0 +1,87 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.SplitPattern
+import com.muwire.core.search.QueryEvent
+import com.muwire.core.search.SearchEvent
+import com.muwire.core.search.UIResultBatchEvent
+import com.muwire.core.search.UIResultEvent
+import com.muwire.core.util.DataUtil
+
+import net.i2p.crypto.DSAEngine
+import net.i2p.data.Base64
+import net.i2p.data.Signature
+
+import java.nio.charset.StandardCharsets
+
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+class SearchModel {
+    private final TextGUIThread guiThread
+    private final String query
+    private final Core core
+    final TableModel model
+        
+    private final Map<Persona, UIResultBatchEvent> resultsPerSender = new HashMap<>()
+    
+    SearchModel(String query, Core core, TextGUIThread guiThread) {
+        this.query = query
+        this.core = core
+        this.guiThread = guiThread
+        this.model = new TableModel("Sender","Results","Browse","Trust")
+        core.eventBus.register(UIResultBatchEvent.class, this)
+        
+        
+        boolean hashSearch = false
+        byte [] root = null
+        if (query.length() == 44 && query.indexOf(" ") < 0) {
+            try {
+                root = Base64.decode(query)
+                hashSearch = true
+            } catch (Exception e) {
+                // not  hash search
+            }
+        }
+        
+        def searchEvent
+        byte [] payload
+        UUID uuid = UUID.randomUUID()
+        long timestamp = System.currentTimeMillis()
+        byte [] sig2 = DataUtil.signUUID(uuid, timestamp, core.spk)
+        if (hashSearch) {
+            searchEvent = new SearchEvent(searchHash : root, uuid : uuid, oobInfohash : true, compressedResults : true)
+            payload = root
+        } else {
+            def nonEmpty = SplitPattern.termify(query)
+            payload = String.join(" ", nonEmpty).getBytes(StandardCharsets.UTF_8)
+            searchEvent = new SearchEvent(searchTerms : nonEmpty, uuid : uuid, oobInfohash: true,
+            searchComments : core.muOptions.searchComments, compressedResults : true)
+        }
+        
+        boolean firstHop = core.muOptions.allowUntrusted || core.muOptions.searchExtraHop
+        
+        Signature sig = DSAEngine.getInstance().sign(payload, core.spk)
+        
+        core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : firstHop,
+            replyTo: core.me.destination, receivedOn: core.me.destination,
+            originator : core.me, sig: sig.data, queryTime : timestamp, sig2 : sig2))
+    }
+    
+    void unregister() {
+        core.eventBus.unregister(UIResultBatchEvent.class, this)
+    }
+    
+    void onUIResultBatchEvent(UIResultBatchEvent e) {
+        guiThread.invokeLater {
+            Persona sender = e.results[0].sender
+
+            resultsPerSender.put(sender, e)
+
+            String browse = String.valueOf(e.results[0].browse)
+            String results = String.valueOf(e.results.length)
+            String trust = core.trustService.getLevel(sender.destination).toString()
+            model.addRow([new PersonaWrapper(sender), results, browse, trust])
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/SearchView.groovy

@@ -0,0 +1,113 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.table.Table
+
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.trust.TrustEvent
+import com.muwire.core.trust.TrustLevel
+
+class SearchView extends BasicWindow {
+    private final Core core
+    private final SearchModel model
+    private final Table table
+    private final TextGUI textGUI
+    private final TerminalSize terminalSize
+    
+    SearchView(SearchModel model, Core core, TextGUI textGUI, TerminalSize terminalSize) {
+        super(model.query)
+        this.core = core
+        this.model = model
+        this.textGUI = textGUI
+        this.terminalSize = terminalSize
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+    
+        table = new Table("Sender","Results","Browse","Trust") 
+        table.setCellSelection(false)
+        table.setSelectAction({rowSelected()})
+        table.setTableModel(model.model)   
+        table.setVisibleRows(terminalSize.getRows())
+        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
+        
+        Button closeButton = new Button("Close", {
+            model.unregister()
+            close()
+        })
+        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
+        
+        setComponent(contentPanel)
+        closeButton.takeFocus()
+    }
+    
+    private void rowSelected() {
+        int selectedRow = table.getSelectedRow()
+        def rows = model.model.getRow(selectedRow)
+        Persona persona = rows[0].persona
+        boolean browse = Boolean.parseBoolean(rows[2])
+        Window prompt = new BasicWindow("Show Or Browse "+rows[0]+"?")
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(6))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        Button showResults = new Button("Show Results", {
+            showResults(persona)
+        })
+        Button browseHost = new Button("Browse Host", {
+            BrowseModel model = new BrowseModel(persona, core, textGUI.getGUIThread())
+            BrowseView view = new BrowseView(model, textGUI, core, terminalSize)
+            textGUI.addWindowAndWait(view)
+        }) 
+        Button trustHost = new Button("Trust",{
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.TRUSTED))
+            MessageDialog.showMessageDialog(textGUI, "Marked Trusted", persona.getHumanReadableName() + " has been marked trusted",
+                    MessageDialogButton.OK)
+        })
+        Button neutralHost = new Button("Neutral",{
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.NEUTRAL))
+            MessageDialog.showMessageDialog(textGUI, "Marked Neutral", persona.getHumanReadableName() + " has been marked neutral",
+                    MessageDialogButton.OK)
+        })
+        Button distrustHost = new Button("Distrust", {
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.DISTRUSTED))
+            MessageDialog.showMessageDialog(textGUI, "Marked Distrusted", persona.getHumanReadableName() + " has been marked distrusted",
+                    MessageDialogButton.OK)
+        })
+        Button closePrompt = new Button("Close", {prompt.close()})
+
+        contentPanel.with {
+            addComponent(showResults, layoutData)
+            if (browse)
+                addComponent(browseHost, layoutData)
+            addComponent(trustHost, layoutData)
+            addComponent(neutralHost, layoutData)
+            addComponent(distrustHost, layoutData)
+            addComponent(closePrompt, layoutData)
+        }
+
+        prompt.setComponent(contentPanel)
+        showResults.takeFocus()
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    private void showResults(Persona persona) {
+        def results = model.resultsPerSender.get(persona)
+        ResultsModel resultsModel = new ResultsModel(results)
+        ResultsView resultsView = new ResultsView(resultsModel, core, textGUI, terminalSize)
+        textGUI.addWindowAndWait(resultsView)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/SharedFileWrapper.groovy

@@ -0,0 +1,16 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.SharedFile
+
+class SharedFileWrapper {
+    private final SharedFile sharedFile
+    
+    SharedFileWrapper(SharedFile sharedFile) {
+        this.sharedFile = sharedFile
+    }
+    
+    @Override
+    public String toString() {
+        sharedFile.getCachedPath()
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustEntryWrapper.groovy

@@ -0,0 +1,7 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.trust.TrustService
+
+class TrustEntryWrapper {
+    TrustService.TrustEntry entry
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListModel.groovy

@@ -0,0 +1,49 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+import com.muwire.core.Core
+import com.muwire.core.trust.RemoteTrustList
+import com.muwire.core.trust.TrustEvent
+
+class TrustListModel {
+    private final TextGUIThread guiThread
+    private final RemoteTrustList trustList
+    private final Core core
+    private final TableModel trustedTableModel, distrustedTableModel
+    
+    TrustListModel(RemoteTrustList trustList, Core core) {
+        this.trustList = trustList
+        this.core = core
+        
+        trustedTableModel = new TableModel("Trusted User","Reason","Your Trust")
+        distrustedTableModel = new TableModel("Distrusted User", "Reason", "Your Trust")
+        refreshModels()
+        
+        core.eventBus.register(TrustEvent.class, this)
+    }
+    
+    void onTrustEvent(TrustEvent e) {
+        guiThread.invokeLater {
+            refreshModels()
+        }
+    }
+    
+    private void refreshModels() {
+        int trustRows = trustedTableModel.getRowCount()
+        trustRows.times { trustedTableModel.removeRow(0) }
+        int distrustRows = distrustedTableModel.getRowCount()
+        distrustRows.times { distrustedTableModel.removeRow(0) }
+        
+        trustList.good.each { 
+            trustedTableModel.addRow(new PersonaWrapper(it.persona),it.reason, core.trustService.getLevel(it.persona.destination))
+        }
+        trustList.bad.each { 
+            distrustedTableModel.addRow(new PersonaWrapper(it.persona),it.reason, core.trustService.getLevel(it.persona.destination))
+        }
+    }
+    
+    void unregister() {
+        core.eventBus.unregister(TrustEvent.class, this)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListView.groovy

@@ -0,0 +1,121 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.dialogs.TextInputDialog
+import com.googlecode.lanterna.gui2.table.Table
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.trust.TrustEvent
+import com.muwire.core.trust.TrustLevel
+
+class TrustListView extends BasicWindow {
+    private final TrustListModel model
+    private final TextGUI textGUI
+    private final Core core
+    private final TerminalSize terminalSize
+    private final Table trusted, distrusted
+    
+    TrustListView(TrustListModel model, TextGUI textGUI, Core core, TerminalSize terminalSize) {
+        this.model = model
+        this.textGUI = textGUI
+        this.core = core
+        this.terminalSize = terminalSize
+        
+        int tableSize = terminalSize.getRows() - 10
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
+        
+        Label nameLabel = new Label("Trust list for "+model.trustList.persona.getHumanReadableName())
+        Label lastUpdatedLabel = new Label("Last updated "+new Date(model.trustList.timestamp))
+        contentPanel.addComponent(nameLabel, layoutData)
+        contentPanel.addComponent(lastUpdatedLabel, layoutData)
+        
+        
+        Panel topPanel = new Panel()
+        topPanel.setLayoutManager(new GridLayout(2))
+        
+        trusted = new Table("Trusted User","Reason","Your Trust")
+        trusted.with {
+            setCellSelection(false)
+            setTableModel(model.trustedTableModel)
+            setVisibleRows(tableSize)
+        }
+        trusted.setSelectAction({ actionsForUser(true) })
+        topPanel.addComponent(trusted, layoutData)
+        
+        distrusted = new Table("Distrusted User","Reason", "Your Trust")
+        distrusted.with { 
+            setCellSelection(false)
+            setTableModel(model.distrustedTableModel)
+            setVisibleRows(tableSize)
+        }
+        distrusted.setSelectAction({actionsForUser(false)}) 
+        topPanel.addComponent(distrusted, layoutData)
+
+        Button closeButton = new Button("Close",{close()})
+        
+        contentPanel.addComponent(topPanel, layoutData)
+        contentPanel.addComponent(closeButton, layoutData)
+        
+        setComponent(contentPanel)        
+    }
+
+    private void actionsForUser(boolean trustedUser) {
+        def table = trustedUser ? trusted : distrusted
+        def model = trustedUser ? model.trustedTableModel : model.distrustedTableModel
+        
+        int selectedRow = table.getSelectedRow()
+        def row = model.getRow(selectedRow)
+        
+        Persona persona = row[0].persona
+        
+        Window prompt = new BasicWindow("Actions for "+persona.getHumanReadableName())
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(4))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        
+        Button trustButton = new Button("Trust",{
+            String reason = TextInputDialog.showDialog(textGUI, "Reason", "Enter reason (optional)", "")
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.TRUSTED, reason : reason))
+            MessageDialog.showMessageDialog(textGUI, "Marked Trusted", persona.getHumanReadableName() + "has been marked trusted",
+                MessageDialogButton.OK)
+        })
+        Button neutralButton = new Button("Neutral",{
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.NEUTRAL))
+            MessageDialog.showMessageDialog(textGUI, "Marked Neutral", persona.getHumanReadableName() + "has been marked neutral",
+                MessageDialogButton.OK)
+        })
+        Button distrustButton = new Button("Distrust",{
+            String reason = TextInputDialog.showDialog(textGUI, "Reason", "Enter reason (optional)", "")
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.DISTRUSTED, reason : reason))
+            MessageDialog.showMessageDialog(textGUI, "Marked Distrusted", persona.getHumanReadableName() + "has been marked distrusted",
+                MessageDialogButton.OK)
+        })
+        Button closeButton = new Button("Close",{prompt.close()})
+        
+        contentPanel.with { 
+            addComponent(trustButton,layoutData)
+            addComponent(neutralButton, layoutData)
+            addComponent(distrustButton, layoutData)
+            addComponent(closeButton, layoutData)
+        }
+        prompt.setComponent(contentPanel)
+        textGUI.addWindowAndWait(prompt)
+    }    
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListWrapper.groovy

@@ -0,0 +1,15 @@
+package com.muwire.clilanterna
+
+import com.muwire.core.trust.RemoteTrustList
+
+class TrustListWrapper {
+    private final RemoteTrustList trustList
+    TrustListWrapper(RemoteTrustList trustList) {
+        this.trustList = trustList
+    }
+    
+    @Override
+    public String toString() {
+        trustList.persona.getHumanReadableName()
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustModel.groovy

@@ -0,0 +1,78 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+import com.muwire.core.Core
+import com.muwire.core.files.AllFilesLoadedEvent
+import com.muwire.core.trust.TrustEvent
+import com.muwire.core.trust.TrustSubscriptionEvent
+import com.muwire.core.trust.TrustSubscriptionUpdatedEvent
+
+class TrustModel {
+    private final TextGUIThread guiThread
+    private final Core core
+    private final TableModel modelTrusted, modelDistrusted, modelSubscriptions
+    
+    TrustModel(TextGUIThread guiThread, Core core) {
+        this.guiThread = guiThread
+        this.core = core
+        
+        modelTrusted = new TableModel("Trusted Users","Reason")
+        modelDistrusted = new TableModel("Distrusted Users","Reason")
+        modelSubscriptions = new TableModel("Name","Trusted","Distrusted","Status","Last Updated")
+        
+        core.eventBus.register(TrustEvent.class, this)
+        core.eventBus.register(AllFilesLoadedEvent.class, this)
+        core.eventBus.register(TrustSubscriptionUpdatedEvent.class, this)
+        
+    }
+    
+    void onTrustEvent(TrustEvent e) {
+        guiThread.invokeLater {
+            refreshModels()
+        }
+    }
+    
+    void onTrustSubscriptionUpdatedEvent(TrustSubscriptionUpdatedEvent e) {
+        guiThread.invokeLater {
+            refreshModels()
+        }
+    }
+    
+    void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
+        guiThread.invokeLater {
+            refreshModels()
+        }
+        core.muOptions.trustSubscriptions.each {
+            core.eventBus.publish(new TrustSubscriptionEvent(persona : it, subscribe : true))
+        }
+    }
+    
+    private void refreshModels() {
+        int trustedRows = modelTrusted.getRowCount()
+        trustedRows.times { modelTrusted.removeRow(0) }
+        int distrustedRows = modelDistrusted.getRowCount()
+        distrustedRows.times { modelDistrusted.removeRow(0) }
+        int subsRows = modelSubscriptions.getRowCount()
+        subsRows.times { modelSubscriptions.removeRow(0) }
+        
+        core.trustService.good.values().each { 
+            modelTrusted.addRow(new PersonaWrapper(it.persona),it.reason)
+        }
+        
+        core.trustService.bad.values().each { 
+            modelDistrusted.addRow(new PersonaWrapper(it.persona),it.reason)
+        }
+        
+        core.trustSubscriber.remoteTrustLists.values().each { 
+            def name = new TrustListWrapper(it)
+            String trusted = String.valueOf(it.good.size())
+            String distrusted = String.valueOf(it.bad.size())
+            String status = it.status
+            String lastUpdated = it.timestamp == 0 ? "Never" : new Date(it.timestamp)
+            
+            modelSubscriptions.addRow(name, trusted, distrusted, status, lastUpdated)
+        }
+        
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy

@@ -0,0 +1,207 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogBuilder
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.dialogs.TextInputDialog
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.table.Table
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.trust.TrustEvent
+import com.muwire.core.trust.TrustLevel
+import com.muwire.core.trust.TrustSubscriptionEvent
+
+class TrustView extends BasicWindow {
+    private final TrustModel model
+    private final TextGUI textGUI
+    private final Core core
+    private final TerminalSize terminalSize
+    private final Table trusted, distrusted, subscriptions
+    
+    TrustView(TrustModel model, TextGUI textGUI, Core core, TerminalSize terminalSize) {
+        this.model = model
+        this.textGUI = textGUI
+        this.core = core
+        this.terminalSize = terminalSize
+        
+        int tableSize = (terminalSize.getRows() / 2 - 10).toInteger()
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
+        
+        Panel topPanel = new Panel()
+        topPanel.setLayoutManager(new GridLayout(2))
+        
+        trusted = new Table("Trusted Users","Reason")
+        trusted.setCellSelection(false)
+        trusted.setSelectAction({trustedActions()})
+        trusted.setTableModel(model.modelTrusted)
+        trusted.setVisibleRows(tableSize)
+        topPanel.addComponent(trusted, layoutData)
+        
+        distrusted = new Table("Distrusted users","Reason")
+        distrusted.setCellSelection(false)
+        distrusted.setSelectAction({distrustedActions()})
+        distrusted.setTableModel(model.modelDistrusted)
+        distrusted.setVisibleRows(tableSize)
+        topPanel.addComponent(distrusted, layoutData)
+        
+        Panel bottomPanel = new Panel()
+        bottomPanel.setLayoutManager(new GridLayout(1))
+        
+        Label tableName = new Label("Trust List Subscriptions")
+        bottomPanel.addComponent(tableName, layoutData)
+        
+        subscriptions = new Table("Name","Trusted","Distrusted","Status","Last Updated")
+        subscriptions.setCellSelection(false)
+        subscriptions.setSelectAction({trustListActions()})
+        subscriptions.setTableModel(model.modelSubscriptions)
+        subscriptions.setVisibleRows(tableSize)
+        bottomPanel.addComponent(subscriptions, layoutData)
+        
+        Button closeButton = new Button("Close", {close()})
+        
+        contentPanel.addComponent(topPanel, layoutData)
+        contentPanel.addComponent(bottomPanel, layoutData)
+        contentPanel.addComponent(closeButton, layoutData)
+        
+        setComponent(contentPanel)
+    }
+    
+    private void trustedActions() {
+        int selectedRow = trusted.getSelectedRow()
+        def row = model.modelTrusted.getRow(selectedRow)
+        Persona persona = row[0].persona
+        
+        Window prompt = new BasicWindow("Change Trust For "+persona.getHumanReadableName())
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(4))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        
+        Button subscribe = new Button("Subscribe", {
+            core.muOptions.trustSubscriptions.add(persona)
+            saveMuSettings()
+            core.eventBus.publish(new TrustSubscriptionEvent(persona : persona, subscribe : true))
+            MessageDialog.showMessageDialog(textGUI, "Subscribed", "Subscribed from trust list of " + persona.getHumanReadableName(),
+                MessageDialogButton.OK)
+           model.refreshModels()
+            
+        })
+        Button markNeutral = new Button("Mark Neutral", {
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.NEUTRAL))
+            MessageDialog.showMessageDialog(textGUI, "Marked Neutral", persona.getHumanReadableName() + "has been marked neutral",
+                 MessageDialogButton.OK)  
+        })
+        Button markDistrusted = new Button("Mark Distrusted", {
+            String reason = TextInputDialog.showDialog(textGUI, "Reason", "Enter reason (optional)", "")
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.DISTRUSTED, reason : reason))
+            MessageDialog.showMessageDialog(textGUI, "Marked Distrusted", persona.getHumanReadableName() + "has been marked distrusted",
+                 MessageDialogButton.OK)
+        })
+        Button closeButton = new Button("Close", {prompt.close()})
+        contentPanel.with {
+            addComponent(subscribe, layoutData) 
+            addComponent(markNeutral, layoutData)
+            addComponent(markDistrusted, layoutData)
+            addComponent(closeButton, layoutData)
+        }
+        prompt.setComponent(contentPanel)
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    private void distrustedActions() {
+        int selectedRow = distrusted.getSelectedRow()
+        def row = model.modelDistrusted.getRow(selectedRow)
+        Persona persona = row[0].persona
+        
+        Window prompt = new BasicWindow("Change Trust For "+persona.getHumanReadableName())
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(3))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        
+        Button markNeutral = new Button("Mark Neutral", {
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.NEUTRAL))
+            MessageDialog.showMessageDialog(textGUI, "Marked Neutral", persona.getHumanReadableName() + "has been marked neutral",
+                 MessageDialogButton.OK)
+        })
+        Button markDistrusted = new Button("Mark Trusted", {
+            String reason = TextInputDialog.showDialog(textGUI, "Reason", "Enter reason (optional)", "")
+            core.eventBus.publish(new TrustEvent(persona : persona, level : TrustLevel.TRUSTED, reason : reason))
+            MessageDialog.showMessageDialog(textGUI, "Marked Trusted", persona.getHumanReadableName() + "has been marked trusted",
+                 MessageDialogButton.OK)
+        })
+        Button closeButton = new Button("Close", {prompt.close()})
+        contentPanel.with {
+            addComponent(markDistrusted, layoutData)
+            addComponent(markNeutral, layoutData)
+            addComponent(closeButton, layoutData)
+        }
+        prompt.setComponent(contentPanel)
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    private void trustListActions() {
+        int selectedRow = subscriptions.getSelectedRow()
+        def row = model.modelSubscriptions.getRow(selectedRow)
+        
+        def trustList = row[0].trustList
+        Persona persona = trustList.persona
+        
+        Window prompt = new BasicWindow("Trust List Actions")
+        prompt.setHints([Window.Hint.CENTERED])
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(4))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        
+        Button reviewButton = new Button("Review",{review(trustList)})
+        Button updateButton = new Button("Update",{
+            core.eventBus.publish(new TrustSubscriptionEvent(persona : persona, subscribe : true))
+            MessageDialog.showMessageDialog(textGUI, "Updating...", "Trust list will update soon", MessageDialogButton.OK)
+        })
+        Button unsubscribeButton = new Button("Unsubscribe", {
+            core.muOptions.trustSubscriptions.remove(persona)
+            saveMuSettings()
+            core.eventBus.publish(new TrustSubscriptionEvent(persona : persona, subscribe : false))
+            MessageDialog.showMessageDialog(textGUI, "Unsubscribed", "Unsubscribed from trust list of " + persona.getHumanReadableName(),
+                 MessageDialogButton.OK)
+            model.refreshModels()
+        })
+        Button closeButton = new Button("Close", {prompt.close()})
+        
+        contentPanel.with { 
+            addComponent(reviewButton, layoutData)
+            addComponent(updateButton, layoutData)
+            addComponent(unsubscribeButton, layoutData)
+            addComponent(closeButton, layoutData)
+        }
+        prompt.setComponent(contentPanel)
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    private void review(def trustList) {
+        TrustListModel model = new TrustListModel(trustList, core)
+        TrustListView view = new TrustListView(model, textGUI, core, terminalSize)
+        textGUI.addWindowAndWait(view)
+        model.unregister()
+    }
+    
+    private void saveMuSettings() {
+        File settingsFile = new File(core.home,"MuWire.properties")
+        settingsFile.withPrintWriter("UTF-8",{ core.muOptions.write(it) })
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/UpdateTextView.groovy

@@ -0,0 +1,34 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextBox
+import com.googlecode.lanterna.gui2.Window
+
+class UpdateTextView extends BasicWindow {
+    private final TextBox textBox
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+    
+    UpdateTextView(String text, TerminalSize terminalSize) {
+        super("Update Details")
+        
+        setHints([Window.Hint.CENTERED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        
+        TerminalSize boxSize = new TerminalSize((terminalSize.getColumns() / 2).toInteger(), (terminalSize.getRows() / 2).toInteger())
+        textBox = new TextBox(boxSize, text, TextBox.Style.MULTI_LINE)
+        contentPanel.addComponent(textBox, layoutData)
+        
+        Button closeButton = new Button("Close", {close()})
+        contentPanel.addComponent(closeButton, layoutData)
+        
+        setComponent(contentPanel)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsModel.groovy

@@ -0,0 +1,107 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+
+import com.muwire.core.Core
+import com.muwire.core.upload.UploadEvent
+import com.muwire.core.upload.UploadFinishedEvent
+import com.muwire.core.upload.Uploader
+
+import net.i2p.data.DataHelper
+
+class UploadsModel {
+    private final TextGUIThread guiThread
+    private final Core core
+    private CliSettings props
+    private final List<UploaderWrapper> uploaders = new ArrayList<>()
+    private final TableModel model = new TableModel("Name","Progress","Downloader","Remote Pieces", "Speed")
+    
+    UploadsModel(TextGUIThread guiThread, Core core, CliSettings props) {
+        this.guiThread = guiThread
+        this.core = core
+        this.props = props
+        
+        core.eventBus.register(UploadEvent.class, this)
+        core.eventBus.register(UploadFinishedEvent.class, this)
+        
+        Timer timer = new Timer(true)
+        Runnable refreshModel = {refreshModel()}
+        timer.schedule({
+            guiThread.invokeLater(refreshModel)
+        } as TimerTask, 1000, 1000)
+        
+    }
+    
+    void onUploadEvent(UploadEvent e) {
+        guiThread.invokeLater {
+            UploaderWrapper found = null
+            uploaders.each { 
+                if (it.uploader == e.uploader) {
+                    found = it
+                    return
+                }
+            }
+            if (found != null) {
+                found.uploader = e.uploader
+                found.finished = false
+            } else
+                uploaders << new UploaderWrapper(uploader : e.uploader)
+        }
+    }
+    
+    void onUploadFinishedEvent(UploadFinishedEvent e) {
+        guiThread.invokeLater {
+            uploaders.each { 
+                if (it.uploader == e.uploader) {
+                    it.finished = true
+                    return
+                }
+            }
+        }
+    }
+    
+    private void refreshModel() {
+        int uploadersSize = model.getRowCount()
+        uploadersSize.times { model.removeRow(0) }
+
+        if (props.clearUploads) {
+            uploaders.removeAll { it.finished }
+        }
+                
+        uploaders.each { 
+            String name = it.uploader.getName()
+            int percent = it.uploader.getProgress()
+            String percentString = "$percent% of piece".toString()
+            String downloader = it.uploader.getDownloader()
+            
+            int pieces = it.uploader.getTotalPieces()
+            int done = it.uploader.getDonePieces()
+            if (percent == 100)
+                done++
+            int percentTotal = -1
+            if (pieces != 0)
+                percentTotal = (done * 100) / pieces
+            long size = it.uploader.getTotalSize()
+            String totalSize = ""
+            if (size > 0)
+                totalSize = " of " + DataHelper.formatSize2Decimal(size, false) + "B"
+            String remotePieces = String.format("%02d", percentTotal) + "% ${totalSize} ($done/$pieces) pcs".toString()
+            
+            String speed = DataHelper.formatSize2Decimal(it.uploader.speed(), false) + "B/sec"
+            
+            
+            model.addRow([name, percentString, downloader, remotePieces, speed])
+        }
+    }
+    
+    private static class UploaderWrapper {
+        Uploader uploader
+        boolean finished
+        
+        @Override
+        public String toString() {
+            uploader.getName()
+        }
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsView.groovy

@@ -0,0 +1,49 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.table.Table
+
+class UploadsView extends BasicWindow {
+    private final UploadsModel model
+    private final Table table
+    
+    UploadsView(UploadsModel model, TerminalSize terminalSize) {
+        this.model = model
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
+        
+        table = new Table("Name","Progress","Downloader","Remote Pieces","Speed")
+        table.setCellSelection(false)
+        table.setTableModel(model.model)
+        table.setVisibleRows(terminalSize.getRows())
+        contentPanel.addComponent(table, layoutData)
+
+        Panel buttonsPanel = new Panel()
+        buttonsPanel.setLayoutManager(new GridLayout(2))
+        
+        Button clearDoneButton = new Button("Clear Finished",{
+            model.uploaders.removeAll { it.finished }
+        })        
+        Button closeButton = new Button("Close",{close()})
+        
+        buttonsPanel.addComponent(clearDoneButton, layoutData)
+        buttonsPanel.addComponent(closeButton, layoutData)
+        
+        contentPanel.addComponent(buttonsPanel, layoutData)
+        
+        setComponent(contentPanel)
+        closeButton.takeFocus()
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesModel.groovy

@@ -0,0 +1,74 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.TextGUIThread
+import com.googlecode.lanterna.gui2.table.TableModel
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.filecert.Certificate
+import com.muwire.core.filecert.CertificateFetchEvent
+import com.muwire.core.filecert.CertificateFetchStatus
+import com.muwire.core.filecert.CertificateFetchedEvent
+import com.muwire.core.filecert.UIFetchCertificatesEvent
+import com.muwire.core.search.UIResultEvent
+
+class ViewCertificatesModel {
+    private final UIResultEvent result
+    private final Core core
+    private final TextGUIThread guiThread
+    
+    private final TableModel model = new TableModel("Issuer","Trust Status","File Name","Comment","Timestamp")
+    
+    private int totalCerts
+    
+    private Label status
+    private Label percentage
+    
+    ViewCertificatesModel(UIResultEvent result, Core core, TextGUIThread guiThread) {
+        this.result = result
+        this.core = core
+        this.guiThread = guiThread
+        
+        core.eventBus.with { 
+            register(CertificateFetchEvent.class,this)
+            register(CertificateFetchedEvent.class, this)
+            publish(new UIFetchCertificatesEvent(host : result.sender, infoHash : result.infohash))
+        }
+    }
+    
+    void unregister() {
+        core.eventBus.unregister(CertificateFetchEvent.class, this)
+        core.eventBus.unregister(CertificateFetchedEvent.class, this)
+    }
+    
+    void onCertificateFetchEvent(CertificateFetchEvent e) {
+        guiThread.invokeLater {
+            status.setText(e.status.toString())
+            if (e.status == CertificateFetchStatus.FETCHING)
+                totalCerts = e.count
+        }
+    }
+    
+    void onCertificateFetchedEvent(CertificateFetchedEvent e) {
+        guiThread.invokeLater {
+            Date date = new Date(e.certificate.timestamp)
+            model.addRow(new CertificateWrapper(e.certificate), core.trustService.getLevel(e.certificate.issuer.destination),
+                e.certificate.name.name, e.certificate.comment != null, date)
+            
+            String percentageString = ""
+            if (totalCerts > 0) {
+                double percentage = Math.round((model.getRowCount() * 100 / totalCerts).toDouble())
+                percentageString = String.valueOf(percentage) + "%"
+            }
+            percentage.setText(percentageString)
+        }
+    }
+    
+    void setStatusLabel(Label status) {
+        this.status = status
+    }
+    
+    void setPercentageLabel(Label percentage) {
+        this.percentage = percentage
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesView.groovy

@@ -0,0 +1,103 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextGUI
+import com.googlecode.lanterna.gui2.Window
+import com.googlecode.lanterna.gui2.dialogs.MessageDialog
+import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.Label
+import com.googlecode.lanterna.gui2.table.Table
+import com.muwire.core.Core
+import com.muwire.core.Persona
+import com.muwire.core.filecert.Certificate
+import com.muwire.core.filecert.UIImportCertificateEvent
+
+class ViewCertificatesView extends BasicWindow {
+    private final ViewCertificatesModel model
+    private final TextGUI textGUI
+    private final Core core
+    private final Table table
+    private final TerminalSize terminalSize
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
+    
+    ViewCertificatesView(ViewCertificatesModel model, TextGUI textGUI, Core core, TerminalSize terminalSize) {
+        super("Certificates")
+        this.model = model
+        this.core = core
+        this.textGUI = textGUI
+        this.terminalSize = terminalSize
+        
+        setHints([Window.Hint.EXPANDED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        
+        Label statusLabel = new Label("")
+        Label percentageLabel = new Label("")
+        model.setStatusLabel(statusLabel)
+        model.setPercentageLabel(percentageLabel)
+        
+        Panel topPanel = new Panel()
+        topPanel.setLayoutManager(new GridLayout(2))
+        topPanel.addComponent(statusLabel, layoutData)
+        topPanel.addComponent(percentageLabel, layoutData)
+        contentPanel.addComponent(topPanel, layoutData)
+        
+        table = new Table("Issuer","Trust Status","File Name","Comment","Timestamp")
+        table.with { 
+            setCellSelection(false)
+            setTableModel(model.model)
+            setVisibleRows(terminalSize.getRows())
+            setSelectAction({rowSelected()})
+        }
+        contentPanel.addComponent(table, layoutData)
+        
+        Button closeButton = new Button("Close",{
+            model.unregister()
+            close()
+        })
+        contentPanel.addComponent(closeButton, layoutData)
+        setComponent(contentPanel)
+    }
+    
+    private void rowSelected() {
+        int selectedRow = table.getSelectedRow()
+        def row = model.model.getRow(selectedRow)
+        Certificate certificate = row[0].certificate
+        
+        Window prompt = new BasicWindow("Import Certificate?")
+        prompt.setHints([Window.Hint.CENTERED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(3))
+        Button importButton = new Button("Import", {importCert(certificate)})
+        
+        Button viewCommentButton = new Button("View Comment", {viewComment(certificate)})
+        
+        Button closeButton = new Button("Close", {prompt.close()})
+        contentPanel.addComponent(importButton, layoutData)
+        if (certificate.comment != null)
+            contentPanel.addComponent(viewCommentButton, layoutData)
+        contentPanel.addComponent(closeButton, layoutData)
+        
+        prompt.setComponent(contentPanel)
+        importButton.takeFocus()
+        textGUI.addWindowAndWait(prompt)
+    }
+    
+    private void importCert(Certificate certificate) {
+        core.eventBus.publish(new UIImportCertificateEvent(certificate : certificate))
+        MessageDialog.showMessageDialog(textGUI, "Certificate(s) Imported", "", MessageDialogButton.OK)
+    }
+    
+    private void viewComment(Certificate certificate) {
+        ViewCommentView view = new ViewCommentView(certificate.comment.name, "Certificate Comment", terminalSize)
+        textGUI.addWindowAndWait(view)
+    }
+}

cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCommentView.groovy

@@ -0,0 +1,39 @@
+package com.muwire.clilanterna
+
+import com.googlecode.lanterna.TerminalSize
+import com.googlecode.lanterna.gui2.BasicWindow
+import com.googlecode.lanterna.gui2.Button
+import com.googlecode.lanterna.gui2.GridLayout
+import com.googlecode.lanterna.gui2.GridLayout.Alignment
+import com.googlecode.lanterna.gui2.LayoutData
+import com.googlecode.lanterna.gui2.Panel
+import com.googlecode.lanterna.gui2.TextBox
+import com.googlecode.lanterna.gui2.Window
+import com.muwire.core.SharedFile
+import com.muwire.core.search.UIResultEvent
+import com.muwire.core.util.DataUtil
+
+import net.i2p.data.Base64
+
+class ViewCommentView extends BasicWindow {
+    private final TextBox textBox
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+    
+    ViewCommentView(String text, String title, TerminalSize terminalSize) {
+        super("View Comments For "+title)
+        
+        setHints([Window.Hint.CENTERED])
+        
+        Panel contentPanel = new Panel()
+        contentPanel.setLayoutManager(new GridLayout(1))
+        
+        TerminalSize boxSize = new TerminalSize((terminalSize.getColumns() / 2).toInteger(), (terminalSize.getRows() / 2).toInteger())
+        textBox = new TextBox(boxSize, text, TextBox.Style.MULTI_LINE)
+        contentPanel.addComponent(textBox, layoutData)
+        
+        Button closeButton = new Button("Close", {close()})
+        contentPanel.addComponent(closeButton, layoutData)
+        
+        setComponent(contentPanel)
+    }
+}

cli/build.gradle

@@ -0,0 +1,22 @@
+buildscript {
+
+    repositories {
+        jcenter()
+        mavenLocal()
+    }
+
+    dependencies {
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+    }
+}
+
+apply plugin : 'application'
+mainClassName = 'com.muwire.cli.Cli'
+apply plugin : 'com.github.johnrengelman.shadow'
+
+applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
+
+dependencies {
+    compile project(":core")
+}
+

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

@@ -0,0 +1,144 @@
+package com.muwire.cli
+
+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
+import com.muwire.core.files.AllFilesLoadedEvent
+import com.muwire.core.files.FileHashedEvent
+import com.muwire.core.files.FileLoadedEvent
+import com.muwire.core.files.FileSharedEvent
+import com.muwire.core.upload.UploadEvent
+import com.muwire.core.upload.UploadFinishedEvent
+
+class Cli {
+
+    public static void main(String[] args) {
+        def home = System.getProperty("user.home") + File.separator + ".MuWire"
+        home = new File(home)
+        if (!home.exists())
+            home.mkdirs()
+
+        def propsFile = new File(home,"MuWire.properties")
+        if (!propsFile.exists()) {
+            println "create props file ${propsFile.getAbsoluteFile()} before launching MuWire"
+            System.exit(1)
+        }
+
+        def props = new Properties()
+        propsFile.withInputStream { props.load(it) }
+        props = new MuWireSettings(props)
+
+        Core core
+        try {
+            core = new Core(props, home, "0.5.3")
+        } catch (Exception bad) {
+            bad.printStackTrace(System.out)
+            println "Failed to initialize core, exiting"
+            System.exit(1)
+        }
+
+
+
+
+        def filesList
+        if (args.length == 0) {
+            println "Enter a file containing list of files to share"
+            def reader = new BufferedReader(new InputStreamReader(System.in))
+            filesList = reader.readLine()
+        } else
+            filesList = args[0]
+
+        Thread.sleep(1000)
+        println "loading shared files from $filesList"
+
+        // listener for shared files
+        def sharedListener = new SharedListener()
+        core.eventBus.register(FileHashedEvent.class, sharedListener)
+        core.eventBus.register(FileLoadedEvent.class, sharedListener)
+
+        // for connections
+        def connectionsListener = new ConnectionListener()
+        core.eventBus.register(ConnectionEvent.class, connectionsListener)
+        core.eventBus.register(DisconnectionEvent.class, connectionsListener)
+
+        // for uploads
+        def uploadsListener = new UploadsListener()
+        core.eventBus.register(UploadEvent.class, uploadsListener)
+        core.eventBus.register(UploadFinishedEvent.class, uploadsListener)
+
+        Timer timer = new Timer("status-printer", true)
+        timer.schedule({
+            println String.valueOf(new Date()) + " Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
+        } as TimerTask, 60000, 60000)
+
+        def latch = new CountDownLatch(1)
+        def fileLoader = new Object() {
+            public void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
+                latch.countDown()
+            }
+        }
+        core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
+        core.startServices()
+
+        core.eventBus.publish(new UILoadedEvent())
+        println "waiting for files to load"
+        latch.await()
+        // now we begin
+        println "MuWire is ready"
+
+        filesList = new File(filesList)
+        filesList.withReader {
+            def toShare = it.readLine()
+            core.eventBus.publish(new FileSharedEvent(file : new File(toShare)))
+        }
+        Runtime.getRuntime().addShutdownHook({
+            println "shutting down.."
+            core.shutdown()
+            println "shutdown."
+        })
+        Thread.sleep(Integer.MAX_VALUE)
+    }
+
+    static class ConnectionListener {
+        volatile int connections
+        public void onConnectionEvent(ConnectionEvent e) {
+            if (e.status == ConnectionAttemptStatus.SUCCESSFUL)
+                connections++
+        }
+        public void onDisconnectionEvent(DisconnectionEvent e) {
+            connections--
+        }
+    }
+
+    static class UploadsListener {
+        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()}"
+        }
+        public void onUploadFinishedEvent(UploadFinishedEvent e) {
+            uploads--
+            println String.valueOf(new Date()) + " Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+        }
+    }
+
+    static class SharedListener {
+        volatile int shared
+        void onFileHashedEvent(FileHashedEvent e) {
+            if (e.error != null)
+                println "ERROR $e.error"
+            else {
+                println "Shared file : $e.sharedFile.file"
+                shared++
+            }
+        }
+        void onFileLoadedEvent(FileLoadedEvent e) {
+            shared++
+        }
+    }
+}

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

@@ -0,0 +1,166 @@
+package com.muwire.cli
+
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CountDownLatch
+
+import com.muwire.core.Core
+import com.muwire.core.MuWireSettings
+import com.muwire.core.connection.ConnectionAttemptStatus
+import com.muwire.core.connection.ConnectionEvent
+import com.muwire.core.download.DownloadStartedEvent
+import com.muwire.core.download.Downloader
+import com.muwire.core.download.UIDownloadEvent
+import com.muwire.core.search.QueryEvent
+import com.muwire.core.search.SearchEvent
+import com.muwire.core.search.UIResultEvent
+
+import net.i2p.data.Base64
+
+class CliDownloader {
+
+    private static final List<Downloader> downloaders = Collections.synchronizedList(new ArrayList<>())
+    private static final Map<UUID,ResultsHolder> resultsListeners = new ConcurrentHashMap<>()
+
+    public static void main(String []args) {
+        def home = System.getProperty("user.home") + File.separator + ".MuWire"
+        home = new File(home)
+        if (!home.exists())
+            home.mkdirs()
+
+        def propsFile = new File(home,"MuWire.properties")
+        if (!propsFile.exists()) {
+            println "create props file ${propsFile.getAbsoluteFile()} before launching MuWire"
+            System.exit(1)
+        }
+
+        def props = new Properties()
+        propsFile.withInputStream { props.load(it) }
+        props = new MuWireSettings(props)
+
+        def filesList
+        int connections
+        int resultWait
+        if (args.length != 3) {
+            println "Enter a file containing list of hashes of files to download, " +
+                "how many connections you want before searching" +
+                "and how long to wait for results to arrive"
+                System.exit(1)
+        } else {
+            filesList = args[0]
+            connections = Integer.parseInt(args[1])
+            resultWait = Integer.parseInt(args[2])
+        }
+
+        Core core
+        try {
+            core = new Core(props, home, "0.5.3")
+        } catch (Exception bad) {
+            bad.printStackTrace(System.out)
+            println "Failed to initialize core, exiting"
+            System.exit(1)
+        }
+
+
+        def latch = new CountDownLatch(connections)
+        def connectionListener = new ConnectionWaiter(latch : latch)
+        core.eventBus.register(ConnectionEvent.class, connectionListener)
+
+        core.startServices()
+        println "starting to wait until there are $connections connections"
+        latch.await()
+
+        println "connected, searching for files"
+
+        def file = new File(filesList)
+        file.eachLine {
+            String[] split = it.split(",")
+            UUID uuid = UUID.randomUUID()
+            core.eventBus.register(UIResultEvent.class, new ResultsListener(fileName : split[1]))
+            def hash = Base64.decode(split[0])
+            def searchEvent = new SearchEvent(searchHash : hash, uuid : uuid)
+            core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop:true,
+                replyTo: core.me.destination, receivedOn : core.me.destination, originator: core.me))
+        }
+
+        println "waiting for results to arrive"
+        Thread.sleep(resultWait * 1000)
+
+        core.eventBus.register(DownloadStartedEvent.class, new DownloadListener())
+        resultsListeners.each { uuid, resultsListener ->
+            println "starting download of $resultsListener.fileName from ${resultsListener.getResults().size()} hosts"
+            File target = new File(resultsListener.fileName)
+
+            core.eventBus.publish(new UIDownloadEvent(target : target, result : resultsListener.getResults()))
+        }
+
+        Thread.sleep(1000)
+
+        Timer timer = new Timer("stats-printer")
+        timer.schedule({
+            println "==== STATUS UPDATE ==="
+            downloaders.each {
+                int donePieces = it.donePieces()
+                int totalPieces = it.nPieces
+                int sources = it.activeWorkers.size()
+                def root = Base64.encode(it.infoHash.getRoot())
+                def state = it.getCurrentState()
+                println "file $it.file hash: $root progress: $donePieces/$totalPieces sources: $sources status: $state}"
+                it.resume()
+            }
+            println "==== END ==="
+        } as TimerTask, 60000, 60000)
+
+        println "waiting for downloads to finish"
+        while(true) {
+            boolean allFinished = true
+            for (Downloader d : downloaders) {
+                allFinished &= d.getCurrentState() == Downloader.DownloadState.FINISHED
+            }
+            if (allFinished)
+                break
+            Thread.sleep(1000)
+        }
+
+        println "all downloads finished"
+    }
+
+    static class ResultsHolder {
+        final List<UIResultEvent> results = Collections.synchronizedList(new ArrayList<>())
+        String fileName
+        void add(UIResultEvent e) {
+            results.add(e)
+        }
+        List getResults() {
+            results
+        }
+    }
+
+    static class ResultsListener {
+        UUID uuid
+        String fileName
+        public onUIResultEvent(UIResultEvent e) {
+            println "got a result for $fileName from ${e.sender.getHumanReadableName()}"
+            ResultsHolder listener = resultsListeners.get(e.uuid)
+            if (listener == null) {
+                listener = new ResultsHolder(fileName : fileName)
+                resultsListeners.put(e.uuid, listener)
+            }
+            listener.add(e)
+        }
+    }
+
+    static class ConnectionWaiter {
+        CountDownLatch latch
+        public void onConnectionEvent(ConnectionEvent e) {
+            if (e.status == ConnectionAttemptStatus.SUCCESSFUL)
+                latch.countDown()
+        }
+    }
+
+
+    static class DownloadListener {
+        public void onDownloadStartedEvent(DownloadStartedEvent e) {
+            downloaders.add(e.downloader)
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+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,8 +2,9 @@ apply plugin : 'application'
 mainClassName = 'com.muwire.core.Core'
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
 dependencies {
-    compile 'net.i2p.client:mstreaming:0.9.40'
-    compile 'net.i2p.client:streaming:0.9.40'
+    compile "net.i2p:router:${i2pVersion}"
+    compile "net.i2p.client:mstreaming:${i2pVersion}"
+    compile "net.i2p.client:streaming:${i2pVersion}"
 
     testCompile 'org.junit.jupiter:junit-jupiter-api:5.4.2'    
     testCompile 'junit:junit:4.12'

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

@@ -1,13 +0,0 @@
-package com.muwire.core
-
-import net.i2p.crypto.SigType
-
-class Constants {
-    public static final byte PERSONA_VERSION = (byte)1
-    public static final SigType SIG_TYPE = SigType.EdDSA_SHA512_Ed25519 
-    
-    public static final int MAX_HEADER_SIZE = 0x1 << 14
-    public static final int MAX_HEADERS = 16
-    
-    public static final float DOWNLOAD_SEQUENTIAL_RATIO = 0.8f
-}

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

@@ -1,7 +1,14 @@
 package com.muwire.core
 
 import java.nio.charset.StandardCharsets
+import java.util.concurrent.atomic.AtomicBoolean
 
+import com.muwire.core.chat.ChatDisconnectionEvent
+import com.muwire.core.chat.ChatManager
+import com.muwire.core.chat.ChatMessageEvent
+import com.muwire.core.chat.ChatServer
+import com.muwire.core.chat.UIConnectChatEvent
+import com.muwire.core.chat.UIDisconnectChatEvent
 import com.muwire.core.connection.ConnectionAcceptor
 import com.muwire.core.connection.ConnectionEstablisher
 import com.muwire.core.connection.ConnectionEvent
@@ -12,9 +19,19 @@ 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.filecert.CertificateClient
+import com.muwire.core.filecert.CertificateManager
+import com.muwire.core.filecert.UICreateCertificateEvent
+import com.muwire.core.filecert.UIFetchCertificatesEvent
+import com.muwire.core.filecert.UIImportCertificateEvent
 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
@@ -22,18 +39,34 @@ 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.SideCarFileEvent
+import com.muwire.core.files.UICommentEvent
+import com.muwire.core.files.UIPersistFilesEvent
+import com.muwire.core.files.AllFilesLoadedEvent
+import com.muwire.core.files.DirectoryUnsharedEvent
+import com.muwire.core.files.DirectoryWatchedEvent
+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.BrowseManager
 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.UIBrowseEvent
+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
@@ -42,6 +75,7 @@ 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
@@ -49,63 +83,133 @@ 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 {
-    
+
     final EventBus eventBus
     final Persona me
     final File home
-    
+    final Properties i2pOptions
+    final MuWireSettings muOptions
+
     private final TrustService trustService
+    private final TrustSubscriber trustSubscriber
     private final PersisterService persisterService
     private final HostCache hostCache
     private final ConnectionManager connectionManager
     private final CacheClient cacheClient
+    private final UpdateClient updateClient
     private final ConnectionAcceptor connectionAcceptor
     private final ConnectionEstablisher connectionEstablisher
     private final HasherService hasherService
-        
-    public Core(MuWireSettings props, File home) {
-        this.home = home		
-        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)
-			}
-		}
-		
-		def sysProps = System.getProperties().clone()
-		sysProps["inbound.nickname"] = "MuWire"
-		I2PSession i2pSession
-		I2PSocketManager socketManager
-		keyDat.withInputStream {
-			socketManager = new I2PSocketManagerFactory().createManager(it, sysProps)
-		}
-		socketManager.getDefaultOptions().setReadTimeout(60000)
-		socketManager.getDefaultOptions().setConnectTimeout(30000)
-		i2pSession = socketManager.getSession()
-		
+    private final DownloadManager downloadManager
+    private final DirectoryWatcher directoryWatcher
+    final FileManager fileManager
+    final UploadManager uploadManager
+    final ContentManager contentManager
+    final CertificateManager certificateManager
+    final ChatServer chatServer
+    final ChatManager chatManager
+
+    private final Router router
+
+    final AtomicBoolean shutdown = new AtomicBoolean()
+    
+    final SigningPrivateKey spk
+
+    public Core(MuWireSettings props, File home, String myVersion) {
+        this.home = home
+        this.muOptions = props
+
+        i2pOptions = new Properties()
+        def i2pOptionsFile = new File(home,"i2p.properties")
+        if (i2pOptionsFile.exists()) {
+            i2pOptionsFile.withInputStream { i2pOptions.load(it) }
+
+            if (!i2pOptions.containsKey("inbound.nickname"))
+                i2pOptions["inbound.nickname"] = "MuWire"
+                if (!i2pOptions.containsKey("outbound.nickname"))
+                    i2pOptions["outbound.nickname"] = "MuWire"
+        } else {
+            i2pOptions["inbound.nickname"] = "MuWire"
+            i2pOptions["outbound.nickname"] = "MuWire"
+            i2pOptions["inbound.length"] = "3"
+            i2pOptions["inbound.quantity"] = "4"
+            i2pOptions["outbound.length"] = "3"
+            i2pOptions["outbound.quantity"] = "4"
+            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.base", home.getAbsolutePath())
+            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
+        I2PSocketManager socketManager
+        keyDat.withInputStream {
+            socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
+        }
+        socketManager.getDefaultOptions().setReadTimeout(60000)
+        socketManager.getDefaultOptions().setConnectTimeout(30000)
+        socketManager.addDisconnectListener({eventBus.publish(new RouterDisconnectedEvent())} as DisconnectListener)
+        i2pSession = socketManager.getSession()
+
         def destination = new Destination()
-        def spk = new SigningPrivateKey(Constants.SIG_TYPE)
+        spk = new SigningPrivateKey(Constants.SIG_TYPE)
         keyDat.withInputStream {
             destination.readBytes(it)
             def privateKey = new PrivateKey()
             privateKey.readBytes(it)
             spk.readBytes(it)
-		}
-            
+        }
+
         def baos = new ByteArrayOutputStream()
         def daos = new DataOutputStream(baos)
         daos.write(Constants.PERSONA_VERSION)
-        daos.writeShort((short)props.getNickname().length())
-        daos.write(props.getNickname().getBytes(StandardCharsets.UTF_8))
+        byte [] name = props.getNickname().getBytes(StandardCharsets.UTF_8)
+        daos.writeShort((short)name.length)
+        daos.write(name)
         destination.writeBytes(daos)
         daos.flush()
         byte [] payload = baos.toByteArray()
@@ -117,90 +221,195 @@ public class Core {
         me = new Persona(new ByteArrayInputStream(baos.toByteArray()))
         log.info("Loaded myself as "+me.getHumanReadableName())
 
-		eventBus = new EventBus()
-		
-		log.info("initializing trust service")
-		File goodTrust = new File(home, "trust.good")
-		File badTrust = new File(home, "trust.bad")
-		trustService = new TrustService(goodTrust, badTrust, 5000)
-		eventBus.register(TrustEvent.class, trustService)
-		
-		
-		log.info "initializing file manager"
-		FileManager fileManager = new FileManager(eventBus)
-		eventBus.register(FileHashedEvent.class, fileManager)
-		eventBus.register(FileLoadedEvent.class, fileManager)
-		eventBus.register(FileDownloadedEvent.class, fileManager)
-		eventBus.register(FileUnsharedEvent.class, fileManager)
-		eventBus.register(SearchEvent.class, fileManager)
-		
-		log.info "initializing persistence service"
-		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 5000, fileManager)
+        eventBus = new EventBus()
+
+        log.info("initializing certificate manager")
+        certificateManager = new CertificateManager(eventBus, home, me, spk)
+        eventBus.register(UICreateCertificateEvent.class, certificateManager)
+        eventBus.register(UIImportCertificateEvent.class, certificateManager)
         
-		log.info("initializing host cache")
-		File hostStorage = new File(home, "hosts.json")
+        
+        log.info("initializing trust service")
+        File goodTrust = new File(home, "trusted")
+        File badTrust = new File(home, "distrusted")
+        trustService = new TrustService(goodTrust, badTrust, 5000)
+        eventBus.register(TrustEvent.class, trustService)
+
+
+        log.info "initializing file manager"
+        fileManager = new FileManager(eventBus, props)
+        eventBus.register(FileHashedEvent.class, fileManager)
+        eventBus.register(FileLoadedEvent.class, fileManager)
+        eventBus.register(FileDownloadedEvent.class, fileManager)
+        eventBus.register(FileUnsharedEvent.class, fileManager)
+        eventBus.register(SearchEvent.class, fileManager)
+        eventBus.register(DirectoryUnsharedEvent.class, fileManager)
+        eventBus.register(UICommentEvent.class, fileManager)
+        eventBus.register(SideCarFileEvent.class, fileManager)
+
+        log.info("initializing mesh manager")
+        MeshManager meshManager = new MeshManager(fileManager, home, props)
+        eventBus.register(SourceDiscoveredEvent.class, meshManager)
+
+        log.info "initializing persistence service"
+        persisterService = new PersisterService(new File(home, "files.json"), eventBus, 60000, fileManager)
+        eventBus.register(UILoadedEvent.class, persisterService)
+        eventBus.register(UIPersistFilesEvent.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(ConnectionEvent.class, hostCache)
-		
-		log.info("initializing connection manager")
-		connectionManager = props.isLeaf() ? 
-			new LeafConnectionManager(eventBus, me, 3, hostCache) : new UltrapeerConnectionManager(eventBus, me, 512, 512, hostCache, trustService)
-		eventBus.register(TrustEvent.class, connectionManager)
-		eventBus.register(ConnectionEvent.class, connectionManager)
-		eventBus.register(DisconnectionEvent.class, connectionManager)
+        eventBus.register(HostDiscoveredEvent.class, hostCache)
+        eventBus.register(ConnectionEvent.class, hostCache)
+
+        log.info("initializing connection manager")
+        connectionManager = props.isLeaf() ?
+            new LeafConnectionManager(eventBus, me, 3, hostCache, props) :
+            new UltrapeerConnectionManager(eventBus, me, 512, 512, hostCache, trustService, props)
+        eventBus.register(TrustEvent.class, connectionManager)
+        eventBus.register(ConnectionEvent.class, connectionManager)
+        eventBus.register(DisconnectionEvent.class, connectionManager)
         eventBus.register(QueryEvent.class, connectionManager)
-		
-		log.info("initializing cache client")
-		cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
+
+        log.info("initializing cache client")
+        cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
+
+        log.info("initializing update client")
+        updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props, fileManager, me, spk)
+        eventBus.register(FileDownloadedEvent.class, updateClient)
+        eventBus.register(UIResultBatchEvent.class, updateClient)
+
+        log.info("initializing connector")
+        I2PConnector i2pConnector = new I2PConnector(socketManager)
+
+        log.info("initializing certificate client")
+        CertificateClient certificateClient = new CertificateClient(eventBus, i2pConnector)
+        eventBus.register(UIFetchCertificatesEvent.class, certificateClient)
         
-		log.info("initializing connector")
-		I2PConnector i2pConnector = new I2PConnector(socketManager)
+        log.info("initializing chat server")
+        chatServer = new ChatServer(eventBus, props, trustService, me, spk)
+        eventBus.with {
+            register(ChatMessageEvent.class, chatServer)
+            register(ChatDisconnectionEvent.class, chatServer)
+            register(TrustEvent.class, chatServer)
+        }
         
-		log.info "initializing results sender"
-		ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me)
-		
-		log.info "initializing search manager"
-		SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
-		eventBus.register(QueryEvent.class, searchManager)
-		eventBus.register(ResultsEvent.class, searchManager)
-		
+        log.info "initializing results sender"
+        ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me, props, certificateManager, chatServer)
+
+        log.info "initializing search manager"
+        SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
+        eventBus.register(QueryEvent.class, searchManager)
+        eventBus.register(ResultsEvent.class, searchManager)
+
         log.info("initializing download manager")
-        DownloadManager downloadManager = new DownloadManager(eventBus, i2pConnector, new File(home, "incompletes"))
+        downloadManager = new DownloadManager(eventBus, trustService, meshManager, props, 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 uploadManager = new UploadManager(eventBus, fileManager)
-        
-        
-		log.info("initializing acceptor")
-		I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
-		connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props, 
-            i2pAcceptor, hostCache, trustService, searchManager, uploadManager)
-		
-        
+        uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager, props)
+
+        log.info("initializing connection establisher")
         connectionEstablisher = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
+
         
+        log.info("initializing chat manager")
+        chatManager = new ChatManager(eventBus, me, i2pConnector, trustService, props)
+        eventBus.with { 
+            register(UIConnectChatEvent.class, chatManager)
+            register(UIDisconnectChatEvent.class, chatManager)
+            register(ChatMessageEvent.class, chatManager)
+            register(ChatDisconnectionEvent.class, chatManager)
+        }
+        
+        log.info("initializing acceptor")
+        I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
+        connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props,
+            i2pAcceptor, hostCache, trustService, searchManager, uploadManager, fileManager, connectionEstablisher,
+            certificateManager, chatServer)
+
+        log.info("initializing directory watcher")
+        directoryWatcher = new DirectoryWatcher(eventBus, fileManager, home, props)
+        eventBus.register(DirectoryWatchedEvent.class, directoryWatcher)
+        eventBus.register(AllFilesLoadedEvent.class, directoryWatcher)
+        eventBus.register(DirectoryUnsharedEvent.class, directoryWatcher)
+
         log.info("initializing hasher service")
-        hasherService = new HasherService(new FileHasher(), eventBus)
+        hasherService = new HasherService(new FileHasher(), eventBus, fileManager, props)
         eventBus.register(FileSharedEvent.class, hasherService)
-	}
-    
+        eventBus.register(FileUnsharedEvent.class, hasherService)
+        eventBus.register(DirectoryUnsharedEvent.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)
+        
+        log.info("initializing browse manager")
+        BrowseManager browseManager = new BrowseManager(i2pConnector, eventBus, me)
+        eventBus.register(UIBrowseEvent.class, browseManager)
+        
+    }
+
     public void startServices() {
         hasherService.start()
         trustService.start()
         trustService.waitForLoad()
-        persisterService.start()
         hostCache.start()
         connectionManager.start()
         cacheClient.start()
         connectionAcceptor.start()
         connectionEstablisher.start()
         hostCache.waitForLoad()
+        updateClient.start()
+    }
+
+    public void shutdown() {
+        if (!shutdown.compareAndSet(false, true)) {
+            log.info("already shutting down")
+            return
+        }
+        log.info("saving settings")
+        saveMuSettings()
+        log.info("shutting down trust subscriber")
+        trustSubscriber.stop()
+        log.info("shutting down download manager")
+        downloadManager.shutdown()
+        log.info("shutting down connection acceptor")
+        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 chat server")
+        chatServer.stop()
+        log.info("shutting down chat manager")
+        chatManager.shutdown()
+        log.info("shutting down connection manager")
+        connectionManager.shutdown()
+        if (router != null) {
+            log.info("shutting down embedded router")
+            router.shutdown(0)
+        }
+        log.info("shutdown complete")
     }
     
-    public void shutdown() {
-        connectionManager.shutdown()
+    public void saveMuSettings() {
+        File f = new File(home, "MuWire.properties")
+        f.withPrintWriter("UTF-8", { muOptions.write(it) })
     }
 
     static main(args) {
@@ -210,7 +419,7 @@ public class Core {
             log.info("creating home dir")
             home.mkdir()
         }
-        
+
         def props = new Properties()
         def propsFile = new File(home, "MuWire.properties")
         if (propsFile.exists()) {
@@ -226,10 +435,10 @@ public class Core {
                 props.write(it)
             }
         }
-        
-        Core core = new Core(props, home)
+
+        Core core = new Core(props, home, "0.6.5")
         core.startServices()
-        
+
         // ... at the end, sleep or execute script
         if (args.length == 0) {
             log.info("initialized everything, sleeping")

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();
-	final long seqNo
-	final long timestamp
-	
-	Event() {
-		seqNo = SEQ_NO.getAndIncrement()
-		timestamp = System.currentTimeMillis()
-	}
-	
-	@Override
-	public String toString() {
-		"seqNo $seqNo timestamp $timestamp"
-	}
+    private static final AtomicLong SEQ_NO = new AtomicLong();
+    final long seqNo
+    final long timestamp
+
+    Event() {
+        seqNo = SEQ_NO.getAndIncrement()
+        timestamp = System.currentTimeMillis()
+    }
+
+    @Override
+    public String toString() {
+        "seqNo $seqNo timestamp $timestamp"
+    }
 }

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

@@ -3,44 +3,54 @@ package com.muwire.core
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
+import java.util.logging.Level
 
 import com.muwire.core.files.FileSharedEvent
 
 import groovy.util.logging.Log
 @Log
 class EventBus {
-	
-	private Map handlers = new HashMap()
-	private final Executor executor = Executors.newSingleThreadExecutor {r ->
-		def rv = new Thread(r)
-		rv.setDaemon(true)
-		rv.setName("event-bus")
-		rv
-	}
 
-	void publish(Event e) {
-		executor.execute({publishInternal(e)} as Runnable)
-	}
-	
-	private void publishInternal(Event e) {
-		log.fine "publishing event $e of type ${e.getClass().getSimpleName()}"
-		def currentHandlers
-		final def clazz = e.getClass()
-		synchronized(this) {
-			currentHandlers = handlers.getOrDefault(clazz, [])
-		}
-		currentHandlers.each {
-			it."on${clazz.getSimpleName()}"(e)
-		}
-	}
-	
-	synchronized void register(Class<? extends Event> eventType, def handler) {
-		log.info "Registering $handler for type $eventType"
-		def currentHandlers = handlers.get(eventType)
-		if (currentHandlers == null) {
-			currentHandlers = new CopyOnWriteArrayList()
-			handlers.put(eventType, currentHandlers)
-		}
-		currentHandlers.add handler
-	}
+    private Map handlers = new HashMap()
+    private final Executor executor = Executors.newSingleThreadExecutor {r ->
+        def rv = new Thread(r)
+        rv.setDaemon(true)
+        rv.setName("event-bus")
+        rv
+    }
+
+    void publish(Event e) {
+        executor.execute({publishInternal(e)} as Runnable)
+    }
+
+    private void publishInternal(Event e) {
+        log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
+        def currentHandlers
+        final def clazz = e.getClass()
+        synchronized(this) {
+            currentHandlers = handlers.getOrDefault(clazz, [])
+        }
+        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) {
+        log.info "Registering $handler for type $eventType"
+        def currentHandlers = handlers.get(eventType)
+        if (currentHandlers == null) {
+            currentHandlers = new CopyOnWriteArrayList()
+            handlers.put(eventType, currentHandlers)
+        }
+        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,62 +1,177 @@
 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
+import net.i2p.util.ConcurrentHashSet
 
 class MuWireSettings {
-	
+
     final boolean isLeaf
     boolean allowUntrusted
+    boolean searchExtraHop
+    boolean allowTrustLists
+    int trustListInterval
+    Set<Persona> trustSubscriptions
+    int downloadRetryInterval
+    int totalUploadSlots
+    int uploadSlotsPerUser
+    int updateCheckInterval
+    long lastUpdateCheck
+    boolean autoDownloadUpdate
+    String updateType
     String nickname
     File downloadLocation
-    String sharedFiles
+    File incompleteLocation
     CrawlerResponse crawlerResponse
-    
-	MuWireSettings() {
+    boolean shareDownloadedFiles
+    boolean shareHiddenFiles
+    boolean searchComments
+    boolean browseFiles
+    boolean startChatServer
+    int maxChatConnections
+    boolean advertiseChat
+    Set<String> watchedDirectories
+    float downloadSequentialRatio
+    int hostClearInterval, hostHopelessInterval, hostRejectInterval
+    int meshExpiration
+    int speedSmoothSeconds
+    boolean embeddedRouter
+    int inBw, outBw
+    Set<String> watchedKeywords
+    Set<String> watchedRegexes
+    Set<String> negativeFileTree
+
+    MuWireSettings() {
         this(new Properties())
     }
-	
-	MuWireSettings(Properties props) {
-		isLeaf = Boolean.valueOf(props.get("leaf","false"))
-		allowUntrusted = Boolean.valueOf(props.get("allowUntrusted","true"))
-		crawlerResponse = CrawlerResponse.valueOf(props.get("crawlerResponse","REGISTERED"))
+
+    MuWireSettings(Properties props) {
+        isLeaf = Boolean.valueOf(props.get("leaf","false"))
+        allowUntrusted = Boolean.valueOf(props.getProperty("allowUntrusted","true"))
+        searchExtraHop = Boolean.valueOf(props.getProperty("searchExtraHop","false"))
+        allowTrustLists = Boolean.valueOf(props.getProperty("allowTrustLists","true"))
+        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", 
+        downloadLocation = new File((String)props.getProperty("downloadLocation",
             System.getProperty("user.home")))
-        sharedFiles = props.getProperty("sharedFiles")
-	}
-    
-    void write(OutputStream out) throws IOException {
+        String incompleteLocationProp = props.getProperty("incompleteLocation")
+        if (incompleteLocationProp != null)
+            incompleteLocation = new File(incompleteLocationProp)
+        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","60"))
+        updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","24"))
+        lastUpdateCheck = Long.parseLong(props.getProperty("lastUpdateChec","0"))
+        autoDownloadUpdate = Boolean.parseBoolean(props.getProperty("autoDownloadUpdate","true"))
+        updateType = props.getProperty("updateType","jar")
+        shareDownloadedFiles = Boolean.parseBoolean(props.getProperty("shareDownloadedFiles","true"))
+        shareHiddenFiles = Boolean.parseBoolean(props.getProperty("shareHiddenFiles","false"))
+        downloadSequentialRatio = Float.valueOf(props.getProperty("downloadSequentialRatio","0.8"))
+        hostClearInterval = Integer.valueOf(props.getProperty("hostClearInterval","15"))
+        hostHopelessInterval = Integer.valueOf(props.getProperty("hostHopelessInterval", "1440"))
+        hostRejectInterval = Integer.valueOf(props.getProperty("hostRejectInterval", "1"))
+        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"))
+        searchComments = Boolean.valueOf(props.getProperty("searchComments","true"))
+        browseFiles = Boolean.valueOf(props.getProperty("browseFiles","true"))
+        speedSmoothSeconds = Integer.valueOf(props.getProperty("speedSmoothSeconds","60"))
+        totalUploadSlots = Integer.valueOf(props.getProperty("totalUploadSlots","-1"))
+        uploadSlotsPerUser = Integer.valueOf(props.getProperty("uploadSlotsPerUser","-1"))
+        startChatServer = Boolean.valueOf(props.getProperty("startChatServer","false"))
+        maxChatConnections = Integer.valueOf(props.get("maxChatConnections", "-1"))
+        advertiseChat = Boolean.valueOf(props.getProperty("advertiseChat","true"))
+        
+        watchedDirectories = DataUtil.readEncodedSet(props, "watchedDirectories")
+        watchedKeywords = DataUtil.readEncodedSet(props, "watchedKeywords")
+        watchedRegexes = DataUtil.readEncodedSet(props, "watchedRegexes")
+        negativeFileTree = DataUtil.readEncodedSet(props, "negativeFileTree")
+
+        trustSubscriptions = new HashSet<>()
+        if (props.containsKey("trustSubscriptions")) {
+            props.getProperty("trustSubscriptions").split(",").each {
+                trustSubscriptions.add(new Persona(new ByteArrayInputStream(Base64.decode(it))))
+            }
+        }
+        
+        
+    }
+
+    void write(Writer out) throws IOException {
         Properties props = new Properties()
         props.setProperty("leaf", isLeaf.toString())
         props.setProperty("allowUntrusted", allowUntrusted.toString())
+        props.setProperty("searchExtraHop", String.valueOf(searchExtraHop))
+        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())
-        if (sharedFiles != null)
-            props.setProperty("sharedFiles", sharedFiles)
-        props.store(out, "")
+        if (incompleteLocation != null)
+            props.setProperty("incompleteLocation", incompleteLocation.getAbsolutePath())
+        props.setProperty("downloadRetryInterval", String.valueOf(downloadRetryInterval))
+        props.setProperty("updateCheckInterval", String.valueOf(updateCheckInterval))
+        props.setProperty("lastUpdateCheck", String.valueOf(lastUpdateCheck))
+        props.setProperty("autoDownloadUpdate", String.valueOf(autoDownloadUpdate))
+        props.setProperty("updateType",String.valueOf(updateType))
+        props.setProperty("shareDownloadedFiles", String.valueOf(shareDownloadedFiles))
+        props.setProperty("shareHiddenFiles", String.valueOf(shareHiddenFiles))
+        props.setProperty("downloadSequentialRatio", String.valueOf(downloadSequentialRatio))
+        props.setProperty("hostClearInterval", String.valueOf(hostClearInterval))
+        props.setProperty("hostHopelessInterval", String.valueOf(hostHopelessInterval))
+        props.setProperty("hostRejectInterval", String.valueOf(hostRejectInterval))
+        props.setProperty("meshExpiration", String.valueOf(meshExpiration))
+        props.setProperty("embeddedRouter", String.valueOf(embeddedRouter))
+        props.setProperty("inBw", String.valueOf(inBw))
+        props.setProperty("outBw", String.valueOf(outBw))
+        props.setProperty("searchComments", String.valueOf(searchComments))
+        props.setProperty("browseFiles", String.valueOf(browseFiles))
+        props.setProperty("speedSmoothSeconds", String.valueOf(speedSmoothSeconds))
+        props.setProperty("totalUploadSlots", String.valueOf(totalUploadSlots))
+        props.setProperty("uploadSlotsPerUser", String.valueOf(uploadSlotsPerUser))
+        props.setProperty("startChatServer", String.valueOf(startChatServer))
+        props.setProperty("maxChatConnectios", String.valueOf(maxChatConnections))
+        props.setProperty("advertiseChat", String.valueOf(advertiseChat))
+
+        DataUtil.writeEncodedSet(watchedDirectories, "watchedDirectories", props)
+        DataUtil.writeEncodedSet(watchedKeywords, "watchedKeywords", props)
+        DataUtil.writeEncodedSet(watchedRegexes, "watchedRegexes", props)
+        DataUtil.writeEncodedSet(negativeFileTree, "negativeFileTree", props)
+
+        if (!trustSubscriptions.isEmpty()) {
+            String encoded = trustSubscriptions.stream().
+                map({it.toBase64()}).
+                collect(Collectors.joining(","))
+            props.setProperty("trustSubscriptions", encoded)
+        }
+
+        props.store(out, "This file is UTF-8")
+    }
+
+    boolean isLeaf() {
+        isLeaf
+    }
+
+    boolean allowUntrusted() {
+        allowUntrusted
+    }
+
+    void setAllowUntrusted(boolean allowUntrusted) {
+        this.allowUntrusted = allowUntrusted
+    }
+
+    CrawlerResponse getCrawlerResponse() {
+        crawlerResponse
+    }
+
+    void setCrawlerResponse(CrawlerResponse crawlerResponse) {
+        this.crawlerResponse = crawlerResponse
     }
 
-	boolean isLeaf() {
-		isLeaf
-	}
-	
-	boolean allowUntrusted() {
-		allowUntrusted
-	} 
-	
-	void setAllowUntrusted(boolean allowUntrusted) {
-		this.allowUntrusted = allowUntrusted
-	}
-	
-	CrawlerResponse getCrawlerResponse() {
-		crawlerResponse
-	}
-	
-	void setCrawlerResponse(CrawlerResponse crawlerResponse) {
-		this.crawlerResponse = crawlerResponse
-	}
-    
     String getNickname() {
         nickname
     }

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

@@ -1,45 +0,0 @@
-package com.muwire.core
-
-import java.nio.charset.StandardCharsets
-
-/**
- * A name of persona, file or search term
- */
-public class Name {
-    final String name
-    
-    Name(String name) {
-        this.name = name
-    }
-    
-    Name(InputStream nameStream) throws IOException {
-        DataInputStream dis = new DataInputStream(nameStream)
-        int length = dis.readUnsignedShort()
-        byte [] nameBytes = new byte[length]
-        dis.readFully(nameBytes)
-        this.name = new String(nameBytes, StandardCharsets.UTF_8)
-    }
-    
-    public void write(OutputStream out) throws IOException {
-        DataOutputStream dos = new DataOutputStream(out)
-        dos.writeShort(name.length())
-        dos.write(name.getBytes(StandardCharsets.UTF_8))
-    }
-    
-    public getName() {
-        name
-    }
-    
-    @Override
-    public int hashCode() {
-        name.hashCode()
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Name))
-            return false
-        Name other = (Name)o
-        name.equals(other.name)
-    }
-}

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

@@ -1,74 +0,0 @@
-package com.muwire.core
-
-import net.i2p.crypto.DSAEngine
-import net.i2p.crypto.SigType
-import net.i2p.data.Destination
-import net.i2p.data.Signature
-import net.i2p.data.SigningPublicKey
-
-public class Persona {
-    private static final int SIG_LEN = Constants.SIG_TYPE.getSigLen()
-    
-    private final byte version
-    private final Name name
-    private final Destination destination
-    private final byte[] sig
-    private volatile String humanReadableName
-    private volatile byte[] payload
-    
-    public Persona(InputStream personaStream) throws IOException, InvalidSignatureException {
-        version = (byte) (personaStream.read() & 0xFF)
-        if (version != Constants.PERSONA_VERSION)
-            throw new IOException("Unknown version "+version)
-            
-        name = new Name(personaStream)
-        destination = Destination.create(personaStream)
-        sig = new byte[SIG_LEN]
-        DataInputStream dis = new DataInputStream(personaStream)
-        dis.readFully(sig)
-        if (!verify(version, name, destination, sig))
-            throw new InvalidSignatureException(getHumanReadableName() + " didn't verify")
-    }
-    
-    private static boolean verify(byte version, Name name, Destination destination, byte [] sig) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream()
-        baos.write(version)
-        name.write(baos)
-        destination.writeBytes(baos)
-        byte[] payload = baos.toByteArray()
-        SigningPublicKey spk = destination.getSigningPublicKey()
-        Signature signature = new Signature(Constants.SIG_TYPE, sig)
-        DSAEngine.getInstance().verifySignature(signature, payload, spk)
-    }
-    
-    public void write(OutputStream out) throws IOException {
-        if (payload == null) {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream()
-            baos.write(version)
-            name.write(baos)
-            destination.writeBytes(baos)
-            baos.write(sig)
-            payload = baos.toByteArray()
-        }
-        out.write(payload)
-    }
-    
-    public String getHumanReadableName() {
-        if (humanReadableName == null) 
-            humanReadableName = name.getName() + "@" + destination.toBase32().substring(0,32)
-        humanReadableName
-    }
-    
-    @Override
-    public int hashCode() {
-        name.hashCode() ^ destination.hashCode()
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Persona))
-            return false
-        Persona other = (Persona)o
-        name.equals(other.name) && destination.equals(other.destination)
-    }
-}

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

@@ -0,0 +1,4 @@
+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
-	
-	abstract void load()
-	
-	void waitForLoad() {
-		while (!loaded)
-			Thread.sleep(10)
-	}
+    volatile boolean loaded
+
+    abstract void load()
+
+    void waitForLoad() {
+        while (!loaded)
+            Thread.sleep(10)
+    }
 }

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

@@ -0,0 +1,91 @@
+package com.muwire.core
+
+class SplitPattern {
+    
+    public static final String SPLIT_PATTERN = "[\\*\\+\\-,\\.:;\\(\\)=_/\\\\\\!\\\"\\\'\\\$%\\|\\[\\]\\{\\}\\?\r\n]";
+ 
+    private static final Set<Character> SPLIT_CHARS = new HashSet<>()
+    static {
+        SPLIT_CHARS.with { 
+            add(' '.toCharacter())
+            add('*'.toCharacter())
+            add('+'.toCharacter())
+            add('-'.toCharacter())
+            add(','.toCharacter())
+            add('.'.toCharacter())
+            add(':'.toCharacter())
+            add(';'.toCharacter())
+            add('('.toCharacter())
+            add(')'.toCharacter())
+            add('='.toCharacter())
+            add('_'.toCharacter())
+            add('/'.toCharacter())
+            add('\\'.toCharacter())
+            add('!'.toCharacter())
+            add('\''.toCharacter())
+            add('$'.toCharacter())
+            add('%'.toCharacter())
+            add('|'.toCharacter())
+            add('['.toCharacter())
+            add(']'.toCharacter())
+            add('{'.toCharacter())
+            add('}'.toCharacter())
+            add('?'.toCharacter())
+        }
+    }
+    
+    public static String[] termify(final String source) {
+        String lowercase = source.toLowerCase().trim()
+        
+        def rv = []
+        int pos = 0
+        int quote = -1
+        
+        StringBuilder tmp = new StringBuilder()
+        while(pos < lowercase.length()) {
+            char c = lowercase.charAt(pos++)
+            if (quote < 0 && c == '"') {
+                quote = pos - 1
+                continue
+            }
+            if (quote >= 0) {
+                if (c == '"') {
+                    quote = -1
+                    if (tmp.length() != 0) {
+                        rv << tmp.toString()
+                        tmp = new StringBuilder()
+                    }
+                } else
+                    tmp.append(c)
+            } else if (SPLIT_CHARS.contains(c)) {
+                if (tmp.length() != 0) {
+                    rv << tmp.toString()
+                    tmp = new StringBuilder()
+                }
+            } else
+                tmp.append c
+        }
+        
+        // check if odd number of quotes and re-tokenize from last quote
+        if (quote >= 0) {
+            tmp = new StringBuilder()
+            pos = quote + 1
+            while(pos < lowercase.length()) {
+                char c = lowercase.charAt(pos++)
+                if (SPLIT_CHARS.contains(c)) {
+                    if (tmp.length() > 0) {
+                        rv << tmp.toString()
+                        tmp = new StringBuilder()
+                    }
+                } else
+                    tmp.append(c)
+            }
+        }
+        
+        if (tmp.length() > 0)
+            rv << tmp.toString()
+        
+        rv
+    }   
+    
+}

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

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

core/src/main/groovy/com/muwire/core/chat/ChatAction.java

@@ -0,0 +1,20 @@
+package com.muwire.core.chat;
+
+enum ChatAction {
+    JOIN(true, false, true), 
+    LEAVE(false, false, true), 
+    SAY(false, false, true), 
+    LIST(true, true, true), 
+    HELP(true, true, true),
+    INFO(true, true, true),
+    JOINED(true, true, false);
+    
+    final boolean console;
+    final boolean stateless;
+    final boolean user;
+    ChatAction(boolean console, boolean stateless, boolean user) {
+        this.console = console;
+        this.stateless = stateless;
+        this.user = user;
+    }
+}

core/src/main/groovy/com/muwire/core/chat/ChatClient.groovy

@@ -0,0 +1,119 @@
+package com.muwire.core.chat
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+
+import com.muwire.core.Constants
+import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
+import com.muwire.core.Persona
+import com.muwire.core.connection.Endpoint
+import com.muwire.core.connection.I2PConnector
+import com.muwire.core.trust.TrustService
+import com.muwire.core.util.DataUtil
+
+import groovy.util.logging.Log
+
+@Log
+class ChatClient implements Closeable {
+    
+    private static final long REJECTION_BACKOFF = 60 * 1000
+    
+    private static final Executor CONNECTOR = Executors.newCachedThreadPool()
+    
+    private final I2PConnector connector
+    private final EventBus eventBus
+    private final Persona host, me
+    private final TrustService trustService
+    private final MuWireSettings settings
+    
+    private volatile ChatConnection connection
+    private volatile boolean connectInProgress
+    private volatile long lastRejectionTime
+    private volatile Thread connectThread
+    
+    ChatClient(I2PConnector connector, EventBus eventBus, Persona host, Persona me, TrustService trustService,
+        MuWireSettings settings) {
+        this.connector = connector
+        this.eventBus = eventBus
+        this.host = host
+        this.me = me
+        this.trustService = trustService
+        this.settings = settings
+    }
+    
+    void connectIfNeeded() {
+        if (connection != null || connectInProgress || (System.currentTimeMillis() - lastRejectionTime < REJECTION_BACKOFF))
+            return
+        CONNECTOR.execute({connect()})
+    }
+    
+    private void connect() {
+        connectInProgress = true
+        connectThread = Thread.currentThread()
+        Endpoint endpoint = null
+        try {
+            eventBus.publish(new ChatConnectionEvent(status : ChatConnectionAttemptStatus.CONNECTING, persona : host))
+            endpoint = connector.connect(host.destination)
+            DataOutputStream dos = new DataOutputStream(endpoint.getOutputStream())
+            DataInputStream dis = new DataInputStream(endpoint.getInputStream())
+            
+            dos.with {
+                write("IRC\r\n".getBytes(StandardCharsets.US_ASCII))
+                write("Version:${Constants.CHAT_VERSION}\r\n".getBytes(StandardCharsets.US_ASCII))
+                write("Persona:${me.toBase64()}\r\n".getBytes(StandardCharsets.US_ASCII))
+                write("\r\n".getBytes(StandardCharsets.US_ASCII))
+                flush()
+            }
+                
+            String codeString = DataUtil.readTillRN(dis)
+            int code = Integer.parseInt(codeString.split(" ")[0])
+            
+            if (code == 429) {
+                eventBus.publish(new ChatConnectionEvent(status : ChatConnectionAttemptStatus.REJECTED, persona : host))
+                endpoint.close()
+                lastRejectionTime = System.currentTimeMillis()
+                return
+            }
+            
+            if (code != 200) 
+                throw new Exception("unknown code $code")
+
+            Map<String,String> headers = DataUtil.readAllHeaders(dis)
+            if (!headers.containsKey('Version'))
+                throw new Exception("Version header missing")
+            
+            int version = Integer.parseInt(headers['Version'])
+            if (version != Constants.CHAT_VERSION)
+                throw new Exception("Unknown chat version $version")
+            
+            connection = new ChatConnection(eventBus, endpoint, host, false, trustService, settings)
+            connection.start()
+            eventBus.publish(new ChatConnectionEvent(status : ChatConnectionAttemptStatus.SUCCESSFUL, persona : host, 
+                connection : connection))
+        } catch (Exception e) {
+            eventBus.publish(new ChatConnectionEvent(status : ChatConnectionAttemptStatus.FAILED, persona : host))
+            endpoint?.close()
+        } finally {
+            connectInProgress = false
+            connectThread = null
+        }
+    }
+    
+    void disconnected() {
+        connectInProgress = false
+        connection = null
+    }
+    
+    @Override
+    public void close() {
+        connectThread?.interrupt()
+        connection?.close()
+        eventBus.publish(new ChatConnectionEvent(status : ChatConnectionAttemptStatus.DISCONNECTED, persona : host))
+    }
+    
+    void ping() {
+        connection?.sendPing()
+    }
+}

core/src/main/groovy/com/muwire/core/chat/ChatCommand.groovy

@@ -0,0 +1,28 @@
+package com.muwire.core.chat
+
+class ChatCommand {
+    private final ChatAction action
+    private final String payload
+    final String source
+    ChatCommand(String source) {
+        if (source.charAt(0) != '/')
+            throw new Exception("command doesn't start with / $source")
+        
+        int position = 1
+        StringBuilder sb = new StringBuilder()
+        while(position < source.length()) {
+            char c = source.charAt(position)
+            if (c == ' ')
+                break
+            sb.append(c)
+            position++    
+        }
+        String command = sb.toString().toUpperCase()
+        action = ChatAction.valueOf(command)
+        if (position < source.length())
+            payload = source.substring(position + 1)
+        else
+            payload = ""
+        this.source = source
+    }
+}

core/src/main/groovy/com/muwire/core/chat/ChatConnection.groovy

@@ -0,0 +1,278 @@
+package com.muwire.core.chat
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.logging.Level
+
+import com.muwire.core.Constants
+import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
+import com.muwire.core.Persona
+import com.muwire.core.connection.Endpoint
+import com.muwire.core.trust.TrustLevel
+import com.muwire.core.trust.TrustService
+
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import groovy.util.logging.Log
+import net.i2p.crypto.DSAEngine
+import net.i2p.data.Base64
+import net.i2p.data.Signature
+import net.i2p.data.SigningPrivateKey
+
+@Log
+class ChatConnection implements ChatLink {
+    
+    private static final long PING_INTERVAL = 20000
+    private static final long MAX_CHAT_AGE = 5 * 60 * 1000
+    
+    private final EventBus eventBus
+    private final Endpoint endpoint
+    private final Persona persona
+    private final boolean incoming
+    private final TrustService trustService
+    private final MuWireSettings settings
+    
+    private final AtomicBoolean running = new AtomicBoolean()
+    private final BlockingQueue messages = new LinkedBlockingQueue()
+    private final Thread reader, writer
+    private final LinkedList<Long> timestamps = new LinkedList<>()
+    private final BlockingQueue incomingEvents = new LinkedBlockingQueue()
+    
+    private final DataInputStream dis
+    private final DataOutputStream dos
+    
+    private final JsonSlurper slurper = new JsonSlurper()
+    
+    private volatile long lastPingSentTime
+    
+    ChatConnection(EventBus eventBus, Endpoint endpoint, Persona persona, boolean incoming,
+        TrustService trustService, MuWireSettings settings) {
+        this.eventBus = eventBus
+        this.endpoint = endpoint
+        this.persona = persona
+        this.incoming = incoming
+        this.trustService = trustService
+        this.settings = settings
+        
+        this.dis = new DataInputStream(endpoint.getInputStream())
+        this.dos = new DataOutputStream(endpoint.getOutputStream())
+
+        this.reader = new Thread({readLoop()} as Runnable)
+        this.reader.setName("reader-${persona.getHumanReadableName()}")
+        this.reader.setDaemon(true)
+        
+        this.writer = new Thread({writeLoop()} as Runnable)
+        this.writer.setName("writer-${persona.getHumanReadableName()}")
+        this.writer.setDaemon(true)        
+    }
+    
+    void start() {
+        if (!running.compareAndSet(false, true)) {
+            log.log(Level.WARNING,"${persona.getHumanReadableName()} already running", new Exception())
+            return
+        }
+        reader.start()
+        writer.start()
+    }
+    
+    @Override
+    public boolean isUp() {
+        running.get()
+    }
+    
+    @Override
+    public Persona getPersona() {
+        persona
+    }
+    
+    @Override
+    public void close() {
+        if (!running.compareAndSet(true, false)) {
+            log.log(Level.WARNING,"${persona.getHumanReadableName()} already closed", new Exception())
+            return
+        }
+        log.info("Closing "+persona.getHumanReadableName())
+        reader.interrupt()
+        writer.interrupt()
+        endpoint.close()
+        eventBus.publish(new ChatDisconnectionEvent(persona : persona))
+    }
+    
+    private void readLoop() {
+        try {
+            while(running.get())
+                read()
+        } catch( InterruptedException | SocketTimeoutException ignored) {
+        } catch (Exception e) {
+          log.log(Level.WARNING,"unhandled exception in reader", e)  
+        } finally {
+            close()
+        }
+    }
+    
+    private void writeLoop() {
+        try {
+            while(running.get()) {
+                def message = messages.take()
+                write(message)
+            }
+        } catch (InterruptedException ignore) {
+        } catch (Exception e) {
+            log.log(Level.WARNING,"unhandled exception in writer",e)
+        } finally {
+            close()
+        }
+    }
+    
+    private void read() {
+        int length = dis.readUnsignedShort()
+        byte [] payload = new byte[length]
+        dis.readFully(payload)
+        def json = slurper.parse(payload)
+        if (json.type == null)
+            throw new Exception("missing json type")
+        switch(json.type) {
+            case "Ping" : break // just ignore
+            case "Chat" : handleChat(json); break
+            case "Leave": handleLeave(json); break
+            default :
+                throw new Exception("unknown json type ${json.type}")
+        }
+    }
+    
+    private void write(Object message) {
+        byte [] payload = JsonOutput.toJson(message).bytes
+        dos.with {
+            writeShort(payload.length)
+            write(payload)
+            flush()
+        }
+    }
+    
+    void sendPing() {
+        long now = System.currentTimeMillis()
+        if (now - lastPingSentTime < PING_INTERVAL)
+            return
+        def ping = [:]
+        ping.type = "Ping"
+        ping.version = 1
+        messages.put(ping)
+        lastPingSentTime = now
+    }
+    
+    private void handleChat(def json) {
+        UUID uuid = UUID.fromString(json.uuid)
+        Persona host = fromString(json.host)
+        Persona sender = fromString(json.sender)
+        long chatTime = json.chatTime
+        String room = json.room
+        String payload = json.payload
+        byte [] sig = Base64.decode(json.sig)
+        
+        if (!verify(uuid,host,sender,chatTime,room,payload,sig)) {
+            log.warning("chat didn't verify")
+            return
+        }
+        if (incoming) {
+            if (sender.destination != endpoint.destination) {
+                log.warning("Sender destination mismatch, dropping message")
+                return
+            }
+        } else {
+            if (host.destination != endpoint.destination) {
+                log.warning("Host destination mismatch, dropping message")
+                return
+            }
+        }
+        if (System.currentTimeMillis() - chatTime > MAX_CHAT_AGE) {
+            log.warning("Chat too old, dropping")
+            return
+        }
+        switch(trustService.getLevel(sender.destination)) {
+            case TrustLevel.TRUSTED : break
+            case TrustLevel.NEUTRAL :
+                if (!settings.allowUntrusted) 
+                    return
+                else
+                    break
+            case TrustLevel.DISTRUSTED :
+                return
+        }
+        def event = new ChatMessageEvent( uuid : uuid, payload : payload, sender : sender,
+            host : host, room : room, chatTime : chatTime, sig : sig)
+        eventBus.publish(event)
+        if (!incoming)
+            incomingEvents.put(event)
+    }
+    
+    private void handleLeave(def json) {
+        Persona leaver = fromString(json.persona)
+        eventBus.publish(new UserDisconnectedEvent(user : leaver, host : persona))
+        incomingEvents.put(leaver)
+    }
+    
+    private static Persona fromString(String base64) {
+        new Persona(new ByteArrayInputStream(Base64.decode(base64)))
+    }
+    
+    private static boolean verify(UUID uuid, Persona host, Persona sender, long chatTime, 
+        String room, String payload, byte []sig) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        DataOutputStream daos = new DataOutputStream(baos)
+        daos.write(uuid.toString().bytes)
+        host.write(daos)
+        sender.write(daos)
+        daos.writeLong(chatTime)
+        daos.write(room.getBytes(StandardCharsets.UTF_8))
+        daos.write(payload.getBytes(StandardCharsets.UTF_8))
+        daos.close()
+        byte [] signed = baos.toByteArray()
+        def spk = sender.destination.getSigningPublicKey()
+        def signature = new Signature(Constants.SIG_TYPE, sig)
+        DSAEngine.getInstance().verifySignature(signature, signed, spk)
+    }
+    
+    public static byte[] sign(UUID uuid, long chatTime, String room, String words, Persona sender, Persona host, SigningPrivateKey spk) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        DataOutputStream daos = new DataOutputStream(baos)
+        daos.with {
+            write(uuid.toString().bytes)
+            host.write(daos)
+            sender.write(daos)
+            writeLong(chatTime)
+            write(room.getBytes(StandardCharsets.UTF_8))
+            write(words.getBytes(StandardCharsets.UTF_8))
+            close()
+        }
+        byte [] payload = baos.toByteArray()
+        Signature sig = DSAEngine.getInstance().sign(payload, spk)
+        sig.getData()
+    }
+    
+    void sendChat(ChatMessageEvent e) {
+        def chat = [:]
+        chat.type = "Chat"
+        chat.uuid = e.uuid.toString()
+        chat.host = e.host.toBase64()
+        chat.sender = e.sender.toBase64()
+        chat.chatTime = e.chatTime
+        chat.room = e.room
+        chat.payload = e.payload
+        chat.sig = Base64.encode(e.sig)
+        messages.put(chat)
+    }
+    
+    void sendLeave(Persona p) {
+        def leave = [:]
+        leave.type = "Leave"
+        leave.persona = p.toBase64()
+        messages.put(leave)
+    }
+    
+    public Object nextEvent() {
+        incomingEvents.take()
+    }
+}

core/src/main/groovy/com/muwire/core/chat/ChatConnectionAttemptStatus.java

@@ -0,0 +1,5 @@
+package com.muwire.core.chat;
+
+public enum ChatConnectionAttemptStatus {
+    CONNECTING, SUCCESSFUL, REJECTED, FAILED, DISCONNECTED
+}

core/src/main/groovy/com/muwire/core/chat/ChatConnectionEvent.groovy

@@ -0,0 +1,10 @@
+package com.muwire.core.chat
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class ChatConnectionEvent extends Event {
+    ChatConnectionAttemptStatus status
+    Persona persona
+    ChatLink connection
+}

core/src/main/groovy/com/muwire/core/chat/ChatDisconnectionEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.chat
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class ChatDisconnectionEvent extends Event {
+    Persona persona
+}

core/src/main/groovy/com/muwire/core/chat/ChatLink.java

@@ -0,0 +1,14 @@
+package com.muwire.core.chat;
+
+import java.io.Closeable;
+
+import com.muwire.core.Persona;
+
+public interface ChatLink extends Closeable {
+    public Persona getPersona();
+    public boolean isUp();
+    public void sendChat(ChatMessageEvent e);
+    public void sendLeave(Persona p);
+    public void sendPing();
+    public Object nextEvent() throws InterruptedException;
+}

core/src/main/groovy/com/muwire/core/chat/ChatManager.groovy

@@ -0,0 +1,73 @@
+package com.muwire.core.chat
+
+import java.util.concurrent.ConcurrentHashMap
+
+import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
+import com.muwire.core.Persona
+import com.muwire.core.connection.I2PConnector
+import com.muwire.core.trust.TrustService
+
+class ChatManager {
+    private final EventBus eventBus
+    private final Persona me
+    private final I2PConnector connector
+    private final TrustService trustService
+    private final MuWireSettings settings
+    
+    private final Map<Persona, ChatClient> clients = new ConcurrentHashMap<>()
+    
+    ChatManager(EventBus eventBus, Persona me, I2PConnector connector, TrustService trustService, 
+        MuWireSettings settings) {
+        this.eventBus = eventBus
+        this.me = me
+        this.connector = connector
+        this.trustService = trustService
+        this.settings = settings
+        
+        Timer timer = new Timer("chat-connector", true)
+        timer.schedule({connect()} as TimerTask, 1000, 1000)
+    }
+    
+    void onUIConnectChatEvent(UIConnectChatEvent e) {
+        if (e.host == me) { 
+            eventBus.publish(new ChatConnectionEvent(status : ChatConnectionAttemptStatus.SUCCESSFUL, 
+                persona : me, connection : LocalChatLink.INSTANCE))
+        } else {
+            ChatClient client = new ChatClient(connector, eventBus, e.host, me, trustService, settings)
+            clients.put(e.host, client)
+        }
+    }
+    
+    void onUIDisconnectChatEvent(UIDisconnectChatEvent e) {
+        if (e.host == me)
+            return
+        ChatClient client = clients.remove(e.host)
+        client?.close()
+    }
+    
+    void onChatMessageEvent(ChatMessageEvent e) {
+        if (e.host == me) 
+            return
+        if (e.sender != me)
+            return
+        clients[e.host]?.connection?.sendChat(e)
+    }
+    
+    void onChatDisconnectionEvent(ChatDisconnectionEvent e) {
+        clients[e.persona]?.disconnected()
+    }
+    
+    private void connect() {
+        clients.each { k, v -> 
+            v.connectIfNeeded()
+            v.ping() 
+        }
+    }
+    
+    void shutdown() {
+        clients.each { k, v ->
+            v.close() 
+        }
+    }
+}

core/src/main/groovy/com/muwire/core/chat/ChatMessageEvent.groovy

@@ -0,0 +1,13 @@
+package com.muwire.core.chat
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class ChatMessageEvent extends Event {
+    UUID uuid
+    String payload
+    Persona sender, host
+    String room
+    long chatTime
+    byte [] sig
+}

core/src/main/groovy/com/muwire/core/chat/ChatServer.groovy

@@ -0,0 +1,302 @@
+package com.muwire.core.chat
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.logging.Level
+import java.util.stream.Collectors
+
+import com.muwire.core.Constants
+import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
+import com.muwire.core.Persona
+import com.muwire.core.connection.Endpoint
+import com.muwire.core.trust.TrustEvent
+import com.muwire.core.trust.TrustLevel
+import com.muwire.core.trust.TrustService
+import com.muwire.core.util.DataUtil
+
+import groovy.util.logging.Log
+import net.i2p.data.Base64
+import net.i2p.data.Destination
+import net.i2p.data.SigningPrivateKey
+import net.i2p.util.ConcurrentHashSet
+
+@Log
+class ChatServer {
+    public static final String CONSOLE = "__CONSOLE__"
+    private final EventBus eventBus
+    private final MuWireSettings settings
+    private final TrustService trustService
+    private final Persona me
+    private final SigningPrivateKey spk
+    
+    private final Map<Destination, ChatLink> connections = new ConcurrentHashMap()
+    private final Map<String, Set<Persona>> rooms = new ConcurrentHashMap<>()
+    private final Map<Persona, Set<String>> memberships = new ConcurrentHashMap<>()
+    
+    private final AtomicBoolean running = new AtomicBoolean()
+    
+    ChatServer(EventBus eventBus, MuWireSettings settings, TrustService trustService, Persona me, SigningPrivateKey spk) {
+        this.eventBus = eventBus
+        this.settings = settings
+        this.trustService = trustService
+        this.me = me
+        this.spk = spk
+        
+        Timer timer = new Timer("chat-server-pinger", true)
+        timer.schedule({sendPings()} as TimerTask, 1000, 1000)
+    }
+    
+    public void start() {
+        running.set(true)
+        connections.put(me.destination, LocalChatLink.INSTANCE)
+        joinRoom(me, CONSOLE)
+        echo("/SAY Welcome to my chat server!  Type /HELP for list of available commands.",me.destination)
+    }
+    
+    private void sendPings() {
+        connections.each { k,v -> 
+            v.sendPing()
+        }
+    }
+    
+    public void handle(Endpoint endpoint) {
+        InputStream is = endpoint.getInputStream()
+        OutputStream os = endpoint.getOutputStream()
+        
+        Map<String, String> headers = DataUtil.readAllHeaders(is)
+        
+        if (!headers.containsKey("Version"))
+            throw new Exception("Version header missing")
+        
+        int version = Integer.parseInt(headers['Version'])
+        if (version != Constants.CHAT_VERSION)
+            throw new Exception("Unknown chat version $version")
+        
+        if (!headers.containsKey('Persona'))
+            throw new Exception("Persona header missing")
+        
+        Persona client = new Persona(new ByteArrayInputStream(Base64.decode(headers['Persona'])))
+        if (client.destination != endpoint.destination)
+            throw new Exception("Client destination mismatch")
+        
+        if (!running.get()) {
+            os.write("400 Chat Not Enabled\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.close()
+            endpoint.close()
+            return
+        }
+        
+        if (connections.containsKey(client.destination) || connections.size() == settings.maxChatConnections) {
+            os.write("429 Rejected\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.close()
+            endpoint.close()
+            return
+        }
+        
+        os.with { 
+            write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
+            write("Version:${Constants.CHAT_VERSION}\r\n".getBytes(StandardCharsets.US_ASCII))
+            write("\r\n".getBytes(StandardCharsets.US_ASCII))
+            flush()
+        }
+        
+        ChatConnection connection = new ChatConnection(eventBus, endpoint, client, true, trustService, settings)
+        connections.put(endpoint.destination, connection)
+        joinRoom(client, CONSOLE)
+        connection.start()
+        echo("/SAY Welcome to my chat server!  Type /HELP for help on available commands",connection.endpoint.destination)
+    }
+    
+    void onChatDisconnectionEvent(ChatDisconnectionEvent e) {
+        ChatConnection con = connections.remove(e.persona.destination)
+        if (con == null)
+            return
+            
+        Set<String> rooms = memberships.get(e.persona)
+        if (rooms != null) {
+            rooms.each { 
+                leaveRoom(e.persona, it)
+            }
+        }
+        connections.each { k, v ->
+            v.sendLeave(e.persona)
+        }
+    }
+    
+    void onTrustEvent(TrustEvent e) {
+        if (e.level == TrustLevel.TRUSTED)
+            return
+        if (settings.allowUntrusted && e.level == TrustLevel.NEUTRAL)
+            return
+        
+        ChatConnection connection = connections.remove(e.persona.destination)
+        connection?.close()
+    }
+    
+    private void joinRoom(Persona p, String room) {
+        Set<Persona> existing = rooms.get(room)
+        if (existing == null) {
+            existing = new ConcurrentHashSet<>()
+            rooms.put(room, existing)
+        }
+        existing.add(p)
+        
+        Set<String> membership = memberships.get(p)
+        if (membership == null) {
+            membership = new ConcurrentHashSet<>()
+            memberships.put(p, membership)
+        }
+        membership.add(room)
+    }
+    
+    private void leaveRoom(Persona p, String room) {
+        Set<Persona> existing = rooms.get(room)
+        if (existing == null) {
+            log.warning(p.getHumanReadableName() + " leaving room they hadn't joined")
+            return
+        }
+        existing.remove(p)
+        if (existing.isEmpty())
+            rooms.remove(room)
+            
+        Set<String> membership = memberships.get(p)
+        if (membership == null) {
+            log.warning(p.getHumanReadableName() + " didn't have any memberships")
+            return
+        }
+        membership.remove(room)
+        if (membership.isEmpty())
+            memberships.remove(p)
+    }
+    
+    void onChatMessageEvent(ChatMessageEvent e) {
+        if (e.host != me)
+            return
+        
+        ChatCommand command
+        try {
+            command = new ChatCommand(e.payload)
+        } catch (Exception badCommand) {
+            log.log(Level.WARNING, "bad chat command",badCommand)
+            return
+        }
+
+        if ((command.action.console && e.room != CONSOLE) ||
+            (!command.action.console && e.room == CONSOLE) ||
+            !command.action.user)
+            return
+            
+        switch(command.action) {
+            case ChatAction.JOIN : processJoin(command.payload, e); break
+            case ChatAction.LEAVE : processLeave(e); break
+            case ChatAction.SAY : processSay(e); break
+            case ChatAction.LIST : processList(e.sender.destination); break
+            case ChatAction.INFO : processInfo(e.sender.destination); break
+            case ChatAction.HELP : processHelp(e.sender.destination); break
+        }
+    }
+    
+    private void processJoin(String room, ChatMessageEvent e) {
+        joinRoom(e.sender, room)
+        rooms[room].each { 
+            if (it == e.sender)
+                return
+            connections[it.destination].sendChat(e)
+        }
+        String payload = rooms[room].stream().filter({it != e.sender}).map({it.toBase64()})
+            .collect(Collectors.joining(","))
+        if (payload.length() == 0) {
+            return
+        }
+        payload = "/JOINED $payload"
+        long now = System.currentTimeMillis()
+        UUID uuid = UUID.randomUUID()
+        byte [] sig = ChatConnection.sign(uuid, now, room, payload, me, me, spk)
+        ChatMessageEvent echo = new ChatMessageEvent(
+            uuid : uuid,
+            payload : payload,
+            sender : me,
+            host : me,
+            room : room,
+            chatTime : now,
+            sig : sig
+            )
+        connections[e.sender.destination].sendChat(echo)
+    }
+    
+    private void processLeave(ChatMessageEvent e) {
+        leaveRoom(e.sender, e.room)
+        rooms.getOrDefault(e.room, []).each { 
+            if (it == e.sender)
+                return
+            connections[it.destination].sendChat(e)
+        }
+    }
+    
+    private void processSay(ChatMessageEvent e) {
+        if (rooms.containsKey(e.room)) {
+            // not a private message
+            rooms[e.room].each { 
+                if (it == e.sender)
+                    return
+                connections[it.destination].sendChat(e)
+            }
+        } else {
+            Persona target = new Persona(new ByteArrayInputStream(Base64.decode(e.room)))
+            connections[target.destination]?.sendChat(e)
+        }
+    }
+    
+    private void processList(Destination d) {
+        String roomList = rooms.keySet().stream().filter({it != CONSOLE}).collect(Collectors.joining("\n"))
+        roomList = "/SAY \nRoom List:\n"+roomList
+        echo(roomList, d)
+    }
+    
+    private void processInfo(Destination d) {
+        String info = "/SAY \nThe address of this server is\n========\n${me.toBase64()}\n========\nCopy/paste the above and share it\n"
+        String connectedUsers = memberships.keySet().stream().map({it.getHumanReadableName()}).collect(Collectors.joining("\n"))
+        info = "${info}\nConnected Users:\n$connectedUsers\n======="
+        echo(info, d)
+    }
+    
+    private void processHelp(Destination d) {
+        String help = """/SAY 
+            Available commands: /JOIN /LEAVE /SAY /LIST /INFO /HELP
+            /JOIN <room name>  - joins a room, or creates one if it does not exist.  You must type this in the console
+            /LEAVE             - leaves a room.  You must type this in the room you want to leave
+            /SAY               - optional, says something in the room you're in
+            /LIST              - lists the existing rooms on this server.  You must type this in the console
+            /INFO              - shows information about this server.  You must type this in the console
+            /HELP              - prints this help message
+            """
+        echo(help, d)
+    }
+    
+    private void echo(String payload, Destination d) {
+        log.info "echoing $payload"
+        UUID uuid = UUID.randomUUID()
+        long now = System.currentTimeMillis()
+        byte [] sig = ChatConnection.sign(uuid, now, CONSOLE, payload, me, me, spk)
+        ChatMessageEvent echo = new ChatMessageEvent(
+            uuid : uuid,
+            payload : payload,
+            sender : me,
+            host : me,
+            room : CONSOLE,
+            chatTime : now,
+            sig : sig
+            )
+        connections[d]?.sendChat(echo)
+    }
+    
+    void stop() {
+        if (running.compareAndSet(true, false)) {
+            connections.each { k, v ->
+                v.close()
+            }
+        }
+    }
+}

core/src/main/groovy/com/muwire/core/chat/LocalChatLink.groovy

@@ -0,0 +1,49 @@
+package com.muwire.core.chat
+
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.LinkedBlockingQueue
+
+import com.muwire.core.Persona
+
+import groovy.util.logging.Log
+
+@Log
+class LocalChatLink implements ChatLink {
+    
+    public static final LocalChatLink INSTANCE = new LocalChatLink()
+    
+    private final BlockingQueue messages = new LinkedBlockingQueue()
+
+    private LocalChatLink() {}
+    
+    @Override
+    public void close() throws IOException {
+    }
+
+    @Override
+    public void sendChat(ChatMessageEvent e) {
+        messages.put(e)
+    }
+
+    @Override
+    public void sendLeave(Persona p) {
+        messages.put(p)
+    }
+
+    @Override
+    public void sendPing() {}
+    
+    @Override
+    public Object nextEvent() {
+        messages.take()
+    }
+
+    @Override
+    public boolean isUp() {
+        true
+    }
+    
+    public Persona getPersona() {
+        null
+    }
+}

core/src/main/groovy/com/muwire/core/chat/UIConnectChatEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.chat
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class UIConnectChatEvent extends Event {
+    Persona host
+}

core/src/main/groovy/com/muwire/core/chat/UIDisconnectChatEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.chat
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class UIDisconnectChatEvent extends Event {
+    Persona host
+}

core/src/main/groovy/com/muwire/core/chat/UserDisconnectedEvent.groovy

@@ -0,0 +1,9 @@
+package com.muwire.core.chat
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class UserDisconnectedEvent extends Event {
+    Persona user
+    Persona host
+}

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

@@ -1,11 +1,20 @@
 package com.muwire.core.connection
 
+import java.nio.charset.StandardCharsets
 import java.util.concurrent.BlockingQueue
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
 import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.logging.Level
 
+import com.muwire.core.Constants
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
+import com.muwire.core.Persona
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.hostcache.HostDiscoveredEvent
 import com.muwire.core.search.QueryEvent
@@ -14,158 +23,280 @@ import com.muwire.core.trust.TrustLevel
 import com.muwire.core.trust.TrustService
 
 import groovy.util.logging.Log
+import net.i2p.crypto.DSAEngine
+import net.i2p.data.Base64
 import net.i2p.data.Destination
+import net.i2p.data.Signature
 
 @Log
 abstract class Connection implements Closeable {
+    
+    private static final int SEARCHES = 10
+    private static final long INTERVAL = 1000
 
-	final EventBus eventBus
-	final Endpoint endpoint
-	final boolean incoming
-	final HostCache hostCache
+    final EventBus eventBus
+    final Endpoint endpoint
+    final boolean incoming
+    final HostCache hostCache
     final TrustService trustService
-	
-	private final AtomicBoolean running = new AtomicBoolean()
-	private final BlockingQueue messages = new LinkedBlockingQueue()
-	private final Thread reader, writer
-	
-	protected final String name
-	
-	long lastPingSentTime, lastPongReceivedTime
-	
-	Connection(EventBus eventBus, Endpoint endpoint, boolean incoming, HostCache hostCache, TrustService trustService) {
-		this.eventBus = eventBus
-		this.incoming = incoming
-		this.endpoint = endpoint
-		this.hostCache = hostCache
+    final MuWireSettings settings
+
+    private final AtomicBoolean running = new AtomicBoolean()
+    private final BlockingQueue messages = new LinkedBlockingQueue()
+    private final Thread reader, writer
+    private final LinkedList<Long> searchTimestamps = new LinkedList<>()
+
+    protected final String name
+
+    long lastPingSentTime, lastPongReceivedTime
+
+    Connection(EventBus eventBus, Endpoint endpoint, boolean incoming,
+        HostCache hostCache, TrustService trustService, MuWireSettings settings) {
+        this.eventBus = eventBus
+        this.incoming = incoming
+        this.endpoint = endpoint
+        this.hostCache = hostCache
         this.trustService = trustService
-		
-		this.name = endpoint.destination.toBase32().substring(0,8)
-		
-		this.reader = new Thread({readLoop()} as Runnable)
-		this.reader.setName("reader-$name")
-		this.reader.setDaemon(true)
-		
-		this.writer = new Thread({writeLoop()} as Runnable)
-		this.writer.setName("writer-$name")
-		this.writer.setDaemon(true)
-	}
-	
-	/**
-	 * starts the connection threads
-	 */
-	void start() {
-		if (!running.compareAndSet(false, true)) {
-			log.log(Level.WARNING,"$name already running", new Exception())
-			return
-		}
-		reader.start()
-		writer.start()
-	}
-	
-	@Override
-	public void close() {
-		if (!running.compareAndSet(true, false)) {
-			log.log(Level.WARNING, "$name already closed", new Exception() )
-			return
-		}
+        this.settings = settings
+
+        this.name = endpoint.destination.toBase32().substring(0,8)
+
+        this.reader = new Thread({readLoop()} as Runnable)
+        this.reader.setName("reader-$name")
+        this.reader.setDaemon(true)
+
+        this.writer = new Thread({writeLoop()} as Runnable)
+        this.writer.setName("writer-$name")
+        this.writer.setDaemon(true)
+    }
+
+    /**
+     * starts the connection threads
+     */
+    void start() {
+        if (!running.compareAndSet(false, true)) {
+            log.log(Level.WARNING,"$name already running", new Exception())
+            return
+        }
+        reader.start()
+        writer.start()
+    }
+
+    @Override
+    public void close() {
+        if (!running.compareAndSet(true, false)) {
+            log.log(Level.WARNING, "$name already closed", new Exception() )
+            return
+        }
         log.info("closing $name")
+        reader.interrupt()
+        writer.interrupt()
         endpoint.close()
-		reader.interrupt()
-		writer.interrupt()
-		eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
-	}
-	
-	protected void readLoop() {
-		try {
-			while(running.get()) {
-				read()
-			}
-		} catch (SocketTimeoutException e) {
+        log.info("closed $name")
+        eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
+    }
+
+    protected void readLoop() {
+        try {
+            while(running.get()) {
+                read()
+            }
+        } catch (InterruptedException ok) {
+        } catch (SocketTimeoutException e) {
         } catch (Exception e) {
             log.log(Level.WARNING,"unhandled exception in reader",e)
         } finally {
             close()
         }
-	}
-	
-	protected abstract void read()
-	
-	protected void writeLoop() {
-		try {
-			while(running.get()) {
-				def message = messages.take()
-				write(message)
-			}
-		} catch (Exception e) {
+    }
+
+    protected abstract void read()
+
+    protected void writeLoop() {
+        try {
+            while(running.get()) {
+                def message = messages.take()
+                write(message)
+            }
+        } catch (InterruptedException ok) {
+        } catch (Exception e) {
             log.log(Level.WARNING, "unhandled exception in writer",e)
         } finally {
             close()
         }
-	}
-	
-	protected abstract void write(def message);
-	
-	void sendPing() {
-		def ping = [:]
-		ping.type = "Ping"
-		ping.version = 1
-		messages.put(ping)
-		lastPingSentTime = System.currentTimeMillis()
-	}
-    
+    }
+
+    protected abstract void write(def message);
+
+    void sendPing() {
+        def ping = [:]
+        ping.type = "Ping"
+        ping.version = 1
+        messages.put(ping)
+        lastPingSentTime = System.currentTimeMillis()
+    }
+
     void sendQuery(QueryEvent e) {
         def query = [:]
         query.type = "Search"
         query.version = 1
         query.uuid = e.searchEvent.getUuid()
         query.firstHop = e.firstHop
-        // TODO: first hop figure out
         query.keywords = e.searchEvent.getSearchTerms()
-        query.replyTo = e.getReceivedOn().toBase64()
+        query.oobInfohash = e.searchEvent.oobInfohash
+        query.searchComments = e.searchEvent.searchComments
+        query.compressedResults = e.searchEvent.compressedResults
+        if (e.searchEvent.searchHash != null)
+            query.infohash = Base64.encode(e.searchEvent.searchHash)
+        query.replyTo = e.replyTo.toBase64()
+        if (e.originator != null)
+            query.originator = e.originator.toBase64()
+        if (e.sig != null)
+            query.sig = Base64.encode(e.sig)
+        if (e.queryTime > 0)
+            query.queryTime = e.queryTime
+        if (e.sig2 != null)
+            query.sig2 = Base64.encode(e.sig2)
         messages.put(query)
     }
-	
-	protected void handlePing() {
-		log.fine("$name received ping")
-		def pong = [:]
-		pong.type = "Pong"
-		pong.version = 1
-		pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
-		messages.put(pong)
-	}
-	
-	protected void handlePong(def pong) {
-		log.fine("$name received pong")
-		lastPongReceivedTime = System.currentTimeMillis()
-		if (pong.pongs == null)
-			throw new Exception("Pong doesn't have pongs")
-		pong.pongs.each { 
-			def dest = new Destination(it)
-			eventBus.publish(new HostDiscoveredEvent(destination: dest))
-		}
-	}
-    
+
+    protected void handlePing() {
+        log.fine("$name received ping")
+        def pong = [:]
+        pong.type = "Pong"
+        pong.version = 1
+        pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
+        messages.put(pong)
+    }
+
+    protected void handlePong(def pong) {
+        log.fine("$name received pong")
+        lastPongReceivedTime = System.currentTimeMillis()
+        if (pong.pongs == null)
+            throw new Exception("Pong doesn't have pongs")
+        pong.pongs.each {
+            def dest = new Destination(it)
+            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)
-        if (search.infohash != null)
+        byte [] infohash = null
+        if (search.infohash != null) {
             search.keywords = null
-            
+            infohash = Base64.decode(search.infohash)
+        }
+
         Destination replyTo = new Destination(search.replyTo)
-        if (trustService.getLevel(replyTo) == TrustLevel.DISTRUSTED) {
+        TrustLevel trustLevel = trustService.getLevel(replyTo)
+        if (trustLevel == TrustLevel.DISTRUSTED) {
             log.info "dropping search from distrusted peer"
             return
         }
-        // TODO: add option to respond only to trusted peers
+        if (trustLevel == TrustLevel.NEUTRAL && !settings.allowUntrusted()) {
+            log.info("dropping search from neutral peer")
+            return
+        }
+
+        Persona originator = null
+        if (search.originator != null) {
+            originator = new Persona(new ByteArrayInputStream(Base64.decode(search.originator)))
+            if (originator.destination != replyTo) {
+                log.info("originator doesn't match destination")
+                return
+            }
+        }
+
+        boolean oob = false
+        if (search.oobInfohash != null)
+            oob = search.oobInfohash
+        boolean searchComments = false
+        if (search.searchComments != null)
+            searchComments = search.searchComments
+        boolean compressedResults = false
+        if (search.compressedResults != null)
+            compressedResults = search.compressedResults
+        byte[] sig = null
+        if (search.sig != null) {
+            sig = Base64.decode(search.sig)
+            byte [] payload 
+            if (infohash != null)
+                payload = infohash
+            else 
+                payload =  String.join(" ",search.keywords).getBytes(StandardCharsets.UTF_8)
+            def spk = originator.destination.getSigningPublicKey()
+            def signature = new Signature(Constants.SIG_TYPE, sig)
+            if (!DSAEngine.getInstance().verifySignature(signature, payload, spk)) {
+                log.info("signature didn't match keywords")
+                return
+            } else
+                log.info("query signature verified")
+        } else {
+            log.info("no signature in query")
+            return
+        }
         
+        // TODO: make this mandatory at some point
+        byte[] sig2 = null        
+        long queryTime = 0
+        if (search.sig2 != null) {
+            if (search.queryTime == null) {
+                log.info("extended signature but no timestamp")
+                return
+            }
+            sig2 = Base64.decode(search.sig2)
+            queryTime = search.queryTime
+            byte [] payload = (search.uuid + String.valueOf(queryTime)).getBytes(StandardCharsets.US_ASCII)
+            def spk = originator.destination.getSigningPublicKey()
+            def signature = new Signature(Constants.SIG_TYPE, sig2)
+            if (!DSAEngine.getInstance().verifySignature(signature, payload, spk)) {
+                log.info("extended signature didn't match uuid and timestamp")
+                return
+            } else {
+                log.info("extended query signature verified")
+                if (queryTime < System.currentTimeMillis() - Constants.MAX_QUERY_AGE) {
+                    log.info("query too old")
+                    return
+                }
+            }
+        } else
+            log.info("no extended signature in query")
+
         SearchEvent searchEvent = new SearchEvent(searchTerms : search.keywords,
-                                            searchHash : search.infohash,
-                                            uuid : uuid)
+                                            searchHash : infohash,
+                                            uuid : uuid,
+                                            oobInfohash : oob,
+                                            searchComments : searchComments,
+                                            compressedResults : compressedResults,
+                                            persona : originator)
         QueryEvent event = new QueryEvent ( searchEvent : searchEvent,
                                             replyTo : replyTo,
+                                            originator : originator,
                                             receivedOn : endpoint.destination,
-                                            firstHop : search.firstHop )
+                                            firstHop : search.firstHop,
+                                            sig : sig,
+                                            queryTime : queryTime,
+                                            sig2 : sig2 )
         eventBus.publish(event)
-                                            
+
     }
 }

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

@@ -1,181 +1,250 @@
 package com.muwire.core.connection
 
 import java.nio.charset.StandardCharsets
+import java.nio.file.attribute.DosFileAttributes
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.logging.Level
 import java.util.zip.DeflaterOutputStream
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
 import java.util.zip.InflaterInputStream
 
+import com.muwire.core.Constants
 import com.muwire.core.EventBus
+import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
+import com.muwire.core.chat.ChatServer
+import com.muwire.core.filecert.Certificate
+import com.muwire.core.filecert.CertificateManager
+import com.muwire.core.files.FileManager
 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.ResultsSender
 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
 import groovy.json.JsonSlurper
 import groovy.util.logging.Log
+import net.i2p.data.Base64
 
 @Log
 class ConnectionAcceptor {
 
-	final EventBus eventBus
-	final UltrapeerConnectionManager manager
-	final MuWireSettings settings
-	final I2PAcceptor acceptor
-	final HostCache hostCache
-	final TrustService trustService
-    final SearchManager searchManager 
+    final EventBus eventBus
+    final UltrapeerConnectionManager manager
+    final MuWireSettings settings
+    final I2PAcceptor acceptor
+    final HostCache hostCache
+    final TrustService trustService
+    final SearchManager searchManager
     final UploadManager uploadManager
-	
-	final ExecutorService acceptorThread
-	final ExecutorService handshakerThreads
-	
-	ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
-		MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
-		TrustService trustService, SearchManager searchManager, UploadManager uploadManager) {
-		this.eventBus = eventBus
-		this.manager = manager
-		this.settings = settings
-		this.acceptor = acceptor
-		this.hostCache = hostCache
-		this.trustService = trustService
+    final FileManager fileManager
+    final ConnectionEstablisher establisher
+    final CertificateManager certificateManager
+    final ChatServer chatServer
+
+    final ExecutorService acceptorThread
+    final ExecutorService handshakerThreads
+
+    private volatile shutdown
+    
+    private volatile int browsed
+
+    ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
+        MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
+        TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
+        FileManager fileManager, ConnectionEstablisher establisher, CertificateManager certificateManager,
+        ChatServer chatServer) {
+        this.eventBus = eventBus
+        this.manager = manager
+        this.settings = settings
+        this.acceptor = acceptor
+        this.hostCache = hostCache
+        this.trustService = trustService
         this.searchManager = searchManager
+        this.fileManager = fileManager
         this.uploadManager = uploadManager
-		
-		acceptorThread = Executors.newSingleThreadExecutor { r -> 
-			def rv = new Thread(r)
-			rv.setDaemon(true)
-			rv.setName("acceptor")
-			rv
-		}
-		
-		handshakerThreads = Executors.newCachedThreadPool { r ->
-			def rv = new Thread(r)
-			rv.setDaemon(true)
-			rv.setName("acceptor-processor-${System.currentTimeMillis()}")
-			rv
-		}
-	}
-	
-	void start() {
-		acceptorThread.execute({acceptLoop()} as Runnable)
-	}
-	
-	void stop() {
-		acceptorThread.shutdownNow()
-		handshakerThreads.shutdownNow()
-	}
-	
-	private void acceptLoop() {
-		while(true) {
-			def incoming = acceptor.accept()
-			log.info("accepted connection from ${incoming.destination.toBase32()}")
-			switch(trustService.getLevel(incoming.destination)) {
-				case TrustLevel.TRUSTED : break
-				case TrustLevel.NEUTRAL :
-					if (settings.allowUntrusted())
-						break
-				case TrustLevel.DISTRUSTED :
-					log.info("Disallowing distrusted connection")
-					incoming.close()
-					continue
-			}
-			handshakerThreads.execute({processIncoming(incoming)} as Runnable)
-		}
-	}
-	
-	private void processIncoming(Endpoint e) {
-		InputStream is = e.inputStream
-		try {
-			int read = is.read()
-			switch(read) {
-				case (byte)'M':
+        this.establisher = establisher
+        this.certificateManager = certificateManager
+        this.chatServer = chatServer
+
+        acceptorThread = Executors.newSingleThreadExecutor { r ->
+            def rv = new Thread(r)
+            rv.setDaemon(true)
+            rv.setName("acceptor")
+            rv
+        }
+
+        handshakerThreads = Executors.newCachedThreadPool { r ->
+            def rv = new Thread(r)
+            rv.setDaemon(true)
+            rv.setName("acceptor-processor-${System.currentTimeMillis()}")
+            rv
+        }
+    }
+
+    void start() {
+        acceptorThread.execute({acceptLoop()} as Runnable)
+    }
+
+    void stop() {
+        shutdown = true
+        acceptorThread.shutdownNow()
+        handshakerThreads.shutdownNow()
+    }
+
+    private void acceptLoop() {
+        try {
+        while(true) {
+            def incoming = acceptor.accept()
+            log.info("accepted connection from ${incoming.destination.toBase32()}")
+            switch(trustService.getLevel(incoming.destination)) {
+                case TrustLevel.TRUSTED : break
+                case TrustLevel.NEUTRAL :
+                    if (settings.allowUntrusted())
+                        break
+                case TrustLevel.DISTRUSTED :
+                    log.info("Disallowing distrusted connection")
+                    incoming.close()
+                    continue
+            }
+            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) {
+        InputStream is = e.inputStream
+        try {
+            int read = is.read()
+            switch(read) {
+                case (byte)'M':
                     if (settings.isLeaf())
                         throw new IOException("Incoming connection as leaf")
-					processMuWire(e)
-					break
-				case (byte)'G':
-					processGET(e)
-					break
+                    processMuWire(e)
+                    break
+                case (byte)'G':
+                    processGET(e)
+                    break
+                case (byte)'H':
+                    processHashList(e)
+                    break
                 case (byte)'P':
                     processPOST(e)
                     break
-				default:
-					throw new Exception("Invalid read $read")
-			}
-		} catch (Exception ex) {
-			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) {
-		byte[] uWire = "uWire ".bytes
-		for (int i = 0; i < uWire.length; i++) {
-			int read = e.inputStream.read()
-			if (read != uWire[i]) {
-				throw new IOException("unexpected value $read at position $i")
-			}
-		}
-        
-		byte[] type = new byte[4]
-		DataInputStream dis = new DataInputStream(e.inputStream)
-		dis.readFully(type)
-                
+                case (byte)'R':
+                    processRESULTS(e)
+                    break
+                case (byte)'T':
+                    processTRUST(e)
+                    break
+                case (byte)'B':
+                    processBROWSE(e)
+                    break
+                case (byte)'C':
+                    processCERTIFICATES(e)
+                    break
+                case (byte)'I':
+                    processIRC(e)
+                    break
+                default:
+                    throw new Exception("Invalid read $read")
+            }
+        } catch (Exception ex) {
+            log.log(Level.WARNING, "incoming connection failed",ex)
+            try {
+                e.getOutputStream().close()
+            } catch (Exception ignore) {}
+            e.close()
+            eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED)
+        }
+    }
+
+    private void processMuWire(Endpoint e) {
+        byte[] uWire = "uWire ".bytes
+        for (int i = 0; i < uWire.length; i++) {
+            int read = e.inputStream.read()
+            if (read != uWire[i]) {
+                throw new IOException("unexpected value $read at position $i")
+            }
+        }
+
+        byte[] type = new byte[4]
+        DataInputStream dis = new DataInputStream(e.inputStream)
+        dis.readFully(type)
+
         if (type == "leaf".bytes)
             handleIncoming(e, true)
         else if (type == "peer".bytes)
             handleIncoming(e, false)
-        else 
+        else
             throw new IOException("unknown connection type $type")
     }
 
-	private void handleIncoming(Endpoint e, boolean leaf) {
-		boolean accept = !manager.isConnected(e.destination) && (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
-		if (accept) {
-			log.info("accepting connection, leaf:$leaf")
-			e.outputStream.write("OK".bytes)
-			e.outputStream.flush()
-			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))
-		} else {
-			log.info("rejecting connection, leaf:$leaf")
-			e.outputStream.write("REJECT".bytes)
-			def hosts = hostCache.getGoodHosts(10)
-			if (!hosts.isEmpty()) {
-				def json = [:]
-				json.tryHosts = hosts.collect { d -> d.toBase64() }
-				json = JsonOutput.toJson(json)
-				def os = new DataOutputStream(e.outputStream)
-				os.writeShort(json.bytes.length)
-				os.write(json.bytes)
-			}
-			e.outputStream.flush()
-			e.close()
-			eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
-		}
-	}
-	
-	
-	
-	private void processGET(Endpoint e) {
+    private void handleIncoming(Endpoint e, boolean leaf) {
+        boolean accept = !manager.isConnected(e.destination) &&
+            !establisher.isInProgress(e.destination) &&
+            (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
+        if (accept) {
+            log.info("accepting connection, leaf:$leaf")
+            e.outputStream.write("OK".bytes)
+            e.outputStream.flush()
+            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))
+        } else {
+            log.info("rejecting connection, leaf:$leaf")
+            e.outputStream.write("REJECT".bytes)
+            def hosts = hostCache.getGoodHosts(10)
+            if (!hosts.isEmpty()) {
+                def json = [:]
+                json.tryHosts = hosts.collect { d -> d.toBase64() }
+                json = JsonOutput.toJson(json)
+                def os = new DataOutputStream(e.outputStream)
+                os.writeShort(json.bytes.length)
+                os.write(json.bytes)
+            }
+            try {
+                e.outputStream.close()
+            } catch (Exception ignored) {}
+            e.close()
+            eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
+        }
+    }
+
+
+
+    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.processEndpoint(e)
-	}
-    
+        uploadManager.processGET(e)
+    }
+
+    private void processHashList(Endpoint e) {
+        byte[] ashList = new byte[8]
+        final DataInputStream dis = new DataInputStream(e.getInputStream())
+        dis.readFully(ashList)
+        if (ashList != "ASHLIST ".getBytes(StandardCharsets.US_ASCII))
+            throw new IOException("Invalid HASHLIST connection")
+        uploadManager.processHashList(e)
+    }
+
     private void processPOST(final Endpoint e) throws IOException {
         byte [] ost = new byte[4]
         final DataInputStream dis = new DataInputStream(e.getInputStream())
@@ -197,20 +266,258 @@ class ConnectionAcceptor {
 
             Persona sender = new Persona(dis)
             if (sender.destination != e.getDestination())
-                throw new IOException("Sender destination mismatch expected $e.getDestination(), got $sender.destination")
+                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)
-                eventBus.publish(ResultsParser.parse(sender, resultsUUID, json))
+                results[i] = 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 {
             e.close()
         }
     }
-	
+    
+    private void processRESULTS(Endpoint e) {
+        InputStream is = e.getInputStream()
+        DataInputStream dis = new DataInputStream(is)
+        byte[] esults = new byte[7]
+        dis.readFully(esults)
+        if (esults != "ESULTS ".getBytes(StandardCharsets.US_ASCII))
+            throw new IOException("Invalid RESULTS connection")
+            
+        JsonSlurper slurper = new JsonSlurper()
+        try {
+            String uuid = DataUtil.readTillRN(dis)
+            UUID resultsUUID = UUID.fromString(uuid)
+            if (!searchManager.hasLocalSearch(resultsUUID))
+                throw new UnexpectedResultsException(resultsUUID.toString())
+            
+            // parse all headers
+            Map<String,String> headers = DataUtil.readAllHeaders(is);
+            
+            if (!headers.containsKey("Sender"))
+                throw new IOException("No Sender header")
+            if (!headers.containsKey("Count"))
+                throw new IOException("No Count header")
+            
+            boolean chat = false
+            if (headers.containsKey('Chat'))
+                chat = Boolean.parseBoolean(headers['Chat'])
+                
+            byte [] personaBytes = Base64.decode(headers['Sender'])
+            Persona sender = new Persona(new ByteArrayInputStream(personaBytes))
+            if (sender.destination != e.getDestination())
+                throw new IOException("Sender destination mismatch expected ${e.getDestination()}, got $sender.destination")
+                
+            int nResults = Integer.parseInt(headers['Count'])
+            if (nResults > Constants.MAX_RESULTS)
+                throw new IOException("too many results $nResults")
+                
+            dis = new DataInputStream(new GZIPInputStream(dis))
+            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)
+                results[i].chat = chat
+            }
+            eventBus.publish(new UIResultBatchEvent(uuid: resultsUUID, results: results))
+        } catch (IOException bad) {
+            log.log(Level.WARNING, "failed to process RESULTS", bad)
+        } finally {
+            e.close()
+        }
+            
+    }
+    
+    private void processBROWSE(Endpoint e) {
+        try {
+            byte [] rowse = new byte[7]
+            DataInputStream dis = new DataInputStream(e.getInputStream())
+            dis.readFully(rowse)
+            if (rowse != "ROWSE\r\n".getBytes(StandardCharsets.US_ASCII))
+                throw new IOException("Invalid BROWSE connection")
+                
+            Persona browser = null
+            Map<String,String> headers = DataUtil.readAllHeaders(dis);
+            if (headers.containsKey('Persona')) { 
+                browser = new Persona(new ByteArrayInputStream(Base64.decode(headers['Persona'])))
+                if (browser.destination != e.destination)
+                    throw new IOException("browser persona mismatch")
+            }
+
+            OutputStream os = e.getOutputStream()
+            if (!settings.browseFiles) {
+                os.write("403 Not Allowed\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                os.flush()
+                e.close()
+                return
+            }
+
+            browsed++
+            
+            os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
+
+            def sharedFiles = fileManager.getSharedFiles().values()
+
+            os.write("Count: ${sharedFiles.size()}\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+
+            DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(os))
+            JsonOutput jsonOutput = new JsonOutput()
+            sharedFiles.each {
+                it.hit(browser, System.currentTimeMillis(), "Browse Host");
+                int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size()
+                def obj = ResultsSender.sharedFileToObj(it, false, certificates)
+                def json = jsonOutput.toJson(obj)
+                dos.writeShort((short)json.length())
+                dos.write(json.getBytes(StandardCharsets.US_ASCII))
+            }
+            dos.flush()
+            dos.close()
+        } finally {
+            e.close()
+        }
+    }
+
+    private void processTRUST(Endpoint e) {
+        try {
+            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")
+            
+            Map<String,String> headers = DataUtil.readAllHeaders(dis)
+            
+            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".getBytes(StandardCharsets.US_ASCII))
+            
+            boolean json = headers.containsKey('Json') && Boolean.parseBoolean(headers['Json'])
+            
+            List<TrustService.TrustEntry> good = new ArrayList<>(trustService.good.values())
+            List<TrustService.TrustEntry> bad = new ArrayList<>(trustService.bad.values())
+            DataOutputStream dos = new DataOutputStream(os)
+
+            if (!json) {
+                os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+                int size = Math.min(Short.MAX_VALUE * 2, good.size())
+                good = good.subList(0, size)
+                dos.writeShort(size)
+                good.each {
+                    it.persona.write(dos)
+                }
+
+                size = Math.min(Short.MAX_VALUE * 2, bad.size())
+                bad = bad.subList(0, size)
+                dos.writeShort(size)
+                bad.each {
+                    it.persona.write(dos)
+                }
+            } else {
+                dos.write("Json: true\r\n".getBytes(StandardCharsets.US_ASCII))
+                dos.write("Good:${good.size()}\r\n".getBytes(StandardCharsets.US_ASCII))
+                dos.write("Bad:${bad.size()}\r\n".getBytes(StandardCharsets.US_ASCII))
+                dos.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+                
+                good.each { 
+                    def obj = [:]
+                    obj.persona = it.persona.toBase64()
+                    obj.reason = it.reason
+                    String toJson = JsonOutput.toJson(obj)
+                    byte [] payload = toJson.getBytes(StandardCharsets.US_ASCII)
+                    dos.writeShort(payload.length)
+                    dos.write(payload)   
+                }
+                bad.each {
+                    def obj = [:]
+                    obj.persona = it.persona.toBase64()
+                    obj.reason = it.reason
+                    String toJson = JsonOutput.toJson(obj)
+                    byte [] payload = toJson.getBytes(StandardCharsets.US_ASCII)
+                    dos.writeShort(payload.length)
+                    dos.write(payload)
+                }
+            }
+
+            dos.flush()
+        } finally {
+            e.close()
+        }
+    }
+    
+    private void processCERTIFICATES(Endpoint e) {
+        try {
+            byte [] ERTIFICATES = new byte[12]
+            DataInputStream dis = new DataInputStream(e.getInputStream())
+            dis.readFully(ERTIFICATES)
+            if (ERTIFICATES != "ERTIFICATES ".getBytes(StandardCharsets.US_ASCII))
+                throw new IOException("Invalid CERTIFICATES connection")
+            
+            byte [] infoHashStringBytes = new byte[44]
+            dis.readFully(infoHashStringBytes)
+            String infoHashString = new String(infoHashStringBytes, StandardCharsets.US_ASCII)
+
+            byte[] rn = new byte[2]
+            dis.readFully(rn)
+            if (rn != "\r\n".getBytes(StandardCharsets.US_ASCII))
+                throw new IOException("Malformed CERTIFICATES request")            
+            
+            String header
+            while ((header = DataUtil.readTillRN(dis)) != ""); // ignore headers for now
+            
+            log.info("responding to certificates request for $infoHashString")
+            byte [] root = Base64.decode(infoHashString)
+            
+            Set<Certificate> certs = certificateManager.getByInfoHash(new InfoHash(root))
+            if (certs.isEmpty()) {
+                log.info("certs not found")
+                e.getOutputStream().write("404 Certs Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                e.getOutputStream().flush()
+                return
+            }
+            
+            OutputStream os = e.getOutputStream()
+            os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("Count: ${certs.size()}\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+            
+            DataOutputStream dos = new DataOutputStream(os)
+            certs.each { 
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()
+                it.write(baos)
+                byte [] payload = baos.toByteArray()
+                dos.writeShort(payload.length)
+                dos.write(payload)
+            }
+            dos.close()
+        } finally {
+            e.close()
+        }
+    }
+    
+    private void processIRC(Endpoint e) {
+        byte[] IRC = new byte[4]
+        DataInputStream dis = new DataInputStream(e.getInputStream())
+        dis.readFully(IRC)
+        if (IRC != "RC\r\n".getBytes(StandardCharsets.US_ASCII))
+            throw new Exception("Invalid IRC connection")
+        chatServer.handle(e)
+    }
+
 }

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

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

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

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

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

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

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

@@ -1,45 +1,43 @@
 package com.muwire.core.connection
 
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.logging.Level
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
 
 @Log
 class Endpoint implements Closeable {
-	final Destination destination
-	final InputStream inputStream
-	final OutputStream outputStream
+    final Destination destination
+    final InputStream inputStream
+    final OutputStream outputStream
     final def toClose
-	
-	private final AtomicBoolean closed = new AtomicBoolean()
-	
-	Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
-		this.destination = destination
-		this.inputStream = inputStream
-		this.outputStream = outputStream
+
+    private final AtomicBoolean closed = new AtomicBoolean()
+
+    Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
+        this.destination = destination
+        this.inputStream = inputStream
+        this.outputStream = outputStream
         this.toClose = toClose
-	}
-	
-	@Override
-	public void close() {
-		if (!closed.compareAndSet(false, true)) {
-			log.warning("Close loop detected for ${destination.toBase32()}", new Exception())
-			return
-		}
-		if (inputStream != null) {
-			try {inputStream.close()} catch (Exception ignore) {}
-		}
-		if (outputStream != null) {
-			try {outputStream.close()} catch (Exception ignore) {}
-		}
-        if (toClose != null) {
-            try {toClose.close()} catch (Exception ignore) {}
+    }
+
+    @Override
+    public void close() {
+        if (!closed.compareAndSet(false, true)) {
+            log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
+            return
         }
-	}
-	
-	@Override
-	public String toString() {
-		"destination: ${destination.toBase32()}"
-	}
-} 
+        if (inputStream != null) {
+            try {inputStream.close()} catch (Exception ignore) {}
+        }
+        if (toClose != null) {
+            try {toClose.reset()} catch (Exception ignore) {}
+        }
+    }
+
+    @Override
+    public String toString() {
+        "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 I2PServerSocket serverSocket
-	
-	I2PAcceptor() {}
-	
-	I2PAcceptor(I2PSocketManager socketManager) {
-		this.socketManager = socketManager
-		this.serverSocket = socketManager.getServerSocket()
-	}
-	
-	Endpoint accept() {
-		def socket = serverSocket.accept()
-		new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
-	}
+    final I2PSocketManager socketManager
+    final I2PServerSocket serverSocket
+
+    I2PAcceptor() {}
+
+    I2PAcceptor(I2PSocketManager socketManager) {
+        this.socketManager = socketManager
+        this.serverSocket = socketManager.getServerSocket()
+    }
+
+    Endpoint accept() {
+        def socket = serverSocket.accept()
+        new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
+    }
 }

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

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

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

@@ -4,32 +4,34 @@ import java.io.InputStream
 import java.io.OutputStream
 
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.trust.TrustService
 
 import net.i2p.data.Destination
 
 /**
- * Connection where the other side is a leaf. 
+ * Connection where the other side is a leaf.
  * Such connections can only be incoming.
  * @author zab
  */
 class LeafConnection extends Connection {
 
-	public LeafConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
-		super(eventBus, endpoint, true, hostCache, trustService);
-	}
+    public LeafConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache,
+        TrustService trustService, MuWireSettings settings) {
+        super(eventBus, endpoint, true, hostCache, trustService, settings);
+    }
 
-	@Override
-	protected void read() {
-		// TODO Auto-generated method stub
-		
-	}
+    @Override
+    protected void read() {
+        // TODO Auto-generated method stub
 
-	@Override
-	protected void write(Object message) {
-		// TODO Auto-generated method stub
-		
-	}
+    }
+
+    @Override
+    protected void write(Object message) {
+        // TODO Auto-generated method stub
+
+    }
 
 }

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

@@ -3,6 +3,7 @@ package com.muwire.core.connection
 import java.util.concurrent.ConcurrentHashMap
 
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.search.QueryEvent
@@ -12,67 +13,68 @@ import net.i2p.data.Destination
 
 @Log
 class LeafConnectionManager extends ConnectionManager {
-	
-	final int maxConnections
-	
-	final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
-	
-	public LeafConnectionManager(EventBus eventBus, Persona me, int maxConnections, HostCache hostCache) {
-		super(eventBus, me, hostCache)
-		this.maxConnections = maxConnections
-	}
-	
-	@Override
-	public void drop(Destination d) {
-		// TODO Auto-generated method stub
-		
-	}
-    
+
+    final int maxConnections
+
+    final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
+
+    public LeafConnectionManager(EventBus eventBus, Persona me, int maxConnections,
+        HostCache hostCache, MuWireSettings settings) {
+        super(eventBus, me, hostCache, settings)
+        this.maxConnections = maxConnections
+    }
+
+    @Override
+    public void drop(Destination d) {
+        // TODO Auto-generated method stub
+
+    }
+
     void onQueryEvent(QueryEvent e) {
         if (me.destination == e.receivedOn) {
             connections.values().each { it.sendQuery(e) }
         }
-            
+
     }
 
-	@Override
-	public Collection<Connection> getConnections() {
-		connections.values()
-	}
+    @Override
+    public Collection<Connection> getConnections() {
+        connections.values()
+    }
 
-	@Override
-	protected int getDesiredConnections() {
-		return maxConnections;
-	}
+    @Override
+    protected int getDesiredConnections() {
+        return maxConnections;
+    }
 
-	@Override
-	public boolean isConnected(Destination d) {
-		connections.containsKey(d)
-	}
+    @Override
+    public boolean isConnected(Destination d) {
+        connections.containsKey(d)
+    }
+
+    @Override
+    public void onConnectionEvent(ConnectionEvent e) {
+        if (e.incoming || e.leaf) {
+            log.severe("Got inconsistent event as a leaf! $e")
+            return
+        }
+        if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
+            return
+
+        Connection c = new UltrapeerConnection(eventBus, e.endpoint)
+        connections.put(e.endpoint.destination, c)
+        c.start()
+    }
+
+    @Override
+    public void onDisconnectionEvent(DisconnectionEvent e) {
+        def removed = connections.remove(e.destination)
+        if (removed == null)
+            log.severe("removed destination not present in connection manager ${e.destination.toBase32()}")
+    }
 
-	@Override
-	public void onConnectionEvent(ConnectionEvent e) {
-		if (e.incoming || e.leaf) {
-			log.severe("Got inconsistent event as a leaf! $e")
-			return
-		}
-		if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
-			return
-			
-		Connection c = new UltrapeerConnection(eventBus, e.endpoint)
-		connections.put(e.endpoint.destination, c)
-		c.start()
-	}
-	
-	@Override 
-	public void onDisconnectionEvent(DisconnectionEvent e) {
-		def removed = connections.remove(e.destination)
-		if (removed == null)
-			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

@@ -4,6 +4,7 @@ import java.io.InputStream
 import java.io.OutputStream
 
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.trust.TrustService
 import com.muwire.core.util.DataUtil
@@ -19,62 +20,63 @@ import net.i2p.data.Destination
  */
 @Log
 class PeerConnection extends Connection {
-	
-	private final DataInputStream dis
-	private final DataOutputStream dos
-	
-	private final byte[] readHeader = new byte[3]
-	private final byte[] writeHeader = new byte[3]
-	
-	private final JsonSlurper slurper = new JsonSlurper()
 
-	public PeerConnection(EventBus eventBus, Endpoint endpoint,
-			boolean incoming, HostCache hostCache, TrustService trustService) {
-		super(eventBus, endpoint, incoming, hostCache, trustService)
-		this.dis = new DataInputStream(endpoint.inputStream)
-		this.dos = new DataOutputStream(endpoint.outputStream)
-	}
+    private final DataInputStream dis
+    private final DataOutputStream dos
 
-	@Override
-	protected void read() {
-		dis.readFully(readHeader)
-		int length = DataUtil.readLength(readHeader)
-		log.fine("$name read length $length")
-		
-		byte[] payload = new byte[length]
-		dis.readFully(payload)
-		
-		if ((readHeader[0] & (byte)0x80) == 0x80) {
-			// TODO process binary
-		} else {
-			def json = slurper.parse(payload)
-			if (json.type == null)
-				throw new Exception("missing json type")
-			switch(json.type) {
-				case "Ping" : handlePing(); break;
-				case "Pong" : handlePong(json); break;
+    private final byte[] readHeader = new byte[3]
+    private final byte[] writeHeader = new byte[3]
+
+    private final JsonSlurper slurper = new JsonSlurper()
+
+    public PeerConnection(EventBus eventBus, Endpoint endpoint,
+            boolean incoming, HostCache hostCache, TrustService trustService,
+            MuWireSettings settings) {
+        super(eventBus, endpoint, incoming, hostCache, trustService, settings)
+        this.dis = new DataInputStream(endpoint.inputStream)
+        this.dos = new DataOutputStream(endpoint.outputStream)
+    }
+
+    @Override
+    protected void read() {
+        dis.readFully(readHeader)
+        int length = DataUtil.readLength(readHeader)
+        log.fine("$name read length $length")
+
+        byte[] payload = new byte[length]
+        dis.readFully(payload)
+
+        if ((readHeader[0] & (byte)0x80) == 0x80) {
+            // TODO process binary
+        } else {
+            def json = slurper.parse(payload)
+            if (json.type == null)
+                throw new Exception("missing json type")
+            switch(json.type) {
+                case "Ping" : handlePing(); break;
+                case "Pong" : handlePong(json); break;
                 case "Search": handleSearch(json); break
-				default :
-					throw new Exception("unknown json type ${json.type}")
-			}
-		}
-	}
+                default :
+                    throw new Exception("unknown json type ${json.type}")
+            }
+        }
+    }
 
-	@Override
-	protected void write(Object message) {
-		byte[] payload
-		if (message instanceof Map) {
-			payload = JsonOutput.toJson(message).bytes
-			DataUtil.packHeader(payload.length, writeHeader)
-			log.fine "$name writing message type ${message.type} length $payload.length"
-			writeHeader[0] &= (byte)0x7F
-		} else {
-			// TODO: write binary
-		}
-		
-		dos.write(writeHeader)
-		dos.write(payload)
-		dos.flush()
-	}
+    @Override
+    protected void write(Object message) {
+        byte[] payload
+        if (message instanceof Map) {
+            payload = JsonOutput.toJson(message).bytes
+            DataUtil.packHeader(payload.length, writeHeader)
+            log.fine "$name writing message type ${message.type} length $payload.length"
+            writeHeader[0] &= (byte)0x7F
+        } else {
+            // TODO: write binary
+        }
+
+        dos.write(writeHeader)
+        dos.write(payload)
+        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) {
-		super(eventBus, endpoint, false, hostCache, trustService)
-	}
+    public UltrapeerConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
+        super(eventBus, endpoint, false, hostCache, trustService)
+    }
 
-	@Override
-	protected void read() {
-		// TODO Auto-generated method stub
-		
-	}
+    @Override
+    protected void read() {
+        // TODO Auto-generated method stub
 
-	@Override
-	protected void write(Object message) {
-		if (message instanceof Map) {
-			writeJsonMessage(message)
-		} else {
-			writeBinaryMessage(message)
-		}
-	}
+    }
 
-	private void writeJsonMessage(def message) {
-		
-	}
-	
-	private void writeBinaryMessage(def message) {
-		
-	}
+    @Override
+    protected void write(Object message) {
+        if (message instanceof Map) {
+            writeJsonMessage(message)
+        } else {
+            writeBinaryMessage(message)
+        }
+    }
+
+    private void writeJsonMessage(def message) {
+
+    }
+
+    private void writeBinaryMessage(def message) {
+
+    }
 }

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

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

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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,35 @@
+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/BadHashException.groovy

@@ -21,5 +21,5 @@ class BadHashException extends Exception {
     public BadHashException(Throwable cause) {
         super(cause);
     }
-    
+
 }

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

@@ -1,23 +1,57 @@
 package com.muwire.core.download
 
 import com.muwire.core.connection.I2PConnector
-import com.muwire.core.EventBus
+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
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import groovy.util.logging.Log
+import net.i2p.data.Base64
+import net.i2p.data.Destination
+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
+import java.util.logging.Level
 
+@Log
 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
-    
-    public DownloadManager(EventBus eventBus, I2PConnector connector, File incompletes) {
+    private final File home
+    private final Persona me
+
+    private final Map<InfoHash, Downloader> downloaders = new ConcurrentHashMap<>()
+
+    public DownloadManager(EventBus eventBus, TrustService trustService, MeshManager meshManager, MuWireSettings muSettings,
+        I2PConnector connector, File home, Persona me) {
         this.eventBus = eventBus
+        this.trustService = trustService
+        this.meshManager = meshManager
+        this.muSettings = muSettings
         this.connector = connector
-        this.incompletes = incompletes
-        incompletes.mkdir()
+        this.home = home
+        this.me = me
+
         this.executor = Executors.newCachedThreadPool({ r ->
             Thread rv = new Thread(r)
             rv.setName("download-worker")
@@ -25,17 +59,174 @@ public class DownloadManager {
             rv
         })
     }
-    
-    
+
+
     public void onUIDownloadEvent(UIDownloadEvent e) {
-        def downloader = new Downloader(this, e.target, e.result.size,
-            e.result.infohash, e.result.pieceSize, connector, e.result.sender.destination,
-            incompletes)
+
+        File incompletes = muSettings.incompleteLocation
+        if (incompletes == null)
+            incompletes = new File(home, "incompletes")
+        incompletes.mkdirs()
+        
+        def size = e.result[0].size
+        def infohash = e.result[0].infohash
+        def pieceSize = e.result[0].pieceSize
+
+        Set<Destination> destinations = new HashSet<>()
+        e.result.each {
+            destinations.add(it.sender.destination)
+        }
+        destinations.addAll(e.sources)
+        destinations.remove(me.destination)
+
+        Pieces pieces = getPieces(infohash, size, pieceSize, e.sequential)
+
+        def downloader = new Downloader(eventBus, this, me, e.target, size,
+            infohash, pieceSize, connector, destinations,
+            incompletes, pieces)
+        downloaders.put(infohash, downloader)
+        persistDownloaders()
         executor.execute({downloader.download()} as Runnable)
         eventBus.publish(new DownloadStartedEvent(downloader : downloader))
     }
-    
+
+    public void onUIDownloadCancelledEvent(UIDownloadCancelledEvent e) {
+        downloaders.remove(e.downloader.infoHash)
+        persistDownloaders()
+    }
+
+    public void onUIDownloadPausedEvent(UIDownloadPausedEvent e) {
+        persistDownloaders()
+    }
+
+    public void onUIDownloadResumedEvent(UIDownloadResumedEvent e) {
+        persistDownloaders()
+    }
+
     void resume(Downloader downloader) {
         executor.execute({downloader.download() as Runnable})
     }
+
+    void onUILoadedEvent(UILoadedEvent e) {
+        File downloadsFile = new File(home, "downloads.json")
+        if (!downloadsFile.exists())
+            return
+        def slurper = new JsonSlurper()
+        downloadsFile.eachLine {
+            def json = slurper.parseText(it)
+            File file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+            def destinations = new HashSet<>()
+            json.destinations.each { destination ->
+                destinations.add new Destination(destination)
+            }
+            InfoHash infoHash
+            if (json.hashList != null) {
+                byte[] hashList = Base64.decode(json.hashList)
+                infoHash = InfoHash.fromHashList(hashList)
+            } else {
+                byte [] root = Base64.decode(json.hashRoot)
+                infoHash = new InfoHash(root)
+            }
+            
+            boolean sequential = false
+            if (json.sequential != null)
+                sequential = json.sequential
+                
+            File incompletes
+            if (json.incompletes != null) 
+                incompletes = new File(DataUtil.readi18nString(Base64.decode(json.incompletes)))
+            else
+                incompletes = new File(home, "incompletes")
+
+            if (json.pieceSizePow2 == null || json.pieceSizePow2 == 0) {
+                log.warning("Skipping $file because pieceSizePow2=$json.pieceSizePow2")
+                return // skip this download as it's corrupt anyway
+            }
+                
+            Pieces pieces = getPieces(infoHash, (long)json.length, json.pieceSizePow2, sequential)
+
+            def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
+                infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
+            if (json.paused != null)
+                downloader.paused = json.paused
+                
+            try {
+                downloader.readPieces()
+                if (!downloader.paused)
+                    downloader.download()
+                downloaders.put(infoHash, downloader)
+                eventBus.publish(new DownloadStartedEvent(downloader : downloader))
+            } catch (IllegalArgumentException bad) {
+                log.log(Level.WARNING,"cannot start downloader, skipping", bad)
+                return
+            }
+        }
+    }
+
+    private Pieces getPieces(InfoHash infoHash, long length, int pieceSizePow2, boolean sequential) {
+        long pieceSize = 0x1L << pieceSizePow2
+        int nPieces = (int)(length / pieceSize)
+        if (length % pieceSize != 0)
+            nPieces++
+        Mesh mesh = meshManager.getOrCreate(infoHash, nPieces, sequential)
+        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)
+        persistDownloaders()
+    }
+
+    private void persistDownloaders() {
+        File downloadsFile = new File(home,"downloads.json")
+        downloadsFile.withPrintWriter { writer ->
+            downloaders.values().each { downloader ->
+                if (!downloader.cancelled) {
+                    def json = [:]
+                    json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
+                    json.length = downloader.length
+                    json.pieceSizePow2 = downloader.pieceSizePow2
+                    def destinations = []
+                    downloader.destinations.each {
+                        destinations << it.toBase64()
+                    }
+                    json.destinations = destinations
+
+                    InfoHash infoHash = downloader.getInfoHash()
+                    if (infoHash.hashList != null)
+                        json.hashList = Base64.encode(infoHash.hashList)
+                    else
+                        json.hashRoot = Base64.encode(infoHash.getRoot())
+
+                    json.paused = downloader.paused
+                    
+                    json.sequential = downloader.pieces.ratio == 0f
+                    
+                    json.incompletes = Base64.encode(DataUtil.encodei18nString(downloader.incompletes.getAbsolutePath()))
+                    
+                    writer.println(JsonOutput.toJson(json))
+                }
+            }
+        }
+    }
+
+    public void shutdown() {
+        downloaders.values().each { it.stop() }
+        Downloader.executorService.shutdownNow()
+    }
 }

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

@@ -3,41 +3,57 @@ 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.concurrent.atomic.AtomicLong
+import java.util.logging.Level
 
 @Log
 class DownloadSession {
-    
+
+    private final EventBus eventBus
+    private final String meB64
     private final Pieces pieces
     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 ByteBuffer mapped
-    
-    DownloadSession(Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file, 
-        int pieceSize, long fileLength) {
+
+    private final AtomicLong dataSinceLastRead
+
+    private MappedByteBuffer mapped
+
+    DownloadSession(EventBus eventBus, String meB64, Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file,
+        int pieceSize, long fileLength, Set<Integer> available, AtomicLong dataSinceLastRead) {
+        this.eventBus = eventBus
+        this.meB64 = meB64
         this.pieces = pieces
         this.endpoint = endpoint
         this.infoHash = infoHash
         this.file = file
         this.pieceSize = pieceSize
         this.fileLength = fileLength
+        this.available = available
+        this.dataSinceLastRead = dataSinceLastRead
         try {
             digest = MessageDigest.getInstance("SHA-256")
         } catch (NoSuchAlgorithmException impossible) {
@@ -45,97 +61,163 @@ class DownloadSession {
             System.exit(1)
         }
     }
-    
-    public void request() throws IOException {
+
+    /**
+     * @return if the request will proceed.  The only time it may not
+     * is if all the pieces have been claimed by other sessions.
+     * @throws IOException
+     */
+    public boolean request() throws IOException {
         OutputStream os = endpoint.getOutputStream()
         InputStream is = endpoint.getInputStream()
-        
-        int piece = pieces.getRandomPiece()
-        long start = piece * pieceSize
-        long end = Math.min(fileLength, start + pieceSize) - 1
-        long length = end - start + 1
-        
+
+        int[] pieceAndPosition
+        if (available.isEmpty())
+            pieceAndPosition = pieces.claim()
+        else
+            pieceAndPosition = pieces.claim(new HashSet<>(available))
+        if (pieceAndPosition == null)
+            return false
+        int piece = pieceAndPosition[0]
+        int position = pieceAndPosition[1]
+        boolean steal = pieceAndPosition[2] == 1
+        boolean unclaim = true
+
+        log.info("will download piece $piece from position $position steal $steal")
+
+        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\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))
+            String xHave = DataUtil.encodeXHave(pieces.getDownloaded(), pieces.nPieces)
+            os.write("X-Have: $xHave\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
             os.flush()
-            String code = readTillRN(is)
-            if (code.startsWith("404 ")) {
+            String codeString = readTillRN(is)
+            int space = codeString.indexOf(' ')
+            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
+                return false
             }
-                
-            if (code.startsWith("416 ")) {
-                log.warning("range $start-$end cannot be satisfied")
-                return // leave endpoint open
-            }
-            
-            if (!code.startsWith("200 ")) {
+
+            if (!(code == 200 || code == 416)) {
                 log.warning("unknown code $code")
                 endpoint.close()
-                return
+                return false
             }
 
             // parse all headers
-            Set<String> headers = new HashSet<>()
+            Map<String,String> headers = new HashMap<>()
             String header
-            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) 
-                headers.add(header)
-
-            long receivedStart = -1
-            long receivedEnd = -1
-            for (String receivedHeader : headers) {
-                def group = (receivedHeader =~ /^Content-Range: (\d+)-(\d+)$/)
-                if (group.size() != 1) {
-                    log.info("ignoring header $receivedHeader")
-                    continue
-                } 
-
-                receivedStart = Long.parseLong(group[0][1])
-                receivedEnd = Long.parseLong(group[0][2])
+            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) {
+                int colon = header.indexOf(':')
+                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
+            if (headers.containsKey("X-Alt")) {
+                headers["X-Alt"].split(",").each {
+                    if (it.length() > 0) {
+                        byte [] raw = Base64.decode(it)
+                        Persona source = new Persona(new ByteArrayInputStream(raw))
+                        eventBus.publish(new SourceDiscoveredEvent(infoHash : infoHash, source : source))
+                    }
+                }
+            }
+
+            // parse X-Have if present
+            if (headers.containsKey("X-Have")) {
+                DataUtil.decodeXHave(headers["X-Have"]).each {
+                    if (it >= pieces.nPieces)
+                        throw new IOException("Invalid X-Have header, available piece $it/$pieces.nPieces")
+                    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()
-                return
+                return false
             }
-            
+
             // start the download
-            channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, 
-                StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
-            mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
-            
-            byte[] tmp = new byte[0x1 << 13]
-            while(mapped.hasRemaining()) {
-                if (mapped.remaining() < tmp.length)
-                    tmp = new byte[mapped.remaining()]
-                int read = is.read(tmp)
-                if (read == -1)
-                    throw new IOException()
-                synchronized(this) {
-                    mapped.put(tmp, 0, read)
+            FileChannel channel
+            try {
+                channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE,
+                        StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) 
+                mapped = channel.map(FileChannel.MapMode.READ_WRITE, pieceStart, end - pieceStart + 1)
+                mapped.position(position)
+
+                byte[] tmp = new byte[0x1 << 13]
+                while(mapped.hasRemaining()) {
+                    if (mapped.remaining() < tmp.length)
+                        tmp = new byte[mapped.remaining()]
+                    int read = is.read(tmp)
+                    if (read == -1)
+                        throw new IOException()
+                    synchronized(this) {
+                        mapped.put(tmp, 0, read)
+                        dataSinceLastRead.addAndGet(read)
+                        pieces.markPartial(piece, mapped.position())
+                    }
                 }
+
+                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)
             }
-            
-            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()
-            
-            pieces.markDownloaded(piece)        
+            pieces.markDownloaded(piece)
+            unclaim = false
         } finally {
-            try { channel?.close() } catch (IOException ignore) {}
+            if (unclaim && !steal) 
+                pieces.unclaim(piece)
         }
+        return true
     }
-    
+
     synchronized int positionInPiece() {
         if (mapped == null)
             return 0

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

@@ -1,122 +1,400 @@
 package com.muwire.core.download
 
 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.concurrent.atomic.AtomicLong
 import java.util.logging.Level
 
 import com.muwire.core.Constants
+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, DOWNLOADING, FAILED, CANCELLED, FINISHED }
+    
+    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, PAUSED, FINISHED }
+    private enum WorkerState { CONNECTING, HASHLIST, DOWNLOADING, FINISHED}
 
-    private final DownloadManager downloadManager    
+    private static final ExecutorService executorService = Executors.newCachedThreadPool({r ->
+        Thread rv = new Thread(r)
+        rv.setName("download worker")
+        rv.setDaemon(true)
+        rv
+    })
+
+    private final EventBus eventBus
+    private final DownloadManager downloadManager
+    private final Persona me
     private final File file
     private final Pieces pieces
     private final long length
-    private final InfoHash infoHash
+    private InfoHash infoHash
     private final int pieceSize
     private final I2PConnector connector
-    private final Destination destination
+    private final Set<Destination> destinations
     private final int nPieces
+    private final File incompletes
     private final File piecesFile
-    
-    private Endpoint endpoint
-    private volatile DownloadSession currentSession
-    private volatile DownloadState currentState
-    private volatile boolean cancelled
-    private volatile Thread downloadThread
-    
-    public Downloader(DownloadManager downloadManager, File file, long length, InfoHash infoHash, 
-        int pieceSizePow2, I2PConnector connector, Destination destination,
-        File incompletes) {
+    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 final AtomicBoolean eventFired = new AtomicBoolean()
+    private boolean piecesFileClosed
+
+    private final AtomicLong dataSinceLastRead = new AtomicLong(0)
+    private volatile long lastSpeedRead = System.currentTimeMillis()
+    private ArrayList speedArr = new ArrayList<Integer>()
+    private int speedPos = 0
+    private int speedAvg = 0
+
+    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) {
+        this.eventBus = eventBus
+        this.me = me
         this.downloadManager = downloadManager
         this.file = file
         this.infoHash = infoHash
         this.length = length
         this.connector = connector
-        this.destination = destination
+        this.destinations = destinations
+        this.incompletes = incompletes
         this.piecesFile = new File(incompletes, file.getName()+".pieces")
+        this.incompleteFile = new File(incompletes, file.getName()+".part")
+        this.pieceSizePow2 = pieceSizePow2
         this.pieceSize = 1 << pieceSizePow2
-        
-        int nPieces
-        if (length % pieceSize == 0)
-            nPieces = length / pieceSize
-        else
-            nPieces = length / pieceSize + 1
-        this.nPieces = nPieces
-        
-        pieces = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
-        currentState = DownloadState.CONNECTING
+        this.pieces = pieces
+        this.nPieces = pieces.nPieces
     }
-    
+
+    public synchronized InfoHash getInfoHash() {
+        infoHash
+    }
+
+    private synchronized void setInfoHash(InfoHash infoHash) {
+        this.infoHash = infoHash
+    }
+
     void download() {
         readPieces()
-        downloadThread = Thread.currentThread()
-        Endpoint endpoint = null
-        try {
-            endpoint = connector.connect(destination)
-            currentState = DownloadState.DOWNLOADING
-            while(!pieces.isComplete()) {
-                currentSession = new DownloadSession(pieces, infoHash, endpoint, file, pieceSize, length)
-                currentSession.request()
-                writePieces()
+        destinations.each {
+            if (it != me.destination) {
+                def worker = new DownloadWorker(it)
+                activeWorkers.put(it, worker)
+                executorService.submit(worker)
             }
-            currentState = DownloadState.FINISHED
-            piecesFile.delete()
-        } catch (Exception bad) {
-            log.log(Level.WARNING,"Exception while downloading",bad)
-            if (cancelled)
-                currentState = DownloadState.CANCELLED
-            else if (currentState != DownloadState.FINISHED)
-                currentState = DownloadState.FAILED
-        } finally {
-            endpoint?.close()
         }
     }
-    
+
     void readPieces() {
         if (!piecesFile.exists())
             return
-        piecesFile.withReader { 
-            int piece = Integer.parseInt(it.readLine())
-            pieces.markDownloaded(piece)
-        }
-    }
-    
-    void writePieces() {
-        piecesFile.withPrintWriter { writer ->
-            pieces.getDownloaded().each { piece -> 
-                writer.println(piece)
+        piecesFile.eachLine {
+            String [] split = it.split(",")
+            int piece = Integer.parseInt(split[0])
+            if (split.length == 1)
+                pieces.markDownloaded(piece)
+            else {
+                int position = Integer.parseInt(split[1])
+                pieces.markPartial(piece, position)
             }
         }
     }
-    
+
+    void writePieces() {
+        synchronized(piecesFile) {
+            if (piecesFileClosed)
+                return
+            piecesFile.withPrintWriter { writer ->
+                pieces.write(writer)
+            }
+        }
+    }
+
     public long donePieces() {
         pieces.donePieces()
     }
-    
-    public int positionInPiece() {
-        if (currentSession == null)
-            return 0
-        currentSession.positionInPiece()
+
+
+    public int speed() {
+        int currSpeed = 0
+        if (getCurrentState() == DownloadState.DOWNLOADING) {
+            long dataRead = dataSinceLastRead.getAndSet(0)
+            long now = System.currentTimeMillis()
+            if (now > lastSpeedRead)
+                currSpeed = (int) (dataRead * 1000.0 / (now - lastSpeedRead))
+            lastSpeedRead = now
+        }
+        
+        if (speedArr.size() != downloadManager.muSettings.speedSmoothSeconds) {
+            speedArr.clear()
+            downloadManager.muSettings.speedSmoothSeconds.times { speedArr.add(0) }
+            speedPos = 0
+        }
+
+        // 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() {
-        currentState
+        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())
+                return DownloadState.FINISHED
+            return DownloadState.FAILED
+        }
+
+        // if at least one is downloading...
+        boolean oneDownloading = false
+        activeWorkers.values().each {
+            if (it.currentState == WorkerState.DOWNLOADING) {
+                oneDownloading = true
+                return
+            }
+        }
+
+        if (oneDownloading)
+            return DownloadState.DOWNLOADING
+
+        // at least one is requesting hashlist
+        boolean oneHashlist = false
+        activeWorkers.values().each {
+            if (it.currentState == WorkerState.HASHLIST) {
+                oneHashlist = true
+                return
+            }
+        }
+        if (oneHashlist)
+            return DownloadState.HASHLIST
+
+        return DownloadState.CONNECTING
     }
-    
+
     public void cancel() {
         cancelled = true
-        downloadThread?.interrupt()
+        stop()
+        synchronized(piecesFile) {
+            piecesFileClosed = true
+            piecesFile.delete()
+        }
+        incompleteFile.delete()
+        pieces.clearAll()
+    }
+
+    public void pause() {
+        paused = true
+        stop()
+    }
+
+    void stop() {
+        activeWorkers.values().each {
+            it.cancel()
+        }
+    }
+
+    public int activeWorkers() {
+        int active = 0
+        activeWorkers.values().each {
+            if (it.currentState != WorkerState.FINISHED)
+                active++
+        }
+        active
+    }
+
+    public void resume() {
+        paused = false
+        readPieces()
+        destinations.each { destination ->
+            def worker = activeWorkers.get(destination)
+            if (worker != null) {
+                if (worker.currentState == WorkerState.FINISHED) {
+                    def newWorker = new DownloadWorker(destination)
+                    activeWorkers.put(destination, newWorker)
+                    executorService.submit(newWorker)
+                }
+            } else {
+                worker = new DownloadWorker(destination)
+                activeWorkers.put(destination, worker)
+                executorService.submit(worker)
+            }
+        }
+    }
+
+    void addSource(Destination d) {
+        if (activeWorkers.containsKey(d))
+            return
+        DownloadWorker newWorker = new DownloadWorker(d)
+        activeWorkers.put(d, newWorker)
+        executorService.submit(newWorker)
     }
     
-    public void resume() {
-        downloadManager.resume(this)
+    boolean isSequential() {
+        pieces.ratio == 0f
+    }
+    
+    File generatePreview() {
+        int lastCompletePiece = pieces.firstIncomplete() - 1
+        if (lastCompletePiece == -1)
+            return null
+        if (lastCompletePiece < -1)
+            return file
+        long previewableLength = (lastCompletePiece + 1) * ((long)pieceSize)
+        
+        // generate name
+        long now = System.currentTimeMillis()
+        File previewFile
+        File parentFile = file.getParentFile()
+        int lastDot = file.getName().lastIndexOf('.')
+        if (lastDot < 0) 
+            previewFile = new File(parentFile, file.getName() + "." + String.valueOf(now) + ".mwpreview")
+        else {
+            String name = file.getName().substring(0, lastDot)
+            String extension = file.getName().substring(lastDot + 1)
+            String previewName = name + "." + String.valueOf(now) + ".mwpreview."+extension
+            previewFile = new File(parentFile, previewName)
+        }
+        
+        // copy
+        InputStream is = null
+        OutputStream os = null
+        try {
+            is = new BufferedInputStream(new FileInputStream(incompleteFile))
+            os = new BufferedOutputStream(new FileOutputStream(previewFile))
+            byte [] tmp = new byte[0x1 << 13]
+            long totalCopied = 0
+            while(totalCopied < previewableLength) {
+                int read = is.read(tmp, 0, (int)Math.min(tmp.length, previewableLength - totalCopied))
+                if (read < 0)
+                    throw new IOException("EOF?")
+                os.write(tmp, 0, read)
+                totalCopied += read
+            }
+            return previewFile
+        } catch (IOException bad) {
+            log.log(Level.WARNING,"Preview failed",bad)
+            return null
+        } finally {
+            try {is?.close() } catch (IOException ignore) {}
+            try {os?.close() } catch (IOException ignore) {}
+        }
+    }
+
+    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
+        }
+
+        public void run() {
+            downloadThread = Thread.currentThread()
+            currentState = WorkerState.CONNECTING
+            Endpoint endpoint = null
+            try {
+                endpoint = connector.connect(destination)
+                while(getInfoHash().hashList == null) {
+                    currentState = WorkerState.HASHLIST
+                    HashListSession session = new HashListSession(me.toBase64(), infoHash, endpoint)
+                    InfoHash received = session.request()
+                    setInfoHash(received)
+                }
+                currentState = WorkerState.DOWNLOADING
+                boolean requestPerformed
+                while(!pieces.isComplete()) {
+                    currentSession = new DownloadSession(eventBus, me.toBase64(), pieces, getInfoHash(),
+                        endpoint, incompleteFile, pieceSize, length, available, dataSinceLastRead)
+                    requestPerformed = currentSession.request()
+                    if (!requestPerformed)
+                        break
+                    successfulDestinations.add(endpoint.destination)
+                    writePieces()
+                }
+            } catch (Exception bad) {
+                log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
+            } finally {
+                writePieces()
+                currentState = WorkerState.FINISHED
+                if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {
+                    synchronized(piecesFile) {
+                        piecesFileClosed = 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.getCanonicalFile(), getInfoHash(), pieceSizePow2, successfulDestinations),
+                        downloader : Downloader.this))
+
+                }
+                endpoint?.close()
+            }
+        }
+
+        void cancel() {
+            downloadThread?.interrupt()
+        }
     }
 }

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

@@ -0,0 +1,82 @@
+package com.muwire.core.download
+
+import java.nio.ByteBuffer
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+import com.muwire.core.Constants
+import com.muwire.core.InfoHash
+import com.muwire.core.connection.Endpoint
+
+import groovy.util.logging.Log
+
+import static com.muwire.core.util.DataUtil.readTillRN
+
+import net.i2p.data.Base64
+
+@Log
+class HashListSession {
+    private final String meB64
+    private final InfoHash infoHash
+    private final Endpoint endpoint
+
+    HashListSession(String meB64, InfoHash infoHash, Endpoint endpoint) {
+        this.meB64 = meB64
+        this.infoHash = infoHash
+        this.endpoint = endpoint
+    }
+
+    InfoHash request() throws IOException {
+        InputStream is = endpoint.getInputStream()
+        OutputStream os = endpoint.getOutputStream()
+
+        String root = Base64.encode(infoHash.getRoot())
+        os.write("HASHLIST $root\r\n".getBytes(StandardCharsets.US_ASCII))
+        os.write("X-Persona: $meB64\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+        os.flush()
+
+        String code = readTillRN(is)
+        if (!code.startsWith("200"))
+            throw new IOException("unknown code $code")
+
+        // parse all headers
+        Set<String> headers = new HashSet<>()
+        String header
+        while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS)
+            headers.add(header)
+
+        long receivedStart = -1
+        long receivedEnd = -1
+        for (String receivedHeader : headers) {
+            def group = (receivedHeader =~ /^Content-Range: (\d+)-(\d+)$/)
+            if (group.size() != 1) {
+                log.info("ignoring header $receivedHeader")
+                continue
+            }
+
+            receivedStart = Long.parseLong(group[0][1])
+            receivedEnd = Long.parseLong(group[0][2])
+        }
+
+        if (receivedStart != 0)
+            throw new IOException("hashlist started at $receivedStart")
+
+        byte[] hashList = new byte[receivedEnd]
+        ByteBuffer hashListBuf = ByteBuffer.wrap(hashList)
+        byte[] tmp = new byte[0x1 << 13]
+        while(hashListBuf.hasRemaining()) {
+            if (hashListBuf.remaining() > tmp.length)
+                tmp = new byte[hashListBuf.remaining()]
+            int read = is.read(tmp)
+            if (read == -1)
+                throw new IOException()
+            hashListBuf.put(tmp, 0, read)
+        }
+
+        InfoHash received = InfoHash.fromHashList(hashList)
+        if (received.getRoot() != infoHash.getRoot())
+            throw new IOException("fetched list doesn't match root")
+        received
+    }
+}

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

@@ -1,55 +1,123 @@
 package com.muwire.core.download
 
 class Pieces {
-    private final BitSet bitSet
+    private final BitSet done, claimed
     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)
     }
-    
+
     Pieces(int nPieces, float ratio) {
         this.nPieces = nPieces
         this.ratio = ratio
-        bitSet = new BitSet(nPieces)
+        done = new BitSet(nPieces)
+        claimed = new BitSet(nPieces)
     }
     
-    synchronized int getRandomPiece() {
-        int cardinality = bitSet.cardinality()
-        if (cardinality == nPieces)
-            return -1
-        
-        // if fuller than ratio just do sequential
-        if ( (1.0f * cardinality) / nPieces > ratio) {
-            return bitSet.nextClearBit(0)
+    synchronized int[] claim() {
+        int claimedCardinality = claimed.cardinality()
+        if (claimedCardinality == nPieces) {
+            // steal
+            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) {
+            int rv = claimed.nextClearBit(0)
+            claimed.set(rv)
+            return [rv, partials.getOrDefault(rv, 0), 0]
+        }
+
         while(true) {
             int start = random.nextInt(nPieces)
-            while(bitSet.get(start) && ++start < nPieces);
-            return start
+            if (claimed.get(start))
+                continue
+            claimed.set(start)
+            return [start, partials.getOrDefault(start,0), 0]
         }
     }
-    
-    def getDownloaded() {
+
+    synchronized int[] claim(Set<Integer> available) {
+        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()
+        if (ratio > 0f)
+            Collections.shuffle(toList)
+        int rv = toList[0]
+        claimed.set(rv)
+        [rv, partials.getOrDefault(rv, 0), 0]
+    }
+
+    synchronized def getDownloaded() {
         def rv = []
-        for (int i = bitSet.nextSetBit(0); i >= 0; i = bitSet.nextSetBit(i+1)) {
+        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1)) {
             rv << i
         }
         rv
     }
-    
+
     synchronized void markDownloaded(int piece) {
-        bitSet.set(piece)
+        if (piece >= nPieces)
+            throw new IllegalArgumentException("invalid piece marked as downloaded? $piece/$nPieces")
+        done.set(piece)
+        claimed.set(piece)
+        partials.remove(piece)
     }
     
+    synchronized void markPartial(int piece, int position) {
+        partials.put(piece, position)
+    }
+
+    synchronized void unclaim(int piece) {
+        claimed.clear(piece)
+    }
+
     synchronized boolean isComplete() {
-        bitSet.cardinality() == nPieces
+        done.cardinality() == nPieces
+    }
+
+    synchronized int donePieces() {
+        done.cardinality()
+    }
+
+    synchronized boolean isDownloaded(int piece) {
+        done.get(piece)
+    }
+
+    synchronized void clearAll() {
+        done.clear()
+        claimed.clear()
+        partials.clear()
     }
     
-    synchronized int donePieces() {
-        bitSet.cardinality()
+    synchronized int firstIncomplete() {
+        done.nextClearBit(0)
+    }
+    
+    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

@@ -0,0 +1,10 @@
+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/UIDownloadCancelledEvent.groovy

@@ -0,0 +1,7 @@
+package com.muwire.core.download
+
+import com.muwire.core.Event
+
+class UIDownloadCancelledEvent extends Event {
+    Downloader downloader
+}

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

@@ -3,8 +3,12 @@ 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
+
+    UIResultEvent[] result
+    Set<Destination> sources
     File target
+    boolean sequential
 }

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

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

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

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

core/src/main/groovy/com/muwire/core/filecert/Certificate.groovy

@@ -0,0 +1,152 @@
+package com.muwire.core.filecert
+
+import com.muwire.core.Constants
+import com.muwire.core.InfoHash
+import com.muwire.core.InvalidSignatureException
+import com.muwire.core.Name
+import com.muwire.core.Persona
+
+import net.i2p.crypto.DSAEngine
+import net.i2p.data.Signature
+import net.i2p.data.SigningPrivateKey
+import net.i2p.data.SigningPublicKey
+
+class Certificate {
+    private final byte version
+    private final InfoHash infoHash
+    private final Name name, comment
+    private final long timestamp
+    private final Persona issuer
+    private final byte[] sig
+    
+    private volatile byte [] payload
+    
+    Certificate(InputStream is) {
+        version = (byte) (is.read() & 0xFF)
+        if (version > Constants.FILE_CERT_VERSION)
+            throw new IOException("Unknown version $version")
+        
+        DataInputStream dis = new DataInputStream(is)
+        timestamp = dis.readLong()
+        
+        byte [] root = new byte[InfoHash.SIZE]
+        dis.readFully(root)
+        infoHash = new InfoHash(root)
+        
+        name = new Name(dis)
+        
+        issuer = new Persona(dis)
+        if (version == 2) {
+            byte present = (byte)(dis.read() & 0xFF)
+            if (present != 0) {
+                comment = new Name(dis)
+            }
+        }
+        
+        sig = new byte[Constants.SIG_TYPE.getSigLen()]
+        dis.readFully(sig)
+        
+        if (!verify(version, infoHash, name, timestamp, issuer, comment, sig))
+            throw new InvalidSignatureException("certificate for $name.name from ${issuer.getHumanReadableName()} didn't verify")
+    }
+    
+    Certificate(InfoHash infoHash, String name, long timestamp, Persona issuer, String comment, SigningPrivateKey spk) {
+        this.version = Constants.FILE_CERT_VERSION
+        this.infoHash = infoHash
+        this.name = new Name(name)
+        if (comment != null)
+            this.comment = new Name(comment)
+        else
+            this.comment = null
+        this.timestamp = timestamp
+        this.issuer = issuer
+        
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        DataOutputStream daos = new DataOutputStream(baos)
+        
+        daos.write(version)
+        daos.writeLong(timestamp)
+        daos.write(infoHash.getRoot())
+        this.name.write(daos)
+        issuer.write(daos)
+        if (this.comment == null) {
+            daos.write((byte) 0)
+        } else {
+            daos.write((byte) 1)
+            this.comment.write(daos)
+        }
+        daos.close()
+        
+        byte[] payload = baos.toByteArray()
+        Signature signature = DSAEngine.getInstance().sign(payload, spk)
+        this.sig = signature.getData()
+    }
+    
+    private static boolean verify(byte version, InfoHash infoHash, Name name, long timestamp, Persona issuer, Name comment, byte[] sig) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        DataOutputStream daos = new DataOutputStream(baos)
+        daos.write(version)
+        daos.writeLong(timestamp)
+        daos.write(infoHash.getRoot())
+        name.write(daos)
+        issuer.write(daos)
+        if (version == 2) {
+            if (comment == null) {
+                daos.write((byte)0)
+            } else {
+                daos.write((byte)1)
+                comment.write(daos)
+            }
+        }
+        daos.close()
+        
+        byte [] payload = baos.toByteArray()
+        SigningPublicKey spk = issuer.destination.getSigningPublicKey()
+        Signature signature = new Signature(Constants.SIG_TYPE, sig)
+        DSAEngine.getInstance().verifySignature(signature, payload, spk)
+    }
+    
+    public void write(OutputStream os) {
+        if (payload == null) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream()
+            DataOutputStream daos = new DataOutputStream(baos)
+            daos.write(version)
+            daos.writeLong(timestamp)
+            daos.write(infoHash.getRoot())
+            name.write(daos)
+            issuer.write(daos)
+            if (version == 2) {
+                if (comment == null)
+                    daos.write((byte) 0)
+                else {
+                    daos.write((byte) 1)
+                    comment.write(daos)
+                }
+            }
+            daos.write(sig)
+            daos.close()
+            
+            payload = baos.toByteArray()
+        }
+        os.write(payload)
+    }
+    
+    @Override
+    public int hashCode() {
+        version.hashCode() ^ infoHash.hashCode() ^ timestamp.hashCode() ^ name.hashCode() ^ issuer.hashCode() ^ Objects.hashCode(comment)
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof Certificate))
+            return false
+        Certificate other = (Certificate)o
+        
+        version == other.version &&
+            infoHash == other.infoHash &&
+            timestamp == other.timestamp &&
+            name == other.name &&
+            issuer == other.issuer &&
+            comment == other.comment
+    }
+}

core/src/main/groovy/com/muwire/core/filecert/CertificateClient.groovy

@@ -0,0 +1,90 @@
+package com.muwire.core.filecert
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.logging.Level
+
+import net.i2p.data.Base64
+
+import com.muwire.core.Constants
+import com.muwire.core.EventBus
+import com.muwire.core.InvalidSignatureException
+import com.muwire.core.connection.Endpoint
+import com.muwire.core.connection.I2PConnector
+import com.muwire.core.util.DataUtil
+
+import groovy.util.logging.Log
+
+@Log
+class CertificateClient {
+    private final EventBus eventBus
+    private final I2PConnector connector
+    
+    private final ExecutorService fetcherThread = Executors.newSingleThreadExecutor()
+    
+    CertificateClient(EventBus eventBus, I2PConnector connector) {
+        this.eventBus = eventBus
+        this.connector = connector
+    }
+    
+    void onUIFetchCertificatesEvent(UIFetchCertificatesEvent e) {
+        fetcherThread.execute({
+            Endpoint endpoint = null
+            try {
+                eventBus.publish(new CertificateFetchEvent(status : CertificateFetchStatus.CONNECTING))
+                endpoint = connector.connect(e.host.destination)
+                
+                String infoHashString = Base64.encode(e.infoHash.getRoot())
+                OutputStream os = endpoint.getOutputStream()
+                os.write("CERTIFICATES ${infoHashString}\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                
+                InputStream is = endpoint.getInputStream()
+                String code = DataUtil.readTillRN(is)
+                if (!code.startsWith("200"))
+                    throw new IOException("invalid code $code")
+
+                // parse all headers
+                Map<String,String> headers = new HashMap<>()
+                String header
+                while((header = DataUtil.readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) {
+                    int colon = header.indexOf(':')
+                    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()
+                }
+
+                if (!headers.containsKey("Count"))
+                    throw new IOException("No count header")
+                
+                int count = Integer.parseInt(headers['Count'])
+                
+                // start pulling the certs
+                eventBus.publish(new CertificateFetchEvent(status : CertificateFetchStatus.FETCHING, count : count))
+                
+                DataInputStream dis = new DataInputStream(is)
+                for (int i = 0; i < count; i++) {
+                    int size = dis.readUnsignedShort()
+                    byte [] tmp = new byte[size]
+                    dis.readFully(tmp)
+                    Certificate cert = null
+                    try {
+                        cert = new Certificate(new ByteArrayInputStream(tmp))
+                    } catch (IOException | InvalidSignatureException ignore) {
+                        log.log(Level.WARNING, "certificate creation failed",ignore)
+                        continue
+                    }
+                    if (cert.infoHash == e.infoHash)
+                        eventBus.publish(new CertificateFetchedEvent(certificate : cert))
+                }
+            } catch (Exception bad) {
+                log.log(Level.WARNING,"Fetching certificates failed", bad)
+                eventBus.publish(new CertificateFetchEvent(status : CertificateFetchStatus.FAILED))
+            } finally {
+                endpoint?.close()
+            }
+        })
+    }
+}

core/src/main/groovy/com/muwire/core/filecert/CertificateCreatedEvent.groovy

@@ -0,0 +1,7 @@
+package com.muwire.core.filecert
+
+import com.muwire.core.Event
+
+class CertificateCreatedEvent extends Event {
+    Certificate certificate
+}