More cloud enhancements.

Author: jeffheaton

src/main/java/org/encog/cloud/CloudListener.java

@@ -1,6 +1,9 @@
 package org.encog.cloud;
 
+import org.encog.cloud.basic.CloudPacket;
+import org.encog.cloud.basic.CommunicationLink;
+
 public interface CloudListener {
-	void notifyPacket();
-	void notifyConnections();
+	void notifyPacket(CloudPacket packet);
+	void notifyConnections(CommunicationLink link, boolean hasOpened);
 }

src/main/java/org/encog/cloud/basic/CommunicationLink.java

@@ -77,43 +77,20 @@ public CommunicationLink(CloudNode node, Socket s) {
 	}
 
 
-	public void writePacket(int command, String[] args) {
+	public void writePacket(String command, Object[] args) {
 		try {
-			// first determine length
-			int length = 0;
-			for(int i=0;i<args.length;i++) {
-				length+=args[i].length();
-				length++;
+			StringBuilder line = new StringBuilder();
+			line.append("\"");
+			line.append(command);
+			line.append("\"");
+			for (int i = 0; i < args.length; i++) {
+				line.append(",\"");
+				line.append(args[i].toString());
+				line.append("\"");
 			}
-			
-			// write the packet
-			this.outputToRemote.writeByte('E');
-			this.outputToRemote.writeByte('N');
-			this.outputToRemote.writeByte('C');
-			this.outputToRemote.writeByte('O');
-			this.outputToRemote.writeByte('G');
-			this.outputToRemote.writeByte(0);// string terminator
-			this.outputToRemote.writeByte(0);//version
-			this.outputToRemote.writeByte(command);
-			this.outputToRemote.writeByte(0);//count
-			this.outputToRemote.writeLong(0);//time
-			this.outputToRemote.writeInt(length);//size
-			
-			// write the arguments
-			byte[] b = new byte[length];
-			int index = 0;
-			
-			for(int i=0;i<args.length;i++) {
-				String str = args[i];
-				for(int j=0;j<str.length();j++) {
-					b[index++] = (byte)str.charAt(j);
-				}
-				b[index++] = 0;
-			}
-			
-			this.outputToRemote.write(b);
+			line.append("\n");
+			this.outputToRemote.writeChars(line.toString());
 			this.flushOutput();
-			
 		} catch (IOException ex) {
 			throw new CloudError(ex);
 		}
@@ -125,7 +102,6 @@ public CloudPacket readPacket() {
 			String str = this.inputFromRemote.readLine();
 			List<String> list = parseLine.parse(str);
 			this.packets++;
-			this.parentNode.notifyListenersPacket();
 
 			EncogLogging.log(EncogLogging.LEVEL_DEBUG, "Received Packet: " + str);
 			return new CloudPacket(list);	
@@ -161,4 +137,9 @@ public void close() {
 		}
 
 	}
+
+	public void requestSignal(List<String> dataSource) {
+		writePacket("signals",dataSource.toArray());
+		
+	}
 }

src/main/java/org/encog/cloud/node/CloudNode.java

@@ -33,6 +33,7 @@
 
 import org.encog.cloud.CloudListener;
 import org.encog.cloud.basic.CloudError;
+import org.encog.cloud.basic.CloudPacket;
 import org.encog.cloud.basic.CommunicationLink;
 import org.encog.util.logging.EncogLogging;
 
@@ -72,7 +73,7 @@ public void run() {
 				Socket connectionSocket = listenSocket.accept();
 				EncogLogging.log(EncogLogging.LEVEL_DEBUG, "Connection from: " + connectionSocket.getRemoteSocketAddress().toString());
 				CommunicationLink link = new CommunicationLink(this,connectionSocket);				
-				notifyListenersConnections();
+				notifyListenersConnections(link, true);
 				HandleClient hc = new HandleClient(this, link);
 				this.connections.add(hc);
 				Thread t = new Thread(hc);
@@ -144,16 +145,21 @@ public void clearListeners() {
 		this.listeners.clear();
 	}
 
-	public void notifyListenersConnections() {
-		for( CloudListener listener : this.listeners ) {
-			listener.notifyConnections();
+	public void notifyListenersConnections(CommunicationLink link, boolean hasOpened) {
+		Object[] list = this.listeners.toArray();
+		
+		for(int i=0;i<list.length;i++) {
+			CloudListener listener = (CloudListener)list[i];
+			listener.notifyConnections(link, hasOpened);
 		}
 	}
 
-	public void notifyListenersPacket() {
-		for( CloudListener listener : this.listeners ) {
-			listener.notifyPacket();
+	public void notifyListenersPacket(CloudPacket packet) {
+		Object[] list = this.listeners.toArray();
+		
+		for(int i=0;i<list.length;i++) {
+			CloudListener listener = (CloudListener)list[i];
+			listener.notifyPacket(packet);
 		}
 	}
-	
 }

src/main/java/org/encog/cloud/node/HandleClient.java

@@ -68,6 +68,9 @@ public void run() {
 					else if( packet.getCommand().equalsIgnoreCase("goodbye") ) {
 						this.done = true;
 					}
+					else {
+						this.server.notifyListenersPacket(packet);
+					}
 				}				
 			} catch (CloudError ex) {
 				EncogLogging.log(EncogLogging.LEVEL_DEBUG,"Client ended connection.");
@@ -76,7 +79,7 @@ else if( packet.getCommand().equalsIgnoreCase("goodbye") ) {
 		}		
 		this.link.close();
 		this.server.getConnections().remove(this);
-		this.server.notifyListenersConnections();
+		this.server.notifyListenersConnections(this.link,false);
 		EncogLogging.log(EncogLogging.LEVEL_DEBUG,"Shutting down client handler");
 	}