changed something when working on hub management features in CLI in SharkMessenger. Added an additional way for sending a transient message.

Author: thsc42

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

@@ -25,4 +25,20 @@ void sendASAPMessage(CharSequence appName, CharSequence uri,
      */
     void sendTransientASAPMessage(CharSequence appName, CharSequence uri, byte[] message)
             throws ASAPException, IOException;
+
+    /**
+     * When calling this methode, this asap message is sent over any existing connection.
+     * It is not stored on sender or receiver side. Message listeners are called as usual. Nothing happens (no
+     * exception is thrown) if there is not a single peer encounter running.
+     *
+     * @param nextHopPeerID Peer will try to send a message only to this peer. An ASAPException is thrown if there
+*                      is no running encounter with that peer in place.
+     * @param appName
+     * @param uri
+     * @param message
+     * @throws ASAPException
+     * @throws IOException
+     */
+    void sendTransientASAPMessage(CharSequence nextHopPeerID, CharSequence appName, CharSequence uri, byte[] message)
+            throws ASAPException, IOException;
 }

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

@@ -4,6 +4,7 @@
 import net.sharksystem.asap.utils.ASAPLogHelper;
 import net.sharksystem.utils.Log;
 
+import javax.swing.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -147,6 +148,14 @@ public void sendTransientASAPMessage(CharSequence appName, CharSequence uri, byt
 
     }
 
+    public void sendTransientASAPMessage(CharSequence nextHopPeerID,
+                 CharSequence appName, CharSequence uri, byte[] message) throws ASAPException, IOException {
+
+        Log.writeLog(this, this.getInternalPeer().getOwner().toString(),
+                "try sending transient message over existing connections to peerID: " + nextHopPeerID);
+        this.getInternalPeer().sendTransientASAPAssimilateMessage(appName, uri, nextHopPeerID, message);
+    }
+
     public String toString() {
         return this.getInternalPeer().getOwner().toString();
     }

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

@@ -92,21 +92,57 @@ void setAsapRoutingAllowed(CharSequence applicationFormat, boolean allowed)
     void deactivateOnlineMessages();
 
     /**
-     * This message is only transmitted with open connections. Message is not stored. Nothing happens if no open
-     * connection is present.
+     * A transient message is not stored and not meant to be forwarded. Sending a transient message has no effect
+     * without a running encounter. Despite that, it is an ordinary ASAP message - described by an application/format
+     * and an optional uri.
+     *
+     * @param nextHopPeerIDs A peer can have multiple encounter at the same time. This list - if present, names
+*                       potential message receiver. If null, message is sent to any open connection. An exception
+     *                            is <b>not thrown</b> if there is no connection to one or more peers in the list
+     * @param format message application / format
+     * @param urlTarget describe message within your app
+     * @param messageAsBytes serialized message
+     * @throws IOException
+     * @throws ASAPException
+     */
+    void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence urlTarget,
+                                            Set<CharSequence> nextHopPeerIDs, byte[] messageAsBytes) throws IOException, ASAPException;
+
+    /**
+     * Send a transient message to a single peer.
+     * <b>An exception is thrown if there is no open connection the the specified peer</b>
      * @param format
      * @param urlTarget
-     * @param recipients
+     * @param nextHopPeerID
      * @param messageAsBytes
      * @throws IOException
      * @throws ASAPException
      */
-    void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, Set<CharSequence> recipients,
-                                            byte[] messageAsBytes) throws IOException, ASAPException;
+    void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence urlTarget,
+                                            CharSequence nextHopPeerID, byte[] messageAsBytes) throws IOException, ASAPException;
 
+    /**
+     * Send a transient message to any peer we have an open connection to.
+     *
+     * @param format
+     * @param urlTarget
+     * @param messageAsBytes
+     * @throws IOException
+     * @throws ASAPException
+     */
     void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, byte[] messageAsBytes)
             throws IOException, ASAPException;
 
+    /**
+     * @deprecated use sendTransientASAPAssimilateMessage instead
+     * @param format
+     * @param urlTarget
+     * @param era
+     * @param recipients
+     * @param messageAsBytes
+     * @throws IOException
+     * @throws ASAPException
+     */
     void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, int era,
          Set<CharSequence> recipients, byte[] messageAsBytes) throws IOException, ASAPException;
 

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

@@ -610,25 +610,29 @@ public void setASAPBasicKeyStorage(ASAPKeyStore ASAPKeyStore) {
 
     public void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence uri, byte[] messageAsBytes)
             throws IOException, ASAPException {
-        this.sendTransientASAPAssimilateMessage(format, uri, null, messageAsBytes);
+        this.sendTransientASAPAssimilateMessage(format, uri, (Set<CharSequence>)null, messageAsBytes);
     }
 
     public void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence uri,
-                                                   Set<CharSequence> receiver, byte[] messageAsBytes)
-            throws IOException, ASAPException {
+                                                   Set<CharSequence> nextHopPeerIDs, byte[] messageAsBytes) throws IOException, ASAPException {
 
-//        int era = ASAP.TRANSIENT_ERA; // init
+        this.sendOnlineASAPAssimilateMessage(format, uri, ASAP.TRANSIENT_ERA, nextHopPeerIDs, messageAsBytes);
+    }
 
-        /*
-        try {
-            era = this.getASAPEngine(format).getEra();
-        } catch (ASAPException e) {
-            // no engine.. ok
-            Log.writeLog(this, "send message with format but no engine exists (yet): " + format);
+    public void sendTransientASAPAssimilateMessage(CharSequence format, CharSequence uri,
+                       CharSequence nextHopPeerID, byte[] messageAsBytes) throws IOException, ASAPException {
+
+        if(nextHopPeerID == null) throw new ASAPException("next hop peer id must not be null");
+
+        if(!this.existASAPConnection(nextHopPeerID)) {
+            String log = "cannot send transient message. No open connection to peer with id: " + nextHopPeerID;
+            Log.writeLog(this, log);
+            throw new ASAPException(log);
         }
-         */
 
-        this.sendOnlineASAPAssimilateMessage(format, uri, ASAP.TRANSIENT_ERA, receiver, messageAsBytes);
+        Set<CharSequence> nextHopPeerIDs = new HashSet<>();
+        nextHopPeerIDs.add(nextHopPeerID);
+        this.sendOnlineASAPAssimilateMessage(format, uri, ASAP.TRANSIENT_ERA, nextHopPeerIDs, messageAsBytes);
     }
 
     public void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence uri, int era, byte[] messageAsBytes)

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

@@ -71,7 +71,13 @@ public void run() {
                 Log.writeLog(this, "resume waiting for new connections on port " + this.port);
             } while(this.remainOpen);
         } catch (IOException e) {
-            e.printStackTrace();
+            if(!remainOpen) {
+                Log.writeLog(this, "socket factory terminated, closed port " + this.port);
+            } else {
+                Log.writeLogErr(this, "socket factory terminated but not from an app(?): "
+                        + e.getLocalizedMessage());
+            }
+
         }
     }