@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-testnet-one.1

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

@@ -22,15 +22,20 @@ class FindSession extends eventemitter3_1.default {
         this.noCloserNodesReceivedCounter = 0;
         this.getResults = () => ({
             closestNodes: this.results.getAllContacts().map((contact) => contact.getPeerDescriptor()),
-            dataEntries: (this.foundData && this.foundData.size > 0) ? Array.from(this.foundData.values()) : undefined
+            dataEntries: Array.from(this.foundData.values())
         });
         this.serviceId = config.serviceId;
         this.transport = config.transport;
-        this.kademliaIdToFind = config.kademliaIdToFind;
+        this.nodeIdToFind = config.nodeIdToFind;
         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.results = new SortedContactList_1.SortedContactList({
+            referenceId: PeerID_1.PeerID.fromValue(this.nodeIdToFind),
+            maxSize: 10,
+            allowToContainReferenceId: true,
+            emitEvents: false
+        });
+        this.action = config.action;
         this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.serviceId, this.transport, {
             rpcRequestTimeout: 15000
         });
@@ -50,11 +55,11 @@ class FindSession extends eventemitter3_1.default {
             unreportedHops.delete(id);
         });
         if (this.noCloserNodesReceivedCounter >= 1 && unreportedHops.size === 0) {
-            if (this.fetchData
+            if (this.action === DhtRpc_1.FindAction.FETCH_DATA
                 && (this.hasNonStaleData() || this.noCloserNodesReceivedCounter >= this.waitedRoutingPathCompletions)) {
                 return true;
             }
-            else if (this.fetchData) {
+            else if (this.action === DhtRpc_1.FindAction.FETCH_DATA) {
                 return false;
             }
             return true;
@@ -79,14 +84,14 @@ class FindSession extends eventemitter3_1.default {
     }
     addKnownHops(routingPath) {
         routingPath.forEach((desc) => {
-            const newPeerId = PeerID_1.PeerID.fromValue(desc.kademliaId);
+            const newPeerId = PeerID_1.PeerID.fromValue(desc.nodeId);
             if (!this.localPeerId.equals(newPeerId)) {
                 this.allKnownHops.add(newPeerId.toKey());
             }
         });
     }
     setHopAsReported(desc) {
-        const newPeerId = PeerID_1.PeerID.fromValue(desc.kademliaId);
+        const newPeerId = PeerID_1.PeerID.fromValue(desc.nodeId);
         if (!this.localPeerId.equals(newPeerId)) {
             this.reportedHops.add(newPeerId.toKey());
         }
@@ -103,11 +108,11 @@ class FindSession extends eventemitter3_1.default {
     }
     processFoundData(dataEntries) {
         dataEntries.forEach((entry) => {
-            const storerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(entry.storer);
-            const existingEntry = this.foundData.get(storerKey);
-            if (!existingEntry || existingEntry.storerTime < entry.storerTime
-                || (existingEntry.storerTime <= entry.storerTime && entry.deleted)) {
-                this.foundData.set(storerKey, entry);
+            const creatorKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(entry.creator);
+            const existingEntry = this.foundData.get(creatorKey);
+            if (!existingEntry || existingEntry.createdAt < entry.createdAt
+                || (existingEntry.createdAt <= entry.createdAt && entry.deleted)) {
+                this.foundData.set(creatorKey, entry);
             }
         });
     }

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

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

@@ -2,7 +2,7 @@ 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;
+    doSendFindResponse: (routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean) => void;
 }
 export declare class FindSessionRpcLocal implements IFindSessionRpc {
     private readonly config;

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

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

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindSessionRpcRemote = void 0;
 const utils_1 = require("@streamr/utils");
-const Remote_1 = require("../contact/Remote");
+const RpcRemote_1 = require("../contact/RpcRemote");
 const logger = new utils_1.Logger(module);
-class FindSessionRpcRemote extends Remote_1.Remote {
+class FindSessionRpcRemote extends RpcRemote_1.RpcRemote {
     sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound) {
         const report = {
             routingPath,

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

@@ -1 +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"}
+{"version":3,"file":"FindSessionRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/find/FindSessionRpcRemote.ts"],"names":[],"mappings":";;;AAMA,0CAAuC;AACvC,oDAAgD;AAEhD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,oBAAqB,SAAQ,qBAAgC;IAEtE,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/Finder.d.ts

@@ -1,4 +1,4 @@
-import { DataEntry, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { DataEntry, PeerDescriptor, FindAction } from '../../proto/packages/dht/protos/DhtRpc';
 import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import { IRouter } from '../routing/Router';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
@@ -14,11 +14,11 @@ interface FinderConfig {
     localPeerDescriptor: PeerDescriptor;
     serviceId: ServiceID;
     localDataStore: LocalDataStore;
-    addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
+    addContact: (contact: PeerDescriptor) => void;
     isPeerCloserToIdThanSelf: (peer1: PeerDescriptor, compareToId: PeerID) => boolean;
 }
 export interface IFinder {
-    startFind(idToFind: Uint8Array, fetchData?: boolean): Promise<FindResult>;
+    startFind(idToFind: Uint8Array, action?: FindAction): Promise<FindResult>;
 }
 export interface FindResult {
     closestNodes: Array<PeerDescriptor>;
@@ -37,7 +37,7 @@ export declare class Finder implements IFinder {
     private stopped;
     constructor(config: FinderConfig);
     private registerLocalRpcMethods;
-    startFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<FindResult>;
+    startFind(idToFind: Uint8Array, action?: FindAction, excludedPeer?: PeerDescriptor, waitForCompletion?: boolean): Promise<FindResult>;
     private wrapFindRequest;
     private findAndReportLocalData;
     private findLocalData;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -35,20 +34,20 @@ class Finder {
     registerLocalRpcMethods(config) {
         const rpcLocal = new FindRpcLocal_1.FindRpcLocal({
             doRouteFindRequest: (routedMessage) => this.doRouteFindRequest(routedMessage),
-            addContact: (contact, setActive) => config.addContact(contact, setActive),
+            addContact: (contact) => config.addContact(contact),
             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');
+                return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
             }
             else {
                 return rpcLocal.routeFindRequest(routedMessage);
             }
         });
     }
-    async startFind(idToFind, fetchData = false, excludedPeer) {
+    async startFind(idToFind, action = DhtRpc_1.FindAction.NODE, excludedPeer, waitForCompletion = true) {
         if (this.stopped) {
             return { closestNodes: [] };
         }
@@ -56,37 +55,50 @@ class Finder {
         const session = new FindSession_1.FindSession({
             serviceId: sessionId,
             transport: this.sessionTransport,
-            kademliaIdToFind: idToFind,
+            nodeIdToFind: idToFind,
             localPeerId: (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor),
             waitedRoutingPathCompletions: this.connections.size > 1 ? 2 : 1,
-            fetchData
+            action
         });
         if (this.connections.size === 0) {
             const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
-            session.doSendFindResponse([this.localPeerDescriptor], [this.localPeerDescriptor], data ? Array.from(data.values()) : [], true);
+            session.doSendFindResponse([this.localPeerDescriptor], [this.localPeerDescriptor], Array.from(data.values()), true);
             return session.getResults();
         }
-        const routeMessage = this.wrapFindRequest(idToFind, sessionId, fetchData);
+        const routeMessage = this.wrapFindRequest(idToFind, sessionId, action);
         this.ongoingSessions.set(sessionId, session);
-        try {
-            await (0, utils_1.runAndWaitForEvents3)([() => this.doRouteFindRequest(routeMessage, excludedPeer)], [[session, 'findCompleted']], 15000);
+        if (waitForCompletion === true) {
+            try {
+                await (0, utils_1.runAndWaitForEvents3)([() => this.doRouteFindRequest(routeMessage, excludedPeer)], [[session, 'findCompleted']], 15000);
+            }
+            catch (err) {
+                logger.debug(`doRouteFindRequest failed with error ${err}`);
+            }
+        }
+        else {
+            this.doRouteFindRequest(routeMessage, excludedPeer);
+            // Wait for delete operation to be sent out by the router
+            // TODO: Add a feature to wait for the router to pass the message?
+            await (0, utils_1.wait)(50);
         }
-        catch (err) {
-            logger.debug(`doRouteFindRequest failed with error ${err}`);
+        if (action === DhtRpc_1.FindAction.FETCH_DATA) {
+            this.findAndReportLocalData(idToFind, [], this.localPeerDescriptor, sessionId);
+        }
+        else if (action === DhtRpc_1.FindAction.DELETE_DATA) {
+            this.localDataStore.markAsDeleted(idToFind, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor));
         }
-        this.findAndReportLocalData(idToFind, fetchData, [], this.localPeerDescriptor, sessionId);
         this.ongoingSessions.delete(sessionId);
         session.stop();
         return session.getResults();
     }
-    wrapFindRequest(idToFind, sessionId, fetchData) {
+    wrapFindRequest(idToFind, sessionId, action) {
         const targetDescriptor = {
-            kademliaId: idToFind,
+            nodeId: idToFind,
             type: DhtRpc_1.NodeType.VIRTUAL
         };
         const request = {
             sessionId,
-            fetchData
+            action
         };
         const msg = {
             messageType: DhtRpc_1.MessageType.FIND_REQUEST,
@@ -107,15 +119,11 @@ class Finder {
         };
         return routeMessage;
     }
-    findAndReportLocalData(idToFind, fetchData, routingPath, sourcePeer, sessionId) {
-        if (fetchData) {
-            const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
-            if (data.size > 0) {
-                this.sendFindResponse(routingPath, sourcePeer, sessionId, [], data, true);
-                return true;
-            }
+    findAndReportLocalData(idToFind, routingPath, sourcePeer, sessionId) {
+        const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
+        if (data.size > 0) {
+            this.sendFindResponse(routingPath, sourcePeer, sessionId, [], data, true);
         }
-        return false;
     }
     findLocalData(idToFind, fetchData) {
         if (fetchData) {
@@ -139,36 +147,41 @@ class Finder {
     }
     doRouteFindRequest(routedMessage, excludedPeer) {
         if (this.stopped) {
-            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, 'DhtNode Stopped');
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.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);
+        const closestPeersToDestination = this.getClosestConnections(routedMessage.destinationPeer.nodeId, 5);
+        const data = this.findLocalData(idToFind.value, findRequest.action === DhtRpc_1.FindAction.FETCH_DATA);
+        if (findRequest.action === DhtRpc_1.FindAction.DELETE_DATA) {
+            this.localDataStore.markAsDeleted(idToFind.value, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.sourcePeer));
+        }
         if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, routedMessage.destinationPeer)) {
+            // TODO this is also very similar case to what we do at line 255, could simplify the code paths?
             this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
             return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
         }
-        const ack = this.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.FIND, excludedPeer);
-        if (ack.error === Router_1.RoutingErrors.NO_CANDIDATES_FOUND) {
-            logger.trace(`routeFindRequest Node found no candidates`);
-            this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
-        }
-        else if (ack.error) {
-            return ack;
-        }
         else {
-            const noCloserContactsFound = (closestPeersToDestination.length > 0
-                && (0, getPreviousPeer_1.getPreviousPeer)(routedMessage)
-                && !this.isPeerCloserToIdThanSelf(closestPeersToDestination[0], idToFind));
-            this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, noCloserContactsFound);
+            const ack = this.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.FIND, excludedPeer);
+            if ((ack.error === undefined) || (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS)) {
+                const noCloserContactsFound = (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS) ||
+                    (closestPeersToDestination.length > 0
+                        && (0, getPreviousPeer_1.getPreviousPeer)(routedMessage)
+                        && !this.isPeerCloserToIdThanSelf(closestPeersToDestination[0], idToFind));
+                this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, noCloserContactsFound);
+            }
+            return ack;
         }
-        return ack;
     }
-    getClosestConnections(kademliaId, limit) {
+    getClosestConnections(nodeId, limit) {
         const connectedPeers = Array.from(this.connections.values());
-        const closestPeers = new SortedContactList_1.SortedContactList(PeerID_1.PeerID.fromValue(kademliaId), limit, undefined, true, undefined);
+        const closestPeers = new SortedContactList_1.SortedContactList({
+            referenceId: PeerID_1.PeerID.fromValue(nodeId),
+            maxSize: limit,
+            allowToContainReferenceId: true,
+            emitEvents: false
+        });
         closestPeers.addContacts(connectedPeers);
         return closestPeers.getClosestContacts(limit).map((peer) => peer.getPeerDescriptor());
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Finder.js","sourceRoot":"","sources":["../../../../src/dht/find/Finder.ts"],"names":[],"mappings":";;;AAAA,mEAS+C;AAC/C,iDAAwD;AACxD,8CAA0D;AAC1D,8DAAuD;AACvD,qFAA0G;AAC1G,0CAA6D;AAE7D,iEAA6D;AAC7D,+BAAyB;AACzB,+CAA8D;AAI9D,uFAAmF;AACnF,iFAAoF;AACpF,kDAAqD;AACrD,oEAAgE;AAChE,gEAA4D;AAC5D,8DAAiE;AAEjE,iDAA6C;AAoB7C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,MAAM;IAaf,YAAY,MAAoB;QAHxB,oBAAe,GAA6B,IAAI,GAAG,EAAE,CAAA;QACrD,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;QAC7C,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;QAC/C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAA;QACrD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAA;QAC3C,IAAI,CAAC,wBAAwB,GAAG,MAAM,CAAC,wBAAwB,CAAA;QAC/D,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAEO,uBAAuB,CAAC,MAAoB;QAChD,MAAM,QAAQ,GAAG,IAAI,2BAAY,CAAC;YAC9B,kBAAkB,EAAE,CAAC,aAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC;YAClG,UAAU,EAAE,CAAC,OAAuB,EAAE,SAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC;YACnG,qBAAqB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC;YAC1F,sBAAsB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC;SAC/F,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAClC,4BAAmB,EACnB,wBAAe,EACf,kBAAkB,EAClB,KAAK,EAAE,aAAkC,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,2CAA2C,CAAC,CAAA;aAC3F;iBAAM;gBACH,OAAO,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;aAClD;QACL,CAAC,CACJ,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,QAAoB,EACpB,YAAqB,KAAK,EAC1B,YAA6B;QAE7B,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAAA;SAC9B;QACD,MAAM,SAAS,GAAG,IAAA,SAAE,GAAE,CAAA;QACtB,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC;YAC5B,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,gBAAgB,EAAE,QAAQ;YAC1B,WAAW,EAAE,IAAA,mDAAwB,EAAC,IAAI,CAAC,mBAAmB,CAAC;YAC/D,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,SAAS;SACZ,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YACrE,OAAO,CAAC,kBAAkB,CACtB,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAC1B,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAC1B,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EACrC,IAAI,CACP,CAAA;YACD,OAAO,OAAO,CAAC,UAAU,EAAE,CAAA;SAC9B;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QACzE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC5C,IAAI;YACA,MAAM,IAAA,4BAAoB,EACtB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,EAC3D,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAC5B,KAAK,CACR,CAAA;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;SAC9D;QACD,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;QACzF,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACtC,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,OAAO,OAAO,CAAC,UAAU,EAAE,CAAA;IAC/B,CAAC;IAEO,eAAe,CAAC,QAAoB,EAAE,SAAiB,EAAE,SAAkB;QAC/E,MAAM,gBAAgB,GAAmB;YACrC,UAAU,EAAE,QAAQ;YACpB,IAAI,EAAE,iBAAQ,CAAC,OAAO;SACzB,CAAA;QACD,MAAM,OAAO,GAAgB;YACzB,SAAS;YACT,SAAS;SACZ,CAAA;QACD,MAAM,GAAG,GAAY;YACjB,WAAW,EAAE,oBAAW,CAAC,YAAY;YACrC,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;gBACxB,WAAW,EAAE,OAAO;aACvB;SACJ,CAAA;QACD,MAAM,YAAY,GAAwB;YACtC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,eAAe,EAAE,gBAAgB;YACjC,UAAU,EAAE,IAAI,CAAC,mBAAmB;YACpC,gBAAgB,EAAE,EAAE;YACpB,WAAW,EAAE,EAAE;SAClB,CAAA;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAEO,sBAAsB,CAC1B,QAAoB,EACpB,SAAkB,EAClB,WAA6B,EAC7B,UAA0B,EAC1B,SAAiB;QAEjB,IAAI,SAAS,EAAE;YACX,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YACrE,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE;gBACf,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACzE,OAAO,IAAI,CAAA;aACd;SACJ;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEO,aAAa,CAAC,QAAoB,EAAE,SAAkB;QAC1D,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;SAClE;QACD,OAAO,SAAS,CAAA;IACpB,CAAC;IAEO,gBAAgB,CACpB,WAA6B,EAC7B,oBAAoC,EACpC,SAAoB,EACpB,YAA8B,EAC9B,IAA2C,EAC3C,qBAA8B,KAAK;QAEnC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3F,MAAM,SAAS,GAAG,IAAA,kDAAuB,EAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;QACzF,IAAI,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAClD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAE;iBAC/B,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;SACtF;aAAM;YACH,MAAM,kBAAkB,GAAG,IAAI,mDAAwB,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAA;YACvH,MAAM,SAAS,GAAG,IAAI,2CAAoB,CACtC,IAAI,CAAC,mBAAmB,EACxB,oBAAoB,EACpB,SAAS,EACT,IAAA,4BAAgB,EAAC,IAAI,oCAAoB,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC,CAAC,EACtF,KAAK,CACR,CAAA;YACD,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;YACtF,kBAAkB,CAAC,OAAO,EAAE,CAAA;SAC/B;IACL,CAAC;IAEO,kBAAkB,CAAC,aAAkC,EAAE,YAA6B;QACxF,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,iBAAiB,CAAC,CAAA;SACjE;QACD,MAAM,QAAQ,GAAG,IAAA,mDAAwB,EAAC,aAAa,CAAC,eAAgB,CAAC,CAAA;QACzE,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAA;QACjC,MAAM,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;QAC5F,MAAM,yBAAyB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,eAAgB,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;QAC1G,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAY,CAAC,SAAS,CAAC,CAAA;QACvE,IAAI,IAAA,kDAAuB,EAAC,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,eAAgB,CAAC,EAAE;YACnF,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,UAAW,EAAE,WAAY,CAAC,SAAS,EAC9F,yBAAyB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YAC1C,OAAO,IAAA,sCAAqB,EAAC,aAAa,CAAC,CAAA;SAC9C;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,4BAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QACrF,IAAI,GAAG,CAAC,KAAK,KAAK,sBAAa,CAAC,mBAAmB,EAAE;YACjD,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAA;YACzD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,UAAW,EAAE,WAAY,CAAC,SAAS,EAC9F,yBAAyB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;SAC7C;aAAM,IAAI,GAAG,CAAC,KAAK,EAAE;YAClB,OAAO,GAAG,CAAA;SACb;aAAM;YACH,MAAM,qBAAqB,GAAG,CAC1B,yBAAyB,CAAC,MAAM,GAAG,CAAC;mBACjC,IAAA,iCAAe,EAAC,aAAa,CAAC;mBAC9B,CAAC,IAAI,CAAC,wBAAwB,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAC5E,CAAA;YACD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,UAAW,EAAE,WAAY,CAAC,SAAS,EAC9F,yBAAyB,EAAE,IAAI,EAAE,qBAAqB,CAAC,CAAA;SAC9D;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IAEO,qBAAqB,CAAC,UAAsB,EAAE,KAAa;QAC/D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAG,IAAI,qCAAiB,CACtC,eAAM,CAAC,SAAS,CAAC,UAAU,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,CACZ,CAAA;QACD,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;QACxC,OAAO,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;IACzF,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YAC1C,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AA/ND,wBA+NC"}
+{"version":3,"file":"Finder.js","sourceRoot":"","sources":["../../../../src/dht/find/Finder.ts"],"names":[],"mappings":";;;AAAA,mEAW+C;AAC/C,iDAAwD;AAExD,8DAAuD;AACvD,qFAA0G;AAC1G,0CAAmE;AAEnE,iEAA6D;AAC7D,+BAAyB;AACzB,+CAA8D;AAI9D,uFAAmF;AACnF,iFAAoF;AACpF,kDAAqD;AACrD,oEAAgE;AAChE,gEAA4D;AAC5D,8DAAiE;AAEjE,iDAA6C;AAoB7C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,MAAM;IAaf,YAAY,MAAoB;QAHxB,oBAAe,GAA6B,IAAI,GAAG,EAAE,CAAA;QACrD,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;QAC7C,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;QAC/C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAA;QACrD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAA;QAC3C,IAAI,CAAC,wBAAwB,GAAG,MAAM,CAAC,wBAAwB,CAAA;QAC/D,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAEO,uBAAuB,CAAC,MAAoB;QAChD,MAAM,QAAQ,GAAG,IAAI,2BAAY,CAAC;YAC9B,kBAAkB,EAAE,CAAC,aAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC;YAClG,UAAU,EAAE,CAAC,OAAuB,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;YACnE,qBAAqB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC;YAC1F,sBAAsB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC;SAC/F,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAClC,4BAAmB,EACnB,wBAAe,EACf,kBAAkB,EAClB,KAAK,EAAE,aAAkC,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAA;aACzE;iBAAM;gBACH,OAAO,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;aAClD;QACL,CAAC,CACJ,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,QAAoB,EACpB,SAAqB,mBAAU,CAAC,IAAI,EACpC,YAA6B,EAC7B,iBAAiB,GAAG,IAAI;QAExB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAAA;SAC9B;QACD,MAAM,SAAS,GAAG,IAAA,SAAE,GAAE,CAAA;QACtB,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC;YAC5B,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,YAAY,EAAE,QAAQ;YACtB,WAAW,EAAE,IAAA,mDAAwB,EAAC,IAAI,CAAC,mBAAmB,CAAC;YAC/D,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,MAAM;SACT,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YACrE,OAAO,CAAC,kBAAkB,CACtB,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAC1B,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAC1B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EACzB,IAAI,CACP,CAAA;YACD,OAAO,OAAO,CAAC,UAAU,EAAE,CAAA;SAC9B;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QACtE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC5C,IAAI,iBAAiB,KAAK,IAAI,EAAE;YAC5B,IAAI;gBACA,MAAM,IAAA,4BAAoB,EACtB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,EAC3D,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAC5B,KAAK,CACR,CAAA;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;aAC9D;SACJ;aAAM;YACH,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;YACnD,yDAAyD;YACzD,kEAAkE;YAClE,MAAM,IAAA,YAAI,EAAC,EAAE,CAAC,CAAA;SACjB;QACD,IAAI,MAAM,KAAK,mBAAU,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;SACjF;aAAM,IAAI,MAAM,KAAK,mBAAU,CAAC,WAAW,EAAE;YAC1C,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAA,mDAAwB,EAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAA;SAClG;QACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACtC,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,OAAO,OAAO,CAAC,UAAU,EAAE,CAAA;IAC/B,CAAC;IAEO,eAAe,CAAC,QAAoB,EAAE,SAAiB,EAAE,MAAkB;QAC/E,MAAM,gBAAgB,GAAmB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,iBAAQ,CAAC,OAAO;SACzB,CAAA;QACD,MAAM,OAAO,GAAgB;YACzB,SAAS;YACT,MAAM;SACT,CAAA;QACD,MAAM,GAAG,GAAY;YACjB,WAAW,EAAE,oBAAW,CAAC,YAAY;YACrC,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;gBACxB,WAAW,EAAE,OAAO;aACvB;SACJ,CAAA;QACD,MAAM,YAAY,GAAwB;YACtC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,eAAe,EAAE,gBAAgB;YACjC,UAAU,EAAE,IAAI,CAAC,mBAAmB;YACpC,gBAAgB,EAAE,EAAE;YACpB,WAAW,EAAE,EAAE;SAClB,CAAA;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAEO,sBAAsB,CAC1B,QAAoB,EACpB,WAA6B,EAC7B,UAA0B,EAC1B,SAAiB;QAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QACrE,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE;YACf,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;SAC5E;IACL,CAAC;IAEO,aAAa,CAAC,QAAoB,EAAE,SAAkB;QAC1D,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;SAClE;QACD,OAAO,SAAS,CAAA;IACpB,CAAC;IAEO,gBAAgB,CACpB,WAA6B,EAC7B,oBAAoC,EACpC,SAAoB,EACpB,YAA8B,EAC9B,IAA2C,EAC3C,qBAA8B,KAAK;QAEnC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3F,MAAM,SAAS,GAAG,IAAA,kDAAuB,EAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;QACzF,IAAI,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAClD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAE;iBAC/B,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;SACtF;aAAM;YACH,MAAM,kBAAkB,GAAG,IAAI,mDAAwB,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAA;YACvH,MAAM,SAAS,GAAG,IAAI,2CAAoB,CACtC,IAAI,CAAC,mBAAmB,EACxB,oBAAoB,EACpB,SAAS,EACT,IAAA,4BAAgB,EAAC,IAAI,oCAAoB,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC,CAAC,EACtF,KAAK,CACR,CAAA;YACD,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;YACtF,kBAAkB,CAAC,OAAO,EAAE,CAAA;SAC/B;IACL,CAAC;IAEO,kBAAkB,CAAC,aAAkC,EAAE,YAA6B;QACxF,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAA;SACzE;QACD,MAAM,QAAQ,GAAG,IAAA,mDAAwB,EAAC,aAAa,CAAC,eAAgB,CAAC,CAAA;QACzE,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAA;QACjC,MAAM,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;QAC5F,MAAM,yBAAyB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,eAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QACtG,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAY,CAAC,MAAM,KAAK,mBAAU,CAAC,UAAU,CAAC,CAAA;QAC9F,IAAI,WAAY,CAAC,MAAM,KAAK,mBAAU,CAAC,WAAW,EAAE;YAChD,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAA,mDAAwB,EAAC,aAAa,CAAC,UAAW,CAAC,CAAC,CAAA;SACzG;QACD,IAAI,IAAA,kDAAuB,EAAC,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,eAAgB,CAAC,EAAE;YACnF,gGAAgG;YAChG,IAAI,CAAC,gBAAgB,CACjB,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,UAAW,EACzB,WAAY,CAAC,SAAS,EACtB,yBAAyB,EACzB,IAAI,EACJ,IAAI,CACP,CAAA;YACD,OAAO,IAAA,sCAAqB,EAAC,aAAa,CAAC,CAAA;SAC9C;aAAM;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,4BAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;YACrF,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,0BAAiB,CAAC,UAAU,CAAC,EAAE;gBAC3E,MAAM,qBAAqB,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,0BAAiB,CAAC,UAAU,CAAC;oBACtE,CACI,yBAAyB,CAAC,MAAM,GAAG,CAAC;2BACjC,IAAA,iCAAe,EAAC,aAAa,CAAC;2BAC9B,CAAC,IAAI,CAAC,wBAAwB,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAC5E,CAAA;gBACL,IAAI,CAAC,gBAAgB,CACjB,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,UAAW,EACzB,WAAY,CAAC,SAAS,EACtB,yBAAyB,EACzB,IAAI,EACJ,qBAAqB,CACxB,CAAA;aACJ;YACD,OAAO,GAAG,CAAA;SACb;IACL,CAAC;IAEO,qBAAqB,CAAC,MAAkB,EAAE,KAAa;QAC3D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAG,IAAI,qCAAiB,CAAmB;YACzD,WAAW,EAAE,eAAM,CAAC,SAAS,CAAC,MAAM,CAAC;YACrC,OAAO,EAAE,KAAK;YACd,yBAAyB,EAAE,IAAI;YAC/B,UAAU,EAAE,KAAK;SACpB,CAAC,CAAA;QACF,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;QACxC,OAAO,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;IACzF,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YAC1C,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AAjPD,wBAiPC"}

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

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

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

@@ -3,11 +3,11 @@ 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 RpcRemote_1 = require("../contact/RpcRemote");
 const utils_1 = require("@streamr/utils");
 const getPreviousPeer_1 = require("./getPreviousPeer");
 const logger = new utils_1.Logger(module);
-class FindRpcRemote extends Remote_1.Remote {
+class FindRpcRemote extends RpcRemote_1.RpcRemote {
     async routeFindRequest(params) {
         const message = {
             destinationPeer: params.destinationPeer,
@@ -17,11 +17,13 @@ class FindRpcRemote extends Remote_1.Remote {
             reachableThrough: params.reachableThrough ?? [],
             routingPath: params.routingPath
         };
-        const options = this.formDhtRpcOptions();
+        const options = this.formDhtRpcOptions({
+            doNotConnect: true
+        });
         try {
             const ack = await this.getClient().routeFindRequest(message, options);
-            if (ack.error.length > 0) {
-                logger.debug('Next hop responded with error ' + ack.error);
+            if (ack.error !== undefined) {
+                logger.trace('Next hop responded with error ' + ack.error);
                 return false;
             }
         }

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

@@ -1 +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"}
+{"version":3,"file":"FindRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/FindRpcRemote.ts"],"names":[],"mappings":";;;AACA,+BAAyB;AACzB,qFAAoF;AACpF,oDAAgD;AAChD,0CAAuC;AAEvC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,aAAc,SAAQ,qBAAyB;IAExD,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,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACrE,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;gBACzB,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;AA/BD,sCA+BC"}

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

@@ -5,10 +5,6 @@ import { PeerIDKey } from '../../helpers/PeerID';
 import { ConnectionManager } from '../../connection/ConnectionManager';
 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;
     localPeerDescriptor: PeerDescriptor;
@@ -20,7 +16,7 @@ export interface RouterConfig {
 }
 export interface IRouter {
     doRouteMessage(routedMessage: RouteMessageWrapper, mode: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
-    send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
+    send(msg: Message, reachableThrough: PeerDescriptor[]): void;
     isMostLikelyDuplicate(requestId: string): boolean;
     addToDuplicateDetector(requestId: string): void;
     addRoutingSession(session: RoutingSession): void;
@@ -38,8 +34,8 @@ export declare class Router implements IRouter {
     private stopped;
     constructor(config: RouterConfig);
     private registerLocalRpcMethods;
-    send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
-    doRouteMessage(routedMessage: RouteMessageWrapper, mode?: RoutingMode): RouteMessageAck;
+    send(msg: Message, reachableThrough: PeerDescriptor[]): void;
+    doRouteMessage(routedMessage: RouteMessageWrapper, mode?: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
     private createRoutingSession;
     isMostLikelyDuplicate(requestId: string): boolean;
     addToDuplicateDetector(requestId: string): void;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = exports.RoutingErrors = void 0;
+exports.Router = void 0;
 const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const RoutingSession_1 = require("./RoutingSession");
@@ -8,11 +8,6 @@ const utils_1 = require("@streamr/utils");
 const DuplicateDetector_1 = require("./DuplicateDetector");
 const uuid_1 = require("uuid");
 const RouterRpcLocal_1 = require("./RouterRpcLocal");
-var RoutingErrors;
-(function (RoutingErrors) {
-    RoutingErrors["NO_CANDIDATES_FOUND"] = "No routing candidates found";
-    RoutingErrors["STOPPED"] = "DhtNode Stopped";
-})(RoutingErrors || (exports.RoutingErrors = RoutingErrors = {}));
 const logger = new utils_1.Logger(module);
 class Router {
     constructor(config) {
@@ -37,18 +32,18 @@ class Router {
         });
         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 (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
             }
             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 (0, RouterRpcLocal_1.createRouteMessageAck)(forwardMessage, DhtRpc_1.RouteMessageError.STOPPED);
             }
             return rpcLocal.forwardMessage(forwardMessage);
         });
     }
-    async send(msg, reachableThrough) {
+    send(msg, reachableThrough) {
         msg.sourceDescriptor = this.localPeerDescriptor;
         const targetPeerDescriptor = msg.targetDescriptor;
         const forwardingEntry = this.forwardingTable.get((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor));
@@ -62,7 +57,12 @@ class Router {
                 reachableThrough,
                 routingPath: []
             };
-            this.doRouteMessage(forwardedMessage, RoutingSession_1.RoutingMode.FORWARD);
+            const ack = this.doRouteMessage(forwardedMessage, RoutingSession_1.RoutingMode.FORWARD);
+            if (ack.error !== undefined) {
+                const error = 'Could not forward message with error ' + ack.error;
+                logger.debug(error);
+                throw new Error(error);
+            }
         }
         else {
             const routedMessage = {
@@ -73,22 +73,28 @@ class Router {
                 reachableThrough,
                 routingPath: []
             };
-            this.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.ROUTE);
+            const ack = this.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.ROUTE);
+            if (ack.error !== undefined) {
+                const error = 'Could not route message with error ' + ack.error;
+                logger.debug(error);
+                throw new Error(error);
+            }
         }
     }
-    doRouteMessage(routedMessage, mode = RoutingSession_1.RoutingMode.ROUTE) {
+    doRouteMessage(routedMessage, mode = RoutingSession_1.RoutingMode.ROUTE, excludedPeer) {
         if (this.stopped) {
-            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, RoutingErrors.STOPPED);
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.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();
+        const session = this.createRoutingSession(routedMessage, mode, excludedPeer);
+        const contacts = session.updateAndGetRoutablePeers();
         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;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             (0, utils_1.executeSafePromise)(async () => {
                 eventReceived = (0, utils_1.raceEvents3)(session, ['routingSucceeded', 'partialSuccess', 'routingFailed', 'stopped'], null);
             });
@@ -107,16 +113,17 @@ class Router {
             return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
         }
         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)}`);
-            }
-            logger.trace('noCandidatesFound sessionId: ' + session.sessionId);
-            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, RoutingErrors.NO_CANDIDATES_FOUND);
+            logger.trace('no targets', { sessionId: session.sessionId });
+            return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.NO_TARGETS);
         }
     }
-    createRoutingSession(routedMessage, mode) {
+    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.localPeerDescriptor, routedMessage, this.connections, (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1, mode, routedMessage.routingPath.map((descriptor) => (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(descriptor)));
+        return new RoutingSession_1.RoutingSession(this.rpcCommunicator, this.localPeerDescriptor, routedMessage, this.connections, (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1, mode, excludedPeers);
     }
     isMostLikelyDuplicate(requestId) {
         return this.duplicateRequestDetector.isMostLikelyDuplicate(requestId);

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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"}