add better tcp connection establishment example and support

Author: thsc42

src/main/java/net/sharksystem/asap/ASAPEncounterManagerImpl.java

@@ -6,6 +6,7 @@
 import net.sharksystem.asap.utils.PeerIDHelper;
 import net.sharksystem.utils.streams.StreamPair;
 import net.sharksystem.utils.Log;
+import net.sharksystem.utils.tcp.StreamPairCreatedListener;
 
 import java.io.*;
 import java.util.*;
@@ -294,7 +295,13 @@ public synchronized void asapConnectionTerminated(Exception terminatingException
         }
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //                                                 utils                                                      //
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
     public String toString() {
         return this.asapConnectionHandler.toString();
     }
+
+
 }

src/main/java/net/sharksystem/asap/apps/TCPServerSocketAcceptor.java

@@ -0,0 +1,33 @@
+package net.sharksystem.asap.apps;
+
+import net.sharksystem.asap.ASAPEncounterManager;
+import net.sharksystem.asap.EncounterConnectionType;
+import net.sharksystem.utils.Log;
+import net.sharksystem.utils.streams.StreamPair;
+import net.sharksystem.utils.tcp.SocketFactory;
+import net.sharksystem.utils.tcp.StreamPairCreatedListener;
+
+import java.io.IOException;
+
+public class TCPServerSocketAcceptor implements StreamPairCreatedListener {
+    private final ASAPEncounterManager encounterManager;
+
+    public TCPServerSocketAcceptor(int portNumber, ASAPEncounterManager encounterManager) throws IOException {
+        this.encounterManager = encounterManager;
+        SocketFactory socketFactory = new SocketFactory(portNumber, this);
+
+        Log.writeLog(this, "start socket factory");
+        new Thread(socketFactory).start();
+    }
+
+    @Override
+    public void streamPairCreated(StreamPair streamPair) {
+        Log.writeLog(this, "new stream pair created");
+        try {
+            this.encounterManager.handleEncounter(streamPair, EncounterConnectionType.INTERNET);
+        } catch (IOException e) {
+            Log.writeLogErr(this, "exception when asking for new connection handling: "
+                    + e.getLocalizedMessage());
+        }
+    }
+}

src/main/java/net/sharksystem/utils/tcp/SocketFactory.java

@@ -2,6 +2,8 @@
 
 //import net.sharksystem.asap.ASAPEncounterHelper;
 
+import net.sharksystem.utils.streams.StreamPairImpl;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -11,11 +13,17 @@
 
 public class SocketFactory implements Runnable {
     private final ServerSocket srv;
+    private StreamPairCreatedListener listener = null;
     InputStream is;
     OutputStream os;
     private Thread waitForConnectionThread = null;
     private String remoteAddress;
 
+    public SocketFactory(int portNumber, StreamPairCreatedListener listener) throws IOException {
+        this(new ServerSocket(portNumber));
+        this.listener = listener;
+    }
+
     public SocketFactory(ServerSocket srv) {
         this.srv = srv;
     }
@@ -35,6 +43,10 @@ public void run() {
                 //this.waitForConnectionThread.interrupt();
                 this.waitForConnectionThread.notify();
             }
+            if(this.listener != null) {
+                this.listener.streamPairCreated(
+                        StreamPairImpl.getStreamPairWithEndpointAddress(this.is, this.os, this.remoteAddress));
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/net/sharksystem/utils/tcp/StreamPairCreatedListener.java

@@ -0,0 +1,7 @@
+package net.sharksystem.utils.tcp;
+
+import net.sharksystem.utils.streams.StreamPair;
+
+public interface StreamPairCreatedListener {
+    void streamPairCreated(StreamPair streamPair);
+}

src/test/java/howto/ConnectPeers.java

@@ -1,6 +1,8 @@
 package howto;
 
 import net.sharksystem.asap.*;
+import net.sharksystem.asap.apps.TCPServerSocketAcceptor;
+import net.sharksystem.utils.streams.StreamPairImpl;
 import net.sharksystem.utils.tcp.SocketFactory;
 import net.sharksystem.utils.testsupport.TestConstants;
 import net.sharksystem.utils.testsupport.TestHelper;
@@ -89,4 +91,53 @@ public void connectAliceAndBob() throws IOException, ASAPException, InterruptedE
         // give it some time to run an encounter.
         Thread.sleep(5);
     }
+
+    @Test
+    public void connectAliceAndBobWithEncounterManager_Preferred() throws IOException, ASAPException, InterruptedException {
+        // supported formats
+        Collection<CharSequence> formats = new ArrayList<>();
+        formats.add(EXAMPLE_APP_FORMAT);
+
+        // test folder for this test run
+        String rootFolder = TestHelper.getFullTempFolderName(TEST_FOLDER, true);
+
+        ////////////////////////// set up peers
+        // set up alice
+        String aliceFolder = rootFolder + "/" + TestConstants.ALICE_ID;
+        ASAPConnectionHandler alice = new ASAPPeerFS(TestConstants.ALICE_ID, aliceFolder, formats);
+        // set up bob
+        String bobFolder = rootFolder + "/" + TestConstants.BOB_ID;
+        ASAPConnectionHandler bob = new ASAPPeerFS(TestConstants.BOB_ID, bobFolder, formats);
+
+        ////////////////////////// encounter manager
+        ASAPEncounterManager aliceEncounterManager = new ASAPEncounterManagerImpl(alice);
+        ASAPEncounterManager bobEncounterManager = new ASAPEncounterManagerImpl(bob);
+
+        ////////////////////////// set up server socket and handle connection requests
+        int portNumberAlice = TestHelper.getPortNumber();
+        TCPServerSocketAcceptor aliceTcpServerSocketAcceptor =
+                new TCPServerSocketAcceptor(portNumberAlice, aliceEncounterManager);
+
+        int portNumberBob = TestHelper.getPortNumber();
+        TCPServerSocketAcceptor bobTcpServerSocketAcceptor =
+                new TCPServerSocketAcceptor(portNumberBob, bobEncounterManager);
+
+        // give it a moment to settle
+        Thread.sleep(5);
+
+        // now, both side wit for connection establishment. Example
+
+        // open connection to Bob
+        Socket socket = new Socket("localhost", portNumberBob);
+
+        // let Alice handle it
+        aliceEncounterManager.handleEncounter(
+                StreamPairImpl.getStreamPair(socket.getInputStream(), socket.getOutputStream()),
+                EncounterConnectionType.INTERNET);
+
+        // give it a moment to run ASAP session
+        Thread.sleep(5);
+
+        // There is just one peer in a real app.
+    }
 }