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

package/dist/src/dht/find/{RecursiveFinder.js → Finder.js}

@@ -1,21 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecursiveFinder = void 0;
+exports.Finder = void 0;
 const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const PeerID_1 = require("../../helpers/PeerID");
 const Router_1 = require("../routing/Router");
 const RoutingSession_1 = require("../routing/RoutingSession");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const utils_1 = require("@streamr/utils");
-const RemoteRecursiveFindSession_1 = require("./RemoteRecursiveFindSession");
+const FindSessionRpcRemote_1 = require("./FindSessionRpcRemote");
 const uuid_1 = require("uuid");
-const RecursiveFindSession_1 = require("./RecursiveFindSession");
+const FindSession_1 = require("./FindSession");
 const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
 const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
 const proto_rpc_1 = require("@streamr/proto-rpc");
 const SortedContactList_1 = require("../contact/SortedContactList");
+const getPreviousPeer_1 = require("../routing/getPreviousPeer");
+const RouterRpcLocal_1 = require("../routing/RouterRpcLocal");
+const FindRpcLocal_1 = require("./FindRpcLocal");
 const logger = new utils_1.Logger(module);
-class RecursiveFinder {
+class Finder {
     constructor(config) {
         this.ongoingSessions = new Map();
         this.stopped = false;
@@ -23,43 +26,58 @@ class RecursiveFinder {
         this.sessionTransport = config.sessionTransport;
         this.connections = config.connections;
         this.router = config.router;
-        this.ownPeerDescriptor = config.ownPeerDescriptor;
+        this.localPeerDescriptor = config.localPeerDescriptor;
         this.serviceId = config.serviceId;
         this.localDataStore = config.localDataStore;
-        this.addContact = config.addContact;
         this.isPeerCloserToIdThanSelf = config.isPeerCloserToIdThanSelf;
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'findRecursively', (routedMessage) => this.findRecursively(routedMessage));
+        this.registerLocalRpcMethods(config);
     }
-    async startRecursiveFind(idToFind, fetchData = false, excludedPeer) {
+    registerLocalRpcMethods(config) {
+        const rpcLocal = new FindRpcLocal_1.FindRpcLocal({
+            doRouteFindRequest: (routedMessage) => this.doRouteFindRequest(routedMessage),
+            addContact: (contact, setActive) => config.addContact(contact, setActive),
+            isMostLikelyDuplicate: (requestId) => this.router.isMostLikelyDuplicate(requestId),
+            addToDuplicateDetector: (requestId) => this.router.addToDuplicateDetector(requestId)
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeFindRequest', async (routedMessage) => {
+            if (this.stopped) {
+                return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, 'routeFindRequest() service is not running');
+            }
+            else {
+                return rpcLocal.routeFindRequest(routedMessage);
+            }
+        });
+    }
+    async startFind(idToFind, fetchData = false, excludedPeer) {
         if (this.stopped) {
             return { closestNodes: [] };
         }
         const sessionId = (0, uuid_1.v4)();
-        const recursiveFindSession = new RecursiveFindSession_1.RecursiveFindSession({
+        const session = new FindSession_1.FindSession({
             serviceId: sessionId,
             transport: this.sessionTransport,
             kademliaIdToFind: idToFind,
-            ownPeerId: (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor),
+            localPeerId: (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor),
             waitedRoutingPathCompletions: this.connections.size > 1 ? 2 : 1,
             fetchData
         });
         if (this.connections.size === 0) {
             const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
-            recursiveFindSession.doSendFindResponse([this.ownPeerDescriptor], [this.ownPeerDescriptor], data ? Array.from(data.values()) : [], true);
-            return recursiveFindSession.getResults();
+            session.doSendFindResponse([this.localPeerDescriptor], [this.localPeerDescriptor], data ? Array.from(data.values()) : [], true);
+            return session.getResults();
         }
         const routeMessage = this.wrapFindRequest(idToFind, sessionId, fetchData);
-        this.ongoingSessions.set(sessionId, recursiveFindSession);
+        this.ongoingSessions.set(sessionId, session);
         try {
-            await (0, utils_1.runAndWaitForEvents3)([() => this.doFindRecursevily(routeMessage, excludedPeer)], [[recursiveFindSession, 'findCompleted']], 15000);
+            await (0, utils_1.runAndWaitForEvents3)([() => this.doRouteFindRequest(routeMessage, excludedPeer)], [[session, 'findCompleted']], 15000);
         }
         catch (err) {
-            logger.debug(`doFindRecursively failed with error ${err}`);
+            logger.debug(`doRouteFindRequest failed with error ${err}`);
         }
-        this.findAndReportLocalData(idToFind, fetchData, [], this.ownPeerDescriptor, sessionId);
+        this.findAndReportLocalData(idToFind, fetchData, [], this.localPeerDescriptor, sessionId);
         this.ongoingSessions.delete(sessionId);
-        recursiveFindSession.stop();
-        return recursiveFindSession.getResults();
+        session.stop();
+        return session.getResults();
     }
     wrapFindRequest(idToFind, sessionId, fetchData) {
         const targetDescriptor = {
@@ -71,7 +89,7 @@ class RecursiveFinder {
             fetchData
         };
         const msg = {
-            messageType: DhtRpc_1.MessageType.RECURSIVE_FIND_REQUEST,
+            messageType: DhtRpc_1.MessageType.FIND_REQUEST,
             messageId: (0, uuid_1.v4)(),
             serviceId: this.serviceId,
             body: {
@@ -83,7 +101,7 @@ class RecursiveFinder {
             message: msg,
             requestId: (0, uuid_1.v4)(),
             destinationPeer: targetDescriptor,
-            sourcePeer: this.ownPeerDescriptor,
+            sourcePeer: this.localPeerDescriptor,
             reachableThrough: [],
             routingPath: []
         };
@@ -107,34 +125,34 @@ class RecursiveFinder {
     }
     sendFindResponse(routingPath, targetPeerDescriptor, serviceId, closestNodes, data, noCloserNodesFound = false) {
         const dataEntries = data ? Array.from(data.values(), DhtRpc_1.DataEntry.create.bind(DhtRpc_1.DataEntry)) : [];
-        const isOwnNode = (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, targetPeerDescriptor);
+        const isOwnNode = (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor);
         if (isOwnNode && this.ongoingSessions.has(serviceId)) {
             this.ongoingSessions.get(serviceId)
                 .doSendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound);
         }
         else {
             const remoteCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(serviceId, this.sessionTransport, { rpcRequestTimeout: 15000 });
-            const remoteSession = new RemoteRecursiveFindSession_1.RemoteRecursiveFindSession(this.ownPeerDescriptor, targetPeerDescriptor, serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RecursiveFindSessionServiceClient(remoteCommunicator.getRpcClientTransport())));
-            remoteSession.sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound);
+            const rpcRemote = new FindSessionRpcRemote_1.FindSessionRpcRemote(this.localPeerDescriptor, targetPeerDescriptor, serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.FindSessionRpcClient(remoteCommunicator.getRpcClientTransport())), 10000);
+            rpcRemote.sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound);
             remoteCommunicator.destroy();
         }
     }
-    doFindRecursevily(routedMessage, excludedPeer) {
+    doRouteFindRequest(routedMessage, excludedPeer) {
         if (this.stopped) {
-            return (0, Router_1.createRouteMessageAck)(routedMessage, 'DhtNode Stopped');
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, 'DhtNode Stopped');
         }
         const idToFind = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.destinationPeer);
         const msg = routedMessage.message;
         const findRequest = msg?.body.oneofKind === 'findRequest' ? msg.body.findRequest : undefined;
         const closestPeersToDestination = this.getClosestConnections(routedMessage.destinationPeer.kademliaId, 5);
         const data = this.findLocalData(idToFind.value, findRequest.fetchData);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, routedMessage.destinationPeer)) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, routedMessage.destinationPeer)) {
             this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
-            return (0, Router_1.createRouteMessageAck)(routedMessage);
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
         }
-        const ack = this.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.RECURSIVE_FIND, excludedPeer);
+        const ack = this.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.FIND, excludedPeer);
         if (ack.error === Router_1.RoutingErrors.NO_CANDIDATES_FOUND) {
-            logger.trace(`findRecursively Node found no candidates`);
+            logger.trace(`routeFindRequest Node found no candidates`);
             this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
         }
         else if (ack.error) {
@@ -142,7 +160,7 @@ class RecursiveFinder {
         }
         else {
             const noCloserContactsFound = (closestPeersToDestination.length > 0
-                && routedMessage.previousPeer
+                && (0, getPreviousPeer_1.getPreviousPeer)(routedMessage)
                 && !this.isPeerCloserToIdThanSelf(closestPeersToDestination[0], idToFind));
             this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, noCloserContactsFound);
         }
@@ -154,20 +172,6 @@ class RecursiveFinder {
         closestPeers.addContacts(connectedPeers);
         return closestPeers.getClosestContacts(limit).map((peer) => peer.getPeerDescriptor());
     }
-    // IRouterRpc method
-    async findRecursively(routedMessage) {
-        if (this.stopped) {
-            return (0, Router_1.createRouteMessageAck)(routedMessage, 'findRecursively() service is not running');
-        }
-        else if (this.router.isMostLikelyDuplicate(routedMessage.requestId)) {
-            return (0, Router_1.createRouteMessageAck)(routedMessage, 'message given to findRecursively() service is likely a duplicate');
-        }
-        const senderKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.previousPeer || routedMessage.sourcePeer);
-        logger.trace(`Received findRecursively call from ${senderKey}`);
-        this.addContact(routedMessage.sourcePeer, true);
-        this.router.addToDuplicateDetector(routedMessage.requestId);
-        return this.doFindRecursevily(routedMessage);
-    }
     stop() {
         this.stopped = true;
         this.ongoingSessions.forEach((session, _id) => {
@@ -176,5 +180,5 @@ class RecursiveFinder {
         this.ongoingSessions.clear();
     }
 }
-exports.RecursiveFinder = RecursiveFinder;
-//# sourceMappingURL=RecursiveFinder.js.map
+exports.Finder = Finder;
+//# sourceMappingURL=Finder.js.map

package/dist/src/dht/find/Finder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Finder.js","sourceRoot":"","sources":["../../../../src/dht/find/Finder.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,6 @@
+import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { Remote } from '../contact/Remote';
+import { IFindRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+export declare class FindRpcRemote extends Remote<IFindRpcClient> {
+    routeFindRequest(params: RouteMessageWrapper): Promise<boolean>;
+}

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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindRpcRemote = void 0;
+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 FindRpcRemote extends Remote_1.Remote {
+    async routeFindRequest(params) {
+        const message = {
+            destinationPeer: params.destinationPeer,
+            sourcePeer: params.sourcePeer,
+            message: params.message,
+            requestId: params.requestId ?? (0, uuid_1.v4)(),
+            reachableThrough: params.reachableThrough ?? [],
+            routingPath: params.routingPath
+        };
+        const options = this.formDhtRpcOptions();
+        try {
+            const ack = await this.getClient().routeFindRequest(message, options);
+            if (ack.error.length > 0) {
+                logger.debug('Next hop responded with error ' + ack.error);
+                return false;
+            }
+        }
+        catch (err) {
+            const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(params);
+            const fromNode = previousPeer
+                ? (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(previousPeer)
+                : (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(params.sourcePeer);
+            // eslint-disable-next-line max-len
+            logger.debug(`Failed to send routeFindRequest message from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} with: ${err}`);
+            return false;
+        }
+        return true;
+    }
+}
+exports.FindRpcRemote = FindRpcRemote;
+//# sourceMappingURL=FindRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FindRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/FindRpcRemote.ts"],"names":[],"mappings":";;;AACA,+BAAyB;AACzB,qFAAoF;AACpF,8CAA0C;AAC1C,0CAAuC;AAEvC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,aAAc,SAAQ,eAAsB;IAErD,KAAK,CAAC,gBAAgB,CAAC,MAA2B;QAC9C,MAAM,OAAO,GAAwB;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,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,EAAE,CAAA;QACxC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACrE,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,YAAY,GAAG,IAAA,iCAAe,EAAC,MAAM,CAAC,CAAA;YAC5C,MAAM,QAAQ,GAAG,YAAY;gBACzB,CAAC,CAAC,IAAA,sDAA2B,EAAC,YAAY,CAAC;gBAC3C,CAAC,CAAC,IAAA,sDAA2B,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YACrD,mCAAmC;YACnC,MAAM,CAAC,KAAK,CAAC,gDAAgD,QAAQ,OAAO,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,CAAA;YACjJ,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AA7BD,sCA6BC"}

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

@@ -3,22 +3,22 @@ import { RoutingMode, RoutingSession } from './RoutingSession';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
 import { PeerIDKey } from '../../helpers/PeerID';
 import { ConnectionManager } from '../../connection/ConnectionManager';
-import { RemoteDhtNode } from '../RemoteDhtNode';
-import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
-export declare const createRouteMessageAck: (routedMessage: RouteMessageWrapper, error?: string) => RouteMessageAck;
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
+import { ServiceID } from '../../types/ServiceID';
 export declare enum RoutingErrors {
     NO_CANDIDATES_FOUND = "No routing candidates found",
     STOPPED = "DhtNode Stopped"
 }
 export interface RouterConfig {
     rpcCommunicator: RoutingRpcCommunicator;
-    ownPeerDescriptor: PeerDescriptor;
-    connections: Map<PeerIDKey, RemoteDhtNode>;
+    localPeerDescriptor: PeerDescriptor;
+    connections: Map<PeerIDKey, DhtNodeRpcRemote>;
     addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
-    serviceId: string;
+    serviceId: ServiceID;
     connectionManager?: ConnectionManager;
+    rpcRequestTimeout?: number;
 }
-interface IRouterFunc {
+export interface IRouter {
     doRouteMessage(routedMessage: RouteMessageWrapper, mode: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
     send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
     isMostLikelyDuplicate(requestId: string): boolean;
@@ -27,31 +27,24 @@ interface IRouterFunc {
     removeRoutingSession(sessionId: string): void;
     stop(): void;
 }
-export interface IRouter extends Omit<IRouterRpc, 'findRecursively'>, IRouterFunc {
-}
 export declare class Router implements IRouter {
     private readonly rpcCommunicator;
-    private readonly ownPeerDescriptor;
+    private readonly localPeerDescriptor;
     private readonly connections;
-    private readonly addContact;
     private readonly serviceId;
-    private readonly connectionManager?;
     private readonly forwardingTable;
     private ongoingRoutingSessions;
     private readonly duplicateRequestDetector;
     private stopped;
     constructor(config: RouterConfig);
+    private registerLocalRpcMethods;
     send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
-    doRouteMessage(routedMessage: RouteMessageWrapper, mode?: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
+    doRouteMessage(routedMessage: RouteMessageWrapper, mode?: RoutingMode): RouteMessageAck;
     private createRoutingSession;
     isMostLikelyDuplicate(requestId: string): boolean;
     addToDuplicateDetector(requestId: string): void;
     addRoutingSession(session: RoutingSession): void;
     removeRoutingSession(sessionId: string): void;
     stop(): void;
-    routeMessage(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
     private setForwardingEntries;
-    forwardMessage(forwardMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
-    private forwardToDestination;
 }
-export {};

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

@@ -1,20 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = exports.RoutingErrors = exports.createRouteMessageAck = void 0;
+exports.Router = exports.RoutingErrors = void 0;
 const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const RoutingSession_1 = require("./RoutingSession");
 const utils_1 = require("@streamr/utils");
 const DuplicateDetector_1 = require("./DuplicateDetector");
 const uuid_1 = require("uuid");
-const createRouteMessageAck = (routedMessage, error) => {
-    const ack = {
-        requestId: routedMessage.requestId,
-        error: error ? error : ''
-    };
-    return ack;
-};
-exports.createRouteMessageAck = createRouteMessageAck;
+const RouterRpcLocal_1 = require("./RouterRpcLocal");
 var RoutingErrors;
 (function (RoutingErrors) {
     RoutingErrors["NO_CANDIDATES_FOUND"] = "No routing candidates found";
@@ -28,16 +21,35 @@ class Router {
         this.duplicateRequestDetector = new DuplicateDetector_1.DuplicateDetector(100000, 100);
         this.stopped = false;
         this.rpcCommunicator = config.rpcCommunicator;
-        this.ownPeerDescriptor = config.ownPeerDescriptor;
+        this.localPeerDescriptor = config.localPeerDescriptor;
         this.connections = config.connections;
-        this.addContact = config.addContact;
         this.serviceId = config.serviceId;
-        this.connectionManager = config.connectionManager;
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'forwardMessage', (forwardMessage) => this.forwardMessage(forwardMessage));
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeMessage', (routedMessage) => this.routeMessage(routedMessage));
+        this.registerLocalRpcMethods(config);
+    }
+    registerLocalRpcMethods(config) {
+        const rpcLocal = new RouterRpcLocal_1.RouterRpcLocal({
+            doRouteMessage: (routedMessage, mode) => this.doRouteMessage(routedMessage, mode),
+            addContact: (contact, setActive) => config.addContact(contact, setActive),
+            setForwardingEntries: (routedMessage) => this.setForwardingEntries(routedMessage),
+            duplicateRequestDetector: this.duplicateRequestDetector,
+            localPeerDescriptor: this.localPeerDescriptor,
+            connectionManager: config.connectionManager
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeMessage', async (routedMessage) => {
+            if (this.stopped) {
+                return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, 'routeMessage() service is not running');
+            }
+            return rpcLocal.routeMessage(routedMessage);
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'forwardMessage', async (forwardMessage) => {
+            if (this.stopped) {
+                return (0, RouterRpcLocal_1.createRouteMessageAck)(forwardMessage, 'forwardMessage() service is not running');
+            }
+            return rpcLocal.forwardMessage(forwardMessage);
+        });
     }
     async send(msg, reachableThrough) {
-        msg.sourceDescriptor = this.ownPeerDescriptor;
+        msg.sourceDescriptor = this.localPeerDescriptor;
         const targetPeerDescriptor = msg.targetDescriptor;
         const forwardingEntry = this.forwardingTable.get((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor));
         if (forwardingEntry && forwardingEntry.peerDescriptors.length > 0) {
@@ -46,7 +58,7 @@ class Router {
                 message: msg,
                 requestId: (0, uuid_1.v4)(),
                 destinationPeer: forwardingPeer,
-                sourcePeer: this.ownPeerDescriptor,
+                sourcePeer: this.localPeerDescriptor,
                 reachableThrough,
                 routingPath: []
             };
@@ -57,28 +69,28 @@ class Router {
                 message: msg,
                 requestId: (0, uuid_1.v4)(),
                 destinationPeer: targetPeerDescriptor,
-                sourcePeer: this.ownPeerDescriptor,
+                sourcePeer: this.localPeerDescriptor,
                 reachableThrough,
                 routingPath: []
             };
             this.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.ROUTE);
         }
     }
-    doRouteMessage(routedMessage, mode = RoutingSession_1.RoutingMode.ROUTE, excludedPeer) {
+    doRouteMessage(routedMessage, mode = RoutingSession_1.RoutingMode.ROUTE) {
         if (this.stopped) {
-            return (0, exports.createRouteMessageAck)(routedMessage, RoutingErrors.STOPPED);
-        }
-        logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer)} `
-            + `to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.destinationPeer)}`);
-        routedMessage.routingPath.push(this.ownPeerDescriptor);
-        const session = this.createRoutingSession(routedMessage, mode, excludedPeer);
-        this.addRoutingSession(session);
-        try {
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, RoutingErrors.STOPPED);
+        }
+        logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer)} `
+            + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.destinationPeer)}`);
+        const session = this.createRoutingSession(routedMessage, mode);
+        const contacts = session.findMoreContacts();
+        if (contacts.length > 0) {
+            this.addRoutingSession(session);
             // eslint-disable-next-line promise/catch-or-return
             logger.trace('starting to raceEvents from routingSession: ' + session.sessionId);
             let eventReceived;
             (0, utils_1.executeSafePromise)(async () => {
-                eventReceived = (0, utils_1.raceEvents3)(session, ['routingSucceeded', 'partialSuccess', 'routingFailed', 'stopped', 'noCandidatesFound'], null);
+                eventReceived = (0, utils_1.raceEvents3)(session, ['routingSucceeded', 'partialSuccess', 'routingFailed', 'stopped'], null);
             });
             setImmediate(async () => {
                 try {
@@ -91,23 +103,20 @@ class Router {
                 session.stop();
                 this.removeRoutingSession(session.sessionId);
             });
-            session.start();
+            session.sendMoreRequests(contacts);
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
         }
-        catch (e) {
-            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(routedMessage.sourcePeer, this.ownPeerDescriptor)) {
-                logger.warn(`Failed to send (routeMessage: ${this.serviceId}) to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.destinationPeer)}: ${e}`);
+        else {
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(routedMessage.sourcePeer, this.localPeerDescriptor)) {
+                logger.debug(`Failed to send (routeMessage: ${this.serviceId}) to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.destinationPeer)}`);
             }
-            return (0, exports.createRouteMessageAck)(routedMessage, RoutingErrors.NO_CANDIDATES_FOUND);
+            logger.trace('noCandidatesFound sessionId: ' + session.sessionId);
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, RoutingErrors.NO_CANDIDATES_FOUND);
         }
-        return (0, exports.createRouteMessageAck)(routedMessage);
     }
-    createRoutingSession(routedMessage, mode, excludedPeer) {
-        const excludedPeers = routedMessage.routingPath.map((descriptor) => (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(descriptor));
-        if (excludedPeer) {
-            excludedPeers.push((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(excludedPeer));
-        }
-        logger.trace(' routing session created with connections: ' + this.connections.size);
-        return new RoutingSession_1.RoutingSession(this.rpcCommunicator, this.ownPeerDescriptor, routedMessage, this.connections, (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1, mode, undefined, excludedPeers);
+    createRoutingSession(routedMessage, mode) {
+        logger.trace('routing session created with connections: ' + this.connections.size);
+        return new RoutingSession_1.RoutingSession(this.rpcCommunicator, this.localPeerDescriptor, routedMessage, this.connections, (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1, mode, routedMessage.routingPath.map((descriptor) => (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(descriptor)));
     }
     isMostLikelyDuplicate(requestId) {
         return this.duplicateRequestDetector.isMostLikelyDuplicate(requestId);
@@ -133,32 +142,9 @@ class Router {
         this.forwardingTable.clear();
         this.duplicateRequestDetector.clear();
     }
-    // IRouterRpc method
-    async routeMessage(routedMessage) {
-        if (this.stopped) {
-            return (0, exports.createRouteMessageAck)(routedMessage, 'routeMessage() service is not running');
-        }
-        else if (this.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
-            logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer)} `
-                + `to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(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.addContact(routedMessage.sourcePeer, true);
-        this.addToDuplicateDetector(routedMessage.requestId);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, routedMessage.destinationPeer)) {
-            logger.trace(`routing message targeted to self ${routedMessage.requestId}`);
-            this.setForwardingEntries(routedMessage);
-            this.connectionManager?.handleMessage(routedMessage.message);
-            return (0, exports.createRouteMessageAck)(routedMessage);
-        }
-        else {
-            return this.doRouteMessage(routedMessage);
-        }
-    }
     setForwardingEntries(routedMessage) {
         const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
-            return !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.ownPeerDescriptor);
+            return !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.localPeerDescriptor);
         });
         if (reachableThroughWithoutSelf.length > 0) {
             const sourceKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer);
@@ -176,35 +162,6 @@ class Router {
             this.forwardingTable.set(sourceKey, forwardingEntry);
         }
     }
-    // IRouterRpc method
-    async forwardMessage(forwardMessage) {
-        if (this.stopped) {
-            return (0, exports.createRouteMessageAck)(forwardMessage, 'forwardMessage() service is not running');
-        }
-        else if (this.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
-            logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(forwardMessage.sourcePeer)} `
-                + `to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(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.addContact(forwardMessage.sourcePeer, true);
-        this.addToDuplicateDetector(forwardMessage.requestId);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, forwardMessage.destinationPeer)) {
-            return this.forwardToDestination(forwardMessage);
-        }
-        else {
-            return this.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.ownPeerDescriptor, forwardedMessage.targetDescriptor)) {
-            this.connectionManager?.handleMessage(forwardedMessage);
-            return (0, exports.createRouteMessageAck)(routedMessage);
-        }
-        return this.doRouteMessage({ ...routedMessage, destinationPeer: forwardedMessage.targetDescriptor });
-    }
 }
 exports.Router = Router;
 //# sourceMappingURL=Router.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,22 @@
+import { ConnectionManager } from '../../connection/ConnectionManager';
+import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { DuplicateDetector } from './DuplicateDetector';
+import { RoutingMode } from './RoutingSession';
+interface RouterRpcLocalConfig {
+    doRouteMessage: (routedMessage: RouteMessageWrapper, mode?: RoutingMode) => RouteMessageAck;
+    addContact: (contact: PeerDescriptor, setActive: boolean) => void;
+    setForwardingEntries: (routedMessage: RouteMessageWrapper) => void;
+    duplicateRequestDetector: DuplicateDetector;
+    localPeerDescriptor: PeerDescriptor;
+    connectionManager?: ConnectionManager;
+}
+export declare const createRouteMessageAck: (routedMessage: RouteMessageWrapper, error?: string) => RouteMessageAck;
+export declare class RouterRpcLocal implements IRouterRpc {
+    private readonly config;
+    constructor(config: RouterRpcLocalConfig);
+    routeMessage(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
+    forwardMessage(forwardMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
+    private forwardToDestination;
+}
+export {};