Allow round trips for blobs

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

Author: gabriel-indik

src/routers/api.ts

@@ -175,7 +175,7 @@ router.post('/messages', async (req, res, next) => {
       throw new RequestError('Missing recipient', 400);
     }
     let recipientEndpoint: string;
-    if(recipientID === peerID) {
+    if (recipientID === peerID) {
       recipientEndpoint = config.p2p.endpoint ?? `https://${config.p2p.hostname}:${config.p2p.port}`;
     } else {
       let recipientPeer = config.peers.find(peer => peer.id === recipientID);
@@ -278,18 +278,23 @@ router.post('/transfers', 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`, 400);
-    }
-    if (recipientDestination !== undefined && !recipientPeer.destinations?.includes(recipientDestination)) {
-      throw new RequestError(`Unknown recipient destination expected=${recipientPeer.destinations?.join('|')} recieved=${recipientDestination}`, 400);
+    let recipientEndpoint: string;
+    recipientEndpoint = config.p2p.endpoint ?? `https://${config.p2p.hostname}:${config.p2p.port}`;
+    if (recipientID === peerID) {
+    } else {
+      let recipientPeer = config.peers.find(peer => peer.id === recipientID);
+      if (recipientPeer === undefined) {
+        throw new RequestError(`Unknown recipient`, 400);
+      }
+      if (recipientDestination !== undefined && !recipientPeer.destinations?.includes(recipientDestination)) {
+        throw new RequestError(`Unknown recipient destination expected=${recipientPeer.destinations?.join('|')} recieved=${recipientDestination}`, 400);
+      }
     }
     let requestId = uuidV4();
     if (typeof req.body.requestId === 'string') {
       requestId = req.body.requestId;
     }
-    blobsHandler.sendBlob(req.body.path, recipientID, recipientPeer.endpoint, requestId, senderDestination, recipientDestination);
+    blobsHandler.sendBlob(req.body.path, recipientID, recipientEndpoint, requestId, senderDestination, recipientDestination);
     res.send({ requestId });
   } catch (err) {
     next(err);

src/routers/p2p.ts

@@ -36,19 +36,7 @@ router.post('/messages', async (req: Request, res, next) => {
     let sender = utils.extractPeerSenderFromRequest(req);
     const { senderDestination, recipientDestination, message } = await utils.extractMessageFromMultipartForm(req);
     if (senderDestination !== undefined) {
-      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);
-        }
-      }
+      validateSenderDestination(sender, senderDestination);
       sender += '/' + senderDestination;
     }
     let recipient = peerID;
@@ -76,10 +64,14 @@ router.put('/blobs/*', async (req: Request, res, next) => {
     let sender = utils.extractPeerSenderFromRequest(req);
     const { file, senderDestination, recipientDestination } = await utils.extractFileFromMultipartForm(req);
     if (senderDestination !== undefined) {
+      validateSenderDestination(sender, senderDestination);
       sender += '/' + senderDestination;
     }
     let recipient = peerID;
     if (recipientDestination !== undefined) {
+      if (!config.destinations?.includes(recipientDestination)) {
+        throw new RequestError(`Unknown recipient destination expected=${config.destinations?.join('|') ?? 'none'} recieved=${recipientDestination}`, 404);
+      }
       recipient += '/' + recipientDestination;
     }
     const blobPath = path.join(utils.constants.RECEIVED_BLOBS_SUBDIRECTORY, sender, req.params[0]);
@@ -99,3 +91,19 @@ router.put('/blobs/*', async (req: Request, res, next) => {
     next(err);
   }
 });
+
+const validateSenderDestination = (sender: string, senderDestination: string) => {
+  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);
+    }
+  }
+};