@streamr/dht 100.0.0-pretestnet.2 → 100.0.0-pretestnet.4

package/dist/src/dht/routing/RouterRpcLocal.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouterRpcLocal = exports.createRouteMessageAck = void 0;
+const utils_1 = require("@streamr/utils");
+const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const RoutingSession_1 = require("./RoutingSession");
+const logger = new utils_1.Logger(module);
+const createRouteMessageAck = (routedMessage, error) => {
+    const ack = {
+        requestId: routedMessage.requestId,
+        error: error ? error : ''
+    };
+    return ack;
+};
+exports.createRouteMessageAck = createRouteMessageAck;
+class RouterRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async routeMessage(routedMessage) {
+        if (this.config.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
+            logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer)} `
+                + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.destinationPeer)} is likely a duplicate`);
+            return (0, exports.createRouteMessageAck)(routedMessage, 'message given to routeMessage() service is likely a duplicate');
+        }
+        logger.trace(`Processing received routeMessage ${routedMessage.requestId}`);
+        this.config.addContact(routedMessage.sourcePeer, true);
+        this.config.duplicateRequestDetector.add(routedMessage.requestId);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, routedMessage.destinationPeer)) {
+            logger.trace(`routing message targeted to self ${routedMessage.requestId}`);
+            this.config.setForwardingEntries(routedMessage);
+            this.config.connectionManager?.handleMessage(routedMessage.message);
+            return (0, exports.createRouteMessageAck)(routedMessage);
+        }
+        else {
+            return this.config.doRouteMessage(routedMessage);
+        }
+    }
+    async forwardMessage(forwardMessage) {
+        if (this.config.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
+            logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(forwardMessage.sourcePeer)} `
+                + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(forwardMessage.destinationPeer)} is likely a duplicate`);
+            return (0, exports.createRouteMessageAck)(forwardMessage, 'message given to forwardMessage() service is likely a duplicate');
+        }
+        logger.trace(`Processing received forward routeMessage ${forwardMessage.requestId}`);
+        this.config.addContact(forwardMessage.sourcePeer, true);
+        this.config.duplicateRequestDetector.add(forwardMessage.requestId);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, forwardMessage.destinationPeer)) {
+            return this.forwardToDestination(forwardMessage);
+        }
+        else {
+            return this.config.doRouteMessage(forwardMessage, RoutingSession_1.RoutingMode.FORWARD);
+        }
+    }
+    forwardToDestination(routedMessage) {
+        logger.trace(`Forwarding found message targeted to self ${routedMessage.requestId}`);
+        const forwardedMessage = routedMessage.message;
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, forwardedMessage.targetDescriptor)) {
+            this.config.connectionManager?.handleMessage(forwardedMessage);
+            return (0, exports.createRouteMessageAck)(routedMessage);
+        }
+        return this.config.doRouteMessage({ ...routedMessage, destinationPeer: forwardedMessage.targetDescriptor });
+    }
+}
+exports.RouterRpcLocal = RouterRpcLocal;
+//# sourceMappingURL=RouterRpcLocal.js.map

package/dist/src/dht/routing/RouterRpcLocal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RouterRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAEvC,qFAA6G;AAI7G,qDAA8C;AAW9C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,qBAAqB,GAAG,CAAC,aAAkC,EAAE,KAAc,EAAmB,EAAE;IACzG,MAAM,GAAG,GAAoB;QACzB,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;KAC5B,CAAA;IACD,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AANY,QAAA,qBAAqB,yBAMjC;AAED,MAAa,cAAc;IAIvB,YAAY,MAA4B;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,aAAkC;QACjD,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;YACrF,MAAM,CAAC,KAAK,CAAC,mBAAmB,aAAa,CAAC,SAAS,SAAS,IAAA,sDAA2B,EAAC,aAAa,CAAC,UAAW,CAAC,GAAG;kBACnH,MAAM,IAAA,sDAA2B,EAAC,aAAa,CAAC,eAAgB,CAAC,wBAAwB,CAAC,CAAA;YAChG,OAAO,IAAA,6BAAqB,EAAC,aAAa,EAAE,+DAA+D,CAAC,CAAA;SAC/G;QACD,MAAM,CAAC,KAAK,CAAC,oCAAoC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;QAC3E,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,UAAW,EAAE,IAAI,CAAC,CAAA;QACvD,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QACjE,IAAI,IAAA,kDAAuB,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,aAAa,CAAC,eAAgB,CAAC,EAAE;YAC1F,MAAM,CAAC,KAAK,CAAC,oCAAoC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;YAC3E,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAA;YAC/C,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,aAAa,CAAC,OAAQ,CAAC,CAAA;YACpE,OAAO,IAAA,6BAAqB,EAAC,aAAa,CAAC,CAAA;SAC9C;aAAM;YACH,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;SACnD;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,cAAmC;QACpD,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YACtF,MAAM,CAAC,KAAK,CAAC,sBAAsB,cAAc,CAAC,SAAS,SAAS,IAAA,sDAA2B,EAAC,cAAc,CAAC,UAAW,CAAC,GAAG;kBACxH,MAAM,IAAA,sDAA2B,EAAC,cAAc,CAAC,eAAgB,CAAC,wBAAwB,CAAC,CAAA;YACjG,OAAO,IAAA,6BAAqB,EAAC,cAAc,EAAE,iEAAiE,CAAC,CAAA;SAClH;QACD,MAAM,CAAC,KAAK,CAAC,4CAA4C,cAAc,CAAC,SAAS,EAAE,CAAC,CAAA;QACpF,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,UAAW,EAAE,IAAI,CAAC,CAAA;QACxD,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QAClE,IAAI,IAAA,kDAAuB,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC,eAAgB,CAAC,EAAE;YAC3F,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAA;SACnD;aAAM;YACH,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,4BAAW,CAAC,OAAO,CAAC,CAAA;SACzE;IACL,CAAC;IAEO,oBAAoB,CAAC,aAAkC;QAC3D,MAAM,CAAC,KAAK,CAAC,6CAA6C,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;QACpF,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAQ,CAAA;QAC/C,IAAI,IAAA,kDAAuB,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,gBAAiB,CAAC,EAAE;YAC9F,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAA;YAC9D,OAAO,IAAA,6BAAqB,EAAC,aAAa,CAAC,CAAA;SAC9C;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,GAAG,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,gBAAgB,EAAE,CAAC,CAAA;IAC/G,CAAC;CAEJ;AArDD,wCAqDC"}

package/dist/src/dht/routing/RouterRpcRemote.d.ts

@@ -4,5 +4,4 @@ import { Remote } from '../contact/Remote';
 export declare class RouterRpcRemote extends Remote<IRouterRpcClient> {
     routeMessage(params: RouteMessageWrapper): Promise<boolean>;
     forwardMessage(params: RouteMessageWrapper): Promise<boolean>;
-    findRecursively(params: RouteMessageWrapper): Promise<boolean>;
 }

package/dist/src/dht/routing/RouterRpcRemote.js

@@ -5,21 +5,19 @@ const uuid_1 = require("uuid");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const Remote_1 = require("../contact/Remote");
 const utils_1 = require("@streamr/utils");
+const getPreviousPeer_1 = require("./getPreviousPeer");
 const logger = new utils_1.Logger(module);
 class RouterRpcRemote extends Remote_1.Remote {
     async routeMessage(params) {
         const message = {
             destinationPeer: params.destinationPeer,
             sourcePeer: params.sourcePeer,
-            previousPeer: params.previousPeer,
             message: params.message,
-            requestId: params.requestId || (0, uuid_1.v4)(),
-            reachableThrough: params.reachableThrough || [],
+            requestId: params.requestId ?? (0, uuid_1.v4)(),
+            reachableThrough: params.reachableThrough ?? [],
             routingPath: params.routingPath
         };
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             const ack = await this.getClient().routeMessage(message, options);
             // Success signal if sent to destination and error includes duplicate
@@ -32,9 +30,11 @@ class RouterRpcRemote extends Remote_1.Remote {
             }
         }
         catch (err) {
-            const fromNode = params.previousPeer ?
-                (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(params.previousPeer) : (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(params.sourcePeer);
-            logger.trace(`Failed to send routeMessage from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())} with: ${err}`);
+            const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(params);
+            const fromNode = previousPeer
+                ? (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(previousPeer)
+                : (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(params.sourcePeer);
+            logger.trace(`Failed to send routeMessage from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} with: ${err}`);
             return false;
         }
         return true;
@@ -43,15 +43,12 @@ class RouterRpcRemote extends Remote_1.Remote {
         const message = {
             destinationPeer: params.destinationPeer,
             sourcePeer: params.sourcePeer,
-            previousPeer: params.previousPeer,
             message: params.message,
-            requestId: params.requestId || (0, uuid_1.v4)(),
-            reachableThrough: params.reachableThrough || [],
+            requestId: params.requestId ?? (0, uuid_1.v4)(),
+            reachableThrough: params.reachableThrough ?? [],
             routingPath: params.routingPath
         };
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             const ack = await this.getClient().forwardMessage(message, options);
             if (ack.error.length > 0) {
@@ -59,36 +56,11 @@ class RouterRpcRemote extends Remote_1.Remote {
             }
         }
         catch (err) {
-            const fromNode = params.previousPeer ?
-                (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(params.previousPeer) : (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(params.sourcePeer);
-            logger.trace(`Failed to send forwardMessage from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())} with: ${err}`);
-            return false;
-        }
-        return true;
-    }
-    async findRecursively(params) {
-        const message = {
-            destinationPeer: params.destinationPeer,
-            sourcePeer: params.sourcePeer,
-            previousPeer: params.previousPeer,
-            message: params.message,
-            requestId: params.requestId || (0, uuid_1.v4)(),
-            reachableThrough: params.reachableThrough || [],
-            routingPath: params.routingPath
-        };
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
-        try {
-            const ack = await this.getClient().findRecursively(message, options);
-            if (ack.error.length > 0) {
-                logger.debug('Next hop responded with error ' + ack.error);
-                return false;
-            }
-        }
-        catch (err) {
-            const fromNode = params.previousPeer ? (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(params.previousPeer) : (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(params.sourcePeer);
-            logger.debug(`Failed to send recursiveFind message from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())} with: ${err}`);
+            const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(params);
+            const fromNode = previousPeer
+                ? (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(previousPeer)
+                : (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(params.sourcePeer);
+            logger.trace(`Failed to send forwardMessage from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} with: ${err}`);
             return false;
         }
         return true;

package/dist/src/dht/routing/RouterRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcRemote.ts"],"names":[],"mappings":";;;AACA,+BAAyB;AACzB,qFAI+C;AAE/C,8CAA0C;AAC1C,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,eAAgB,SAAQ,eAAwB;IAEzD,KAAK,CAAC,YAAY,CAAC,MAA2B;QAC1C,MAAM,OAAO,GAAwB;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAA,SAAE,GAAE;YACnC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,EAAE;YAC/C,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACjE,qEAAqE;YACrE,IACI,IAAA,kDAAuB,EAAC,MAAM,CAAC,eAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;mBACvE,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACpC;gBACE,OAAO,IAAI,CAAA;aACd;iBAAM,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7B,OAAO,KAAK,CAAA;aACf;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBAClC,IAAA,mDAAwB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAA,gDAAqB,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YAC7F,MAAM,CAAC,KAAK,CAAC,oCAAoC,QAAQ,OAAO,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,CAAA;YAC/H,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAA2B;QAC5C,MAAM,OAAO,GAAwB;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAA,SAAE,GAAE;YACnC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,EAAE;YAC/C,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACnE,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,OAAO,KAAK,CAAA;aACf;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBAClC,IAAA,gDAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAA,gDAAqB,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YAE1F,MAAM,CAAC,KAAK,CACR,sCAAsC,QAAQ,OAAO,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,GAAG,EAAE,CACtH,CAAA;YACD,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAA2B;QAC7C,MAAM,OAAO,GAAwB;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAA,SAAE,GAAE;YACnC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,EAAE;YAC/C,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACpE,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;gBAC1D,OAAO,KAAK,CAAA;aACf;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAA,gDAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAA,gDAAqB,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YAC7H,MAAM,CAAC,KAAK,CAAC,6CAA6C,QAAQ,OAAO,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,CAAA;YACxI,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CAEJ;AA5FD,0CA4FC"}
+{"version":3,"file":"RouterRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcRemote.ts"],"names":[],"mappings":"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"}

package/dist/src/dht/routing/RoutingSession.d.ts

@@ -1,26 +1,35 @@
-import { RemoteDhtNode } from '../RemoteDhtNode';
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
 import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import EventEmitter from 'eventemitter3';
 import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { RouterRpcRemote } from './RouterRpcRemote';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
+import { Contact } from '../contact/Contact';
+import { FindRpcRemote } from './FindRpcRemote';
+declare class RemoteContact extends Contact {
+    private routerRpcRemote;
+    private findRpcRemote;
+    constructor(peer: DhtNodeRpcRemote, localPeerDescriptor: PeerDescriptor, rpcCommunicator: RoutingRpcCommunicator);
+    getRouterRpcRemote(): RouterRpcRemote;
+    getFindRpcRemote(): FindRpcRemote;
+}
 export interface RoutingSessionEvents {
     routingSucceeded: (sessionId: string) => void;
     partialSuccess: (sessionId: string) => void;
     routingFailed: (sessionId: string) => void;
     stopped: (sessionId: string) => void;
-    noCandidatesFound: (sessionId: string) => void;
 }
 export declare enum RoutingMode {
     ROUTE = 0,
     FORWARD = 1,
-    RECURSIVE_FIND = 2
+    FIND = 2
 }
 export declare class RoutingSession extends EventEmitter<RoutingSessionEvents> {
     readonly sessionId: string;
     private readonly rpcCommunicator;
     private ongoingRequests;
     private contactList;
-    private readonly ownPeerDescriptor;
+    private readonly localPeerDescriptor;
     private readonly messageToRoute;
     private connections;
     private readonly parallelism;
@@ -28,13 +37,13 @@ export declare class RoutingSession extends EventEmitter<RoutingSessionEvents> {
     private successfulHopCounter;
     private readonly mode;
     private stopped;
-    constructor(rpcCommunicator: RoutingRpcCommunicator, ownPeerDescriptor: PeerDescriptor, messageToRoute: RouteMessageWrapper, connections: Map<PeerIDKey, RemoteDhtNode>, parallelism: number, mode?: RoutingMode, destinationId?: Uint8Array, excludedPeerIDs?: PeerID[]);
+    constructor(rpcCommunicator: RoutingRpcCommunicator, localPeerDescriptor: PeerDescriptor, messageToRoute: RouteMessageWrapper, connections: Map<PeerIDKey, DhtNodeRpcRemote>, parallelism: number, mode?: RoutingMode, excludedPeerIDs?: PeerID[]);
     private onRequestFailed;
     private emitFailure;
     private onRequestSucceeded;
     private sendRouteMessageRequest;
-    private findMoreContacts;
-    private sendMoreRequests;
-    start(): void;
+    findMoreContacts(): RemoteContact[];
+    sendMoreRequests(uncontacted: RemoteContact[]): void;
     stop(): void;
 }
+export {};

package/dist/src/dht/routing/RoutingSession.js

@@ -14,25 +14,32 @@ const RouterRpcRemote_1 = require("./RouterRpcRemote");
 const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
 const proto_rpc_1 = require("@streamr/proto-rpc");
 const Contact_1 = require("../contact/Contact");
+const FindRpcRemote_1 = require("./FindRpcRemote");
+const Remote_1 = require("../contact/Remote");
+const getPreviousPeer_1 = require("./getPreviousPeer");
 const logger = new utils_1.Logger(module);
 const MAX_FAILED_HOPS = 2;
 class RemoteContact extends Contact_1.Contact {
-    constructor(peer, ownPeerDescriptor, rpcCommunicator) {
+    constructor(peer, localPeerDescriptor, rpcCommunicator) {
         super(peer.getPeerDescriptor());
-        this.router = new RouterRpcRemote_1.RouterRpcRemote(ownPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RouterRpcClient(rpcCommunicator.getRpcClientTransport())));
+        this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RouterRpcClient(rpcCommunicator.getRpcClientTransport())), Remote_1.EXISTING_CONNECTION_TIMEOUT);
+        this.findRpcRemote = new FindRpcRemote_1.FindRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.FindRpcClient(rpcCommunicator.getRpcClientTransport())), Remote_1.EXISTING_CONNECTION_TIMEOUT);
     }
-    getRouter() {
-        return this.router;
+    getRouterRpcRemote() {
+        return this.routerRpcRemote;
+    }
+    getFindRpcRemote() {
+        return this.findRpcRemote;
     }
 }
 var RoutingMode;
 (function (RoutingMode) {
     RoutingMode[RoutingMode["ROUTE"] = 0] = "ROUTE";
     RoutingMode[RoutingMode["FORWARD"] = 1] = "FORWARD";
-    RoutingMode[RoutingMode["RECURSIVE_FIND"] = 2] = "RECURSIVE_FIND";
+    RoutingMode[RoutingMode["FIND"] = 2] = "FIND";
 })(RoutingMode || (exports.RoutingMode = RoutingMode = {}));
 class RoutingSession extends eventemitter3_1.default {
-    constructor(rpcCommunicator, ownPeerDescriptor, messageToRoute, connections, parallelism, mode = RoutingMode.ROUTE, destinationId, excludedPeerIDs) {
+    constructor(rpcCommunicator, localPeerDescriptor, messageToRoute, connections, parallelism, mode = RoutingMode.ROUTE, excludedPeerIDs) {
         super();
         this.sessionId = (0, uuid_1.v4)();
         this.ongoingRequests = new Set();
@@ -40,140 +47,126 @@ class RoutingSession extends eventemitter3_1.default {
         this.successfulHopCounter = 0;
         this.mode = RoutingMode.ROUTE;
         this.stopped = false;
-        this.onRequestFailed = (peerId) => {
-            logger.trace('onRequestFailed() sessionId: ' + this.sessionId);
-            if (this.stopped) {
-                return;
-            }
-            if (this.ongoingRequests.has(peerId.toKey())) {
-                this.ongoingRequests.delete(peerId.toKey());
-            }
-            const contacts = this.findMoreContacts();
-            if (contacts.length < 1 && this.ongoingRequests.size < 1) {
-                logger.trace('routing failed, emitting routingFailed sessionId: ' + this.sessionId);
-                this.stopped = true;
-                this.emitFailure();
-            }
-            else {
-                this.failedHopCounter += 1;
-                logger.trace('routing failed, retrying to route sessionId: ' + this.sessionId + ' failedHopCounter: ' + this.failedHopCounter);
-                this.sendMoreRequests(contacts);
-            }
-        };
-        this.emitFailure = () => {
-            if (this.successfulHopCounter >= 1) {
-                this.emit('partialSuccess', this.sessionId);
-            }
-            else {
-                this.emit('routingFailed', this.sessionId);
-            }
-        };
-        this.onRequestSucceeded = () => {
-            logger.trace('onRequestSucceeded() sessionId: ' + this.sessionId);
-            if (this.stopped) {
-                return;
-            }
-            this.successfulHopCounter += 1;
-            const contacts = this.findMoreContacts();
-            if (this.successfulHopCounter >= this.parallelism || contacts.length < 1) {
-                this.stopped = true;
-                this.emit('routingSucceeded', this.sessionId);
-            }
-            else if (contacts.length > 0 && this.ongoingRequests.size < 1) {
-                this.sendMoreRequests(contacts);
-            }
-        };
-        this.sendRouteMessageRequest = async (contact) => {
-            if (this.stopped) {
-                return false;
-            }
-            const router = contact.getRouter();
-            if (this.mode === RoutingMode.FORWARD) {
-                return router.forwardMessage({
-                    ...this.messageToRoute,
-                    previousPeer: this.ownPeerDescriptor
-                });
-            }
-            else if (this.mode === RoutingMode.RECURSIVE_FIND) {
-                return router.findRecursively({
-                    ...this.messageToRoute,
-                    previousPeer: this.ownPeerDescriptor
-                });
-            }
-            else {
-                return router.routeMessage({
-                    ...this.messageToRoute,
-                    previousPeer: this.ownPeerDescriptor
-                });
-            }
-        };
-        this.findMoreContacts = () => {
-            logger.trace('findMoreContacts() sessionId: ' + this.sessionId);
-            // the contents of the connections might have changed between the rounds
-            // addContacts() will only add new contacts that were not there yet
-            const contacts = Array.from(this.connections.values())
-                .map((peer) => new RemoteContact(peer, this.ownPeerDescriptor, this.rpcCommunicator));
-            this.contactList.addContacts(contacts);
-            return this.contactList.getUncontactedContacts(this.parallelism);
-        };
-        this.sendMoreRequests = (uncontacted) => {
-            logger.trace('sendMoreRequests() sessionId: ' + this.sessionId);
-            if (this.stopped) {
-                return;
-            }
-            if (uncontacted.length < 1) {
-                this.emitFailure();
-                return;
-            }
-            if (this.failedHopCounter >= MAX_FAILED_HOPS) {
-                logger.trace(`Stopping routing after ${MAX_FAILED_HOPS} failed attempts for sessionId: ${this.sessionId}`);
-                this.emitFailure();
-                return;
-            }
-            while ((this.ongoingRequests.size) < this.parallelism && (uncontacted.length > 0) && !this.stopped) {
-                const nextPeer = uncontacted.shift();
-                // eslint-disable-next-line max-len
-                logger.trace(`Sending routeMessage request to contact: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
-                this.contactList.setContacted(nextPeer.getPeerId());
-                this.ongoingRequests.add(nextPeer.getPeerId().toKey());
-                setImmediate(async () => {
-                    try {
-                        const succeeded = await this.sendRouteMessageRequest(nextPeer);
-                        if (succeeded) {
-                            this.onRequestSucceeded();
-                        }
-                        else {
-                            this.onRequestFailed(nextPeer.getPeerId());
-                        }
-                    }
-                    catch (e) {
-                        logger.debug('Unable to route message ', { error: e });
-                    }
-                    finally {
-                        logger.trace('sendRouteMessageRequest returned');
-                    }
-                });
-            }
-        };
         this.rpcCommunicator = rpcCommunicator;
-        this.ownPeerDescriptor = ownPeerDescriptor;
+        this.localPeerDescriptor = localPeerDescriptor;
         this.messageToRoute = messageToRoute;
         this.connections = connections;
         this.parallelism = parallelism;
         this.mode = mode;
-        const previousId = messageToRoute.previousPeer ? PeerID_1.PeerID.fromValue(messageToRoute.previousPeer.kademliaId) : undefined;
-        this.contactList = new SortedContactList_1.SortedContactList(destinationId ? PeerID_1.PeerID.fromValue(destinationId) : PeerID_1.PeerID.fromValue(this.messageToRoute.destinationPeer.kademliaId), 10000, undefined, true, previousId, excludedPeerIDs);
+        const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(messageToRoute);
+        const previousId = previousPeer ? PeerID_1.PeerID.fromValue(previousPeer.kademliaId) : undefined;
+        this.contactList = new SortedContactList_1.SortedContactList(PeerID_1.PeerID.fromValue(this.messageToRoute.destinationPeer.kademliaId), 10000, undefined, true, previousId, excludedPeerIDs);
+    }
+    onRequestFailed(peerId) {
+        logger.trace('onRequestFailed() sessionId: ' + this.sessionId);
+        if (this.stopped) {
+            return;
+        }
+        if (this.ongoingRequests.has(peerId.toKey())) {
+            this.ongoingRequests.delete(peerId.toKey());
+        }
+        const contacts = this.findMoreContacts();
+        if (contacts.length === 0 && this.ongoingRequests.size === 0) {
+            logger.trace('routing failed, emitting routingFailed sessionId: ' + this.sessionId);
+            // TODO should call this.stop() so that we do cleanup? (after the emitFailure call)
+            this.stopped = true;
+            this.emitFailure();
+        }
+        else {
+            this.failedHopCounter += 1;
+            logger.trace('routing failed, retrying to route sessionId: ' + this.sessionId + ' failedHopCounter: ' + this.failedHopCounter);
+            this.sendMoreRequests(contacts);
+        }
+    }
+    emitFailure() {
+        if (this.successfulHopCounter >= 1) {
+            this.emit('partialSuccess', this.sessionId);
+        }
+        else {
+            this.emit('routingFailed', this.sessionId);
+        }
     }
-    start() {
-        logger.trace('start() sessionId: ' + this.sessionId);
+    onRequestSucceeded() {
+        logger.trace('onRequestSucceeded() sessionId: ' + this.sessionId);
+        if (this.stopped) {
+            return;
+        }
+        this.successfulHopCounter += 1;
         const contacts = this.findMoreContacts();
-        if (contacts.length < 1) {
-            logger.trace('start() throwing noCandidatesFound sessionId: ' + this.sessionId);
+        if (this.successfulHopCounter >= this.parallelism || contacts.length === 0) {
+            // TODO should call this.stop() so that we do cleanup? (after the routingSucceeded call)
             this.stopped = true;
-            this.emit('noCandidatesFound', this.sessionId);
-            throw new Error('noCandidatesFound ' + this.sessionId);
+            this.emit('routingSucceeded', this.sessionId);
+        }
+        else if (contacts.length > 0 && this.ongoingRequests.size === 0) {
+            this.sendMoreRequests(contacts);
+        }
+    }
+    async sendRouteMessageRequest(contact) {
+        if (this.stopped) {
+            return false;
+        }
+        const msg = {
+            ...this.messageToRoute,
+            routingPath: this.messageToRoute.routingPath.concat([this.localPeerDescriptor])
+        };
+        if (this.mode === RoutingMode.FORWARD) {
+            return contact.getRouterRpcRemote().forwardMessage(msg);
+        }
+        else if (this.mode === RoutingMode.FIND) {
+            return contact.getFindRpcRemote().routeFindRequest(msg);
+        }
+        else {
+            return contact.getRouterRpcRemote().routeMessage(msg);
+        }
+    }
+    findMoreContacts() {
+        logger.trace('findMoreContacts() sessionId: ' + this.sessionId);
+        // the contents of the connections might have changed between the rounds
+        // addContacts() will only add new contacts that were not there yet
+        const contacts = Array.from(this.connections.values())
+            .map((peer) => new RemoteContact(peer, this.localPeerDescriptor, this.rpcCommunicator));
+        this.contactList.addContacts(contacts);
+        return this.contactList.getUncontactedContacts(this.parallelism);
+    }
+    sendMoreRequests(uncontacted) {
+        logger.trace('sendMoreRequests() sessionId: ' + this.sessionId);
+        if (this.stopped) {
+            return;
+        }
+        if (uncontacted.length === 0) {
+            this.emitFailure();
+            return;
+        }
+        if (this.failedHopCounter >= MAX_FAILED_HOPS) {
+            logger.trace(`Stopping routing after ${MAX_FAILED_HOPS} failed attempts for sessionId: ${this.sessionId}`);
+            this.emitFailure();
+            return;
+        }
+        while ((this.ongoingRequests.size < this.parallelism) && (uncontacted.length > 0) && !this.stopped) {
+            const nextPeer = uncontacted.shift();
+            // eslint-disable-next-line max-len
+            logger.trace(`Sending routeMessage request to contact: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
+            this.contactList.setContacted(nextPeer.getPeerId());
+            this.ongoingRequests.add(nextPeer.getPeerId().toKey());
+            setImmediate(async () => {
+                try {
+                    const succeeded = await this.sendRouteMessageRequest(nextPeer);
+                    if (succeeded) {
+                        this.onRequestSucceeded();
+                    }
+                    else {
+                        this.onRequestFailed(nextPeer.getPeerId());
+                    }
+                }
+                catch (e) {
+                    logger.debug('Unable to route message ', { error: e });
+                }
+                finally {
+                    logger.trace('sendRouteMessageRequest returned');
+                }
+            });
         }
-        this.sendMoreRequests(contacts);
     }
     stop() {
         this.stopped = true;

package/dist/src/dht/routing/RoutingSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":";;;;;;AACA,oEAAgE;AAChE,iDAAwD;AACxD,qFAA8E;AAC9E,0CAAuC;AACvC,kEAAwC;AACxC,+BAAyB;AAEzB,uDAAmD;AAEnD,iFAA+E;AAC/E,kDAAqD;AACrD,gDAA4C;AAE5C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,eAAe,GAAG,CAAC,CAAA;AAEzB,MAAM,aAAc,SAAQ,iBAAO;IAI/B,YAAY,IAAmB,EAAE,iBAAiC,EAAE,eAAuC;QACvG,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,iCAAe,CAC7B,iBAAiB,EACjB,IAAI,CAAC,iBAAiB,EAAE,EACxB,IAAI,CAAC,YAAY,EAAE,EACnB,IAAA,4BAAgB,EAAC,IAAI,+BAAe,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CACjF,CAAA;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;CACJ;AAeD,IAAY,WAA8C;AAA1D,WAAY,WAAW;IAAG,+CAAK,CAAA;IAAE,mDAAO,CAAA;IAAE,iEAAc,CAAA;AAAC,CAAC,EAA9C,WAAW,2BAAX,WAAW,QAAmC;AAE1D,MAAa,cAAe,SAAQ,uBAAkC;IAelE,YACI,eAAuC,EACvC,iBAAiC,EACjC,cAAmC,EACnC,WAA0C,EAC1C,WAAmB,EACnB,OAAoB,WAAW,CAAC,KAAK,EACrC,aAA0B,EAC1B,eAA0B;QAE1B,KAAK,EAAE,CAAA;QAvBK,cAAS,GAAG,IAAA,SAAE,GAAE,CAAA;QAExB,oBAAe,GAAmB,IAAI,GAAG,EAAE,CAAA;QAM3C,qBAAgB,GAAG,CAAC,CAAA;QACpB,yBAAoB,GAAG,CAAC,CAAA;QACf,SAAI,GAAgB,WAAW,CAAC,KAAK,CAAA;QAC9C,YAAO,GAAG,KAAK,CAAA;QA8Bf,oBAAe,GAAG,CAAC,MAAc,EAAE,EAAE;YACzC,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9D,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAM;aACT;YACD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE;gBAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;aAC9C;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACxC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;gBACtD,MAAM,CAAC,KAAK,CAAC,oDAAoD,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;gBACnF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;gBACnB,IAAI,CAAC,WAAW,EAAE,CAAA;aACrB;iBAAM;gBACH,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAA;gBAC1B,MAAM,CAAC,KAAK,CAAC,+CAA+C,GAAG,IAAI,CAAC,SAAS,GAAG,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAC9H,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;aAClC;QACL,CAAC,CAAA;QAEO,gBAAW,GAAG,GAAG,EAAE;YACvB,IAAI,IAAI,CAAC,oBAAoB,IAAI,CAAC,EAAE;gBAChC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;aAE9C;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;aAC7C;QACL,CAAC,CAAA;QAEO,uBAAkB,GAAG,GAAG,EAAE;YAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YACjE,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAM;aACT;YACD,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAA;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACxC,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;gBACnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;aAChD;iBAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;gBAC7D,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;aAClC;QACL,CAAC,CAAA;QAEO,4BAAuB,GAAG,KAAK,EAAE,OAAsB,EAAoB,EAAE;YACjF,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,KAAK,CAAA;aACf;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAA;YAClC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO,EAAE;gBACnC,OAAO,MAAM,CAAC,cAAc,CAAC;oBACzB,GAAG,IAAI,CAAC,cAAc;oBACtB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACvC,CAAC,CAAA;aACL;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,cAAc,EAAE;gBACjD,OAAO,MAAM,CAAC,eAAe,CAAC;oBAC1B,GAAG,IAAI,CAAC,cAAc;oBACtB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACvC,CAAC,CAAA;aACL;iBAAM;gBACH,OAAO,MAAM,CAAC,YAAY,CAAC;oBACvB,GAAG,IAAI,CAAC,cAAc;oBACtB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACvC,CAAC,CAAA;aACL;QACL,CAAC,CAAA;QAEO,qBAAgB,GAAG,GAAoB,EAAE;YAC7C,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/D,wEAAwE;YACxE,mEAAmE;YACnE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;iBACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAA;YACzF,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACpE,CAAC,CAAA;QAEO,qBAAgB,GAAG,CAAC,WAA4B,EAAE,EAAE;YACxD,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/D,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAM;aACT;YACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,IAAI,CAAC,WAAW,EAAE,CAAA;gBAClB,OAAM;aACT;YACD,IAAI,IAAI,CAAC,gBAAgB,IAAI,eAAe,EAAE;gBAC1C,MAAM,CAAC,KAAK,CAAC,0BAA0B,eAAe,mCAAmC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;gBAC1G,IAAI,CAAC,WAAW,EAAE,CAAA;gBAClB,OAAM;aACT;YACD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAChG,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,CAAA;gBACpC,mCAAmC;gBACnC,MAAM,CAAC,KAAK,CAAC,4CAA4C,IAAA,gDAAqB,EAAC,QAAS,CAAC,iBAAiB,EAAE,CAAC,eAAe,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;gBAC9I,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,CAAA;gBACpD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;gBACvD,YAAY,CAAC,KAAK,IAAI,EAAE;oBACpB,IAAI;wBACA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAS,CAAC,CAAA;wBAC/D,IAAI,SAAS,EAAE;4BACX,IAAI,CAAC,kBAAkB,EAAE,CAAA;yBAC5B;6BAAM;4BACH,IAAI,CAAC,eAAe,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,CAAA;yBAC9C;qBACJ;oBAAC,OAAO,CAAC,EAAE;wBACR,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;qBACzD;4BAAS;wBACN,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;qBACnD;gBACL,CAAC,CAAC,CAAA;aACL;QACL,CAAC,CAAA;QAjIG,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,MAAM,UAAU,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACrH,IAAI,CAAC,WAAW,GAAG,IAAI,qCAAiB,CACpC,aAAa,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,eAAgB,CAAC,UAAU,CAAC,EACnH,KAAK,EACL,SAAS,EACT,IAAI,EACJ,UAAU,EACV,eAAe,CAClB,CAAA;IACL,CAAC;IAoHM,KAAK;QACR,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACxC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,CAAC,KAAK,CAAC,gDAAgD,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAE/E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YACnB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9C,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;SACzD;QACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACnC,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;QAEvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACpC,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;CAEJ;AAlLD,wCAkLC"}
+{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":"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"}

package/dist/src/dht/routing/getPreviousPeer.d.ts

@@ -0,0 +1,2 @@
+import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+export declare const getPreviousPeer: (routeMessage: RouteMessageWrapper) => PeerDescriptor | undefined;

package/dist/src/dht/routing/getPreviousPeer.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPreviousPeer = void 0;
+const lodash_1 = require("lodash");
+const getPreviousPeer = (routeMessage) => {
+    return (0, lodash_1.last)(routeMessage.routingPath);
+};
+exports.getPreviousPeer = getPreviousPeer;
+//# sourceMappingURL=getPreviousPeer.js.map

package/dist/src/dht/routing/getPreviousPeer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPreviousPeer.js","sourceRoot":"","sources":["../../../../src/dht/routing/getPreviousPeer.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAGtB,MAAM,eAAe,GAAG,CAAC,YAAiC,EAA8B,EAAE;IAC7F,OAAO,IAAA,aAAI,EAAC,YAAY,CAAC,WAAY,CAAC,CAAA;AAC1C,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B"}