about fixing online message exchange but - snapshot - still works

Author: thsc42

src/main/java/net/sharksystem/asap/engine/ASAPChunkStorageFS.java

@@ -74,7 +74,9 @@ String getChunkFileTrunkname(int era, String uri) {
     String setupChunkFolder(int era, String targetUrl) {
         String eraFolderString = this.getPath(era);
         File eraFolder = new File(eraFolderString);
+        Log.writeLog(this, "setup chunk / era folder: " + eraFolderString);
         if(!eraFolder.exists()) {
+            Log.writeLog(this, "folder does not exist - create: " + eraFolderString);
             eraFolder.mkdirs();
         }
 

src/main/java/net/sharksystem/asap/engine/ASAPEngine.java

@@ -497,12 +497,13 @@ private ASAPInternalChunk getIncomingChunk(String encounteredPeer, ASAP_Assimila
         Log.writeLog(this, this.toString(), "got incoming chunk storage "
                 + incomingChunkStorage);
 
-            // get local target for data to come
+        // get local target for data to come
         if (!incomingChunkStorage.existsChunk(uri, eraSender)) {
             ASAPInternalChunk localChunk = null;
             // is there a local chunk - to clone recipients from?
             if (this.channelExists(uri)) {
-                localChunk = this.getStorage().getChunk(uri, this.getEra());
+//                localChunk = incomingChunkStorage.getChunk(uri, this.getEra());
+                localChunk = incomingChunkStorage.getChunk(uri, eraSender);
             } else {
                 Log.writeLog(this, this.toString(), "asked to set up new channel: (uri/senderE2E): "
                         + uri + " | " + senderE2E);

src/main/java/net/sharksystem/asap/engine/ASAPInternalChunkFS.java

@@ -5,6 +5,7 @@
 import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.utils.ASAPSerialization;
 import net.sharksystem.asap.utils.Helper;
+import net.sharksystem.utils.Log;
 
 import java.io.*;
 import java.util.*;
@@ -115,7 +116,7 @@ private void initFiles(String trunkName) throws IOException {
 
         // try to read existing meta data
         if(!this.readMetaData(this.metaFile)) {
-            // no metadate to be read - set defaults
+            // no meta date to be read - set defaults
             this.writeMetaData(this.metaFile);
             this.recipients = new HashSet<>();
             this.deliveredTo = new ArrayList<>();
@@ -180,21 +181,32 @@ public void addMessage(byte[] messageAsBytes) throws IOException {
     }
 
     public void addMessage(InputStream messageByteIS, long length) throws IOException {
+        Log.writeLog(this, "going to add message to chunkFS" );
         if(length > Integer.MAX_VALUE) {
             throw new IOException("message must not be longer than Integer.MAXVALUE");
         }
 
-        long offset = this.messageFile.length();
+        long offset = 0;
+        if(!this.messageFile.exists()) {
+            Log.writeLog(this, "content file does not exist yet - create: " + this.messageFile.getName());
+            Log.writeLog(this, "apath " + this.messageFile.getAbsolutePath());
+            Log.writeLog(this, "cpath " + this.messageFile.getCanonicalPath());
+            Log.writeLog(this, "path " + this.messageFile.getPath());
+            this.messageFile.createNewFile();
+        } else {
+            offset = this.messageFile.length();
+        }
+        Log.writeLog(this, "got chunk content file length: " + offset);
 
-//        Log.writeLog(this, "chunk file offset == " + offset);
         OutputStream os = new FileOutputStream(this.messageFile, true);
+        Log.writeLog(this, "opened chunk content file to append data");
 
-//        Log.writeLog(this, "write message to the end of chunk file");
+        Log.writeLog(this, "write message to the end of chunk file");
         while(length-- > 0) {
             os.write(messageByteIS.read());
         }
 
-//        Log.writeLog(this, "closing");
+        Log.writeLog(this, "closing");
         os.close();
 
         // remember offset if not 0

src/main/java/net/sharksystem/asap/utils/PeerIDHelper.java

@@ -3,8 +3,6 @@
 import net.sharksystem.asap.ASAP;
 
 public class PeerIDHelper {
-    private static long lastCall = 0;
-
     public static boolean sameID(CharSequence idA, CharSequence idB) {
         if(idA.length() != idB.length()) return false;
 
@@ -26,14 +24,6 @@ public static boolean sameUri(CharSequence uriA, CharSequence uriB) {
     }
 
     public static String createUniqueID() {
-        if(lastCall == System.currentTimeMillis()) {
-            try {
-                Thread.sleep(1);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        lastCall = System.currentTimeMillis();
         return ASAP.createUniqueID();
     }
 }

src/test/java/net/sharksystem/asap/peer/Point2Point2Test2.java

@@ -4,8 +4,6 @@
 import net.sharksystem.TestHelper;
 import net.sharksystem.asap.ASAP;
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.asap.engine.ASAPInternalChunk;
-import net.sharksystem.asap.utils.PeerIDHelper;
 import net.sharksystem.testsupport.ASAPTestPeerFS;
 import net.sharksystem.testsupport.StoreReceivedMessages;
 import net.sharksystem.utils.Utils;
@@ -35,8 +33,8 @@ public void point2point1() throws IOException, ASAPException, InterruptedExcepti
         String uri = "asapExample://uriExample";
         byte[] message = "ASAP example message".getBytes(StandardCharsets.UTF_8);
 
-        String aliceID = PeerIDHelper.createUniqueID();
-        String bobID = PeerIDHelper.createUniqueID();
+        String aliceID = TestConstants.ALICE_ID;
+        String bobID = TestConstants.BOB_ID;
         String aliceDirectory = WORKING_SUB_DIRECTORY + "/" + aliceID;
         String bobDirectory = WORKING_SUB_DIRECTORY + "/" + bobID;
 
@@ -59,13 +57,13 @@ public void point2point1() throws IOException, ASAPException, InterruptedExcepti
         System.out.println("\n>>>>>>>>>>>>>>>>>>> send message #1 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
         aliceSimplePeer.sendASAPMessage(appName, uri, message);
         Thread.sleep(100);
+        //Thread.sleep(Long.MAX_VALUE);
 
         Assert.assertEquals(1, bobListener.messageList.size());
 
         byte[] messageReceived = bobListener.messageList.get(0).getMessages().next();
         Assert.assertTrue(Utils.compareArrays(messageReceived, message));
 
         aliceSimplePeer.stopEncounter(bobSimplePeer);
-        //Thread.sleep(Long.MAX_VALUE);
     }
 }