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

package/dist/src/dht/find/FindRpcLocal.d.ts

@@ -0,0 +1,14 @@
+import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { IFindRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
+interface FindRpcLocalConfig {
+    doRouteFindRequest: (routedMessage: RouteMessageWrapper) => RouteMessageAck;
+    addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
+    isMostLikelyDuplicate: (requestId: string) => boolean;
+    addToDuplicateDetector: (requestId: string) => void;
+}
+export declare class FindRpcLocal implements IFindRpc {
+    private readonly config;
+    constructor(config: FindRpcLocalConfig);
+    routeFindRequest(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
+}
+export {};

package/dist/src/dht/find/FindRpcLocal.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindRpcLocal = void 0;
+const utils_1 = require("@streamr/utils");
+const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const RouterRpcLocal_1 = require("../routing/RouterRpcLocal");
+const getPreviousPeer_1 = require("../routing/getPreviousPeer");
+const logger = new utils_1.Logger(module);
+class FindRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async routeFindRequest(routedMessage) {
+        if (this.config.isMostLikelyDuplicate(routedMessage.requestId)) {
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, 'message given to routeFindRequest() service is likely a duplicate');
+        }
+        const senderKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)((0, getPreviousPeer_1.getPreviousPeer)(routedMessage) ?? routedMessage.sourcePeer);
+        logger.trace(`Received routeFindRequest call from ${senderKey}`);
+        this.config.addContact(routedMessage.sourcePeer, true);
+        this.config.addToDuplicateDetector(routedMessage.requestId);
+        return this.config.doRouteFindRequest(routedMessage);
+    }
+}
+exports.FindRpcLocal = FindRpcLocal;
+//# sourceMappingURL=FindRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FindRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/find/FindRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAGvC,qFAA8E;AAC9E,8DAAiE;AACjE,gEAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AASjC,MAAa,YAAY;IAIrB,YAAY,MAA0B;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAkC;QACrD,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;YAC5D,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,mEAAmE,CAAC,CAAA;SACnH;QACD,MAAM,SAAS,GAAG,IAAA,gDAAqB,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,UAAW,CAAC,CAAA;QACpG,MAAM,CAAC,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,UAAW,EAAE,IAAI,CAAC,CAAA;QACvD,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;IACxD,CAAC;CACJ;AAlBD,oCAkBC"}

package/dist/src/dht/find/{RecursiveFindSession.d.ts → FindSession.d.ts}

@@ -1,26 +1,25 @@
 import EventEmitter from 'eventemitter3';
 import { PeerID } from '../../helpers/PeerID';
-import { DataEntry, PeerDescriptor, FindResponse } from '../../proto/packages/dht/protos/DhtRpc';
-import { IRecursiveFindSessionService } from '../../proto/packages/dht/protos/DhtRpc.server';
-import { Empty } from '../../proto/google/protobuf/empty';
+import { DataEntry, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ITransport } from '../../transport/ITransport';
-import { RecursiveFindResult } from './RecursiveFinder';
-export interface RecursiveFindSessionEvents {
+import { FindResult } from './Finder';
+import { ServiceID } from '../../types/ServiceID';
+export interface FindSessionEvents {
     findCompleted: (results: PeerDescriptor[]) => void;
 }
-export interface RecursiveFindSessionConfig {
-    serviceId: string;
+export interface FindSessionConfig {
+    serviceId: ServiceID;
     transport: ITransport;
     kademliaIdToFind: Uint8Array;
-    ownPeerId: PeerID;
+    localPeerId: PeerID;
     waitedRoutingPathCompletions: number;
     fetchData: boolean;
 }
-export declare class RecursiveFindSession extends EventEmitter<RecursiveFindSessionEvents> implements IRecursiveFindSessionService {
+export declare class FindSession extends EventEmitter<FindSessionEvents> {
     private readonly serviceId;
     private readonly transport;
     private readonly kademliaIdToFind;
-    private readonly ownPeerId;
+    private readonly localPeerId;
     private readonly waitedRoutingPathCompletions;
     private readonly rpcCommunicator;
     private readonly fetchData;
@@ -31,7 +30,8 @@ export declare class RecursiveFindSession extends EventEmitter<RecursiveFindSess
     private reportFindCompletedTimeout?;
     private findCompletedEmitted;
     private noCloserNodesReceivedCounter;
-    constructor(config: RecursiveFindSessionConfig);
+    constructor(config: FindSessionConfig);
+    private registerLocalRpcMethods;
     private isFindCompleted;
     private hasNonStaleData;
     doSendFindResponse(routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound?: boolean): void;
@@ -39,7 +39,6 @@ export declare class RecursiveFindSession extends EventEmitter<RecursiveFindSess
     private setHopAsReported;
     private processFoundData;
     private onNoCloserPeersFound;
-    sendFindResponse(report: FindResponse): Promise<Empty>;
-    getResults: () => RecursiveFindResult;
+    getResults: () => FindResult;
     stop(): void;
 }

package/dist/src/dht/find/{RecursiveFindSession.js → FindSession.js}

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecursiveFindSession = void 0;
-const utils_1 = require("@streamr/utils");
+exports.FindSession = void 0;
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const PeerID_1 = require("../../helpers/PeerID");
 const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
@@ -12,8 +11,8 @@ const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunic
 const Contact_1 = require("../contact/Contact");
 const SortedContactList_1 = require("../contact/SortedContactList");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
-const logger = new utils_1.Logger(module);
-class RecursiveFindSession extends eventemitter3_1.default {
+const FindSessionRpcLocal_1 = require("./FindSessionRpcLocal");
+class FindSession extends eventemitter3_1.default {
     constructor(config) {
         super();
         this.foundData = new Map();
@@ -28,14 +27,22 @@ class RecursiveFindSession extends eventemitter3_1.default {
         this.serviceId = config.serviceId;
         this.transport = config.transport;
         this.kademliaIdToFind = config.kademliaIdToFind;
-        this.ownPeerId = config.ownPeerId;
+        this.localPeerId = config.localPeerId;
         this.waitedRoutingPathCompletions = config.waitedRoutingPathCompletions;
         this.results = new SortedContactList_1.SortedContactList(PeerID_1.PeerID.fromValue(this.kademliaIdToFind), 10, undefined, true);
         this.fetchData = config.fetchData;
         this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.serviceId, this.transport, {
             rpcRequestTimeout: 15000
         });
-        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.FindResponse, 'sendFindResponse', (req) => this.sendFindResponse(req));
+        this.registerLocalRpcMethods();
+    }
+    registerLocalRpcMethods() {
+        const rpcLocal = new FindSessionRpcLocal_1.FindSessionRpcLocal({
+            doSendFindResponse: (routingPath, nodes, dataEntries, noCloserNodesFound) => {
+                this.doSendFindResponse(routingPath, nodes, dataEntries, noCloserNodesFound);
+            }
+        });
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.FindResponse, 'sendFindResponse', (req) => rpcLocal.sendFindResponse(req));
     }
     isFindCompleted() {
         const unreportedHops = new Set(this.allKnownHops);
@@ -73,14 +80,14 @@ class RecursiveFindSession extends eventemitter3_1.default {
     addKnownHops(routingPath) {
         routingPath.forEach((desc) => {
             const newPeerId = PeerID_1.PeerID.fromValue(desc.kademliaId);
-            if (!this.ownPeerId.equals(newPeerId)) {
+            if (!this.localPeerId.equals(newPeerId)) {
                 this.allKnownHops.add(newPeerId.toKey());
             }
         });
     }
     setHopAsReported(desc) {
         const newPeerId = PeerID_1.PeerID.fromValue(desc.kademliaId);
-        if (!this.ownPeerId.equals(newPeerId)) {
+        if (!this.localPeerId.equals(newPeerId)) {
             this.reportedHops.add(newPeerId.toKey());
         }
         if (this.isFindCompleted()) {
@@ -125,11 +132,6 @@ class RecursiveFindSession extends eventemitter3_1.default {
             }
         }
     }
-    async sendFindResponse(report) {
-        logger.trace('recursiveFindReport arrived: ' + JSON.stringify(report));
-        this.doSendFindResponse(report.routingPath, report.closestConnectedPeers, report.dataEntries, report.noCloserNodesFound);
-        return {};
-    }
     stop() {
         if (this.reportFindCompletedTimeout) {
             clearTimeout(this.reportFindCompletedTimeout);
@@ -139,5 +141,5 @@ class RecursiveFindSession extends eventemitter3_1.default {
         this.emit('findCompleted', []);
     }
 }
-exports.RecursiveFindSession = RecursiveFindSession;
-//# sourceMappingURL=RecursiveFindSession.js.map
+exports.FindSession = FindSession;
+//# sourceMappingURL=FindSession.js.map

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

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

package/dist/src/dht/find/FindSessionRpcLocal.d.ts

@@ -0,0 +1,12 @@
+import { IFindSessionRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { Empty } from '../../proto/google/protobuf/empty';
+import { DataEntry, FindResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+interface FindSessionRpcLocalConfig {
+    doSendFindResponse: (routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound?: boolean) => void;
+}
+export declare class FindSessionRpcLocal implements IFindSessionRpc {
+    private readonly config;
+    constructor(config: FindSessionRpcLocalConfig);
+    sendFindResponse(report: FindResponse): Promise<Empty>;
+}
+export {};

package/dist/src/dht/find/FindSessionRpcLocal.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindSessionRpcLocal = void 0;
+const utils_1 = require("@streamr/utils");
+const logger = new utils_1.Logger(module);
+class FindSessionRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async sendFindResponse(report) {
+        logger.trace('FindResponse arrived: ' + JSON.stringify(report));
+        this.config.doSendFindResponse(report.routingPath, report.closestConnectedPeers, report.dataEntries, report.noCloserNodesFound);
+        return {};
+    }
+}
+exports.FindSessionRpcLocal = FindSessionRpcLocal;
+//# sourceMappingURL=FindSessionRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FindSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/find/FindSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAMjC,MAAa,mBAAmB;IAI5B,YAAY,MAAiC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAoB;QACvC,MAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAC/H,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAbD,kDAaC"}

package/dist/src/dht/find/{RemoteRecursiveFindSession.d.ts → FindSessionRpcRemote.d.ts}

@@ -1,6 +1,6 @@
 import { DataEntry, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { IRecursiveFindSessionServiceClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+import { IFindSessionRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
 import { Remote } from '../contact/Remote';
-export declare class RemoteRecursiveFindSession extends Remote<IRecursiveFindSessionServiceClient> {
+export declare class FindSessionRpcRemote extends Remote<IFindSessionRpcClient> {
     sendFindResponse(routingPath: PeerDescriptor[], closestNodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean): void;
 }

package/dist/src/dht/find/{RemoteRecursiveFindSession.js → FindSessionRpcRemote.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteRecursiveFindSession = void 0;
+exports.FindSessionRpcRemote = void 0;
 const utils_1 = require("@streamr/utils");
 const Remote_1 = require("../contact/Remote");
 const logger = new utils_1.Logger(module);
-class RemoteRecursiveFindSession extends Remote_1.Remote {
+class FindSessionRpcRemote extends Remote_1.Remote {
     sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound) {
         const report = {
             routingPath,
@@ -13,9 +13,9 @@ class RemoteRecursiveFindSession extends Remote_1.Remote {
             noCloserNodesFound
         };
         this.getClient().sendFindResponse(report, this.formDhtRpcOptions()).catch((_e) => {
-            logger.trace('Failed to send FindResult');
+            logger.trace('Failed to send FindResponse');
         });
     }
 }
-exports.RemoteRecursiveFindSession = RemoteRecursiveFindSession;
-//# sourceMappingURL=RemoteRecursiveFindSession.js.map
+exports.FindSessionRpcRemote = FindSessionRpcRemote;
+//# sourceMappingURL=FindSessionRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FindSessionRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/find/FindSessionRpcRemote.ts"],"names":[],"mappings":";;;AAMA,0CAAuC;AACvC,8CAA0C;AAE1C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,oBAAqB,SAAQ,eAA6B;IAEnE,gBAAgB,CACZ,WAA6B,EAC7B,YAA8B,EAC9B,WAAwB,EACxB,kBAA2B;QAE3B,MAAM,MAAM,GAAiB;YACzB,WAAW;YACX,qBAAqB,EAAE,YAAY;YACnC,WAAW;YACX,kBAAkB;SACrB,CAAA;QACD,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7E,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAlBD,oDAkBC"}

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

@@ -1,52 +1,49 @@
-import { DataEntry, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { DataEntry, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import { IRouter } from '../routing/Router';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-import { RemoteDhtNode } from '../RemoteDhtNode';
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
 import { ITransport } from '../../transport/ITransport';
 import { LocalDataStore } from '../store/LocalDataStore';
-import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
-interface RecursiveFinderConfig {
+import { ServiceID } from '../../types/ServiceID';
+interface FinderConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     sessionTransport: ITransport;
-    connections: Map<PeerIDKey, RemoteDhtNode>;
+    connections: Map<PeerIDKey, DhtNodeRpcRemote>;
     router: IRouter;
-    ownPeerDescriptor: PeerDescriptor;
-    serviceId: string;
+    localPeerDescriptor: PeerDescriptor;
+    serviceId: ServiceID;
     localDataStore: LocalDataStore;
     addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
     isPeerCloserToIdThanSelf: (peer1: PeerDescriptor, compareToId: PeerID) => boolean;
 }
-interface RecursiveFinderFunc {
-    startRecursiveFind(idToFind: Uint8Array, fetchData?: boolean): Promise<RecursiveFindResult>;
+export interface IFinder {
+    startFind(idToFind: Uint8Array, fetchData?: boolean): Promise<FindResult>;
 }
-export interface IRecursiveFinder extends Pick<IRouterRpc, 'findRecursively'>, RecursiveFinderFunc {
-}
-export interface RecursiveFindResult {
+export interface FindResult {
     closestNodes: Array<PeerDescriptor>;
     dataEntries?: Array<DataEntry>;
 }
-export declare class RecursiveFinder implements IRecursiveFinder {
+export declare class Finder implements IFinder {
     private readonly rpcCommunicator;
     private readonly sessionTransport;
     private readonly connections;
     private readonly router;
-    private readonly ownPeerDescriptor;
+    private readonly localPeerDescriptor;
     private readonly serviceId;
     private readonly localDataStore;
-    private readonly addContact;
     private readonly isPeerCloserToIdThanSelf;
     private ongoingSessions;
     private stopped;
-    constructor(config: RecursiveFinderConfig);
-    startRecursiveFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
+    constructor(config: FinderConfig);
+    private registerLocalRpcMethods;
+    startFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<FindResult>;
     private wrapFindRequest;
     private findAndReportLocalData;
     private findLocalData;
     private sendFindResponse;
-    private doFindRecursevily;
+    private doRouteFindRequest;
     private getClosestConnections;
-    findRecursively(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
     stop(): void;
 }
 export {};

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.keyFromPeerDescriptor)(previousPeer)
+                : (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(params.sourcePeer);
+            // eslint-disable-next-line max-len
+            logger.debug(`Failed to send routeFindRequest message from ${fromNode} to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(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,qFAA8E;AAC9E,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,gDAAqB,EAAC,YAAY,CAAC;gBACrC,CAAC,CAAC,IAAA,gDAAqB,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YAC/C,mCAAmC;YACnC,MAAM,CAAC,KAAK,CAAC,gDAAgD,QAAQ,OAAO,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,CAAA;YAC3I,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AA7BD,sCA6BC"}