@streamr/dht 0.0.1-tatum.6 → 0.0.1-tatum.8

package/dist/src/dht/discovery/PeerDiscovery.js

@@ -1,71 +1,68 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PeerDiscovery = void 0;
 const DiscoverySession_1 = require("./DiscoverySession");
-const crypto_1 = __importDefault(require("crypto"));
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const utils_1 = require("@streamr/utils");
+const kademliaId_1 = require("../../helpers/kademliaId");
 const logger = new utils_1.Logger(module);
 class PeerDiscovery {
     constructor(config) {
         this.ongoingDiscoverySessions = new Map();
-        this.stopped = false;
         this.rejoinOngoing = false;
         this.joinCalled = false;
         this.recoveryIntervalStarted = false;
         this.config = config;
         this.abortController = new AbortController();
     }
-    async joinDht(entryPointDescriptor, doRandomJoin = true, retry = true) {
-        if (this.stopped) {
+    async joinDht(entryPointDescriptor, doAdditionalRandomPeerDiscovery = true, retry = true) {
+        if (this.isStopped()) {
             return;
         }
         this.joinCalled = true;
         logger.debug(`Joining ${this.config.serviceId === 'layer0' ? 'The Streamr Network' : `Control Layer for ${this.config.serviceId}`}`
             + ` via entrypoint ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(entryPointDescriptor)}`);
-        if ((0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(entryPointDescriptor, this.config.ownPeerDescriptor)) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.ownPeerDescriptor)) {
             return;
         }
         this.config.connectionManager?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
         this.config.addContact(entryPointDescriptor);
-        const closest = this.config.bucket.closest(this.config.ownPeerId.value, this.config.getClosestContactsLimit);
+        const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.ownPeerDescriptor).value;
+        const closest = this.config.bucket.closest(targetId, this.config.peerDiscoveryQueryBatchSize);
         this.config.neighborList.addContacts(closest);
+        const sessions = [this.createSession(targetId)];
+        if (doAdditionalRandomPeerDiscovery) {
+            sessions.push(this.createSession((0, kademliaId_1.createRandomKademliaId)()));
+        }
+        await this.runSessions(sessions, entryPointDescriptor, retry);
+        this.config.connectionManager?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
+    }
+    createSession(targetId) {
         const sessionOptions = {
             bucket: this.config.bucket,
             neighborList: this.config.neighborList,
-            targetId: this.config.ownPeerId.value,
+            targetId,
             ownPeerDescriptor: this.config.ownPeerDescriptor,
             serviceId: this.config.serviceId,
             rpcCommunicator: this.config.rpcCommunicator,
             parallelism: this.config.parallelism,
             noProgressLimit: this.config.joinNoProgressLimit,
-            newContactListener: (newPeer) => this.config.addContact(newPeer.getPeerDescriptor()),
-            nodeName: this.config.ownPeerDescriptor.nodeName
+            newContactListener: (newPeer) => this.config.addContact(newPeer.getPeerDescriptor())
         };
-        const session = new DiscoverySession_1.DiscoverySession(sessionOptions);
-        const randomSession = doRandomJoin ? new DiscoverySession_1.DiscoverySession({
-            ...sessionOptions,
-            targetId: crypto_1.default.randomBytes(8),
-            nodeName: this.config.ownPeerDescriptor.nodeName + '-random'
-        }) : null;
-        this.ongoingDiscoverySessions.set(session.sessionId, session);
-        if (randomSession) {
-            this.ongoingDiscoverySessions.set(randomSession.sessionId, randomSession);
-        }
+        return new DiscoverySession_1.DiscoverySession(sessionOptions);
+    }
+    async runSessions(sessions, entryPointDescriptor, retry) {
         try {
-            await session.findClosestNodes(this.config.joinTimeout);
-            if (randomSession) {
-                await randomSession.findClosestNodes(this.config.joinTimeout);
+            for (const session of sessions) {
+                this.ongoingDiscoverySessions.set(session.sessionId, session);
+                await session.findClosestNodes(this.config.joinTimeout);
             }
         }
         catch (_e) {
             logger.debug(`DHT join on ${this.config.serviceId} timed out`);
         }
         finally {
-            if (!this.stopped) {
+            if (!this.isStopped()) {
                 if (this.config.bucket.count() === 0) {
                     if (retry) {
                         (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPointDescriptor), 1000, this.abortController.signal);
@@ -75,18 +72,14 @@ class PeerDiscovery {
                     await this.ensureRecoveryIntervalIsRunning();
                 }
             }
-            this.ongoingDiscoverySessions.delete(session.sessionId);
-            if (randomSession) {
-                this.ongoingDiscoverySessions.delete(randomSession.sessionId);
-            }
-            this.config.connectionManager?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
+            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.sessionId));
         }
     }
     async rejoinDht(entryPoint) {
-        if (this.stopped || this.rejoinOngoing) {
+        if (this.isStopped() || this.rejoinOngoing) {
             return;
         }
-        logger.debug(`Rejoining DHT ${this.config.serviceId} ${this.config.ownPeerDescriptor.nodeName}!`);
+        logger.debug(`Rejoining DHT ${this.config.serviceId}`);
         this.rejoinOngoing = true;
         try {
             this.config.neighborList.clear();
@@ -95,7 +88,7 @@ class PeerDiscovery {
         }
         catch (err) {
             logger.warn(`Rejoining DHT ${this.config.serviceId} failed`);
-            if (!this.stopped) {
+            if (!this.isStopped()) {
                 (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPoint), 5000, this.abortController.signal);
             }
         }
@@ -110,10 +103,11 @@ class PeerDiscovery {
         }
     }
     async fetchClosestPeersFromBucket() {
-        if (this.stopped) {
+        if (this.isStopped()) {
             return;
         }
-        await Promise.allSettled(this.config.bucket.closest(this.config.ownPeerId.value, this.config.parallelism).map(async (peer) => {
+        const nodes = this.config.bucket.closest((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.ownPeerDescriptor).value, this.config.parallelism);
+        await Promise.allSettled(nodes.map(async (peer) => {
             const contacts = await peer.getClosestPeers(this.config.ownPeerDescriptor.kademliaId);
             contacts.forEach((contact) => {
                 this.config.addContact(contact);
@@ -126,8 +120,10 @@ class PeerDiscovery {
     isJoinCalled() {
         return this.joinCalled;
     }
+    isStopped() {
+        return this.abortController.signal.aborted;
+    }
     stop() {
-        this.stopped = true;
         this.abortController.abort();
         if (this.rejoinTimeoutRef) {
             clearTimeout(this.rejoinTimeoutRef);

package/dist/src/dht/discovery/PeerDiscovery.js.map

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

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

@@ -1,7 +1,6 @@
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import EventEmitter from 'eventemitter3';
 import { PeerID } from '../../helpers/PeerID';
-import { DataEntry, FindMode, PeerDescriptor, RecursiveFindReport } from '../../proto/packages/dht/protos/DhtRpc';
+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 { ITransport } from '../../transport/ITransport';
@@ -11,20 +10,20 @@ export interface RecursiveFindSessionEvents {
 }
 export interface RecursiveFindSessionConfig {
     serviceId: string;
-    rpcTransport: ITransport;
+    transport: ITransport;
     kademliaIdToFind: Uint8Array;
-    ownPeerID: PeerID;
+    ownPeerId: PeerID;
     waitedRoutingPathCompletions: number;
-    mode: FindMode;
+    fetchData: boolean;
 }
 export declare class RecursiveFindSession extends EventEmitter<RecursiveFindSessionEvents> implements IRecursiveFindSessionService {
     private readonly serviceId;
-    private readonly rpcTransport;
+    private readonly transport;
     private readonly kademliaIdToFind;
-    private readonly ownPeerID;
+    private readonly ownPeerId;
     private readonly waitedRoutingPathCompletions;
     private readonly rpcCommunicator;
-    private readonly mode;
+    private readonly fetchData;
     private results;
     private foundData;
     private allKnownHops;
@@ -35,12 +34,12 @@ export declare class RecursiveFindSession extends EventEmitter<RecursiveFindSess
     constructor(config: RecursiveFindSessionConfig);
     private isFindCompleted;
     private hasNonStaleData;
-    doReportRecursiveFindResult(routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound?: boolean): void;
+    doSendFindResponse(routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound?: boolean): void;
     private addKnownHops;
     private setHopAsReported;
     private processFoundData;
     private onNoCloserPeersFound;
-    reportRecursiveFindResult(report: RecursiveFindReport, _context: ServerCallContext): Promise<Empty>;
+    sendFindResponse(report: FindResponse): Promise<Empty>;
     getResults: () => RecursiveFindResult;
     stop(): void;
 }

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

@@ -26,16 +26,16 @@ class RecursiveFindSession extends eventemitter3_1.default {
             dataEntries: (this.foundData && this.foundData.size > 0) ? Array.from(this.foundData.values()) : undefined
         });
         this.serviceId = config.serviceId;
-        this.rpcTransport = config.rpcTransport;
+        this.transport = config.transport;
         this.kademliaIdToFind = config.kademliaIdToFind;
-        this.ownPeerID = config.ownPeerID;
+        this.ownPeerId = config.ownPeerId;
         this.waitedRoutingPathCompletions = config.waitedRoutingPathCompletions;
         this.results = new SortedContactList_1.SortedContactList(PeerID_1.PeerID.fromValue(this.kademliaIdToFind), 10, undefined, true);
-        this.mode = config.mode;
-        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.serviceId, this.rpcTransport, {
+        this.fetchData = config.fetchData;
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.serviceId, this.transport, {
             rpcRequestTimeout: 15000
         });
-        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RecursiveFindReport, 'reportRecursiveFindResult', (req, context) => this.reportRecursiveFindResult(req, context));
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.FindResponse, 'sendFindResponse', (req) => this.sendFindResponse(req));
     }
     isFindCompleted() {
         const unreportedHops = new Set(this.allKnownHops);
@@ -43,11 +43,11 @@ class RecursiveFindSession extends eventemitter3_1.default {
             unreportedHops.delete(id);
         });
         if (this.noCloserNodesReceivedCounter >= 1 && unreportedHops.size === 0) {
-            if (this.mode === DhtRpc_1.FindMode.DATA
+            if (this.fetchData
                 && (this.hasNonStaleData() || this.noCloserNodesReceivedCounter >= this.waitedRoutingPathCompletions)) {
                 return true;
             }
-            else if (this.mode === DhtRpc_1.FindMode.DATA) {
+            else if (this.fetchData) {
                 return false;
             }
             return true;
@@ -57,12 +57,12 @@ class RecursiveFindSession extends eventemitter3_1.default {
     hasNonStaleData() {
         return Array.from(this.foundData.values()).some((entry) => entry.stale === false);
     }
-    doReportRecursiveFindResult(routingPath, nodes, dataEntries, noCloserNodesFound) {
+    doSendFindResponse(routingPath, nodes, dataEntries, noCloserNodesFound) {
         this.addKnownHops(routingPath);
         if (routingPath.length >= 1) {
             this.setHopAsReported(routingPath[routingPath.length - 1]);
         }
-        nodes.map((descriptor) => {
+        nodes.forEach((descriptor) => {
             this.results.addContact(new Contact_1.Contact(descriptor));
         });
         this.processFoundData(dataEntries);
@@ -73,14 +73,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.ownPeerId.equals(newPeerId)) {
                 this.allKnownHops.add(newPeerId.toKey());
             }
         });
     }
     setHopAsReported(desc) {
         const newPeerId = PeerID_1.PeerID.fromValue(desc.kademliaId);
-        if (!this.ownPeerID.equals(newPeerId)) {
+        if (!this.ownPeerId.equals(newPeerId)) {
             this.reportedHops.add(newPeerId.toKey());
         }
         if (this.isFindCompleted()) {
@@ -125,9 +125,9 @@ class RecursiveFindSession extends eventemitter3_1.default {
             }
         }
     }
-    async reportRecursiveFindResult(report, _context) {
+    async sendFindResponse(report) {
         logger.trace('recursiveFindReport arrived: ' + JSON.stringify(report));
-        this.doReportRecursiveFindResult(report.routingPath, report.nodes, report.dataEntries, report.noCloserNodesFound);
+        this.doSendFindResponse(report.routingPath, report.closestConnectedPeers, report.dataEntries, report.noCloserNodesFound);
         return {};
     }
     stop() {

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

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

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

@@ -1,27 +1,26 @@
-import { DataEntry, FindMode, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { DataEntry, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
 import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import { IRouter } from '../routing/Router';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-import { DhtPeer } from '../DhtPeer';
+import { RemoteDhtNode } from '../RemoteDhtNode';
 import { ITransport } from '../../transport/ITransport';
 import { LocalDataStore } from '../store/LocalDataStore';
-import { IRoutingService } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 interface RecursiveFinderConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     sessionTransport: ITransport;
-    connections: Map<PeerIDKey, DhtPeer>;
+    connections: Map<PeerIDKey, RemoteDhtNode>;
     router: IRouter;
     ownPeerDescriptor: PeerDescriptor;
-    ownPeerId: PeerID;
     serviceId: string;
     localDataStore: LocalDataStore;
     addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
     isPeerCloserToIdThanSelf: (peer1: PeerDescriptor, compareToId: PeerID) => boolean;
 }
 interface RecursiveFinderFunc {
-    startRecursiveFind(idToFind: Uint8Array, findMode?: FindMode): Promise<RecursiveFindResult>;
+    startRecursiveFind(idToFind: Uint8Array, fetchData?: boolean): Promise<RecursiveFindResult>;
 }
-export interface IRecursiveFinder extends Pick<IRoutingService, 'findRecursively'>, RecursiveFinderFunc {
+export interface IRecursiveFinder extends Pick<IRouterRpc, 'findRecursively'>, RecursiveFinderFunc {
 }
 export interface RecursiveFindResult {
     closestNodes: Array<PeerDescriptor>;
@@ -33,7 +32,6 @@ export declare class RecursiveFinder implements IRecursiveFinder {
     private readonly connections;
     private readonly router;
     private readonly ownPeerDescriptor;
-    private readonly ownPeerId;
     private readonly serviceId;
     private readonly localDataStore;
     private readonly addContact;
@@ -41,11 +39,11 @@ export declare class RecursiveFinder implements IRecursiveFinder {
     private ongoingSessions;
     private stopped;
     constructor(config: RecursiveFinderConfig);
-    startRecursiveFind(idToFind: Uint8Array, findMode?: FindMode, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
-    private wrapRecursiveFindRequest;
+    startRecursiveFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
+    private wrapFindRequest;
     private findAndReportLocalData;
     private findLocalData;
-    private reportRecursiveFindResult;
+    private sendFindResponse;
     private doFindRecursevily;
     private getClosestConnections;
     findRecursively(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;

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

@@ -24,60 +24,59 @@ class RecursiveFinder {
         this.connections = config.connections;
         this.router = config.router;
         this.ownPeerDescriptor = config.ownPeerDescriptor;
-        this.ownPeerId = config.ownPeerId;
         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));
     }
-    async startRecursiveFind(idToFind, findMode = DhtRpc_1.FindMode.NODE, excludedPeer) {
+    async startRecursiveFind(idToFind, fetchData = false, excludedPeer) {
         if (this.stopped) {
             return { closestNodes: [] };
         }
         const sessionId = (0, uuid_1.v4)();
         const recursiveFindSession = new RecursiveFindSession_1.RecursiveFindSession({
             serviceId: sessionId,
-            rpcTransport: this.sessionTransport,
+            transport: this.sessionTransport,
             kademliaIdToFind: idToFind,
-            ownPeerID: this.ownPeerId,
+            ownPeerId: (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor),
             waitedRoutingPathCompletions: this.connections.size > 1 ? 2 : 1,
-            mode: findMode
+            fetchData
         });
         if (this.connections.size === 0) {
             const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
-            recursiveFindSession.doReportRecursiveFindResult([this.ownPeerDescriptor], [this.ownPeerDescriptor], data ? Array.from(data.values()) : [], true);
+            recursiveFindSession.doSendFindResponse([this.ownPeerDescriptor], [this.ownPeerDescriptor], data ? Array.from(data.values()) : [], true);
             return recursiveFindSession.getResults();
         }
-        const routeMessage = this.wrapRecursiveFindRequest(idToFind, sessionId, findMode);
+        const routeMessage = this.wrapFindRequest(idToFind, sessionId, fetchData);
         this.ongoingSessions.set(sessionId, recursiveFindSession);
         try {
             await (0, utils_1.runAndWaitForEvents3)([() => this.doFindRecursevily(routeMessage, excludedPeer)], [[recursiveFindSession, 'findCompleted']], 15000);
         }
         catch (err) {
-            logger.debug(`doFindRecursively failed with error ${this.ownPeerDescriptor.nodeName} ${err}`);
+            logger.debug(`doFindRecursively failed with error ${err}`);
         }
-        this.findAndReportLocalData(idToFind, findMode, [], this.ownPeerDescriptor, sessionId);
+        this.findAndReportLocalData(idToFind, fetchData, [], this.ownPeerDescriptor, sessionId);
         this.ongoingSessions.delete(sessionId);
         recursiveFindSession.stop();
         return recursiveFindSession.getResults();
     }
-    wrapRecursiveFindRequest(idToFind, sessionId, findMode) {
+    wrapFindRequest(idToFind, sessionId, fetchData) {
         const targetDescriptor = {
             kademliaId: idToFind,
             type: DhtRpc_1.NodeType.VIRTUAL
         };
         const request = {
-            recursiveFindSessionId: sessionId,
-            findMode
+            sessionId,
+            fetchData
         };
         const msg = {
             messageType: DhtRpc_1.MessageType.RECURSIVE_FIND_REQUEST,
             messageId: (0, uuid_1.v4)(),
             serviceId: this.serviceId,
             body: {
-                oneofKind: 'recursiveFindRequest',
-                recursiveFindRequest: request
+                oneofKind: 'findRequest',
+                findRequest: request
             }
         };
         const routeMessage = {
@@ -90,52 +89,52 @@ class RecursiveFinder {
         };
         return routeMessage;
     }
-    findAndReportLocalData(idToFind, findMode, routingPath, sourcePeer, sessionId) {
-        if (findMode === DhtRpc_1.FindMode.DATA) {
+    findAndReportLocalData(idToFind, fetchData, routingPath, sourcePeer, sessionId) {
+        if (fetchData) {
             const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
             if (data.size > 0) {
-                this.reportRecursiveFindResult(routingPath, sourcePeer, sessionId, [], data, true);
+                this.sendFindResponse(routingPath, sourcePeer, sessionId, [], data, true);
                 return true;
             }
         }
         return false;
     }
-    findLocalData(idToFind, findMode) {
-        if (findMode === DhtRpc_1.FindMode.DATA) {
+    findLocalData(idToFind, fetchData) {
+        if (fetchData) {
             return this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
         }
         return undefined;
     }
-    reportRecursiveFindResult(routingPath, targetPeerDescriptor, serviceId, closestNodes, data, noCloserNodesFound = false) {
+    sendFindResponse(routingPath, targetPeerDescriptor, serviceId, closestNodes, data, noCloserNodesFound = false) {
         const dataEntries = data ? Array.from(data.values(), DhtRpc_1.DataEntry.create.bind(DhtRpc_1.DataEntry)) : [];
-        const isOwnPeerId = this.ownPeerId.equals(PeerID_1.PeerID.fromValue(targetPeerDescriptor.kademliaId));
-        if (isOwnPeerId && this.ongoingSessions.has(serviceId)) {
+        const isOwnNode = (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, targetPeerDescriptor);
+        if (isOwnNode && this.ongoingSessions.has(serviceId)) {
             this.ongoingSessions.get(serviceId)
-                .doReportRecursiveFindResult(routingPath, closestNodes, dataEntries, noCloserNodesFound);
+                .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.reportRecursiveFindResult(routingPath, closestNodes, dataEntries, noCloserNodesFound);
+            remoteSession.sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound);
         }
     }
     doFindRecursevily(routedMessage, excludedPeer) {
         if (this.stopped) {
             return (0, Router_1.createRouteMessageAck)(routedMessage, 'DhtNode Stopped');
         }
-        const idToFind = PeerID_1.PeerID.fromValue(routedMessage.destinationPeer.kademliaId);
+        const idToFind = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.destinationPeer);
         const msg = routedMessage.message;
-        const recursiveFindRequest = msg?.body.oneofKind === 'recursiveFindRequest' ? msg.body.recursiveFindRequest : undefined;
+        const findRequest = msg?.body.oneofKind === 'findRequest' ? msg.body.findRequest : undefined;
         const closestPeersToDestination = this.getClosestConnections(routedMessage.destinationPeer.kademliaId, 5);
-        const data = this.findLocalData(idToFind.value, recursiveFindRequest.findMode);
-        if (this.ownPeerId.equals(idToFind)) {
-            this.reportRecursiveFindResult(routedMessage.routingPath, routedMessage.sourcePeer, recursiveFindRequest.recursiveFindSessionId, closestPeersToDestination, data, true);
+        const data = this.findLocalData(idToFind.value, findRequest.fetchData);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, routedMessage.destinationPeer)) {
+            this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
             return (0, Router_1.createRouteMessageAck)(routedMessage);
         }
         const ack = this.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.RECURSIVE_FIND, excludedPeer);
         if (ack.error === Router_1.RoutingErrors.NO_CANDIDATES_FOUND) {
-            logger.trace(`findRecursively Node ${this.ownPeerDescriptor.nodeName} found no candidates`);
-            this.reportRecursiveFindResult(routedMessage.routingPath, routedMessage.sourcePeer, recursiveFindRequest.recursiveFindSessionId, closestPeersToDestination, data, true);
+            logger.trace(`findRecursively Node found no candidates`);
+            this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
         }
         else if (ack.error) {
             return ack;
@@ -144,7 +143,7 @@ class RecursiveFinder {
             const noCloserContactsFound = (closestPeersToDestination.length > 0
                 && routedMessage.previousPeer
                 && !this.isPeerCloserToIdThanSelf(closestPeersToDestination[0], idToFind));
-            this.reportRecursiveFindResult(routedMessage.routingPath, routedMessage.sourcePeer, recursiveFindRequest.recursiveFindSessionId, closestPeersToDestination, data, noCloserContactsFound);
+            this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, noCloserContactsFound);
         }
         return ack;
     }
@@ -154,18 +153,18 @@ class RecursiveFinder {
         closestPeers.addContacts(connectedPeers);
         return closestPeers.getClosestContacts(limit).map((peer) => peer.getPeerDescriptor());
     }
-    // IRoutingService method
+    // IRouterRpc method
     async findRecursively(routedMessage) {
         if (this.stopped) {
             return (0, Router_1.createRouteMessageAck)(routedMessage, 'findRecursively() service is not running');
         }
-        else if (this.router.checkDuplicate(routedMessage.requestId)) {
+        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(`Node ${this.ownPeerId.toKey()} received findRecursively call from ${senderKey}`);
+        logger.trace(`Received findRecursively call from ${senderKey}`);
         this.addContact(routedMessage.sourcePeer, true);
-        this.router.addToDuplicateDetector(routedMessage.requestId, (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer));
+        this.router.addToDuplicateDetector(routedMessage.requestId);
         return this.doFindRecursevily(routedMessage);
     }
     stop() {

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

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

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

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