Working on hub integration.

Author: thsc42

libs/ASAPHub.jar

@@ -24,6 +24,7 @@
 import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandShowOpenTCPPorts;
 import net.sharksystem.fs.ExtraData;
 import net.sharksystem.fs.ExtraDataFS;
+import net.sharksystem.hub.peerside.ASAPHubManager;
 import net.sharksystem.utils.Log;
 
 /**
@@ -33,9 +34,11 @@
 public class ProductionUI {
     public static final String SETTINGSFILENAME = ".sharkMessengerSettings";
     public static final String PEERNAME_KEY = "peername";
+    public static final String SYNC_WITH_OTHERS_IN_SECONDS_KEY = "syncWithOthersInSeconds";
 
     public static void main(String[] args) throws SharkException, IOException {
         String peerName = null;
+        int syncWithOthersInSeconds = ASAPHubManager.DEFAULT_WAIT_INTERVAL_IN_SECONDS;
         ExtraData settings = new ExtraDataFS("./" + SETTINGSFILENAME);
         boolean isBack = false;
 
@@ -49,6 +52,17 @@ public static void main(String[] args) throws SharkException, IOException {
             case 1:
                 peerName = args[0];
                 break;
+            case 2:
+                peerName = args[0];
+                try {
+                    syncWithOthersInSeconds = Integer.parseInt(args[1]);
+                }
+                catch(NumberFormatException re) {
+                    System.err.println("could not parse second parameter " +
+                            "/ meant to be an integer telling how many seconds to wait for syncing with hubs"
+                            + re.getLocalizedMessage());
+                }
+                break;
             default:
                 System.out.println("possible arguments: ");
                 System.out.println("\n -n peerName");
@@ -84,6 +98,8 @@ public static void main(String[] args) throws SharkException, IOException {
             settings.putExtra(PEERNAME_KEY, peerName.getBytes());
         }
 
+        settings.putExtra(SYNC_WITH_OTHERS_IN_SECONDS_KEY, syncWithOthersInSeconds);
+
         // Re-direct asap/shark log messages.
         PrintStream asapLogMessages = new PrintStream("asapLogs" + peerName + ".txt");
         Log.setOutStream(asapLogMessages);

libs/ASAPJava.jar

@@ -21,6 +21,8 @@
 import java.net.Socket;
 import java.util.*;
 
+import static net.sharksystem.cmdline.sharkmessengerUI.ProductionUI.SYNC_WITH_OTHERS_IN_SECONDS_KEY;
+
 /**
  * Proposed and suggested pattern for Shark app. Implement a central entity (could even be a singleton)
  * that provides access to any component that is part of this application
@@ -45,6 +47,7 @@ public SharkMessengerApp(String peerName, ExtraData settings) throws SharkExcept
         this.settings = settings;
         this.sharkPeerFS = new SharkPeerFS(peerName, this.peerDataFolderName);
         this.peerName = peerName;
+        int syncWithOthersInSeconds = settings.getExtraInteger(SYNC_WITH_OTHERS_IN_SECONDS_KEY);
 
         // set up shark components
 
@@ -79,16 +82,19 @@ public SharkMessengerApp(String peerName, ExtraData settings) throws SharkExcept
         //////////////////////// setup hub connection management
         // TODO: that's still a design flaw. We need something that extracts a connection handler from a peer. Do we?
         ASAPPeer asapPeer = this.sharkPeerFS.getASAPPeer();
+        ASAPConnectionHandler asapHandler = (ASAPConnectionHandler) asapPeer;
         // this code runs on service side - this peer should be a connection handler
         if (asapPeer instanceof ASAPConnectionHandler) { // TODO: aaaaargs
             // yes it is
             ASAPEncounterManagerImpl asapEncounterManager =
-                    new ASAPEncounterManagerImpl((ASAPConnectionHandler) asapPeer, asapPeer.getPeerID());
+                    new ASAPEncounterManagerImpl(asapHandler, asapPeer.getPeerID(),
+                            syncWithOthersInSeconds*1000);
             // same object - different roles
             this.encounterManager = asapEncounterManager;
             this.encounterManagerAdmin = asapEncounterManager;
 
-            this.hubConnectionManager = new HubConnectionManagerImpl(this.encounterManager, asapPeer);
+            this.hubConnectionManager =
+                    new HubConnectionManagerImpl(this.encounterManager, asapPeer, syncWithOthersInSeconds);
         } else {
             Log.writeLogErr(this,
                     "ASAP peer set but is not a connection handler - cannot set up connection management");
@@ -191,7 +197,10 @@ public Set<Integer> getOpenHubPorts() {
     public void startHub(int portNumber) throws IOException {
         if(this.portAlreadyInUse(portNumber)) return;
 
-        ASAPTCPHub asapHub = new ASAPTCPHub(portNumber);
+        // create a new hub that spawns new TCP connections.
+//        ASAPTCPHub asapHub = new ASAPTCPHub(portNumber, true);
+
+        ASAPTCPHub asapHub = new ASAPTCPHub(portNumber, false);
         this.asapHubs.put(portNumber, asapHub);
         new Thread(asapHub).start();
     }