working on better hub integration in shark messenger.

Author: thsc42

libs/ASAPJava.jar

@@ -39,9 +39,22 @@ public HubConnector getHubConnector(HubConnectorDescription hcd) throws SharkExc
         return this.hubManager.getHubConnector(hcd);
     }
 
-    public HubConnectionManagerImpl(ASAPEncounterManager encounterManager, ASAPPeer asapPeer) {
+    private Thread hubManangerThread = null;
+    public HubConnectionManagerImpl(
+            ASAPEncounterManager encounterManager, ASAPPeer asapPeer, int waitIntervalInSeconds) {
         this.asapPeer = asapPeer;
-        this.hubManager = new ASAPHubManagerImpl(encounterManager);
+        this.hubManager = new ASAPHubManagerImpl(encounterManager, waitIntervalInSeconds);
+        // run it
+        this.hubManangerThread = new Thread(this.hubManager);
+        this.hubManangerThread.start();
+    }
+
+    public HubConnectionManagerImpl(ASAPEncounterManager encounterManager, ASAPPeer asapPeer) {
+        this(encounterManager, asapPeer, ASAPHubManagerImpl.DEFAULT_WAIT_INTERVAL_IN_SECONDS);
+    }
+
+    public void stopThreads() {
+        this.hubManager.kill();
     }
 
     @Override

src/main/java/net/sharksystem/hub/HubConnectionManagerImpl.java

@@ -15,7 +15,7 @@
 
 public class ASAPTCPHub extends HubSingleEntitySharedChannel implements Runnable {
     public static final int DEFAULT_MAX_IDLE_CONNECTION_IN_SECONDS = 60;
-    private final boolean newConnection;
+    private final boolean createNewConnection;
     private int maxIdleInMillis = DEFAULT_MAX_IDLE_CONNECTION_IN_SECONDS * 1000;
 
     private final int port;
@@ -35,11 +35,11 @@ public ASAPTCPHub(int port) throws IOException {
         this(port, false);
     }
 
-    public ASAPTCPHub(int port, boolean newConnection) throws IOException {
+    public ASAPTCPHub(int port, boolean createNewConnection) throws IOException {
         this.port = port;
         this.nextPort = port+1;
         this.serverSocket = new ServerSocket(this.port);
-        this.newConnection = newConnection;
+        this.createNewConnection = createNewConnection;
     }
 
     public void setPortRange(int minPort, int maxPort) throws ASAPException {
@@ -95,7 +95,7 @@ public void run() {
 
             try {
                 Connector hubConnectorSession;
-                if(this.newConnection) {
+                if(this.createNewConnection) {
                     hubConnectorSession =
                             new MultipleTCPChannelsConnectorHubSideImpl(
                                     newConnection.getInputStream(), newConnection.getOutputStream(), this);

src/main/java/net/sharksystem/hub/hubside/ASAPTCPHub.java

@@ -235,7 +235,7 @@ public void run() {
         Log.writeLog(this, this.toString(), "hub manager thread started");
 
         while (!this.managerThreadStopped) {
-            Log.writeLog(this, this.toString(), "start a new round");
+            Log.writeLog(this, this.toString(),"start a new round");
 
             for(HubConnector hubConnector : this.hubConnectors) {
                 Log.writeLog(this, this.toString(), "check hub connection");
@@ -297,6 +297,8 @@ public void notifySynced(Connector connector, boolean changed) {
     @Override
     public void notifyPeerConnected(CharSequence targetPeerID, StreamPair streamPair) {
         try {
+            // can be a race condition - this side did not initiate connection establishment
+//            this.asapEncounterManager.handleEncounter(streamPair, ASAPEncounterConnectionType.ASAP_HUB, false);
             this.asapEncounterManager.handleEncounter(streamPair, ASAPEncounterConnectionType.ASAP_HUB);
         } catch (IOException e) {
             Log.writeLogErr(this, this.toString(), "cannot handle peer encounter: "

src/main/java/net/sharksystem/hub/peerside/ASAPHubManagerImpl.java

@@ -189,7 +189,7 @@ public void usageHubManagerAndTwoPeers(boolean multichannel) throws IOException,
         ASAPTCPHub hub = ASAPTCPHub.startTCPHubThread(hubPort, multichannel, MAX_IDLE_IN_SECONDS);
 
         // give it moment to settle in
-        Thread.sleep(1000);
+        Thread.sleep(100);
 
         Collection<CharSequence> formats = new ArrayList<>();
         formats.add(FORMAT);
@@ -218,7 +218,7 @@ public void usageHubManagerAndTwoPeers(boolean multichannel) throws IOException,
 
         // connect with bulk import
         aliceHubManager.connectASAPHubs(hubDescriptions, aliceASAPPeer, true);
-        Thread.sleep(1000);
+        Thread.sleep(100);
 
         ///////////////////// connect to hub - Bob
         // setup encounter manager with a connection handler
@@ -231,10 +231,10 @@ public void usageHubManagerAndTwoPeers(boolean multichannel) throws IOException,
 
         // connect to hub - Bob
         bobHubManager.connectASAPHubs(hubDescriptions, bobASAPPeer, true);
-        Thread.sleep(1000);
+        Thread.sleep(100);
 
         // give them moment to exchange data
-        Thread.sleep(5000);
+        Thread.sleep(500);
         //Thread.sleep(Long.MAX_VALUE);
         System.out.println("slept a moment");