X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=dee33c3e2708e38e82cdc63c0f234a8fa627a716;hb=3d9879f268ac491cfc7ce8d6e3030f75ff2cdd44;hp=c1591578ec5e8960225f35a96d40269bd52b903d;hpb=886f3619d16f744e55f9f1e1c68fb95d5ee1235b;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 c159157..dee33c3 100644 --- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java +++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java @@ -28,11 +28,13 @@ 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 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; @@ -67,6 +69,7 @@ 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.io.TemporaryInputStream; import net.pterodactylus.util.thread.ObjectWrapper; /** @@ -83,9 +86,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 +95,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 +130,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 +187,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); } // @@ -250,12 +268,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() { @@ -286,6 +306,72 @@ public class FcpClient { } /** + * Returns the file with the given URI. + * + * @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 { + 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); + fcpConnection.sendMessage(clientGet); + } + + @Override + public void receivedGetFailed(FcpConnection fcpConnection, GetFailed getFailed) { + if (!getFailed.getIdentifier().equals(identifier)) { + return; + } + if (getFailed.getCode() == 27) { + /* redirect! */ + String newUri = getFailed.getRedirectURI(); + getResult.realUri(newUri); + try { + fcpConnection.sendMessage(new ClientGet(newUri, identifier)); + } catch (IOException ioe1) { + getResult.success(false).exception(ioe1); + completionLatch.countDown(); + } + } else { + getResult.success(false).errorCode(getFailed.getCode()); + completionLatch.countDown(); + } + } + + @Override + public void receivedAllData(FcpConnection fcpConnection, AllData allData) { + if (!allData.getIdentifier().equals(identifier)) { + return; + } + InputStream temporaryInputStream; + try { + temporaryInputStream = new TemporaryInputStream(allData.getPayloadInputStream()); + getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(temporaryInputStream); + } catch (IOException ioe1) { + getResult.success(false).exception(ioe1); + } + completionLatch.countDown(); + } + + }.execute(); + return getResult; + } + + /** * Disconnects the FCP client. */ public void disconnect() { @@ -305,6 +391,13 @@ public class FcpClient { return connected; } + /** + * Detaches this client from its underlying FCP connection. + */ + public void detach() { + fcpConnection.removeFcpListener(connectionClosedListener); + } + // // PEER MANAGEMENT //