start working on an asap management protocol

thsc42 · thsc42 · commit f823a0c5b095 · 2019-10-19T08:10:48.000+02:00
diff --git a/src/net/sharksystem/asap/ASAPEngine.java b/src/net/sharksystem/asap/ASAPEngine.java
@@ -276,6 +276,17 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU,
         try {
             // read URI
             String uri = asapAssimiliationPDU.getChannel();
+            if(!senderStorage.existsChunk(uri, eraSender) && asapAssimiliationPDU.recipientPeerSet()) {
+                //<<<<<<<<<<<<<<<<<<debug
+                b = new StringBuilder();
+                b.append(this.getLogStart());
+                b.append("recipient ( ");
+                b.append(asapAssimiliationPDU.getRecipientPeer());
+                b.append(") but no chunk on my side - should run asap management before (TODO):");
+                System.out.println(b.toString());
+                //>>>>>>>>>>>>>>>>>>>debug
+            }
+
             ASAPChunk chunk = senderStorage.getChunk(uri, eraSender);
 
             if(chunk != null) {
diff --git a/src/net/sharksystem/asap/protocol/ASAP_PDU_1_0.java b/src/net/sharksystem/asap/protocol/ASAP_PDU_1_0.java
@@ -1,14 +1,47 @@
 package net.sharksystem.asap.protocol;
 
 public interface ASAP_PDU_1_0 {
+    /**
+     * @return ASAP command. Version 1 know three alternatives: interest, offer, assimilate
+     */
+    byte getCommand();
+
+    /**
+     * @return ID of sender of this message
+     */
     String getPeer();
+
+    /**
+     * @return format A URI style is strongly recommended.
+     * In most cases a format will match with an application that deals with one (or more
+     * formats)
+     *
+     */
     String getFormat();
+
+    /**
+     * @return A URI representing content (semantics) of this message.
+     * It is assumed that multiple messages with same uri are floating around the
+     * ASAP network
+     */
     String getChannel();
+
+    /**
+     * @return Sender can send era in which this message was created. Can be helpful
+     * in multihop networks to reduce communication costs.
+     */
     int getEra();
 
+    /**
+     * @return a flag that indicates whether the optional peer parameter was transmitted
+     */
     boolean peerSet();
+    /**
+     * @return a flag that indicates whether the optional channel parameter was transmitted
+     */
     boolean channelSet();
+    /**
+     * @return a flag that indicates whether the optional era parameter was transmitted
+     */
     boolean eraSet();
-
-    byte getCommand();
 }
diff --git a/test/net/sharksystem/asap/MultihopTests.java b/test/net/sharksystem/asap/MultihopTests.java
@@ -5,6 +5,7 @@
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.List;
 
 public class MultihopTests {
     /**
@@ -92,7 +93,83 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         Assert.assertTrue(same);
     }
 
-    @Test
+    //@Test
+    public void createNonOpenStorage() throws IOException, ASAPException, InterruptedException {
+        CmdLineUI ui = new CmdLineUI(System.out);
+
+        ui.doResetASAPStorages();
+
+        // Alice creates storage with three recipients
+        ui.doCreateASAPStorage("Alice nonOpen");
+        ui.doCreateASAPStorage("Bob nonOpen");
+        ui.doCreateASAPStorage("Clara nonOpen");
+
+        ui.doAddRecipient("Alice:nonOpen Bob");
+        ui.doAddRecipient("Alice:nonOpen Clara");
+        ui.doAddRecipient("Alice:nonOpen David");
+
+        // message shall reach Bob and Clara but not David
+        ui.doAddRecipient("Bob:nonOpen Clara");
+
+        ui.doSetSendReceivedMessage("Alice:nonOpen on");
+        ui.doSetSendReceivedMessage("Bob:nonOpen on");
+
+        // add message to alice storage
+        String messageAlice2Clara = "HiClara";
+        String parameters = "Alice nonOpen abcChat " + messageAlice2Clara;
+        ui.doCreateASAPMessage(parameters);
+
+        // message is no in Alice storage
+
+        System.out.println("**************************************************************************");
+        System.out.println("**                       connect Alice with Bob                         **");
+        System.out.println("**************************************************************************");
+        // connect alice with bob
+        ui.doCreateASAPMultiEngine("Alice");
+        ui.doOpen("7070 Alice");
+        // wait a moment to give server socket time to be created
+        Thread.sleep(10);
+        ui.doCreateASAPMultiEngine("Bob");
+
+        ui.doConnect("7070 Bob");
+
+        // alice should be in era 1 (content has changed before connection) and bob era is 0 - no changes
+
+        // wait a moment
+        Thread.sleep(1000);
+
+        // kill connections
+        ui.doKill("all");
+
+        // alice should stay in era 1 (no content change), bob should be in era 1 received something
+
+        // wait a moment
+        Thread.sleep(1000);
+
+        // Bob should now have created an closed asap storage with three recipients
+        ASAPStorage bobStorage = this.getFreshStorageByName(ui, "Bob:nonOpen");
+
+        CharSequence uri = bobStorage.getChannelURIs().get(0);
+        List<CharSequence> recipientsList = bobStorage.getRecipients("nonOpen");
+        boolean aliceFound = false;
+        boolean bobFound = false;
+        boolean claraFound = false;
+        boolean davidFound = false;
+        for(CharSequence recipient : recipientsList) {
+            String recipientString = recipient.toString();
+            switch(recipient.toString()) {
+                case "Alice": aliceFound = true; break;
+                case "Bob": bobFound = true; break;
+                case "Clara": claraFound = true; break;
+                case "David": davidFound = true; break;
+                default: Assert.fail("found unexpected recipient: " + recipient);
+            }
+        }
+
+        Assert.assertTrue(aliceFound && bobFound && claraFound && davidFound);
+    }
+
+    //@Test
     public void twoHopsNonOpenStorage() throws IOException, ASAPException, InterruptedException {
         CmdLineUI ui = new CmdLineUI(System.out);
 
@@ -102,15 +179,17 @@ public void twoHopsNonOpenStorage() throws IOException, ASAPException, Interrupt
         ui.doCreateASAPStorage("Alice twoHops");
         ui.doCreateASAPStorage("Bob twoHops");
         ui.doCreateASAPStorage("Clara twoHops");
+        ui.doCreateASAPStorage("David twoHops");
 
         ui.doAddRecipient("Alice:twoHops Bob");
         ui.doAddRecipient("Alice:twoHops Clara");
+        ui.doAddRecipient("Alice:twoHops David");
 
-        Assert.fail("test case implementation not yet finished");
+        // message shall reach Bob and Clara but not David
+        ui.doAddRecipient("Bob:twoHops Clara");
 
         ui.doSetSendReceivedMessage("Alice:twoHops on");
         ui.doSetSendReceivedMessage("Bob:twoHops on");
-        ui.doSetSendReceivedMessage("Clara:twoHops on");
 
         // add message to alice storage
         String messageAlice2Clara = "HiClara";
@@ -142,6 +221,31 @@ public void twoHopsNonOpenStorage() throws IOException, ASAPException, Interrupt
         // wait a moment
         Thread.sleep(1000);
 
+        System.out.println("**************************************************************************");
+        System.out.println("**                       connect Bob with David                         **");
+        System.out.println("**************************************************************************");
+        // connect alice with bob
+        ui.doCreateASAPMultiEngine("Bob");
+        ui.doOpen("7070 Bob");
+        // wait a moment to give server socket time to be created
+        Thread.sleep(10);
+        ui.doCreateASAPMultiEngine("David");
+
+        ui.doConnect("7070 David");
+
+        // alice should be in era 1 (content has changed before connection) and bob era is 0 - no changes
+
+        // wait a moment
+        Thread.sleep(1000);
+
+        // kill connections
+        ui.doKill("all");
+
+        // alice should stay in era 1 (no content change), bob should be in era 1 received something
+
+        // wait a moment
+        Thread.sleep(1000);
+
         System.out.println("**************************************************************************");
         System.out.println("**                       connect Bob with Clara                         **");
         System.out.println("**************************************************************************");
@@ -159,8 +263,7 @@ public void twoHopsNonOpenStorage() throws IOException, ASAPException, Interrupt
         ui.doKill("all");
 
         // get Clara storage
-        String rootFolder = ui.getEngineRootFolderByStorageName("Clara:twoHops");
-        ASAPStorage clara = ASAPEngineFS.getExistingASAPEngineFS(rootFolder);
+        ASAPStorage clara = this.getFreshStorageByName(ui, "Clara:twoHops");
 
         /* message was actually from Bob but originated from Alice. It is put
         into a incoming folder as it would have been directly received from Alice.
@@ -175,4 +278,9 @@ public void twoHopsNonOpenStorage() throws IOException, ASAPException, Interrupt
         boolean same = messageAlice2Clara.equalsIgnoreCase(message.toString());
         Assert.assertTrue(same);
     }
+
+    private ASAPStorage getFreshStorageByName(CmdLineUI ui, String storageName) throws ASAPException, IOException {
+        String rootFolder = ui.getEngineRootFolderByStorageName(storageName);
+        return ASAPEngineFS.getExistingASAPEngineFS(rootFolder);
+    }
 }
