Allow round trips

Signed-off-by: Gabriel Indik <[email protected]>

Author: gabriel-indik

.gitignore

@@ -3,4 +3,6 @@ build
 coverage
 .nyc_output
 data/member-a/blobs
-data/member-b/blobs
+data/member-a/destinations
+data/member-b/blobs
+data/member-b/destinations

src/routers/api.ts

@@ -174,18 +174,24 @@ router.post('/messages', async (req, res, next) => {
     } else {
       throw new RequestError('Missing recipient', 400);
     }
-    let recipientPeer = config.peers.find(peer => peer.id === recipientID);
-    if (recipientPeer === undefined) {
-      throw new RequestError(`Unknown recipient ${recipientID}`, 400);
-    }
-    if (recipientDestination !== undefined && !recipientPeer.destinations?.includes(recipientDestination)) {
-      throw new RequestError(`Unknown recipient destination expected=${recipientPeer.destinations?.join('|') ?? 'none'} recieved=${recipientDestination}`, 400);
+    let recipientEndpoint: string;
+    if(recipientID === peerID) {
+      recipientEndpoint = config.p2p.endpoint ?? `https://${config.p2p.hostname}:${config.p2p.port}`;
+    } else {
+      let recipientPeer = config.peers.find(peer => peer.id === recipientID);
+      if (recipientPeer === undefined) {
+        throw new RequestError(`Unknown recipient ${recipientID}`, 400);
+      }
+      recipientEndpoint = recipientPeer.endpoint;
+      if (recipientDestination !== undefined && !recipientPeer.destinations?.includes(recipientDestination)) {
+        throw new RequestError(`Unknown recipient destination expected=${recipientPeer.destinations?.join('|') ?? 'none'} recieved=${recipientDestination}`, 400);
+      }
     }
     let requestId = uuidV4();
     if (typeof req.body.requestId === 'string') {
       requestId = req.body.requestId;
     }
-    messagesHandler.sendMessage(req.body.message, recipientID, recipientPeer.endpoint, requestId, senderDestination, recipientDestination);
+    messagesHandler.sendMessage(req.body.message, recipientID, recipientEndpoint, requestId, senderDestination, recipientDestination);
     res.send({ requestId });
   } catch (err) {
     next(err);

src/routers/p2p.ts

@@ -36,18 +36,24 @@ router.post('/messages', async (req: Request, res, next) => {
     let sender = utils.extractPeerSenderFromRequest(req);
     const { senderDestination, recipientDestination, message } = await utils.extractMessageFromMultipartForm(req);
     if (senderDestination !== undefined) {
-      const peer = config.peers.find(peer => peer.id === sender);
-      if(peer === undefined) {
-        throw new RequestError(`Unknown sender ${sender}`, 404);
-      }
-      if(!peer.destinations?.includes(senderDestination)) {
-        throw new RequestError(`Unknown sender destination expected=${peer.destinations?.join('|') ?? 'none'} recieved=${senderDestination}`, 404);
+      if (sender === peerID) {
+        if (!config.destinations?.includes(senderDestination)) {
+          throw new RequestError(`Unknown sender destination expected=${config.destinations?.join('|') ?? 'none'} recieved=${senderDestination}`, 404);
+        }
+      } else {
+        const peer = config.peers.find(peer => peer.id === sender);
+        if (peer === undefined) {
+          throw new RequestError(`Unknown sender ${sender}`, 404);
+        }
+        if (!peer.destinations?.includes(senderDestination)) {
+          throw new RequestError(`Unknown sender destination expected=${peer.destinations?.join('|') ?? 'none'} recieved=${senderDestination}`, 404);
+        }
       }
       sender += '/' + senderDestination;
     }
     let recipient = peerID;
     if (recipientDestination !== undefined) {
-      if(!config.destinations?.includes(recipientDestination)) {
+      if (!config.destinations?.includes(recipientDestination)) {
         throw new RequestError(`Unknown recipient destination expected=${config.destinations?.join('|') ?? 'none'} recieved=${recipientDestination}`, 404);
       }
       recipient += '/' + recipientDestination;