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

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

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

package/dist/src/dht/discovery/PeerDiscovery.d.ts

@@ -1,26 +1,23 @@
-import { RemoteDhtNode } from '../RemoteDhtNode';
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import KBucket from 'k-bucket';
 import { SortedContactList } from '../contact/SortedContactList';
 import { ConnectionManager } from '../../connection/ConnectionManager';
-import { PeerIDKey } from '../../helpers/PeerID';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-import { RandomContactList } from '../contact/RandomContactList';
+import { ServiceID } from '../../types/ServiceID';
 interface PeerDiscoveryConfig {
     rpcCommunicator: RoutingRpcCommunicator;
-    ownPeerDescriptor: PeerDescriptor;
-    bucket: KBucket<RemoteDhtNode>;
-    connections: Map<PeerIDKey, RemoteDhtNode>;
-    neighborList: SortedContactList<RemoteDhtNode>;
-    randomPeers: RandomContactList<RemoteDhtNode>;
-    openInternetPeers: SortedContactList<RemoteDhtNode>;
+    localPeerDescriptor: PeerDescriptor;
+    bucket: KBucket<DhtNodeRpcRemote>;
+    neighborList: SortedContactList<DhtNodeRpcRemote>;
     joinNoProgressLimit: number;
     peerDiscoveryQueryBatchSize: number;
-    serviceId: string;
+    serviceId: ServiceID;
     parallelism: number;
     joinTimeout: number;
     addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
     connectionManager?: ConnectionManager;
+    rpcRequestTimeout?: number;
 }
 export declare class PeerDiscovery {
     private readonly config;

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

@@ -21,13 +21,13 @@ class PeerDiscovery {
         }
         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.areEqualPeerDescriptors)(entryPointDescriptor, this.config.ownPeerDescriptor)) {
+            + ` via entrypoint ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(entryPointDescriptor)}`);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.localPeerDescriptor)) {
             return;
         }
         this.config.connectionManager?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
         this.config.addContact(entryPointDescriptor);
-        const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.ownPeerDescriptor).value;
+        const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value;
         const closest = this.config.bucket.closest(targetId, this.config.peerDiscoveryQueryBatchSize);
         this.config.neighborList.addContacts(closest);
         const sessions = [this.createSession(targetId)];
@@ -42,7 +42,7 @@ class PeerDiscovery {
             bucket: this.config.bucket,
             neighborList: this.config.neighborList,
             targetId,
-            ownPeerDescriptor: this.config.ownPeerDescriptor,
+            localPeerDescriptor: this.config.localPeerDescriptor,
             serviceId: this.config.serviceId,
             rpcCommunicator: this.config.rpcCommunicator,
             parallelism: this.config.parallelism,
@@ -106,9 +106,9 @@ class PeerDiscovery {
         if (this.isStopped()) {
             return;
         }
-        const nodes = this.config.bucket.closest((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.ownPeerDescriptor).value, this.config.parallelism);
+        const nodes = this.config.bucket.closest((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value, this.config.parallelism);
         await Promise.allSettled(nodes.map(async (peer) => {
-            const contacts = await peer.getClosestPeers(this.config.ownPeerDescriptor.kademliaId);
+            const contacts = await peer.getClosestPeers(this.config.localPeerDescriptor.kademliaId);
             contacts.forEach((contact) => {
                 this.config.addContact(contact);
             });

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/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 senderId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)((0, getPreviousPeer_1.getPreviousPeer)(routedMessage) ?? routedMessage.sourcePeer);
+        logger.trace(`Received routeFindRequest call from ${senderId}`);
+        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,qFAAoF;AACpF,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,QAAQ,GAAG,IAAA,sDAA2B,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,UAAW,CAAC,CAAA;QACzG,MAAM,CAAC,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAA;QAC/D,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 {};