X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FHighLevelClient.java;h=b7064d0842667028f4435ad0d7a8ba3dabc467b6;hb=7b73e6e23b03d9412e9dcc0ff3b4f681baa301c5;hp=1521703f8b5336cec3cad5ef787d992789c4e064;hpb=6026f491a483495b8ce38603a3085d26d5b58181;p=jFCPlib.git diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java index 1521703..b7064d0 100644 --- a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java +++ b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java @@ -105,14 +105,8 @@ 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 highLevelClientListeners = Collections.synchronizedList(new ArrayList()); @@ -120,7 +114,10 @@ public class HighLevelClient { /** The listener for the connection. */ private HighLevelClientFcpListener highLevelClientFcpListener = new HighLevelClientFcpListener(); - /** The callback for {@link #connect()}. */ + /** The listeners for progress events. */ + private List highLevelProgressListeners = Collections.synchronizedList(new ArrayList()); + + /** The callback for {@link #connect(String)}. */ private HighLevelCallback connectCallback; /** Mapping from request identifiers to callbacks. */ @@ -147,60 +144,9 @@ public class HighLevelClient { * * @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"); - } - - /** - * Creates a new high-level client that connects to a node on the given - * host. - * - * @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. - */ - public HighLevelClient(String clientName, String host) throws UnknownHostException { - this(clientName, host, FcpConnection.DEFAULT_PORT); - } - - /** - * Creates a new high-level client that connects to a node on the given - * host. - * - * @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. - */ - public HighLevelClient(String clientName, String host, int port) throws UnknownHostException { - this(clientName, InetAddress.getByName(host), port); - } - - /** - * Creates a new high-level client that connects to a node at the given - * address. - * - * @param clientName - * The name of the client - * @param address - * The address of the node - * @param port - * The port number of the node */ - public HighLevelClient(String clientName, InetAddress address, int port) { + public HighLevelClient(String clientName) { this.clientName = clientName; - this.address = address; - this.port = port; } // @@ -231,7 +177,7 @@ public class HighLevelClient { * Notifies all listeners that a client has connected. */ private void fireClientConnected() { - for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) { + for (HighLevelClientListener highLevelClientListener : highLevelClientListeners) { highLevelClientListener.clientConnected(this); } } @@ -244,11 +190,46 @@ public class HighLevelClient { * if there was no exception */ private void fireClientDisconnected(Throwable throwable) { - for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) { + 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 // @@ -264,6 +245,16 @@ public class HighLevelClient { return fcpConnection; } + /** + * Returns whether the node is connected. + * + * @return true if the node is currently connected, + * false otherwise + */ + public boolean isConnected() { + return fcpConnection != null; + } + // // ACTIONS // @@ -271,18 +262,61 @@ 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 connect() throws IOException { - fcpConnection = new FcpConnection(address, port); - fcpConnection.addFcpListener(highLevelClientFcpListener); - fcpConnection.connect(); - ClientHello clientHello = new ClientHello(clientName); - connectCallback = new HighLevelCallback(new ConnectResult()); - fcpConnection.sendMessage(clientHello); - return connectCallback; + public HighLevelCallback 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 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 connect(InetAddress address, int port) throws IOException { + try { + synchronized (this) { + fcpConnection = new FcpConnection(address, port); + } + fcpConnection.addFcpListener(highLevelClientFcpListener); + fcpConnection.connect(); + ClientHello clientHello = new ClientHello(clientName); + connectCallback = new HighLevelCallback(new ConnectResult()); + fcpConnection.sendMessage(clientHello); + return connectCallback; + } catch (IOException ioe1) { + fcpConnection = null; + throw ioe1; + } } /** @@ -298,8 +332,11 @@ public class HighLevelClient { * @return A callback with the keypair * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback generateKey() throws IOException { + public HighLevelCallback generateKey() throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("generateSSK"); GenerateSSK generateSSK = new GenerateSSK(identifier); HighLevelCallback keyGenerationCallback = new HighLevelCallback(new KeyGenerationResult(identifier)); @@ -317,8 +354,11 @@ public class HighLevelClient { * client-local queue * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public void setWatchGlobal(boolean enabled) throws IOException { + public void setWatchGlobal(boolean enabled) throws IOException, HighLevelException { + checkConnection(); WatchGlobal watchGlobal = new WatchGlobal(enabled); fcpConnection.sendMessage(watchGlobal); } @@ -329,8 +369,11 @@ public class HighLevelClient { * @return A callback with the peer list * @throws IOException * if an I/O error occurs with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback getPeers() throws IOException { + public HighLevelCallback getPeers() throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("listPeers"); ListPeers listPeers = new ListPeers(identifier, true, true); HighLevelCallback peerListCallback = new HighLevelCallback(new PeerListResult(identifier)); @@ -347,8 +390,11 @@ public class HighLevelClient { * @return A peer callback * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback addPeer(String nodeRefFile) throws IOException { + public HighLevelCallback addPeer(String nodeRefFile) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("addPeer"); AddPeer addPeer = new AddPeer(nodeRefFile); HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier)); @@ -365,8 +411,11 @@ public class HighLevelClient { * @return A peer callback * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback addPeer(URL nodeRefURL) throws IOException { + public HighLevelCallback addPeer(URL nodeRefURL) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("addPeer"); AddPeer addPeer = new AddPeer(nodeRefURL); HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier)); @@ -383,8 +432,11 @@ public class HighLevelClient { * @return A peer callback * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback addPeer(NodeRef nodeRef) throws IOException { + public HighLevelCallback addPeer(NodeRef nodeRef) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("addPeer"); AddPeer addPeer = new AddPeer(nodeRef); HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier)); @@ -406,8 +458,12 @@ public class HighLevelClient { * Whether you want to write to the given directory * @return A direct disk access callback * @throws IOException + * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException { + public HighLevelCallback checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException, HighLevelException { + checkConnection(); TestDDARequest testDDARequest = new TestDDARequest(directory, wantRead, wantWrite); HighLevelCallback directDiskAccessCallback = new HighLevelCallback(new DirectDiskAccessResult(directory)); directDiskAccessCallbacks.put(directory, directDiskAccessCallback); @@ -432,8 +488,11 @@ public class HighLevelClient { * @return A download result * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelProgressCallback download(String uri, String filename, boolean global) throws IOException { + public HighLevelProgressCallback download(String uri, String filename, boolean global) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("download"); ClientGet clientGet = new ClientGet(uri, identifier, (filename == null) ? ReturnType.direct : ReturnType.disk); clientGet.setGlobal(global); @@ -449,8 +508,11 @@ public class HighLevelClient { * @return The request list result * @throws IOException * if an I/O errors communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback getRequests() throws IOException { + public HighLevelCallback getRequests() throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("list-persistent-requests"); ListPersistentRequests listPersistentRequests = new ListPersistentRequests(); synchronized (syncObject) { @@ -468,6 +530,21 @@ public class HighLevelClient { // /** + * Checks whether the client is already connected and throws an exception if + * it is not. + * + * @throws NotConnectedException + * if the client is not connected + */ + private void checkConnection() throws NotConnectedException { + synchronized (this) { + if (fcpConnection == null) { + throw new NotConnectedException("client is not connected"); + } + } + } + + /** * Generates an identifier for the given function. * * @param function @@ -487,8 +564,10 @@ public class HighLevelClient { * if there was no exception */ private void disconnect(Throwable throwable) { - fcpConnection.close(); - fireClientDisconnected(throwable); + if (fcpConnection != null) { + fcpConnection.close(); + } + fcpConnection = null; } /** @@ -537,31 +616,31 @@ public class HighLevelClient { } if (identifier == null) { /* key generation callbacks */ - for (Entry> keyGenerationEntry: keyGenerationCallbacks.entrySet()) { + for (Entry> keyGenerationEntry : keyGenerationCallbacks.entrySet()) { keyGenerationEntry.getValue().getIntermediaryResult().setFailed(true); keyGenerationEntry.getValue().setDone(); } keyGenerationCallbacks.clear(); /* peer list callbacks. */ - for (Entry> peerListEntry: peerListCallbacks.entrySet()) { + for (Entry> peerListEntry : peerListCallbacks.entrySet()) { peerListEntry.getValue().getIntermediaryResult().setFailed(true); peerListEntry.getValue().setDone(); } peerListCallbacks.clear(); /* peer callbacks. */ - for (Entry> peerEntry: peerCallbacks.entrySet()) { + for (Entry> peerEntry : peerCallbacks.entrySet()) { peerEntry.getValue().getIntermediaryResult().setFailed(true); peerEntry.getValue().setDone(); } peerCallbacks.clear(); /* direct disk access callbacks. */ - for (Entry> directDiskAccessEntry: directDiskAccessCallbacks.entrySet()) { + for (Entry> directDiskAccessEntry : directDiskAccessCallbacks.entrySet()) { directDiskAccessEntry.getValue().getIntermediaryResult().setFailed(true); directDiskAccessEntry.getValue().setDone(); } directDiskAccessCallbacks.clear(); /* download callbacks. */ - for (Entry> downloadEntry: downloadCallbacks.entrySet()) { + for (Entry> downloadEntry : downloadCallbacks.entrySet()) { downloadEntry.getValue().getIntermediaryResult().setFailed(true); downloadEntry.getValue().setDone(); } @@ -681,6 +760,7 @@ public class HighLevelClient { } cancelIdentifier(null); disconnect(throwable); + fireClientDisconnected(throwable); } /** @@ -712,7 +792,20 @@ public class HighLevelClient { * net.pterodactylus.fcp.DataFound) */ public void receivedDataFound(FcpConnection fcpConnection, DataFound dataFound) { - /* TODO */ + if (fcpConnection != HighLevelClient.this.fcpConnection) { + return; + } + String identifier = dataFound.getIdentifier(); + HighLevelProgressCallback downloadCallback = downloadCallbacks.get(identifier); + if (downloadCallback != null) { + DownloadResult downloadResult = downloadCallback.getIntermediaryResult(); + downloadResult.setFinished(true); + downloadResult.setFailed(false); + downloadCallback.progressUpdated(); + downloadCallback.setDone(); + } + HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, true); + fireProgressReceived(identifier , highLevelProgress); } /** @@ -779,7 +872,9 @@ public class HighLevelClient { String identifier = getFailed.getIdentifier(); HighLevelProgressCallback downloadCallback = downloadCallbacks.remove(identifier); if (downloadCallback != null) { - downloadCallback.getIntermediaryResult().setFailed(true); + DownloadResult downloadResult = downloadCallback.getIntermediaryResult(); + downloadResult.setFailed(true); + downloadResult.setFinished(true); downloadCallback.setDone(); return; } @@ -975,7 +1070,21 @@ public class HighLevelClient { * net.pterodactylus.fcp.PutFailed) */ public void receivedPutFailed(FcpConnection fcpConnection, PutFailed putFailed) { - /* TODO */ + if (fcpConnection != HighLevelClient.this.fcpConnection) { + return; + } + String identifier = putFailed.getIdentifier(); + HighLevelProgressCallback downloadCallback = downloadCallbacks.get(identifier); + if (downloadCallback != null) { + DownloadResult downloadResult = downloadCallback.getIntermediaryResult(); + downloadResult.setFailed(true); + downloadResult.setFinished(true); + downloadCallback.progressUpdated(); + downloadCallback.setDone(); + } + /* TODO - check inserts */ + HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, true); + fireProgressReceived(identifier, highLevelProgress); } /** @@ -983,7 +1092,14 @@ public class HighLevelClient { * net.pterodactylus.fcp.PutFetchable) */ public void receivedPutFetchable(FcpConnection fcpConnection, PutFetchable putFetchable) { - /* TODO */ + if (fcpConnection != HighLevelClient.this.fcpConnection) { + return; + } + String identifier = putFetchable.getIdentifier(); + /* TODO - check inserts */ + HighLevelProgress highLevelProgress = new HighLevelProgress(identifier); + highLevelProgress.setFetchable(true); + fireProgressReceived(identifier, highLevelProgress); } /** @@ -991,7 +1107,20 @@ public class HighLevelClient { * net.pterodactylus.fcp.PutSuccessful) */ public void receivedPutSuccessful(FcpConnection fcpConnection, PutSuccessful putSuccessful) { - /* TODO */ + if (fcpConnection != HighLevelClient.this.fcpConnection) { + return; + } + String identifier = putSuccessful.getIdentifier(); + HighLevelProgressCallback downloadCallback = downloadCallbacks.get(identifier); + if (downloadCallback != null) { + DownloadResult downloadResult = downloadCallback.getIntermediaryResult(); + downloadResult.setFinished(true); + downloadResult.setFailed(false); + downloadCallback.progressUpdated(); + } + /* TODO - check inserts */ + HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, true); + fireProgressReceived(identifier, highLevelProgress); } /** @@ -1033,10 +1162,10 @@ public class HighLevelClient { downloadResult.setFatallyFailedBlocks(simpleProgress.getFatallyFailed()); downloadResult.setTotalFinalized(simpleProgress.isFinalizedTotal()); downloadCallback.progressUpdated(); - return; } - /* unknown identifier? */ - logger.warning("unknown identifier for SimpleProgress: " + identifier); + /* TODO - check inserts */ + HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, simpleProgress.getTotal(), simpleProgress.getRequired(), simpleProgress.getSucceeded(), simpleProgress.getFailed(), simpleProgress.getFatallyFailed(), simpleProgress.isFinalizedTotal()); + fireProgressReceived(identifier, highLevelProgress); } /**