X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=aa2c8f15dcb6f2ffa3d3e0f125c7381dbc931e44;hb=fa22404c6b514de83828117b9885a1da1a851481;hp=f9445c9d0b3278eb0b75eb43998f77eae38a327f;hpb=11a8b925cffae24f5b43570bf593044e7e71e2de;p=jFCPlib.git

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index f9445c9..aa2c8f1 100644
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -21,21 +21,39 @@ package net.pterodactylus.fcp.highlevel;
 
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
+import net.pterodactylus.fcp.AddPeer;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
+import net.pterodactylus.fcp.EndListPeerNotes;
 import net.pterodactylus.fcp.EndListPeers;
+import net.pterodactylus.fcp.EndListPersistentRequests;
 import net.pterodactylus.fcp.FcpAdapter;
 import net.pterodactylus.fcp.FcpConnection;
 import net.pterodactylus.fcp.FcpListener;
+import net.pterodactylus.fcp.GenerateSSK;
+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.NodeHello;
+import net.pterodactylus.fcp.NodeRef;
 import net.pterodactylus.fcp.Peer;
+import net.pterodactylus.fcp.PeerNote;
+import net.pterodactylus.fcp.PeerRemoved;
+import net.pterodactylus.fcp.PersistentGet;
 import net.pterodactylus.fcp.ProtocolError;
+import net.pterodactylus.fcp.RemovePeer;
+import net.pterodactylus.fcp.SSKKeypair;
+import net.pterodactylus.fcp.WatchGlobal;
+import net.pterodactylus.util.thread.ObjectWrapper;
 
 /**
  * High-level FCP client that hides the details of the underlying FCP
@@ -136,7 +154,20 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	public void connect() throws IOException, FcpException {
-		ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.connect();
+				ClientHello clientHello = new ClientHello(name);
+				fcpConnection.sendMessage(clientHello);
+				WatchGlobal watchGlobal = new WatchGlobal(true);
+				fcpConnection.sendMessage(watchGlobal);
+			}
 
 			/**
 			 * {@inheritDoc}
@@ -145,26 +176,7 @@ public class FcpClient {
 			public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
 				completionLatch.countDown();
 			}
-		};
-		fcpConnection.addFcpListener(fcpListener);
-		try {
-			fcpConnection.connect();
-			ClientHello clientHello = new ClientHello(name);
-			fcpConnection.sendMessage(clientHello);
-			while (true) {
-				try {
-					fcpListener.complete();
-					break;
-				} catch (InterruptedException e) {
-					/* ignore, we’ll loop. */
-				}
-			}
-		} finally {
-			fcpConnection.removeFcpListener(fcpListener);
-		}
-		if (fcpListener.getFcpException() != null) {
-			throw fcpListener.getFcpException();
-		}
+		}.execute();
 	}
 
 	/**
@@ -184,22 +196,41 @@ public class FcpClient {
 	/**
 	 * Returns all peers that the node has.
 	 *
+	 * @param withMetadata
+	 *            <code>true</code> to include peer metadata
+	 * @param withVolatile
+	 *            <code>true</code> to include volatile peer data
 	 * @return A set containing the node’s peers
 	 * @throws IOException
 	 *             if an I/O error occurs
 	 * @throws FcpException
 	 *             if an FCP error occurs
 	 */
-	public Set<Peer> getPeers() throws IOException, FcpException {
-		final Set<Peer> peers = new HashSet<Peer>();
-		ExtendedFcpAdapter fcpAdapter = new ExtendedFcpAdapter() {
+	public Set<Peer> getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
+		final Set<Peer> peers = Collections.synchronizedSet(new HashSet<Peer>());
+		new ExtendedFcpAdapter() {
+
+			/** The ID of the “ListPeers” request. */
+			@SuppressWarnings("synthetic-access")
+			private String identifier = createIdentifier("list-peers");
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new ListPeers(identifier, withMetadata, withVolatile));
+			}
 
 			/**
 			 * {@inheritDoc}
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				peers.add(peer);
+				if (peer.getIdentifier().equals(identifier)) {
+					peers.add(peer);
+				}
 			}
 
 			/**
@@ -207,27 +238,372 @@ public class FcpClient {
 			 */
 			@Override
 			public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
+				if (endListPeers.getIdentifier().equals(identifier)) {
+					completionLatch.countDown();
+				}
+			}
+		}.execute();
+		return peers;
+	}
+
+	/**
+	 * Adds the given peer to the node.
+	 *
+	 * @param peer
+	 *            The peer to add
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void addPeer(Peer peer) throws IOException, FcpException {
+		addPeer(peer.getNodeRef());
+	}
+
+	/**
+	 * Adds the peer defined by the noderef to the node.
+	 *
+	 * @param nodeRef
+	 *            The noderef that defines the new peer
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void addPeer(NodeRef nodeRef) throws IOException, FcpException {
+		addPeer(new AddPeer(nodeRef));
+	}
+
+	/**
+	 * Adds a peer, reading the noderef from the given URL.
+	 *
+	 * @param url
+	 *            The URL to read the noderef from
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void addPeer(URL url) throws IOException, FcpException {
+		addPeer(new AddPeer(url));
+	}
+
+	/**
+	 * Adds a peer, reading the noderef of the peer from the given file.
+	 * <strong>Note:</strong> 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
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void addPeer(String file) throws IOException, FcpException {
+		addPeer(new AddPeer(file));
+	}
+
+	/**
+	 * Sends the given {@link AddPeer} message to the node. This method should
+	 * not be called directly. Use one of {@link #addPeer(Peer)},
+	 * {@link #addPeer(NodeRef)}, {@link #addPeer(URL)}, or
+	 * {@link #addPeer(String)} instead.
+	 *
+	 * @param addPeer
+	 *            The “AddPeer” message
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	private void addPeer(final AddPeer addPeer) throws IOException, FcpException {
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(addPeer);
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
+				completionLatch.countDown();
+			}
+		}.execute();
+	}
+
+	/**
+	 * Modifies the given peer.
+	 *
+	 * @param peer
+	 *            The peer to modify
+	 * @param allowLocalAddresses
+	 *            <code>true</code> to allow local address, <code>false</code>
+	 *            to not allow local address, <code>null</code> to not change
+	 *            the setting
+	 * @param disabled
+	 *            <code>true</code> to disable the peer, <code>false</code> to
+	 *            enable the peer, <code>null</code> to not change the setting
+	 * @param listenOnly
+	 *            <code>true</code> to enable “listen only” for the peer,
+	 *            <code>false</code> to disable it, <code>null</code> to not
+	 *            change it
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void modifyPeer(final Peer peer, final Boolean allowLocalAddresses, final Boolean disabled, final Boolean listenOnly) throws IOException, FcpException {
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new ModifyPeer(peer.getIdentity(), allowLocalAddresses, disabled, listenOnly));
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
 				completionLatch.countDown();
 			}
-		};
-		fcpConnection.addFcpListener(fcpAdapter);
-		fcpConnection.sendMessage(new ListPeers("list-peers"));
-		try {
-			while (true) {
-				try {
-					fcpAdapter.complete();
-					break;
-				} catch (InterruptedException e) {
-					/* ignore, we’ll loop. */
+		}.execute();
+	}
+
+	/**
+	 * Removes the given peer.
+	 *
+	 * @param peer
+	 *            The peer to remove
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void removePeer(final Peer peer) throws IOException, FcpException {
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new RemovePeer(peer.getIdentity()));
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
+				completionLatch.countDown();
+			}
+		}.execute();
+	}
+
+	//
+	// PEER NOTES MANAGEMENT
+	//
+
+	/**
+	 * Returns the peer note of the given peer.
+	 *
+	 * @param peer
+	 *            The peer to get the note for
+	 * @return The peer’s note
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public PeerNote getPeerNote(final Peer peer) throws IOException, FcpException {
+		final ObjectWrapper<PeerNote> objectWrapper = new ObjectWrapper<PeerNote>();
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new ListPeerNotes(peer.getIdentity()));
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPeerNote(FcpConnection fcpConnection, PeerNote peerNote) {
+				if (peerNote.getNodeIdentifier().equals(peer.getIdentity())) {
+					objectWrapper.set(peerNote);
 				}
 			}
-		} finally {
-			fcpConnection.removeFcpListener(fcpAdapter);
-		}
-		if (fcpListener.getFcpException() != null) {
-			throw fcpListener.getFcpException();
-		}
-		return peers;
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
+				completionLatch.countDown();
+			}
+		}.execute();
+		return objectWrapper.get();
+	}
+
+	/**
+	 * Replaces the peer note for the given peer.
+	 *
+	 * @param peer
+	 *            The peer
+	 * @param noteText
+	 *            The new base64-encoded note text
+	 * @param noteType
+	 *            The type of the note (currently only <code>1</code> is
+	 *            allowed)
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public void modifyPeerNote(final Peer peer, final String noteText, final int noteType) throws IOException, FcpException {
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new ModifyPeerNote(peer.getIdentity(), noteText, noteType));
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPeer(FcpConnection fcpConnection, Peer receivedPeer) {
+				if (receivedPeer.getIdentity().equals(peer.getIdentity())) {
+					completionLatch.countDown();
+				}
+			}
+		}.execute();
+	}
+
+	//
+	// KEY GENERATION
+	//
+
+	/**
+	 * Generates a new SSK key pair.
+	 *
+	 * @return The generated key pair
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public SSKKeypair generateKeyPair() throws IOException, FcpException {
+		final ObjectWrapper<SSKKeypair> sskKeypairWrapper = new ObjectWrapper<SSKKeypair>();
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new GenerateSSK());
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedSSKKeypair(FcpConnection fcpConnection, SSKKeypair sskKeypair) {
+				sskKeypairWrapper.set(sskKeypair);
+				completionLatch.countDown();
+			}
+		}.execute();
+		return sskKeypairWrapper.get();
+	}
+
+	//
+	// REQUEST MANAGEMENT
+	//
+
+	/**
+	 * Returns all currently visible persistent get requests.
+	 *
+	 * @param global
+	 *            <code>true</code> to return get requests from the global
+	 *            queue, <code>false</code> to only show requests from the
+	 *            client-local queue
+	 * @return All get requests
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public Set<PersistentGet> getGetRequests(final boolean global) throws IOException, FcpException {
+		final Set<PersistentGet> getRequests = Collections.synchronizedSet(new HashSet<PersistentGet>());
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new ListPersistentRequests());
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPersistentGet(FcpConnection fcpConnection, PersistentGet persistentGet) {
+				if (!persistentGet.isGlobal() || global) {
+					getRequests.add(persistentGet);
+				}
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
+				completionLatch.countDown();
+			}
+		}.execute();
+		return getRequests;
+	}
+
+	//
+	// PRIVATE METHODS
+	//
+
+	/**
+	 * Creates a unique request identifier.
+	 *
+	 * @param basename
+	 *            The basename of the request
+	 * @return The created request identifier
+	 */
+	private String createIdentifier(String basename) {
+		return basename + "-" + System.currentTimeMillis() + "-" + (int) (Math.random() * Integer.MAX_VALUE);
 	}
 
 	/**
@@ -236,7 +612,7 @@ public class FcpClient {
 	 *
 	 * @author David ‘Bombe’ Roden &lt;bombe@freenetproject.org&gt;
 	 */
-	private static class ExtendedFcpAdapter extends FcpAdapter {
+	private abstract class ExtendedFcpAdapter extends FcpAdapter {
 
 		/** The count down latch used to wait for completion. */
 		protected final CountDownLatch completionLatch = new CountDownLatch(1);
@@ -252,24 +628,42 @@ public class FcpClient {
 		}
 
 		/**
-		 * Returns the FCP exception that occured. If no FCP exception occured,
-		 * <code>null</code> is returned.
+		 * Executes the FCP commands in {@link #run()}, wrapping the execution
+		 * and catching exceptions.
 		 *
-		 * @return The FCP exception that occured, or <code>null</code>
+		 * @throws IOException
+		 *             if an I/O error occurs
+		 * @throws FcpException
+		 *             if an FCP error occurs
 		 */
-		public FcpException getFcpException() {
-			return fcpException;
+		@SuppressWarnings("synthetic-access")
+		public void execute() throws IOException, FcpException {
+			fcpConnection.addFcpListener(this);
+			try {
+				run();
+				while (true) {
+					try {
+						completionLatch.await();
+						break;
+					} catch (InterruptedException ie1) {
+						/* ignore, we’ll loop. */
+					}
+				}
+			} finally {
+				fcpConnection.removeFcpListener(this);
+			}
+			if (fcpException != null) {
+				throw fcpException;
+			}
 		}
 
 		/**
-		 * Waits for the completion of the command.
+		 * The FCP commands that actually get executed.
 		 *
-		 * @throws InterruptedException
-		 *             if {@link CountDownLatch#await()} is interrupted
+		 * @throws IOException
+		 *             if an I/O error occurs
 		 */
-		public void complete() throws InterruptedException {
-			completionLatch.await();
-		}
+		public abstract void run() throws IOException;
 
 		/**
 		 * {@inheritDoc}