X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=3012e0011c1fc9b262921c3190b6ba2e5162fc5f;hb=e0d4c56493b97a16514ca865cad0ae42a2d8a5a2;hp=f90ab771862c4191ad541341f3a1e61861adbbd3;hpb=807741b54ef70dcaf80b8da7a280124998c89f18;p=jFCPlib.git diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java index f90ab77..3012e00 100644 --- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java +++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java @@ -1,6 +1,5 @@ /* - * jFCPlib - FcpClient.java - - * Copyright © 2009 David Roden + * jFCPlib - FcpClient.java - Copyright © 2009 David Roden * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +19,7 @@ package net.pterodactylus.fcp.highlevel; import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.Map.Entry; import java.util.concurrent.CountDownLatch; import net.pterodactylus.fcp.AddPeer; @@ -38,16 +39,20 @@ import net.pterodactylus.fcp.DataFound; import net.pterodactylus.fcp.EndListPeerNotes; import net.pterodactylus.fcp.EndListPeers; import net.pterodactylus.fcp.EndListPersistentRequests; +import net.pterodactylus.fcp.FCPPluginMessage; +import net.pterodactylus.fcp.FCPPluginReply; import net.pterodactylus.fcp.FcpAdapter; import net.pterodactylus.fcp.FcpConnection; import net.pterodactylus.fcp.FcpListener; import net.pterodactylus.fcp.GenerateSSK; import net.pterodactylus.fcp.GetFailed; +import net.pterodactylus.fcp.GetNode; import net.pterodactylus.fcp.ListPeerNotes; import net.pterodactylus.fcp.ListPeers; import net.pterodactylus.fcp.ListPersistentRequests; import net.pterodactylus.fcp.ModifyPeer; import net.pterodactylus.fcp.ModifyPeerNote; +import net.pterodactylus.fcp.NodeData; import net.pterodactylus.fcp.NodeHello; import net.pterodactylus.fcp.NodeRef; import net.pterodactylus.fcp.Peer; @@ -75,12 +80,18 @@ public class FcpClient { /** Object used for synchronization. */ private final Object syncObject = new Object(); + /** Listener management. */ + private final FcpClientListenerManager fcpClientListenerManager = new FcpClientListenerManager(this); + /** The name of this client. */ private final String name; /** The underlying FCP connection. */ private final FcpConnection fcpConnection; + /** Whether the client is currently connected. */ + private volatile boolean connected; + /** * Creates an FCP client with the given name. * @@ -148,6 +159,62 @@ public class FcpClient { public FcpClient(String name, InetAddress host, int port) { this.name = name; fcpConnection = new FcpConnection(host, port); + fcpConnection.addFcpListener(new FcpAdapter() { + + /** + * {@inheritDoc} + */ + @Override + @SuppressWarnings("synthetic-access") + public void connectionClosed(FcpConnection fcpConnection, Throwable throwable) { + connected = false; + fcpClientListenerManager.fireFcpClientDisconnected(); + } + }); + } + + // + // LISTENER MANAGEMENT + // + + /** + * Adds an FCP listener to the underlying connection. + * + * @param fcpListener + * The FCP listener to add + */ + public void addFcpListener(FcpListener fcpListener) { + fcpConnection.addFcpListener(fcpListener); + } + + /** + * Removes an FCP listener from the underlying connection. + * + * @param fcpListener + * The FCP listener to remove + */ + public void removeFcpListener(FcpListener fcpListener) { + fcpConnection.removeFcpListener(fcpListener); + } + + /** + * Adds an FCP client listener to the list of registered listeners. + * + * @param fcpClientListener + * The FCP client listener to add + */ + public void addFcpClientListener(FcpClientListener fcpClientListener) { + fcpClientListenerManager.addListener(fcpClientListener); + } + + /** + * Removes an FCP client listener from the list of registered listeners. + * + * @param fcpClientListener + * The FCP client listener to remove + */ + public void removeFcpClientListener(FcpClientListener fcpClientListener) { + fcpClientListenerManager.removeListener(fcpClientListener); } // @@ -163,6 +230,8 @@ public class FcpClient { * if an FCP error occurs */ public void connect() throws IOException, FcpException { + checkConnected(false); + connected = true; new ExtendedFcpAdapter() { /** @@ -198,6 +267,16 @@ public class FcpClient { } } + /** + * Returns whether this client is currently connected. + * + * @return {@code true} if the client is currently connected, {@code false} + * otherwise + */ + public boolean isConnected() { + return connected; + } + // // PEER MANAGEMENT // @@ -792,6 +871,122 @@ public class FcpClient { return requests.values(); } + /** + * Sends a message to a plugin and waits for the response. + * + * @param pluginClass + * The name of the plugin class + * @param parameters + * The parameters for the plugin + * @return The responses from the plugin + * @throws FcpException + * if an FCP error occurs + * @throws IOException + * if an I/O error occurs + */ + public Map sendPluginMessage(String pluginClass, Map parameters) throws IOException, FcpException { + return sendPluginMessage(pluginClass, parameters, 0, null); + } + + /** + * Sends a message to a plugin and waits for the response. + * + * @param pluginClass + * The name of the plugin class + * @param parameters + * The parameters for the plugin + * @param dataLength + * The length of the optional data stream, or {@code 0} if there + * is no optional data stream + * @param dataInputStream + * The input stream for the payload, or {@code null} if there is + * no payload + * @return The responses from the plugin + * @throws FcpException + * if an FCP error occurs + * @throws IOException + * if an I/O error occurs + */ + public Map sendPluginMessage(final String pluginClass, final Map parameters, final long dataLength, final InputStream dataInputStream) throws IOException, FcpException { + final Map pluginReplies = Collections.synchronizedMap(new HashMap()); + new ExtendedFcpAdapter() { + + @SuppressWarnings("synthetic-access") + private final String identifier = createIdentifier("FCPPluginMessage"); + + @Override + @SuppressWarnings("synthetic-access") + public void run() throws IOException { + FCPPluginMessage fcpPluginMessage = new FCPPluginMessage(pluginClass); + for (Entry parameter : parameters.entrySet()) { + fcpPluginMessage.setParameter(parameter.getKey(), parameter.getValue()); + } + fcpPluginMessage.setIdentifier(identifier); + if ((dataLength > 0) && (dataInputStream != null)) { + fcpPluginMessage.setDataLength(dataLength); + fcpPluginMessage.setPayloadInputStream(dataInputStream); + } + fcpConnection.sendMessage(fcpPluginMessage); + } + + /** + * {@inheritDoc} + */ + @Override + public void receivedFCPPluginReply(FcpConnection fcpConnection, FCPPluginReply fcpPluginReply) { + if (!fcpPluginReply.getIdentifier().equals(identifier)) { + return; + } + pluginReplies.putAll(fcpPluginReply.getReplies()); + completionLatch.countDown(); + } + + }.execute(); + return pluginReplies; + } + + // + // NODE INFORMATION + // + + /** + * Returns information about the node. + * + * @param giveOpennetRef + * Whether to return the OpenNet reference + * @param withPrivate + * Whether to return private node data + * @param withVolatile + * Whether to return volatile node data + * @return Node information + * @throws FcpException + * if an FCP error occurs + * @throws IOException + * if an I/O error occurs + */ + public NodeData getNodeInformation(final Boolean giveOpennetRef, final Boolean withPrivate, final Boolean withVolatile) throws IOException, FcpException { + final ObjectWrapper nodeDataWrapper = new ObjectWrapper(); + new ExtendedFcpAdapter() { + + @Override + @SuppressWarnings("synthetic-access") + public void run() throws IOException { + GetNode getNodeMessage = new GetNode(giveOpennetRef, withPrivate, withVolatile); + fcpConnection.sendMessage(getNodeMessage); + } + + /** + * {@inheritDoc} + */ + @Override + public void receivedNodeData(FcpConnection fcpConnection, NodeData nodeData) { + nodeDataWrapper.set(nodeData); + completionLatch.countDown(); + } + }.execute(); + return nodeDataWrapper.get(); + } + // // PRIVATE METHODS // @@ -808,6 +1003,28 @@ public class FcpClient { } /** + * Checks whether the connection is in the required state. + * + * @param connected + * The required connection state + * @throws FcpException + * if the connection is not in the required state + */ + private void checkConnected(boolean connected) throws FcpException { + if (this.connected != connected) { + throw new FcpException("Client is " + (connected ? "not" : "already") + " connected."); + } + } + + /** + * Tells the client that it is now disconnected. This method is called by + * {@link ExtendedFcpAdapter} only. + */ + private void setDisconnected() { + connected = false; + } + + /** * Implementation of an {@link FcpListener} that can store an * {@link FcpException} and wait for the arrival of a certain command. * @@ -839,6 +1056,7 @@ public class FcpClient { */ @SuppressWarnings("synthetic-access") public void execute() throws IOException, FcpException { + checkConnected(true); fcpConnection.addFcpListener(this); try { run(); @@ -850,10 +1068,14 @@ public class FcpClient { /* ignore, we’ll loop. */ } } + } catch (IOException ioe1) { + setDisconnected(); + throw ioe1; } finally { fcpConnection.removeFcpListener(this); } if (fcpException != null) { + setDisconnected(); throw fcpException; } }