X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FNodeManager.java;h=f032570c02a97cb9306f09405365c42ebb1cd06a;hb=c63257e8cc0ba1a5aca9364b22171abe7279d479;hp=71bb95dcef39957dec5dae0de7001dc6f6a96a40;hpb=029548705a1fa60731ad7f492103333acdd48001;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java index 71bb95d..f032570 100644 --- a/src/net/pterodactylus/jsite/core/NodeManager.java +++ b/src/net/pterodactylus/jsite/core/NodeManager.java @@ -19,6 +19,8 @@ package net.pterodactylus.jsite.core; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -29,29 +31,31 @@ import java.net.UnknownHostException; 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.ConnectResult; -import net.pterodactylus.fcp.highlevel.HighLevelCallback; 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.jsite.util.IdGenerator; import net.pterodactylus.util.io.Closer; +import net.pterodactylus.util.logging.Logging; +import net.pterodactylus.util.number.Hex; /** * TODO * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> - * @version $Id$ */ -public class NodeManager { +public class NodeManager implements Iterable, PropertyChangeListener, HighLevelClientListener { /** Logger. */ - private static final Logger logger = Logger.getLogger(NodeManager.class.getName()); + private static final Logger logger = Logging.getLogger(NodeManager.class.getName()); /** The FCP client name. */ private final String clientName; @@ -62,14 +66,17 @@ public class NodeManager { /** Object used for synchronization. */ private final Object syncObject = new Object(); + /** Node listeners. */ + private List nodeListeners = Collections.synchronizedList(new ArrayList()); + /** All nodes. */ private List nodes = Collections.synchronizedList(new ArrayList()); - /** All FCP connections. */ - private Map nodeConnections = Collections.synchronizedMap(new HashMap()); + /** Map from node ID to node. */ + private Map idNodes = Collections.synchronizedMap(new HashMap()); - /** Keeps track of which connection is in use right now. */ - private Set usedConnections = Collections.synchronizedSet(new HashSet()); + /** All FCP connections. */ + private Map nodeClients = Collections.synchronizedMap(new HashMap()); /** Maps nodes to high-level clients. */ private Map clientNodes = Collections.synchronizedMap(new HashMap()); @@ -88,6 +95,100 @@ public class NodeManager { } // + // EVENT MANAGEMENT + // + + /** + * Adds the given listener to the list of listeners. + * + * @param nodeListener + * The listener to add + */ + public void addNodeListener(NodeListener nodeListener) { + nodeListeners.add(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) { + logger.log(Level.FINEST, "firing nodeAdded event with [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) { + logger.log(Level.FINEST, "firing nodeRemoved event with [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) { + logger.log(Level.FINEST, "firing nodeConnected event with [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) { + logger.log(Level.FINEST, "firing nodeConnectionFailed event with [node=" + node + ",cause=" + 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 null + * if there was no exception + */ + private void fireNodeDisconnected(Node node, Throwable throwable) { + logger.log(Level.FINEST, "firing nodeDisconnected event with [node=" + node + ",throwable=" + throwable + "]"); + for (NodeListener nodeListener : nodeListeners) { + nodeListener.nodeDisconnected(node, throwable); + } + } + + // // ACCESSORS // @@ -112,6 +213,13 @@ public class NodeManager { return nodes.contains(node); } + /** + * {@inheritDoc} + */ + public Iterator iterator() { + return nodes.iterator(); + } + // // ACTIONS // @@ -123,6 +231,7 @@ public class NodeManager { * 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()) { @@ -140,6 +249,10 @@ public class NodeManager { List loadedNodes = new ArrayList(); while (nodeProperties.containsKey("nodes." + ++nodeIndex + ".name")) { String nodePrefix = "nodes." + nodeIndex; + String nodeId = nodeProperties.getProperty(nodePrefix + ".id"); + if (nodeId == null) { + nodeId = Hex.toHex(IdGenerator.generateId()); + } String nodeName = nodeProperties.getProperty(nodePrefix + ".name"); if (!Verifier.verifyNodeName(nodeName)) { logger.log(Level.WARNING, "invalid node name “" + nodeName + "”, skipping…"); @@ -164,14 +277,18 @@ public class NodeManager { continue; } Node newNode = new Node(); + newNode.setId(nodeId); newNode.setName(nodeName); newNode.setHostname(nodeHostname); newNode.setPort(nodePort); loadedNodes.add(newNode); } + logger.log(Level.FINE, "loaded " + loadedNodes.size() + " nodes from config"); synchronized (syncObject) { nodes.clear(); - nodes.addAll(loadedNodes); + for (Node node : loadedNodes) { + addNode(node); + } } } @@ -182,6 +299,7 @@ public class NodeManager { * 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()) { @@ -190,8 +308,9 @@ public class NodeManager { } Properties nodeProperties = new Properties(); int nodeIndex = -1; - for (Node node: nodes) { + for (Node node : nodes) { String nodePrefix = "nodes." + ++nodeIndex; + nodeProperties.setProperty(nodePrefix + ".id", node.getId()); nodeProperties.setProperty(nodePrefix + ".name", node.getName()); nodeProperties.setProperty(nodePrefix + ".hostname", node.getHostname()); nodeProperties.setProperty(nodePrefix + ".port", String.valueOf(node.getPort())); @@ -207,41 +326,92 @@ public class NodeManager { } /** - * Adds a connection to the given node. The connection is made instantly so - * this method may block. If the node can not be connected, it will not be - * added to the list of nodes. + * Adds the given node to this manager. * + * @see #connect(Node) * @param node * The node to connect to - * @return true if the connection to the node could be - * established - * @throws UnknownHostException - * if the hostname of the node can not be resolved - * @throws IOException - * if an I/O error occurs connecting to the node + * @return true if the node was added, false + * if the node was not added because it was already known */ - public boolean addNode(Node node) throws UnknownHostException, IOException { + public boolean addNode(Node node) { + logger.log(Level.FINEST, "addNode(node=" + node + ")"); if (nodes.contains(node)) { - return true; + logger.log(Level.WARNING, "was told to add already known node: " + node); + return false; } - HighLevelClient highLevelClient = new HighLevelClient(clientName, node.getHostname(), node.getPort()); - HighLevelCallback connectCallback = highLevelClient.connect(); - ConnectResult connectResult = null; - while (connectResult == null) { - try { - connectResult = connectCallback.getResult(); - } catch (InterruptedException e) { - /* ignore. */ + node.addPropertyChangeListener(this); + HighLevelClient highLevelClient = new HighLevelClient(clientName); + nodes.add(node); + idNodes.put(node.getId(), node); + clientNodes.put(highLevelClient, node); + nodeClients.put(node, highLevelClient); + highLevelClient.addHighLevelClientListener(this); + 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); } - if (connectResult.isConnected()) { - synchronized (syncObject) { - nodes.add(node); - nodeConnections.put(node, highLevelClient); - clientNodes.put(highLevelClient, node); + } + + /** + * Tries to establish a connection with the given node. + * + * @param node + * The node to connect to + */ + public void connect(Node node) { + logger.log(Level.FINEST, "connect(node=" + node + ")"); + HighLevelClient highLevelClient; + highLevelClient = nodeClients.get(node); + if (highLevelClient == null) { + logger.log(Level.WARNING, "was told to connect to unknown node: " + node); + return; + } + try { + highLevelClient.connect(node.getHostname(), node.getPort()); + } catch (UnknownHostException uhe1) { + fireNodeConnectionFailed(node, uhe1); + } catch (IOException ioe1) { + fireNodeConnectionFailed(node, ioe1); + } + } + + /** + * Disconnects the given node without removing it. + * + * @param node + * The node to disconnect + */ + public void disconnect(Node node) { + logger.log(Level.FINEST, "disconnect(node=" + node + ")"); + synchronized (syncObject) { + if (!nodes.contains(node)) { + return; } + HighLevelClient highLevelClient = nodeClients.get(node); + highLevelClient.disconnect(); } - return connectResult.isConnected(); } /** @@ -250,49 +420,138 @@ public class NodeManager { * @return A list of all nodes */ public List getNodes() { - return new ArrayList(clientNodes.values()); + return Collections.unmodifiableList(nodes); + } + + /** + * 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 null if the + * node was disconnected or removed + */ + 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 null if the + * high-level client is not known + */ + public Node getNode(HighLevelClient highLevelClient) { + return clientNodes.get(highLevelClient); + } + + /** + * Returns the node identified by the given ID. + * + * @param id + * The ID of the node + * @return The node with the given ID, or null if no such + * node was found + */ + Node getNode(String id) { + return idNodes.get(id); + } + + /** + * Generates a new SSK key pair. + * + * @return An array with the private key at index 0 and the + * public key at index 1 + * @throws IOException + * if an I/O error occurs communicating with the node + * @throws JSiteException + * 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; } // // PRIVATE METHODS // + // + // INTERFACE HighLevelClientListener + // + /** - * Finds a currently unused high-level client, optionally waiting until a - * client is free and marking it used. - * - * @param wait - * true to wait for a free connection, - * false to return null - * @param markAsUsed - * true to mark the connection as used before - * returning it, false not to mark it - * @return An unused FCP connection, or null if no connection - * could be found + * {@inheritDoc} + */ + public void clientConnected(HighLevelClient highLevelClient) { + logger.log(Level.FINEST, "clientConnected(highLevelClient=" + highLevelClient + ")"); + Node node = clientNodes.get(highLevelClient); + if (node == null) { + logger.log(Level.WARNING, "got event for unknown client"); + return; + } + fireNodeConnected(node); + } + + /** + * {@inheritDoc} */ - @SuppressWarnings("unused") - private HighLevelClient findUnusedClient(boolean wait, boolean markAsUsed) { + public void clientDisconnected(HighLevelClient highLevelClient, Throwable throwable) { + logger.log(Level.FINEST, "clientDisconnected(highLevelClient=" + highLevelClient + ",throwable=" + throwable + ")"); synchronized (syncObject) { - HighLevelClient freeHighLevelClient = null; - while (freeHighLevelClient == null) { - for (HighLevelClient highLevelClient: nodeConnections.values()) { - if (!usedConnections.contains(highLevelClient)) { - freeHighLevelClient = highLevelClient; - break; - } + Node node = clientNodes.get(highLevelClient); + if (node == null) { + logger.log(Level.WARNING, "got event for unknown client"); + return; + } + fireNodeDisconnected(node, throwable); + } + } + + // + // INTERFACE PropertyChangeListener + // + + /** + * {@inheritDoc} + */ + public void propertyChange(PropertyChangeEvent propertyChangeEvent) { + Object eventSource = propertyChangeEvent.getSource(); + 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 (freeHighLevelClient != null) { - if (markAsUsed) { - usedConnections.add(freeHighLevelClient); + if (highLevelClient.isConnected()) { + highLevelClient.disconnect(); + try { + highLevelClient.connect(node.getHostname(), node.getPort()); + } catch (UnknownHostException uhe1) { + fireNodeConnectionFailed(node, uhe1); + } catch (IOException ioe1) { + fireNodeConnectionFailed(node, ioe1); } - return freeHighLevelClient; - } - if (!wait) { - return null; } } - /* we never get here, but the compiler doesn't realize. */ - return null; } }