add emitting client to progress event
[jFCPlib.git] / src / net / pterodactylus / fcp / highlevel / HighLevelClient.java
index 089c205..a347e68 100644 (file)
@@ -27,14 +27,18 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.fcp.AddPeer;
 import net.pterodactylus.fcp.AllData;
+import net.pterodactylus.fcp.ClientGet;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
 import net.pterodactylus.fcp.ConfigData;
@@ -52,6 +56,7 @@ import net.pterodactylus.fcp.GenerateSSK;
 import net.pterodactylus.fcp.GetFailed;
 import net.pterodactylus.fcp.IdentifierCollision;
 import net.pterodactylus.fcp.ListPeers;
+import net.pterodactylus.fcp.ListPersistentRequests;
 import net.pterodactylus.fcp.NodeData;
 import net.pterodactylus.fcp.NodeHello;
 import net.pterodactylus.fcp.NodeRef;
@@ -68,6 +73,7 @@ import net.pterodactylus.fcp.ProtocolError;
 import net.pterodactylus.fcp.PutFailed;
 import net.pterodactylus.fcp.PutFetchable;
 import net.pterodactylus.fcp.PutSuccessful;
+import net.pterodactylus.fcp.ReturnType;
 import net.pterodactylus.fcp.SSKKeypair;
 import net.pterodactylus.fcp.SimpleProgress;
 import net.pterodactylus.fcp.StartedCompression;
@@ -79,6 +85,7 @@ import net.pterodactylus.fcp.TestDDAResponse;
 import net.pterodactylus.fcp.URIGenerated;
 import net.pterodactylus.fcp.UnknownNodeIdentifier;
 import net.pterodactylus.fcp.UnknownPeerNoteType;
+import net.pterodactylus.fcp.WatchGlobal;
 
 /**
  * A high-level client that allows simple yet full-featured access to a Freenet
@@ -98,19 +105,19 @@ public class HighLevelClient {
        /** The name of the client. */
        private final String clientName;
 
-       /** The address of the node. */
-       private InetAddress address;
-
-       /** The port number of the node. */
-       private int port;
-
        /** The FCP connection to the node. */
-       private FcpConnection fcpConnection;
+       private FcpConnection fcpConnection = null;
+
+       /** Listeners for high-level client events. */
+       private List<HighLevelClientListener> highLevelClientListeners = Collections.synchronizedList(new ArrayList<HighLevelClientListener>());
 
        /** The listener for the connection. */
        private HighLevelClientFcpListener highLevelClientFcpListener = new HighLevelClientFcpListener();
 
-       /** The callback for {@link #connect()}. */
+       /** The listeners for progress events. */
+       private List<HighLevelProgressListener> highLevelProgressListeners = Collections.synchronizedList(new ArrayList<HighLevelProgressListener>());
+
+       /** The callback for {@link #connect(String)}. */
        private HighLevelCallback<ConnectResult> connectCallback;
 
        /** Mapping from request identifiers to callbacks. */
@@ -125,72 +132,129 @@ public class HighLevelClient {
        /** Mapping from directories to DDA callbacks. */
        private Map<String, HighLevelCallback<DirectDiskAccessResult>> directDiskAccessCallbacks = Collections.synchronizedMap(new HashMap<String, HighLevelCallback<DirectDiskAccessResult>>());
 
+       /** Mapping from request identifiers to download callbacks. */
+       private Map<String, HighLevelProgressCallback<DownloadResult>> downloadCallbacks = Collections.synchronizedMap(new HashMap<String, HighLevelProgressCallback<DownloadResult>>());
+
+       /** The callback for {@link #getRequests()}. */
+       private HighLevelCallback<RequestListResult> requestListCallback;
+
        /**
         * Creates a new high-level client that connects to a node on
         * <code>localhost</code>.
         * 
         * @param clientName
         *            The name of the client
-        * @throws UnknownHostException
-        *             if the hostname of the node can not be resolved.
         */
-       public HighLevelClient(String clientName) throws UnknownHostException {
-               this(clientName, "localhost");
+       public HighLevelClient(String clientName) {
+               this.clientName = clientName;
        }
 
+       //
+       // EVENT MANAGEMENT
+       //
+
        /**
-        * Creates a new high-level client that connects to a node on the given
-        * host.
+        * Adds the given high-level client listener to list of listeners.
         * 
-        * @param clientName
-        *            The name of the client
-        * @param host
-        *            The hostname of the node
-        * @throws UnknownHostException
-        *             if the hostname of the node can not be resolved.
+        * @param highLevelClientListener
+        *            The listener to add
         */
-       public HighLevelClient(String clientName, String host) throws UnknownHostException {
-               this(clientName, host, FcpConnection.DEFAULT_PORT);
+       public void addHighLevelClientListener(HighLevelClientListener highLevelClientListener) {
+               highLevelClientListeners.add(highLevelClientListener);
        }
 
        /**
-        * Creates a new high-level client that connects to a node on the given
-        * host.
+        * Removes the given high-level client listener from the list of listeners.
         * 
-        * @param clientName
-        *            The name of the client
-        * @param host
-        *            The hostname of the node
-        * @param port
-        *            The port number of the node
-        * @throws UnknownHostException
-        *             if the hostname of the node can not be resolved.
+        * @param highLevelClientListener
+        *            The listener to remove
         */
-       public HighLevelClient(String clientName, String host, int port) throws UnknownHostException {
-               this(clientName, InetAddress.getByName(host), port);
+       public void removeHighLevelClientListener(HighLevelClientListener highLevelClientListener) {
+               highLevelClientListeners.remove(highLevelClientListener);
        }
 
        /**
-        * Creates a new high-level client that connects to a node at the given
-        * address.
+        * Notifies all listeners that a client has connected.
+        */
+       private void fireClientConnected() {
+               for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) {
+                       highLevelClientListener.clientConnected(this);
+               }
+       }
+
+       /**
+        * Notifies all listeners that a client has disconnected.
         * 
-        * @param clientName
-        *            The name of the client
-        * @param address
-        *            The address of the node
-        * @param port
-        *            The port number of the node
+        * @param throwable
+        *            The exception that caused the disconnect, or <code>null</code>
+        *            if there was no exception
         */
-       public HighLevelClient(String clientName, InetAddress address, int port) {
-               this.clientName = clientName;
-               this.address = address;
-               this.port = port;
+       private void fireClientDisconnected(Throwable throwable) {
+               for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) {
+                       highLevelClientListener.clientDisconnected(this, throwable);
+               }
+       }
+
+       /**
+        * Adds a high-level progress listener.
+        * 
+        * @param highLevelProgressListener
+        *            The high-level progress listener to add
+        */
+       public void addHighLevelProgressListener(HighLevelProgressListener highLevelProgressListener) {
+               highLevelProgressListeners.add(highLevelProgressListener);
+       }
+
+       /**
+        * Removes a high-level progress listener.
+        * 
+        * @param highLevelProgressListener
+        *            The high-level progress listener to remove
+        */
+       public void removeHighLevelProgressListener(HighLevelProgressListener highLevelProgressListener) {
+               highLevelProgressListeners.remove(highLevelProgressListener);
+       }
+
+       /**
+        * Notifies all listeners that the request with the given identifier made
+        * some progress.
+        * 
+        * @param identifier
+        *            The identifier of the request
+        * @param highLevelProgress
+        *            The progress of the request
+        */
+       private void fireProgressReceived(String identifier, HighLevelProgress highLevelProgress) {
+               for (HighLevelProgressListener highLevelProgressListener: highLevelProgressListeners) {
+                       highLevelProgressListener.progressReceived(this, identifier, highLevelProgress);
+               }
        }
 
        //
        // ACCESSORS
        //
 
+       /**
+        * Returns the FCP connection that backs this high-level client. This method
+        * should be used with care as fiddling around with the FCP connection can
+        * easily break the high-level client if you don’t know what you’re doing!
+        * 
+        * @return The FCP connection of this client
+        */
+       public FcpConnection getFcpConnection() {
+               return fcpConnection;
+       }
+
+       /**
+        * Returns whether the node is connected.
+        * 
+        * @return <code>true</code> if the node is currently connected,
+        *         <code>false</code> otherwise
+        */
+       public boolean isConnected() {
+               return fcpConnection != null;
+       }
+
        //
        // ACTIONS
        //
@@ -198,13 +262,50 @@ public class HighLevelClient {
        /**
         * Connects the client.
         * 
+        * @param hostname
+        *            The hostname of the node
+        * @return A callback with a connection result
+        * @throws UnknownHostException
+        *             if the hostname can not be resolved
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public HighLevelCallback<ConnectResult> connect(String hostname) throws UnknownHostException, IOException {
+               return connect(hostname, 9481);
+       }
+
+       /**
+        * Connects the client.
+        * 
+        * @param hostname
+        *            The hostname of the node
+        * @param port
+        *            The port number of the node
+        * @return A callback with a connection result
+        * @throws UnknownHostException
+        *             if the hostname can not be resolved
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public HighLevelCallback<ConnectResult> connect(String hostname, int port) throws UnknownHostException, IOException {
+               return connect(InetAddress.getByName(hostname), port);
+       }
+
+       /**
+        * Connects the client.
+        * 
+        * @param address
+        *            The address of the node
+        * @param port
+        *            The port number of the node
         * @return A callback with a connection result
         * @throws IOException
         *             if an I/O error occurs communicating with the node
         */
-       public HighLevelCallback<ConnectResult> connect() throws IOException {
+       public HighLevelCallback<ConnectResult> connect(InetAddress address, int port) throws IOException {
                fcpConnection = new FcpConnection(address, port);
                fcpConnection.addFcpListener(highLevelClientFcpListener);
+               fcpConnection.connect();
                ClientHello clientHello = new ClientHello(clientName);
                connectCallback = new HighLevelCallback<ConnectResult>(new ConnectResult());
                fcpConnection.sendMessage(clientHello);
@@ -215,6 +316,7 @@ public class HighLevelClient {
         * Disconnects the client from the node.
         */
        public void disconnect() {
+               disconnect(null);
        }
 
        /**
@@ -227,13 +329,28 @@ public class HighLevelClient {
        public HighLevelCallback<KeyGenerationResult> generateKey() throws IOException {
                String identifier = generateIdentifier("generateSSK");
                GenerateSSK generateSSK = new GenerateSSK(identifier);
-               HighLevelCallback<KeyGenerationResult> keyGenerationCallback = new HighLevelCallback<KeyGenerationResult>(new KeyGenerationResult());
+               HighLevelCallback<KeyGenerationResult> keyGenerationCallback = new HighLevelCallback<KeyGenerationResult>(new KeyGenerationResult(identifier));
                keyGenerationCallbacks.put(identifier, keyGenerationCallback);
                fcpConnection.sendMessage(generateSSK);
                return keyGenerationCallback;
        }
 
        /**
+        * Sets whether to watch the global queue.
+        * 
+        * @param enabled
+        *            <code>true</code> to watch the global queue in addition to
+        *            the client-local queue, <code>false</code> to only watch the
+        *            client-local queue
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public void setWatchGlobal(boolean enabled) throws IOException {
+               WatchGlobal watchGlobal = new WatchGlobal(enabled);
+               fcpConnection.sendMessage(watchGlobal);
+       }
+
+       /**
         * Gets a list of all peers from the node.
         * 
         * @return A callback with the peer list
@@ -243,7 +360,7 @@ public class HighLevelClient {
        public HighLevelCallback<PeerListResult> getPeers() throws IOException {
                String identifier = generateIdentifier("listPeers");
                ListPeers listPeers = new ListPeers(identifier, true, true);
-               HighLevelCallback<PeerListResult> peerListCallback = new HighLevelCallback<PeerListResult>(new PeerListResult());
+               HighLevelCallback<PeerListResult> peerListCallback = new HighLevelCallback<PeerListResult>(new PeerListResult(identifier));
                peerListCallbacks.put(identifier, peerListCallback);
                fcpConnection.sendMessage(listPeers);
                return peerListCallback;
@@ -261,7 +378,7 @@ public class HighLevelClient {
        public HighLevelCallback<PeerResult> addPeer(String nodeRefFile) throws IOException {
                String identifier = generateIdentifier("addPeer");
                AddPeer addPeer = new AddPeer(nodeRefFile);
-               HighLevelCallback<PeerResult> peerCallback = new HighLevelCallback<PeerResult>(new PeerResult());
+               HighLevelCallback<PeerResult> peerCallback = new HighLevelCallback<PeerResult>(new PeerResult(identifier));
                peerCallbacks.put(identifier, peerCallback);
                fcpConnection.sendMessage(addPeer);
                return peerCallback;
@@ -279,7 +396,7 @@ public class HighLevelClient {
        public HighLevelCallback<PeerResult> addPeer(URL nodeRefURL) throws IOException {
                String identifier = generateIdentifier("addPeer");
                AddPeer addPeer = new AddPeer(nodeRefURL);
-               HighLevelCallback<PeerResult> peerCallback = new HighLevelCallback<PeerResult>(new PeerResult());
+               HighLevelCallback<PeerResult> peerCallback = new HighLevelCallback<PeerResult>(new PeerResult(identifier));
                peerCallbacks.put(identifier, peerCallback);
                fcpConnection.sendMessage(addPeer);
                return peerCallback;
@@ -297,7 +414,7 @@ public class HighLevelClient {
        public HighLevelCallback<PeerResult> addPeer(NodeRef nodeRef) throws IOException {
                String identifier = generateIdentifier("addPeer");
                AddPeer addPeer = new AddPeer(nodeRef);
-               HighLevelCallback<PeerResult> peerCallback = new HighLevelCallback<PeerResult>(new PeerResult());
+               HighLevelCallback<PeerResult> peerCallback = new HighLevelCallback<PeerResult>(new PeerResult(identifier));
                peerCallbacks.put(identifier, peerCallback);
                fcpConnection.sendMessage(addPeer);
                return peerCallback;
@@ -319,12 +436,60 @@ public class HighLevelClient {
         */
        public HighLevelCallback<DirectDiskAccessResult> checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException {
                TestDDARequest testDDARequest = new TestDDARequest(directory, wantRead, wantWrite);
-               HighLevelCallback<DirectDiskAccessResult> directDiskAccessCallback = new HighLevelCallback<DirectDiskAccessResult>(new DirectDiskAccessResult());
+               HighLevelCallback<DirectDiskAccessResult> directDiskAccessCallback = new HighLevelCallback<DirectDiskAccessResult>(new DirectDiskAccessResult(directory));
                directDiskAccessCallbacks.put(directory, directDiskAccessCallback);
                fcpConnection.sendMessage(testDDARequest);
                return directDiskAccessCallback;
        }
 
+       /**
+        * Starts a download. Files can either be download to disk or streamed from
+        * the node. When downloading to disk you have to perform a direct disk
+        * access check for the directory you want to put the downloaded file in!
+        * 
+        * @see #checkDirectDiskAccess(String, boolean, boolean)
+        * @param uri
+        *            The URI to get
+        * @param filename
+        *            The filename to save the data to, or <code>null</code> to
+        *            retrieve the data as InputStream from the
+        *            {@link DownloadResult}
+        * @param global
+        *            Whether to put the download on the global queue
+        * @return A download result
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public HighLevelProgressCallback<DownloadResult> download(String uri, String filename, boolean global) throws IOException {
+               String identifier = generateIdentifier("download");
+               ClientGet clientGet = new ClientGet(uri, identifier, (filename == null) ? ReturnType.direct : ReturnType.disk);
+               clientGet.setGlobal(global);
+               HighLevelProgressCallback<DownloadResult> downloadCallback = new HighLevelProgressCallback<DownloadResult>(new DownloadResult(identifier));
+               downloadCallbacks.put(identifier, downloadCallback);
+               fcpConnection.sendMessage(clientGet);
+               return downloadCallback;
+       }
+
+       /**
+        * Requests a list of all running requests from the node.
+        * 
+        * @return The request list result
+        * @throws IOException
+        *             if an I/O errors communicating with the node
+        */
+       public HighLevelCallback<RequestListResult> getRequests() throws IOException {
+               String identifier = generateIdentifier("list-persistent-requests");
+               ListPersistentRequests listPersistentRequests = new ListPersistentRequests();
+               synchronized (syncObject) {
+                       if (requestListCallback != null) {
+                               logger.log(Level.SEVERE, "getRequests() called with request still running!");
+                       }
+                       requestListCallback = new HighLevelCallback<RequestListResult>(new RequestListResult(identifier));
+               }
+               fcpConnection.sendMessage(listPersistentRequests);
+               return requestListCallback;
+       }
+
        //
        // PRIVATE METHODS
        //
@@ -341,6 +506,21 @@ public class HighLevelClient {
        }
 
        /**
+        * Disconnects the client from the node, handing the given Throwable to
+        * {@link #fireClientDisconnected(Throwable)}.
+        * 
+        * @param throwable
+        *            The exception that caused the disconnect, or <code>null</code>
+        *            if there was no exception
+        */
+       private void disconnect(Throwable throwable) {
+               if (fcpConnection != null) {
+                       fcpConnection.close();
+               }
+               fcpConnection = null;
+       }
+
+       /**
         * FCP listener for {@link HighLevelClient}.
         * 
         * @author David ‘Bombe’ Roden &lt;bombe@freenetproject.org&gt;
@@ -355,6 +535,7 @@ public class HighLevelClient {
                 * Creates a new FCP listener for {@link HighLevelClient}.
                 */
                HighLevelClientFcpListener() {
+                       /* do nothing. */
                }
 
                //
@@ -377,6 +558,11 @@ public class HighLevelClient {
                                        connectCallback.setDone();
                                        connectCallback = null;
                                }
+                               if (requestListCallback != null) {
+                                       requestListCallback.getIntermediaryResult().setFailed(true);
+                                       requestListCallback.setDone();
+                                       requestListCallback = null;
+                               }
                        }
                        if (identifier == null) {
                                /* key generation callbacks */
@@ -403,6 +589,12 @@ public class HighLevelClient {
                                        directDiskAccessEntry.getValue().setDone();
                                }
                                directDiskAccessCallbacks.clear();
+                               /* download callbacks. */
+                               for (Entry<String, HighLevelProgressCallback<DownloadResult>> downloadEntry: downloadCallbacks.entrySet()) {
+                                       downloadEntry.getValue().getIntermediaryResult().setFailed(true);
+                                       downloadEntry.getValue().setDone();
+                               }
+                               downloadCallbacks.clear();
                        } else {
                                HighLevelCallback<KeyGenerationResult> keyGenerationCallback = keyGenerationCallbacks.remove(identifier);
                                if (keyGenerationCallback != null) {
@@ -428,6 +620,12 @@ public class HighLevelClient {
                                        directDiskAccessCallback.setDone();
                                        return;
                                }
+                               HighLevelProgressCallback<DownloadResult> downloadCallback = downloadCallbacks.remove(identifier);
+                               if (downloadCallback != null) {
+                                       downloadCallback.getIntermediaryResult().setFailed(true);
+                                       downloadCallback.setDone();
+                                       return;
+                               }
                        }
                }
 
@@ -502,14 +700,17 @@ public class HighLevelClient {
                //
 
                /**
-                * @see net.pterodactylus.fcp.FcpListener#connectionClosed(net.pterodactylus.fcp.FcpConnection)
+                * @see net.pterodactylus.fcp.FcpListener#connectionClosed(net.pterodactylus.fcp.FcpConnection,
+                *      Throwable)
                 */
                @SuppressWarnings("synthetic-access")
-               public void connectionClosed(FcpConnection fcpConnection) {
+               public void connectionClosed(FcpConnection fcpConnection, Throwable throwable) {
                        if (fcpConnection != HighLevelClient.this.fcpConnection) {
                                return;
                        }
                        cancelIdentifier(null);
+                       disconnect(throwable);
+                       fireClientDisconnected(throwable);
                }
 
                /**
@@ -517,6 +718,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.AllData)
                 */
                public void receivedAllData(FcpConnection fcpConnection, AllData allData) {
+                       /* TODO */
                }
 
                /**
@@ -524,6 +726,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.CloseConnectionDuplicateClientName)
                 */
                public void receivedCloseConnectionDuplicateClientName(FcpConnection fcpConnection, CloseConnectionDuplicateClientName closeConnectionDuplicateClientName) {
+                       /* TODO */
                }
 
                /**
@@ -531,6 +734,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.ConfigData)
                 */
                public void receivedConfigData(FcpConnection fcpConnection, ConfigData configData) {
+                       /* TODO */
                }
 
                /**
@@ -538,6 +742,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.DataFound)
                 */
                public void receivedDataFound(FcpConnection fcpConnection, DataFound dataFound) {
+                       /* TODO */
                }
 
                /**
@@ -545,6 +750,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.EndListPeerNotes)
                 */
                public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
+                       /* TODO */
                }
 
                /**
@@ -568,7 +774,19 @@ public class HighLevelClient {
                 * @see net.pterodactylus.fcp.FcpListener#receivedEndListPersistentRequests(net.pterodactylus.fcp.FcpConnection,
                 *      net.pterodactylus.fcp.EndListPersistentRequests)
                 */
+               @SuppressWarnings("synthetic-access")
                public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
+                       if (fcpConnection != HighLevelClient.this.fcpConnection) {
+                               return;
+                       }
+                       synchronized (syncObject) {
+                               if (HighLevelClient.this.requestListCallback == null) {
+                                       logger.log(Level.WARNING, "got EndListPersistentRequests without running request!");
+                                       return;
+                               }
+                               requestListCallback.setDone();
+                               requestListCallback = null;
+                       }
                }
 
                /**
@@ -576,13 +794,27 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.FCPPluginReply)
                 */
                public void receivedFCPPluginReply(FcpConnection fcpConnection, FCPPluginReply fcpPluginReply) {
+                       /* TODO */
                }
 
                /**
                 * @see net.pterodactylus.fcp.FcpListener#receivedGetFailed(net.pterodactylus.fcp.FcpConnection,
                 *      net.pterodactylus.fcp.GetFailed)
                 */
+               @SuppressWarnings("synthetic-access")
                public void receivedGetFailed(FcpConnection fcpConnection, GetFailed getFailed) {
+                       if (fcpConnection != HighLevelClient.this.fcpConnection) {
+                               return;
+                       }
+                       String identifier = getFailed.getIdentifier();
+                       HighLevelProgressCallback<DownloadResult> downloadCallback = downloadCallbacks.remove(identifier);
+                       if (downloadCallback != null) {
+                               downloadCallback.getIntermediaryResult().setFailed(true);
+                               downloadCallback.setDone();
+                               return;
+                       }
+                       /* unknown identifier? */
+                       logger.warning("unknown identifier for GetFailed: " + identifier);
                }
 
                /**
@@ -590,6 +822,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.IdentifierCollision)
                 */
                public void receivedIdentifierCollision(FcpConnection fcpConnection, IdentifierCollision identifierCollision) {
+                       /* TODO */
                }
 
                /**
@@ -597,6 +830,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.FcpMessage)
                 */
                public void receivedMessage(FcpConnection fcpConnection, FcpMessage fcpMessage) {
+                       /* TODO */
                }
 
                /**
@@ -604,6 +838,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.NodeData)
                 */
                public void receivedNodeData(FcpConnection fcpConnection, NodeData nodeData) {
+                       /* TODO */
                }
 
                /**
@@ -620,6 +855,7 @@ public class HighLevelClient {
                                connectCallback.setDone();
                                connectCallback = null;
                        }
+                       fireClientConnected();
                }
 
                /**
@@ -644,7 +880,9 @@ public class HighLevelClient {
                        if (peerResult != null) {
                                peerResult.getIntermediaryResult().setPeer(peer);
                                peerResult.setDone();
+                               return;
                        }
+                       logger.warning("got Peer message with unknown identifier: " + identifier);
                }
 
                /**
@@ -652,6 +890,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PeerNote)
                 */
                public void receivedPeerNote(FcpConnection fcpConnection, PeerNote peerNote) {
+                       /* TODO */
                }
 
                /**
@@ -659,27 +898,66 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PeerRemoved)
                 */
                public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
+                       /* TODO */
                }
 
                /**
                 * @see net.pterodactylus.fcp.FcpListener#receivedPersistentGet(net.pterodactylus.fcp.FcpConnection,
                 *      net.pterodactylus.fcp.PersistentGet)
                 */
+               @SuppressWarnings("synthetic-access")
                public void receivedPersistentGet(FcpConnection fcpConnection, PersistentGet persistentGet) {
+                       if (fcpConnection != HighLevelClient.this.fcpConnection) {
+                               return;
+                       }
+                       synchronized (syncObject) {
+                               if (requestListCallback != null) {
+                                       RequestListResult requestListResult = requestListCallback.getIntermediaryResult();
+                                       requestListResult.addRequestResult(new GetRequestResult(persistentGet));
+                                       return;
+                               }
+                       }
+                       String identifier = persistentGet.getIdentifier();
+                       if (downloadCallbacks.containsKey(identifier)) {
+                               /* TODO */
+                               return;
+                       }
                }
 
                /**
                 * @see net.pterodactylus.fcp.FcpListener#receivedPersistentPut(net.pterodactylus.fcp.FcpConnection,
                 *      net.pterodactylus.fcp.PersistentPut)
                 */
+               @SuppressWarnings("synthetic-access")
                public void receivedPersistentPut(FcpConnection fcpConnection, PersistentPut persistentPut) {
+                       if (fcpConnection != HighLevelClient.this.fcpConnection) {
+                               return;
+                       }
+                       synchronized (syncObject) {
+                               if (requestListCallback != null) {
+                                       RequestListResult requestListResult = requestListCallback.getIntermediaryResult();
+                                       requestListResult.addRequestResult(new PutRequestResult(persistentPut));
+                                       return;
+                               }
+                       }
                }
 
                /**
                 * @see net.pterodactylus.fcp.FcpListener#receivedPersistentPutDir(net.pterodactylus.fcp.FcpConnection,
                 *      net.pterodactylus.fcp.PersistentPutDir)
                 */
+               @SuppressWarnings("synthetic-access")
                public void receivedPersistentPutDir(FcpConnection fcpConnection, PersistentPutDir persistentPutDir) {
+                       if (fcpConnection != HighLevelClient.this.fcpConnection) {
+                               return;
+                       }
+                       synchronized (syncObject) {
+                               if (requestListCallback != null) {
+                                       RequestListResult requestListResult = requestListCallback.getIntermediaryResult();
+                                       requestListResult.addRequestResult(new PutDirRequestResult(persistentPutDir));
+                                       return;
+                               }
+                       }
                }
 
                /**
@@ -687,6 +965,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PersistentRequestModified)
                 */
                public void receivedPersistentRequestModified(FcpConnection fcpConnection, PersistentRequestModified persistentRequestModified) {
+                       /* TODO */
                }
 
                /**
@@ -694,6 +973,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PersistentRequestRemoved)
                 */
                public void receivedPersistentRequestRemoved(FcpConnection fcpConnection, PersistentRequestRemoved persistentRequestRemoved) {
+                       /* TODO */
                }
 
                /**
@@ -701,6 +981,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PluginInfo)
                 */
                public void receivedPluginInfo(FcpConnection fcpConnection, PluginInfo pluginInfo) {
+                       /* TODO */
                }
 
                /**
@@ -724,6 +1005,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PutFailed)
                 */
                public void receivedPutFailed(FcpConnection fcpConnection, PutFailed putFailed) {
+                       /* TODO */
                }
 
                /**
@@ -731,6 +1013,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PutFetchable)
                 */
                public void receivedPutFetchable(FcpConnection fcpConnection, PutFetchable putFetchable) {
+                       /* TODO */
                }
 
                /**
@@ -738,6 +1021,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.PutSuccessful)
                 */
                public void receivedPutSuccessful(FcpConnection fcpConnection, PutSuccessful putSuccessful) {
+                       /* TODO */
                }
 
                /**
@@ -763,7 +1047,25 @@ public class HighLevelClient {
                 * @see net.pterodactylus.fcp.FcpListener#receivedSimpleProgress(net.pterodactylus.fcp.FcpConnection,
                 *      net.pterodactylus.fcp.SimpleProgress)
                 */
+               @SuppressWarnings("synthetic-access")
                public void receivedSimpleProgress(FcpConnection fcpConnection, SimpleProgress simpleProgress) {
+                       if (fcpConnection != HighLevelClient.this.fcpConnection) {
+                               return;
+                       }
+                       String identifier = simpleProgress.getIdentifier();
+                       HighLevelProgressCallback<DownloadResult> downloadCallback = downloadCallbacks.get(identifier);
+                       if (downloadCallback != null) {
+                               DownloadResult downloadResult = downloadCallback.getIntermediaryResult();
+                               downloadResult.setTotalBlocks(simpleProgress.getTotal());
+                               downloadResult.setRequiredBlocks(simpleProgress.getRequired());
+                               downloadResult.setSuccessfulBlocks(simpleProgress.getSucceeded());
+                               downloadResult.setFailedBlocks(simpleProgress.getFailed());
+                               downloadResult.setFatallyFailedBlocks(simpleProgress.getFatallyFailed());
+                               downloadResult.setTotalFinalized(simpleProgress.isFinalizedTotal());
+                               downloadCallback.progressUpdated();
+                       }
+                       HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, simpleProgress.getTotal(), simpleProgress.getRequired(), simpleProgress.getSucceeded(), simpleProgress.getFailed(), simpleProgress.getFatallyFailed(), simpleProgress.isFinalizedTotal());
+                       fireProgressReceived(identifier, highLevelProgress);
                }
 
                /**
@@ -771,6 +1073,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.StartedCompression)
                 */
                public void receivedStartedCompression(FcpConnection fcpConnection, StartedCompression startedCompression) {
+                       /* TODO */
                }
 
                /**
@@ -778,6 +1081,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.SubscribedUSKUpdate)
                 */
                public void receivedSubscribedUSKUpdate(FcpConnection fcpConnection, SubscribedUSKUpdate subscribedUSKUpdate) {
+                       /* TODO */
                }
 
                /**
@@ -833,6 +1137,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.URIGenerated)
                 */
                public void receivedURIGenerated(FcpConnection fcpConnection, URIGenerated uriGenerated) {
+                       /* TODO */
                }
 
                /**
@@ -840,6 +1145,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.UnknownNodeIdentifier)
                 */
                public void receivedUnknownNodeIdentifier(FcpConnection fcpConnection, UnknownNodeIdentifier unknownNodeIdentifier) {
+                       /* TODO */
                }
 
                /**
@@ -847,6 +1153,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.UnknownPeerNoteType)
                 */
                public void receivedUnknownPeerNoteType(FcpConnection fcpConnection, UnknownPeerNoteType unknownPeerNoteType) {
+                       /* TODO */
                }
 
                /**
@@ -854,6 +1161,7 @@ public class HighLevelClient {
                 *      net.pterodactylus.fcp.FinishedCompression)
                 */
                public void receviedFinishedCompression(FcpConnection fcpConnection, FinishedCompression finishedCompression) {
+                       /* TODO */
                }
 
        }