X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=65bc227fa381d6a1b44004234d6de19e2c2e808a;hb=369d751e2d866f4263c2ef9652068b11ea515c7f;hp=5bf4e1a3a57b33b514b809c810cfc3a9041aaa82;hpb=2d2cb653da15b89e3161f5026c4778e08a8bff0a;p=jFCPlib.git
diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
index 5bf4e1a..65bc227 100644
--- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -1,9 +1,9 @@
/*
- * jFCPlib - FcpClient.java - Copyright © 2009 David Roden
+ * jFCPlib - FcpClient.java - Copyright © 2009â2016 David Roden
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -12,12 +12,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see .
*/
package net.pterodactylus.fcp.highlevel;
+import static com.google.common.collect.FluentIterable.from;
+
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
@@ -28,11 +30,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
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.DataFound;
@@ -65,9 +70,8 @@ import net.pterodactylus.fcp.RemovePeer;
import net.pterodactylus.fcp.SSKKeypair;
import net.pterodactylus.fcp.SimpleProgress;
import net.pterodactylus.fcp.WatchGlobal;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
-import net.pterodactylus.util.thread.ObjectWrapper;
+
+import com.google.common.base.Predicate;
/**
* High-level FCP client that hides the details of the underlying FCP
@@ -75,7 +79,7 @@ import net.pterodactylus.util.thread.ObjectWrapper;
*
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
-public class FcpClient {
+public class FcpClient implements Closeable {
/** Object used for synchronization. */
private final Object syncObject = new Object();
@@ -83,9 +87,6 @@ public class FcpClient {
/** 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;
@@ -95,37 +96,34 @@ public class FcpClient {
/** Whether the client is currently connected. */
private volatile boolean connected;
+ /** The listener for âconnection closedâ events. */
+ private FcpListener connectionClosedListener;
+
/**
* Creates an FCP client with the given name.
*
- * @param name
- * The name of the FCP client
* @throws UnknownHostException
* if the hostname âlocalhostâ is unknown
*/
- public FcpClient(String name) throws UnknownHostException {
- this(name, "localhost");
+ public FcpClient() throws UnknownHostException {
+ this("localhost");
}
/**
* Creates an FCP client.
*
- * @param name
- * The name of the FCP client
* @param hostname
* The hostname of the Freenet node
* @throws UnknownHostException
* if the given hostname can not be resolved
*/
- public FcpClient(String name, String hostname) throws UnknownHostException {
- this(name, hostname, FcpConnection.DEFAULT_PORT);
+ public FcpClient(String hostname) throws UnknownHostException {
+ this(hostname, FcpConnection.DEFAULT_PORT);
}
/**
* Creates an FCP client.
*
- * @param name
- * The name of the FCP client
* @param hostname
* The hostname of the Freenet node
* @param port
@@ -133,36 +131,56 @@ public class FcpClient {
* @throws UnknownHostException
* if the given hostname can not be resolved
*/
- public FcpClient(String name, String hostname, int port) throws UnknownHostException {
- this(name, InetAddress.getByName(hostname), port);
+ public FcpClient(String hostname, int port) throws UnknownHostException {
+ this(InetAddress.getByName(hostname), port);
}
/**
* Creates an FCP client.
*
- * @param name
- * The name of the FCP client
* @param host
* The host address of the Freenet node
*/
- public FcpClient(String name, InetAddress host) {
- this(name, host, FcpConnection.DEFAULT_PORT);
+ public FcpClient(InetAddress host) {
+ this(host, FcpConnection.DEFAULT_PORT);
}
/**
* Creates an FCP client.
*
- * @param name
- * The name of the FCP client
* @param host
* The host address of the Freenet node
* @param port
* The Freenet nodeâs FCP port
*/
- public FcpClient(String name, InetAddress host, int port) {
- this.name = name;
- fcpConnection = new FcpConnection(host, port);
- fcpConnection.addFcpListener(new FcpAdapter() {
+ public FcpClient(InetAddress host, int port) {
+ this(new FcpConnection(host, port), false);
+ }
+
+ /**
+ * Creates a new high-level FCP client that will use the given connection.
+ * This constructor will assume that the FCP connection is already
+ * connected.
+ *
+ * @param fcpConnection
+ * The FCP connection to use
+ */
+ public FcpClient(FcpConnection fcpConnection) {
+ this(fcpConnection, true);
+ }
+
+ /**
+ * Creates a new high-level FCP client that will use the given connection.
+ *
+ * @param fcpConnection
+ * The FCP connection to use
+ * @param connected
+ * The initial status of the FCP connection
+ */
+ public FcpClient(FcpConnection fcpConnection, boolean connected) {
+ this.fcpConnection = fcpConnection;
+ this.connected = connected;
+ connectionClosedListener = new FcpAdapter() {
/**
* {@inheritDoc}
@@ -170,10 +188,11 @@ public class FcpClient {
@Override
@SuppressWarnings("synthetic-access")
public void connectionClosed(FcpConnection fcpConnection, Throwable throwable) {
- connected = false;
+ FcpClient.this.connected = false;
fcpClientListenerManager.fireFcpClientDisconnected();
}
- });
+ };
+ fcpConnection.addFcpListener(connectionClosedListener);
}
//
@@ -234,6 +253,15 @@ public class FcpClient {
return nodeHello;
}
+ /**
+ * Returns the underlying FCP connection.
+ *
+ * @return The underlying FCP connection
+ */
+ public FcpConnection getConnection() {
+ return fcpConnection;
+ }
+
//
// ACTIONS
//
@@ -241,12 +269,14 @@ public class FcpClient {
/**
* Connects the FCP client.
*
+ * @param name
+ * The name of the client
* @throws IOException
* if an I/O error occurs
* @throws FcpException
* if an FCP error occurs
*/
- public void connect() throws IOException, FcpException {
+ public void connect(final String name) throws IOException, FcpException {
checkConnected(false);
connected = true;
new ExtendedFcpAdapter() {
@@ -270,10 +300,92 @@ public class FcpClient {
@Override
@SuppressWarnings("synthetic-access")
public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
- completionLatch.countDown();
FcpClient.this.nodeHello = nodeHello;
+ complete();
+ }
+ }.execute();
+ }
+
+ /**
+ * Returns the file with the given URI. The retrieved data will be run
+ * through Freenetâs content filter.
+ *
+ * @param uri
+ * The URI to get
+ * @return The result of the get request
+ * @throws IOException
+ * if an I/O error occurs
+ * @throws FcpException
+ * if an FCP error occurs
+ */
+ public GetResult getURI(final String uri) throws IOException, FcpException {
+ return getURI(uri, true);
+ }
+
+ /**
+ * Returns the file with the given URI.
+ *
+ * @param uri
+ * The URI to get
+ * @param filterData
+ * {@code true} to filter the retrieved data, {@code false}
+ * otherwise
+ * @return The result of the get request
+ * @throws IOException
+ * if an I/O error occurs
+ * @throws FcpException
+ * if an FCP error occurs
+ */
+ public GetResult getURI(final String uri, final boolean filterData) throws IOException, FcpException {
+ checkConnected(true);
+ final GetResult getResult = new GetResult();
+ new ExtendedFcpAdapter() {
+
+ @SuppressWarnings("synthetic-access")
+ private final String identifier = createIdentifier("client-get");
+
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() throws IOException {
+ ClientGet clientGet = new ClientGet(uri, identifier);
+ clientGet.setFilterData(filterData);
+ fcpConnection.sendMessage(clientGet);
+ }
+
+ @Override
+ public void receivedGetFailed(FcpConnection fcpConnection, GetFailed getFailed) {
+ if (!getFailed.getIdentifier().equals(identifier)) {
+ return;
+ }
+ if ((getFailed.getCode() == 27) || (getFailed.getCode() == 24)) {
+ /* redirect! */
+ String newUri = getFailed.getRedirectURI();
+ getResult.realUri(newUri);
+ try {
+ ClientGet clientGet = new ClientGet(newUri, identifier);
+ clientGet.setFilterData(filterData);
+ fcpConnection.sendMessage(clientGet);
+ } catch (IOException ioe1) {
+ getResult.success(false).exception(ioe1);
+ complete();
+ }
+ } else {
+ getResult.success(false).errorCode(getFailed.getCode());
+ complete();
+ }
+ }
+
+ @Override
+ public void receivedAllData(FcpConnection fcpConnection, AllData allData) {
+ if (!allData.getIdentifier().equals(identifier)) {
+ return;
+ }
+ getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
+ complete();
}
+
}.execute();
+ return getResult;
}
/**
@@ -287,6 +399,14 @@ public class FcpClient {
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public void close() {
+ disconnect();
+ }
+
+ /**
* Returns whether this client is currently connected.
*
* @return {@code true} if the client is currently connected, {@code false}
@@ -296,6 +416,13 @@ public class FcpClient {
return connected;
}
+ /**
+ * Detaches this client from its underlying FCP connection.
+ */
+ public void detach() {
+ fcpConnection.removeFcpListener(connectionClosedListener);
+ }
+
//
// PEER MANAGEMENT
//
@@ -346,7 +473,7 @@ public class FcpClient {
@Override
public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
if (endListPeers.getIdentifier().equals(identifier)) {
- completionLatch.countDown();
+ complete();
}
}
}.execute();
@@ -469,8 +596,8 @@ public class FcpClient {
/**
* Adds a peer, reading the noderef of the peer from the given file.
- * Note: the file to read the noderef from has to reside on
- * the same machine as the node!
+ * Note: the file to read the noderef from has to reside
+ * on the same machine as the node!
*
* @param file
* The name of the file containing the peerâs noderef
@@ -513,7 +640,7 @@ public class FcpClient {
*/
@Override
public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -556,7 +683,7 @@ public class FcpClient {
*/
@Override
public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -588,7 +715,7 @@ public class FcpClient {
*/
@Override
public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -609,7 +736,7 @@ public class FcpClient {
* if an FCP error occurs
*/
public PeerNote getPeerNote(final Peer peer) throws IOException, FcpException {
- final ObjectWrapper objectWrapper = new ObjectWrapper();
+ final AtomicReference objectWrapper = new AtomicReference();
new ExtendedFcpAdapter() {
/**
@@ -636,7 +763,7 @@ public class FcpClient {
*/
@Override
public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
- completionLatch.countDown();
+ complete();
}
}.execute();
return objectWrapper.get();
@@ -675,7 +802,7 @@ public class FcpClient {
@Override
public void receivedPeer(FcpConnection fcpConnection, Peer receivedPeer) {
if (receivedPeer.getIdentity().equals(peer.getIdentity())) {
- completionLatch.countDown();
+ complete();
}
}
}.execute();
@@ -695,7 +822,7 @@ public class FcpClient {
* if an FCP error occurs
*/
public SSKKeypair generateKeyPair() throws IOException, FcpException {
- final ObjectWrapper sskKeypairWrapper = new ObjectWrapper();
+ final AtomicReference sskKeypairWrapper = new AtomicReference();
new ExtendedFcpAdapter() {
/**
@@ -713,7 +840,7 @@ public class FcpClient {
@Override
public void receivedSSKKeypair(FcpConnection fcpConnection, SSKKeypair sskKeypair) {
sskKeypairWrapper.set(sskKeypair);
- completionLatch.countDown();
+ complete();
}
}.execute();
return sskKeypairWrapper.get();
@@ -737,15 +864,12 @@ public class FcpClient {
* if an FCP error occurs
*/
public Collection getGetRequests(final boolean global) throws IOException, FcpException {
- return Filters.filteredCollection(getRequests(global), new Filter() {
-
- /**
- * {@inheritDoc}
- */
- public boolean filterObject(Request request) {
+ return from(getRequests(global)).filter(new Predicate() {
+ @Override
+ public boolean apply(Request request) {
return request instanceof GetRequest;
}
- });
+ }).toList();
}
/**
@@ -762,15 +886,12 @@ public class FcpClient {
* if an FCP error occurs
*/
public Collection getPutRequests(final boolean global) throws IOException, FcpException {
- return Filters.filteredCollection(getRequests(global), new Filter() {
-
- /**
- * {@inheritDoc}
- */
- public boolean filterObject(Request request) {
+ return from(getRequests(global)).filter(new Predicate() {
+ @Override
+ public boolean apply(Request request) {
return request instanceof PutRequest;
}
- });
+ }).toList();
}
/**
@@ -778,8 +899,8 @@ public class FcpClient {
*
* @param global
* true
to return requests from the global queue,
- * false
to only show requests from the client-local
- * queue
+ * false
to only show requests from the
+ * client-local queue
* @return All requests
* @throws IOException
* if an I/O error occurs
@@ -884,7 +1005,7 @@ public class FcpClient {
*/
@Override
public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
- completionLatch.countDown();
+ complete();
}
}.execute();
return requests.values();
@@ -957,7 +1078,7 @@ public class FcpClient {
return;
}
pluginReplies.putAll(fcpPluginReply.getReplies());
- completionLatch.countDown();
+ complete();
}
}.execute();
@@ -984,7 +1105,7 @@ public class FcpClient {
* 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();
+ final AtomicReference nodeDataWrapper = new AtomicReference();
new ExtendedFcpAdapter() {
@Override
@@ -1000,7 +1121,7 @@ public class FcpClient {
@Override
public void receivedNodeData(FcpConnection fcpConnection, NodeData nodeData) {
nodeDataWrapper.set(nodeData);
- completionLatch.countDown();
+ complete();
}
}.execute();
return nodeDataWrapper.get();
@@ -1052,7 +1173,7 @@ public class FcpClient {
private abstract class ExtendedFcpAdapter extends FcpAdapter {
/** The count down latch used to wait for completion. */
- protected final CountDownLatch completionLatch = new CountDownLatch(1);
+ private final CountDownLatch completionLatch = new CountDownLatch(1);
/** The FCP exception, if any. */
protected FcpException fcpException;
@@ -1108,6 +1229,13 @@ public class FcpClient {
public abstract void run() throws IOException;
/**
+ * Signals completion of the command processing.
+ */
+ protected void complete() {
+ completionLatch.countDown();
+ }
+
+ /**
* {@inheritDoc}
*/
@Override