multichannel works - close to finish this one - make a snapshot

Author: thsc42

…stem/hub/hubside/ConnectionPreparer.java …/sharksystem/hub/ConnectionPreparer.javasrc/net/sharksystem/hub/hubside/ConnectionPreparer.java renamed to src/net/sharksystem/hub/ConnectionPreparer.java src/net/sharksystem/hub/hubside/ConnectionPreparer.java renamed to src/net/sharksystem/hub/ConnectionPreparer.java

@@ -1,7 +1,8 @@
-package net.sharksystem.hub.hubside;
+package net.sharksystem.hub;
 
 import net.sharksystem.streams.StreamPair;
 
 public interface ConnectionPreparer {
+    byte readyByte = 42; // what else would it be
     void prepare(StreamPair streamPair);
 }

src/net/sharksystem/hub/hubside/HubGenericImpl.java

@@ -2,6 +2,7 @@
 
 import net.sharksystem.asap.ASAPPeer;
 import net.sharksystem.hub.ASAPHubException;
+import net.sharksystem.hub.ConnectionPreparer;
 import net.sharksystem.streams.StreamPair;
 import net.sharksystem.streams.StreamPairLink;
 import net.sharksystem.utils.Log;
@@ -77,8 +78,11 @@ protected abstract void sendDisconnectRequest(CharSequence sourcePeerID, CharSeq
     public void startDataSession(CharSequence sourcePeerID, CharSequence targetPeerID,
                                  StreamPair connection, int timeout) throws ASAPHubException, IOException {
 
+        ConnectionPreparer preparer = null; // should be in parameter list TODO
         // remember this request
-        this.dataSessionRequestList.add(new DataSessionRequest(sourcePeerID, targetPeerID, connection, timeout));
+        this.dataSessionRequestList.add(
+                new DataSessionRequest(sourcePeerID, targetPeerID, connection, timeout, preparer));
+
         Log.writeLog(this, "start data session " + sourcePeerID + " -> " + targetPeerID);
         this.createDataConnection(sourcePeerID, targetPeerID, timeout);
     }

src/net/sharksystem/hub/hubside/HubSingleEntitySharedChannel.java

@@ -1,6 +1,7 @@
 package net.sharksystem.hub.hubside;
 
 import net.sharksystem.hub.ASAPHubException;
+import net.sharksystem.hub.ConnectionPreparer;
 import net.sharksystem.streams.IdleStreamPairCloser;
 import net.sharksystem.streams.StreamPair;
 import net.sharksystem.utils.Log;
@@ -88,6 +89,9 @@ public void newConnectionCreated(CharSequence sourcePeerID, CharSequence targetP
                     + e.getLocalizedMessage());
         }
 
-        this.connectionCreated(targetPeerID, sourcePeerID, streamPair);
+//        ConnectionPreparer preparer = new TCPSocketConnectionPreparer();
+        ConnectionPreparer preparer = null;
+
+        this.connectionCreated(targetPeerID, sourcePeerID, streamPair, preparer);
     }
 }

src/net/sharksystem/hub/hubside/MultipleTCPChannelsConnectorHubSideImpl.java

@@ -97,6 +97,8 @@ public void newConnectionCreated(CharSequence sourcePeerID, CharSequence targetP
         Log.writeLog(this, this.toString(),"newConnectionCreated: " + sourcePeerID + "-->" + targetPeerID);
         try {
             IdleStreamPairCloser.getIdleStreamsCloser(streamPair, timeOutDataConnection).start();
+            // a preparer would fit
+            TCPSocketConnectionPreparer preparer = new TCPSocketConnectionPreparer();
             this.getHub().startDataSession(sourcePeerID, targetPeerID, streamPair, this.getTimeOutDataConnection());
         } catch (ASAPHubException | IOException e) {
             Log.writeLog(this, this.toString(),"could not create data connection: " + e.getLocalizedMessage());

src/net/sharksystem/hub/hubside/TCPSocketConnectionPreparer.java

@@ -0,0 +1,18 @@
+package net.sharksystem.hub.hubside;
+
+import net.sharksystem.hub.ConnectionPreparer;
+import net.sharksystem.streams.StreamPair;
+import net.sharksystem.utils.Log;
+
+import java.io.IOException;
+
+class TCPSocketConnectionPreparer implements ConnectionPreparer {
+    @Override
+    public void prepare(StreamPair streamPair) {
+        try {
+            streamPair.getOutputStream().write(ConnectionPreparer.readyByte);
+        } catch (IOException e) {
+            Log.writeLog(this, "socket already gone before first usage");
+        }
+    }
+}

tests/net/sharksystem/hub/HubConnectorTester.java

@@ -73,10 +73,11 @@ public void notifyPeerConnected(CharSequence targetPeerID, StreamPair streamPair
                 System.out.println(peerID + " writes pure bytes: " + this.messageA);
                 streamPair.getOutputStream().write(testBytes);
                 byte[] receivedBytes = new byte[10];
-                //Thread.sleep(1000); // give other process a moment
                 System.out.println(peerID + " available: " + streamPair.getInputStream().available());
+                Thread.sleep(100); // give other process a moment
+                System.out.println(peerID + " available #2: " + streamPair.getInputStream().available());
                 streamPair.getInputStream().read(receivedBytes);
-                System.out.println(peerID + " available: " + streamPair.getInputStream().available());
+                System.out.println(peerID + " available #3: " + streamPair.getInputStream().available());
                 if(!Helper.sameByteArray(testBytes, receivedBytes)) this.onError(testBytes, receivedBytes);
                 return;
             }