import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import net.pterodactylus.fcp.highlevel.HighLevelClient;
-import net.pterodactylus.fcp.highlevel.HighLevelClientListener;
-import net.pterodactylus.fcp.highlevel.HighLevelException;
-import net.pterodactylus.fcp.highlevel.KeyGenerationResult;
+import net.pterodactylus.fcp.highlevel.FcpClient;
+import net.pterodactylus.fcp.highlevel.FcpException;
import net.pterodactylus.jsite.util.IdGenerator;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.logging.Logging;
/**
* TODO
- *
+ *
* @author David ‘Bombe’ Roden <bombe@freenetproject.org>
*/
-public class NodeManager implements Iterable<Node>, PropertyChangeListener, HighLevelClientListener {
+public class NodeManager implements Iterable<Node>, PropertyChangeListener {
/** Logger. */
private static final Logger logger = Logging.getLogger(NodeManager.class.getName());
/** Object used for synchronization. */
private final Object syncObject = new Object();
- /** Node listeners. */
- private List<NodeListener> nodeListeners = Collections.synchronizedList(new ArrayList<NodeListener>());
+ /** Node listener support. */
+ private final NodeListenerSupport nodeListenerManager = new NodeListenerSupport();
/** All nodes. */
- private List<Node> nodes = Collections.synchronizedList(new ArrayList<Node>());
+ private final List<Node> nodes = Collections.synchronizedList(new ArrayList<Node>());
+
+ /** Map from node ID to node. */
+ private final Map<String, Node> idNodes = Collections.synchronizedMap(new HashMap<String, Node>());
- /** All FCP connections. */
- private Map<Node, HighLevelClient> nodeClients = Collections.synchronizedMap(new HashMap<Node, HighLevelClient>());
+ /** Map from node to client. */
+ private final Map<Node, FcpClient> nodeClients = Collections.synchronizedMap(new HashMap<Node, FcpClient>());
- /** Maps nodes to high-level clients. */
- private Map<HighLevelClient, Node> clientNodes = Collections.synchronizedMap(new HashMap<HighLevelClient, Node>());
+ /** Collection of currently connected nodes. */
+ private final Set<Node> connectedNodes = Collections.synchronizedSet(new HashSet<Node>());
/**
* Creates a new FCP collector.
- *
+ *
* @param clientName
* The name of the FCP client
* @param directory
/**
* Adds the given listener to the list of listeners.
- *
+ *
* @param nodeListener
* The listener to add
*/
public void addNodeListener(NodeListener nodeListener) {
- nodeListeners.add(nodeListener);
+ nodeListenerManager.addListener(nodeListener);
}
/**
* Removes the given listener from the list of listeners.
- *
+ *
* @param nodeListener
* The listener to remove
*/
public void removeNodeListener(NodeListener nodeListener) {
- nodeListeners.remove(nodeListener);
- }
-
- /**
- * Notifies all listeners that a node was added.
- *
- * @param node
- * The node that was added.
- */
- private void fireNodeAdded(Node node) {
- for (NodeListener nodeListener : nodeListeners) {
- nodeListener.nodeAdded(node);
- }
- }
-
- /**
- * Notifies all listeners that a node was removed.
- *
- * @param node
- * The node that was removed
- */
- private void fireNodeRemoved(Node node) {
- for (NodeListener nodeListener : nodeListeners) {
- nodeListener.nodeRemoved(node);
- }
- }
-
- /**
- * Notifies all listeners that the given node was connected.
- *
- * @param node
- * The node that is now connected
- */
- private void fireNodeConnected(Node node) {
- for (NodeListener nodeListener : nodeListeners) {
- nodeListener.nodeConnected(node);
- }
- }
-
- /**
- * Notifies all listeners that a connection to a node has failed.
- *
- * @param node
- * The node that could not be connected
- * @param cause
- * The cause of the failure
- */
- private void fireNodeConnectionFailed(Node node, Throwable cause) {
- for (NodeListener nodeListener : nodeListeners) {
- nodeListener.nodeConnectionFailed(node, cause);
- }
- }
-
- /**
- * Notifies all listeners that the given node was disconnected.
- *
- * @param node
- * The node that is now disconnected
- * @param throwable
- * The exception that caused the disconnect, or <code>null</code>
- * if there was no exception
- */
- private void fireNodeDisconnected(Node node, Throwable throwable) {
- for (NodeListener nodeListener : nodeListeners) {
- nodeListener.nodeDisconnected(node, throwable);
- }
+ nodeListenerManager.removeListener(nodeListener);
}
//
/**
* Returns the directory in which the nodes are stored.
- *
+ *
* @return The directory the nodes are stored in
*/
public String getDirectory() {
/**
* Checks whether the given node is already connected.
- *
+ *
* @param node
* The node to check
* @return <code>true</code> if the node is already connected,
}
/**
+ * Returns whether the given node is currently connected.
+ *
+ * @param node
+ * The node to check
+ * @return <code>true</code> if the node is currently connected,
+ * <code>false</code> otherwise
+ */
+ public boolean isNodeConnected(Node node) {
+ return connectedNodes.contains(node);
+ }
+
+ /**
* {@inheritDoc}
*/
public Iterator<Node> iterator() {
/**
* Loads nodes.
- *
+ *
* @throws IOException
* if an I/O error occurs loading the nodes
*/
public void load() throws IOException {
+ logger.log(Level.FINEST, "load()");
File directoryFile = new File(directory);
File nodeFile = new File(directoryFile, "nodes.properties");
if (!nodeFile.exists() || !nodeFile.isFile() || !nodeFile.canRead()) {
newNode.setPort(nodePort);
loadedNodes.add(newNode);
}
- logger.fine("loaded " + loadedNodes.size() + " nodes from config");
+ logger.log(Level.FINE, "loaded " + loadedNodes.size() + " nodes from config");
synchronized (syncObject) {
nodes.clear();
for (Node node : loadedNodes) {
/**
* Saves all configured nodes.
- *
+ *
* @throws IOException
* if an I/O error occurs saving the nodes
*/
public void save() throws IOException {
+ logger.log(Level.FINEST, "save()");
File directoryFile = new File(directory);
if (!directoryFile.exists()) {
if (!directoryFile.mkdirs()) {
/**
* Adds the given node to this manager.
- *
+ *
* @see #connect(Node)
* @param node
* The node to connect to
- * @return <code>true</code> if the node was added, <code>false</code>
- * if the node was not added because it was already known
+ * @return <code>true</code> if the node was added, <code>false</code> if
+ * the node was not added because it was already known
*/
public boolean addNode(Node node) {
+ logger.log(Level.FINEST, "addNode(node=" + node + ")");
if (nodes.contains(node)) {
- logger.warning("was told to add already known node: " + node);
+ logger.log(Level.WARNING, "was told to add already known node: " + node);
return false;
}
node.addPropertyChangeListener(this);
- HighLevelClient highLevelClient = new HighLevelClient(clientName);
nodes.add(node);
- clientNodes.put(highLevelClient, node);
- nodeClients.put(node, highLevelClient);
- highLevelClient.addHighLevelClientListener(this);
- fireNodeAdded(node);
+ idNodes.put(node.getId(), node);
+ nodeListenerManager.fireNodeAdded(node);
return true;
}
/**
* Removes the given node from the node manager, disconnecting it if it is
* currently connected.
- *
+ *
* @param node
* The node to remove
*/
public void removeNode(Node node) {
+ logger.log(Level.FINEST, "removeNode(node=" + node + ")");
synchronized (syncObject) {
if (!nodes.contains(node)) {
return;
}
- if (nodeClients.containsKey(node)) {
- disconnect(node);
- }
nodes.remove(node);
+ idNodes.remove(node.getId());
node.removePropertyChangeListener(this);
- fireNodeRemoved(node);
+ nodeListenerManager.fireNodeRemoved(node);
}
}
/**
* Tries to establish a connection with the given node.
- *
+ *
* @param node
* The node to connect to
*/
public void connect(Node node) {
- HighLevelClient highLevelClient;
- highLevelClient = nodeClients.get(node);
- if (highLevelClient == null) {
- logger.warning("was told to connect to unknown node: " + node);
+ logger.log(Level.FINEST, "connect(node=" + node + ")");
+ if (!nodes.contains(node)) {
+ logger.log(Level.WARNING, "Was told to connect to node (" + node + ") I don’t know about!");
return;
}
try {
- highLevelClient.connect(node.getHostname(), node.getPort());
+ FcpClient fcpClient = new FcpClient(clientName, node.getHostname(), node.getPort());
+ fcpClient.connect();
+ nodeClients.put(node, fcpClient);
+ nodeListenerManager.fireNodeConnected(node);
} catch (UnknownHostException uhe1) {
- fireNodeConnectionFailed(node, uhe1);
+ nodeListenerManager.fireNodeConnectionFailed(node, uhe1);
} catch (IOException ioe1) {
- fireNodeConnectionFailed(node, ioe1);
+ nodeListenerManager.fireNodeConnectionFailed(node, ioe1);
+ } catch (FcpException fe1) {
+ nodeListenerManager.fireNodeConnectionFailed(node, fe1);
}
}
/**
* Disconnects the given node without removing it.
- *
+ *
* @param node
* The node to disconnect
*/
public void disconnect(Node node) {
- synchronized (syncObject) {
- if (!nodes.contains(node)) {
- return;
- }
- HighLevelClient highLevelClient = nodeClients.get(node);
- highLevelClient.disconnect();
+ logger.log(Level.FINEST, "disconnect(node=" + node + ")");
+ if (!nodes.contains(node)) {
+ logger.log(Level.WARNING, "Was told to disconnect from a node (" + node + ") I don’t know about!");
+ return;
+ }
+ FcpClient fcpClient = nodeClients.get(node);
+ if (fcpClient == null) {
+ logger.log(Level.WARNING, "No FCP client for node (" + node + ")!");
+ return;
}
+ fcpClient.disconnect();
+ nodeListenerManager.fireNodeDisconnected(node, null);
}
/**
* Returns a list of all nodes.
- *
+ *
* @return A list of all nodes
*/
public List<Node> getNodes() {
}
/**
- * Returns the high-level client for a given node.
- *
- * @param node
- * The node to get a high-level client for
- * @return The high-level client for a node, or <code>null</code> if the
- * node was disconnected or removed
+ * Returns the node identified by the given ID.
+ *
+ * @param id
+ * The ID of the node
+ * @return The node with the given ID, or <code>null</code> if no such node
+ * was found
*/
- public HighLevelClient getHighLevelClient(Node node) {
- return nodeClients.get(node);
- }
-
- /**
- * Returns the node for a high-level client.
- *
- * @param highLevelClient
- * The high-level client to get the node for
- * @return The node for the high-level client, or <code>null</code> if the
- * high-level client is not known
- */
- public Node getNode(HighLevelClient highLevelClient) {
- return clientNodes.get(highLevelClient);
+ Node getNode(String id) {
+ return idNodes.get(id);
}
/**
* Generates a new SSK key pair.
- *
+ *
* @return An array with the private key at index <code>0</code> and the
* public key at index <code>1</code>
* @throws IOException
* if there is a problem with the node
*/
public String[] generateKeyPair() throws IOException, JSiteException {
+ logger.log(Level.FINEST, "generateKeyPair()");
if (nodes.isEmpty()) {
throw new NoNodeException("no node configured");
}
- Node node = nodes.get(0);
- HighLevelClient highLevelClient = nodeClients.get(node);
- try {
- KeyGenerationResult keyGenerationResult = highLevelClient.generateKey().getResult();
- return new String[] { keyGenerationResult.getInsertURI(), keyGenerationResult.getRequestURI() };
- } catch (HighLevelException hle1) {
- throw new BackendException(hle1);
- } catch (InterruptedException e) {
- /* ignore. */
- }
return null;
}
//
//
- // INTERFACE HighLevelClientListener
- //
-
- /**
- * {@inheritDoc}
- */
- public void clientConnected(HighLevelClient highLevelClient) {
- logger.log(Level.FINER, "clientConnected(c=" + highLevelClient + ")");
- Node node = clientNodes.get(highLevelClient);
- if (node == null) {
- logger.log(Level.WARNING, "got event for unknown client");
- return;
- }
- fireNodeConnected(node);
- }
-
- /**
- * {@inheritDoc}
- */
- public void clientDisconnected(HighLevelClient highLevelClient, Throwable throwable) {
- logger.log(Level.FINER, "clientDisconnected(c=" + highLevelClient + ",t=" + throwable + ")");
- synchronized (syncObject) {
- Node node = clientNodes.get(highLevelClient);
- if (node == null) {
- logger.log(Level.WARNING, "got event for unknown client");
- return;
- }
- fireNodeDisconnected(node, throwable);
- }
- }
-
- //
// INTERFACE PropertyChangeListener
//
if (eventSource instanceof Node) {
String propertyName = propertyChangeEvent.getPropertyName();
if ("hostname".equals(propertyName) || "port".equals(propertyName)) {
- Node node = (Node) eventSource;
- HighLevelClient highLevelClient = nodeClients.get(node);
- if (highLevelClient == null) {
- logger.log(Level.WARNING, "got property change event for unknown node: " + node);
- return;
- }
- if (highLevelClient.isConnected()) {
- highLevelClient.disconnect();
- try {
- highLevelClient.connect(node.getHostname(), node.getPort());
- } catch (UnknownHostException uhe1) {
- fireNodeConnectionFailed(node, uhe1);
- } catch (IOException ioe1) {
- fireNodeConnectionFailed(node, ioe1);
- }
- }
+ /* TODO - reconnect. */
}
}
}
projects / jSite2.git / blobdiff