@streamr/dht 100.0.0-pretestnet.4 → 100.0.0-rc.0

package/dist/src/dht/recursive-operation/RecursiveOperationSession.js

@@ -0,0 +1,187 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecursiveOperationSession = void 0;
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const uuid_1 = require("uuid");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
+const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
+const Contact_1 = require("../contact/Contact");
+const SortedContactList_1 = require("../contact/SortedContactList");
+const RecursiveOperationSessionRpcLocal_1 = require("./RecursiveOperationSessionRpcLocal");
+const identifiers_1 = require("../../identifiers");
+class RecursiveOperationSession extends eventemitter3_1.default {
+    id = (0, uuid_1.v4)();
+    rpcCommunicator;
+    results;
+    foundData = new Map();
+    allKnownHops = new Set();
+    reportedHops = new Set();
+    timeoutTask;
+    completionEventEmitted = false;
+    noCloserNodesReceivedCounter = 0;
+    noCloserNodesReceivedFrom = new Set();
+    config;
+    constructor(config) {
+        super();
+        this.config = config;
+        this.results = new SortedContactList_1.SortedContactList({
+            referenceId: config.targetId,
+            maxSize: 10, // TODO use config option or named constant?
+            allowToContainReferenceId: true,
+            emitEvents: false
+        });
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.id, config.transport, {
+            rpcRequestTimeout: 15000 // TODO use config option or named constant?
+        });
+        this.registerLocalRpcMethods();
+    }
+    registerLocalRpcMethods() {
+        const rpcLocal = new RecursiveOperationSessionRpcLocal_1.RecursiveOperationSessionRpcLocal({
+            onResponseReceived: (sourceId, routingPath, nodes, dataEntries, noCloserNodesFound) => {
+                this.onResponseReceived(sourceId, routingPath, nodes, dataEntries, noCloserNodesFound);
+            }
+        });
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RecursiveOperationResponse, 'sendResponse', (req, context) => rpcLocal.sendResponse(req, context));
+    }
+    start(serviceId) {
+        const routeMessage = this.wrapRequest(serviceId);
+        this.config.doRouteRequest(routeMessage);
+    }
+    wrapRequest(serviceId) {
+        const request = {
+            sessionId: this.getId(),
+            operation: this.config.operation
+        };
+        const msg = {
+            messageId: (0, uuid_1.v4)(),
+            serviceId,
+            body: {
+                oneofKind: 'recursiveOperationRequest',
+                recursiveOperationRequest: request
+            }
+        };
+        const routeMessage = {
+            message: msg,
+            requestId: (0, uuid_1.v4)(),
+            target: (0, identifiers_1.getRawFromDhtAddress)(this.config.targetId),
+            sourcePeer: this.config.localPeerDescriptor,
+            reachableThrough: [],
+            routingPath: [],
+            parallelRootNodeIds: []
+        };
+        return routeMessage;
+    }
+    isCompleted() {
+        const unreportedHops = new Set(this.allKnownHops);
+        this.reportedHops.forEach((id) => {
+            unreportedHops.delete(id);
+        });
+        if (this.noCloserNodesReceivedCounter >= 1 && unreportedHops.size === 0) {
+            if (this.config.operation === DhtRpc_1.RecursiveOperation.FETCH_DATA
+                && (this.hasNonStaleData() || this.noCloserNodesReceivedCounter >= this.config.waitedRoutingPathCompletions)) {
+                return true;
+            }
+            else if (this.config.operation === DhtRpc_1.RecursiveOperation.FETCH_DATA) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+    hasNonStaleData() {
+        return Array.from(this.foundData.values()).some((entry) => entry.stale === false);
+    }
+    onResponseReceived(sourceId, routingPath, nodes, dataEntries, noCloserNodesFound) {
+        this.addKnownHops(routingPath);
+        if (routingPath.length >= 1) {
+            this.setHopAsReported(routingPath[routingPath.length - 1]);
+        }
+        nodes.forEach((descriptor) => {
+            this.results.addContact(new Contact_1.Contact(descriptor));
+        });
+        this.processFoundData(dataEntries);
+        if (noCloserNodesFound || this.noCloserNodesReceivedFrom.has(sourceId)) {
+            this.onNoCloserPeersFound(sourceId);
+        }
+    }
+    addKnownHops(routingPath) {
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
+        routingPath.forEach((desc) => {
+            const newNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(desc);
+            if (localNodeId !== newNodeId) {
+                this.allKnownHops.add(newNodeId);
+            }
+        });
+    }
+    setHopAsReported(desc) {
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
+        const newNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(desc);
+        if (localNodeId !== newNodeId) {
+            this.reportedHops.add(newNodeId);
+        }
+        if (this.isCompleted()) {
+            if (!this.completionEventEmitted && this.isCompleted()) {
+                if (this.timeoutTask) {
+                    clearTimeout(this.timeoutTask);
+                    this.timeoutTask = undefined;
+                }
+                this.emit('completed');
+                this.completionEventEmitted = true;
+            }
+        }
+    }
+    processFoundData(dataEntries) {
+        dataEntries.forEach((entry) => {
+            const creatorNodeId = (0, identifiers_1.getDhtAddressFromRaw)(entry.creator);
+            const existingEntry = this.foundData.get(creatorNodeId);
+            if (!existingEntry || existingEntry.createdAt < entry.createdAt
+                || (existingEntry.createdAt <= entry.createdAt && entry.deleted)) {
+                this.foundData.set(creatorNodeId, entry);
+            }
+        });
+    }
+    onNoCloserPeersFound(sourceId) {
+        this.noCloserNodesReceivedCounter += 1;
+        this.noCloserNodesReceivedFrom.add(sourceId);
+        if (this.isCompleted()) {
+            this.emit('completed');
+            this.completionEventEmitted = true;
+            if (this.timeoutTask) {
+                clearTimeout(this.timeoutTask);
+                this.timeoutTask = undefined;
+            }
+        }
+        else {
+            if (!this.timeoutTask && !this.completionEventEmitted) {
+                this.timeoutTask = setTimeout(() => {
+                    if (!this.completionEventEmitted) {
+                        this.emit('completed');
+                        this.completionEventEmitted = true;
+                    }
+                }, 4000); // TODO use config option or named constant?
+            }
+        }
+    }
+    getResults() {
+        return {
+            closestNodes: this.results.getAllContacts().map((contact) => contact.getPeerDescriptor()),
+            dataEntries: Array.from(this.foundData.values())
+        };
+    }
+    getId() {
+        return this.id;
+    }
+    stop() {
+        if (this.timeoutTask) {
+            clearTimeout(this.timeoutTask);
+            this.timeoutTask = undefined;
+        }
+        this.rpcCommunicator.destroy();
+        this.emit('completed');
+    }
+}
+exports.RecursiveOperationSession = RecursiveOperationSession;
+//# sourceMappingURL=RecursiveOperationSession.js.map

package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,+BAAyB;AACzB,mEAS+C;AAE/C,uFAAmF;AACnF,gDAA4C;AAC5C,oEAAgE;AAGhE,2FAAuF;AACvF,mDAAuH;AAgBvH,MAAa,yBAA0B,SAAQ,uBAA6C;IAEvE,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACT,eAAe,CAA0B;IAClD,OAAO,CAA4B;IACnC,SAAS,GAA+B,IAAI,GAAG,EAAE,CAAA;IACjD,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,WAAW,CAAiB;IAC5B,sBAAsB,GAAG,KAAK,CAAA;IAC9B,4BAA4B,GAAG,CAAC,CAAA;IACvB,yBAAyB,GAAoB,IAAI,GAAG,EAAE,CAAA;IACtD,MAAM,CAAiC;IAExD,YAAY,MAAuC;QAC/C,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,IAAI,qCAAiB,CAAC;YACjC,WAAW,EAAE,MAAM,CAAC,QAAQ;YAC5B,OAAO,EAAE,EAAE,EAAG,4CAA4C;YAC1D,yBAAyB,EAAE,IAAI;YAC/B,UAAU,EAAE,KAAK;SACpB,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE;YAC3E,iBAAiB,EAAE,KAAK,CAAE,4CAA4C;SACzE,CAAC,CAAA;QACF,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,IAAI,qEAAiC,CAAC;YACnD,kBAAkB,EAAE,CAChB,QAAoB,EACpB,WAA6B,EAC7B,KAAuB,EACvB,WAAwB,EACxB,kBAA2B,EAC7B,EAAE;gBACA,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;YAC1F,CAAC;SACJ,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,mCAA0B,EAAE,cAAc,EACnF,CAAC,GAA+B,EAAE,OAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC7G,CAAC;IAEM,KAAK,CAAC,SAAoB;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;IAC5C,CAAC;IAEO,WAAW,CAAC,SAAoB;QACpC,MAAM,OAAO,GAA8B;YACvC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE;YACvB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;SACnC,CAAA;QACD,MAAM,GAAG,GAAY;YACjB,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,SAAS;YACT,IAAI,EAAE;gBACF,SAAS,EAAE,2BAA2B;gBACtC,yBAAyB,EAAE,OAAO;aACrC;SACJ,CAAA;QACD,MAAM,YAAY,GAAwB;YACtC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,MAAM,EAAE,IAAA,kCAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YAClD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YAC3C,gBAAgB,EAAE,EAAE;YACpB,WAAW,EAAE,EAAE;YACf,mBAAmB,EAAE,EAAE;SAC1B,CAAA;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAEO,WAAW;QACf,MAAM,cAAc,GAAoB,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAClE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7B,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,4BAA4B,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU;mBACpD,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,IAAI,CAAC,4BAA4B,IAAI,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,EAAE,CAAC;gBAC/G,OAAO,IAAI,CAAA;YACf,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU,EAAE,CAAC;gBACjE,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEO,eAAe;QACnB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;IACrF,CAAC;IAEM,kBAAkB,CACrB,QAAoB,EACpB,WAA6B,EAC7B,KAAuB,EACvB,WAAwB,EACxB,kBAA2B;QAE3B,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QAC9B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAC9D,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,CAAC,UAA0B,EAAE,EAAE;YACzC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QAClC,IAAI,kBAAkB,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAA;QACvC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,WAA6B;QAC9C,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAChF,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,CAAA;YACnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACpC,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,gBAAgB,CAAC,IAAoB;QACzC,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAChF,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,CAAA;QACnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;gBAChC,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,WAAwB;QAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACzD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YACvD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,SAAU,GAAG,KAAK,CAAC,SAAU;mBAC1D,CAAC,aAAa,CAAC,SAAU,IAAI,KAAK,CAAC,SAAU,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YAC5C,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,oBAAoB,CAAC,QAAoB;QAC7C,IAAI,CAAC,4BAA4B,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC5C,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;YAClC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;YAChC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBACpD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC/B,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;wBACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;oBACtC,CAAC;gBACL,CAAC,EAAE,IAAI,CAAC,CAAA,CAAE,4CAA4C;YAC1D,CAAC;QACL,CAAC;IACL,CAAC;IAEM,UAAU;QACb,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YACzF,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;SACnD,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,EAAE,CAAA;IAClB,CAAC;IAEM,IAAI;QACP,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAChC,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC1B,CAAC;CACJ;AApMD,8DAoMC"}

package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.d.ts

@@ -0,0 +1,14 @@
+import { IRecursiveOperationSessionRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { Empty } from '../../proto/google/protobuf/empty';
+import { DataEntry, RecursiveOperationResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { DhtAddress } from '../../identifiers';
+interface RecursiveOperationSessionRpcLocalConfig {
+    onResponseReceived: (sourceId: DhtAddress, routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean) => void;
+}
+export declare class RecursiveOperationSessionRpcLocal implements IRecursiveOperationSessionRpc {
+    private readonly config;
+    constructor(config: RecursiveOperationSessionRpcLocalConfig);
+    sendResponse(report: RecursiveOperationResponse, context: ServerCallContext): Promise<Empty>;
+}
+export {};

package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecursiveOperationSessionRpcLocal = void 0;
+const utils_1 = require("@streamr/utils");
+const identifiers_1 = require("../../identifiers");
+const logger = new utils_1.Logger(module);
+class RecursiveOperationSessionRpcLocal {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    async sendResponse(report, context) {
+        const sourceId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(context.incomingSourceDescriptor);
+        logger.trace('RecursiveOperationResponse arrived: ' + JSON.stringify(report));
+        this.config.onResponseReceived(sourceId, report.routingPath, report.closestConnectedPeers, report.dataEntries, report.noCloserNodesFound);
+        return {};
+    }
+}
+exports.RecursiveOperationSessionRpcLocal = RecursiveOperationSessionRpcLocal;
+//# sourceMappingURL=RecursiveOperationSessionRpcLocal.js.map

package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecursiveOperationSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAGvC,mDAA2E;AAE3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAYjC,MAAa,iCAAiC;IAEzB,MAAM,CAAyC;IAEhE,YAAY,MAA+C;QACvD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAkC,EAAE,OAA0B;QAC7E,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACnG,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7E,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACzI,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAdD,8EAcC"}

package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.d.ts

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

package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecursiveOperationSessionRpcRemote = void 0;
+const utils_1 = require("@streamr/utils");
+const RpcRemote_1 = require("../contact/RpcRemote");
+const logger = new utils_1.Logger(module);
+class RecursiveOperationSessionRpcRemote extends RpcRemote_1.RpcRemote {
+    sendResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound) {
+        const report = {
+            routingPath,
+            closestConnectedPeers: closestNodes,
+            dataEntries,
+            noCloserNodesFound
+        };
+        this.getClient().sendResponse(report, this.formDhtRpcOptions()).catch((_e) => {
+            logger.trace('Failed to send RecursiveOperationResponse');
+        });
+    }
+}
+exports.RecursiveOperationSessionRpcRemote = RecursiveOperationSessionRpcRemote;
+//# sourceMappingURL=RecursiveOperationSessionRpcRemote.js.map

package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecursiveOperationSessionRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAOvC,oDAAgD;AAEhD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,kCAAmC,SAAQ,qBAA6C;IAEjG,YAAY,CACR,WAA6B,EAC7B,YAA8B,EAC9B,WAAwB,EACxB,kBAA2B;QAE3B,MAAM,MAAM,GAA+B;YACvC,WAAW;YACX,qBAAqB,EAAE,YAAY;YACnC,WAAW;YACX,kBAAkB;SACrB,CAAA;QACD,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACzE,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAlBD,gFAkBC"}

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

@@ -1,12 +1,10 @@
 export declare class DuplicateDetector {
     private values;
     private queue;
-    private maxAge;
-    private maxNumberOfValues;
-    constructor(maxNumberOfValues: number, maxAgeInSeconds: number);
+    private maxItemCount;
+    constructor(maxItemCount: number);
     add(value: string): void;
     isMostLikelyDuplicate(value: string): boolean;
-    private cleanUp;
     size(): number;
     clear(): void;
 }

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

@@ -2,28 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuplicateDetector = void 0;
 class DuplicateDetector {
-    constructor(maxNumberOfValues, maxAgeInSeconds) {
-        this.values = new Set();
-        this.queue = [];
-        this.maxNumberOfValues = maxNumberOfValues;
-        this.maxAge = maxAgeInSeconds * 1000;
+    values = new Set();
+    queue = [];
+    maxItemCount;
+    constructor(maxItemCount) {
+        this.maxItemCount = maxItemCount;
     }
     add(value) {
         this.values.add(value);
-        this.queue.push([Date.now(), value]);
-        this.cleanUp();
+        this.queue.push(value);
+        if (this.queue.length > this.maxItemCount) {
+            const removed = this.queue.shift();
+            this.values.delete(removed);
+        }
     }
     isMostLikelyDuplicate(value) {
         return this.values.has(value);
     }
-    cleanUp() {
-        const currentTime = Date.now();
-        while (this.queue.length > 0 && (this.queue.length > this.maxNumberOfValues ||
-            (currentTime - this.queue[0][0]) > this.maxAge)) {
-            const oldestEntry = this.queue.shift();
-            this.values.delete(oldestEntry[1]);
-        }
-    }
     size() {
         return this.values.size;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"DuplicateDetector.js","sourceRoot":"","sources":["../../../../src/dht/routing/DuplicateDetector.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;IAO1B,YACI,iBAAyB,EACzB,eAAuB;QAPnB,WAAM,GAAgB,IAAI,GAAG,EAAE,CAAA;QAC/B,UAAK,GAAsB,EAAE,CAAA;QAQjC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,MAAM,GAAG,eAAe,GAAG,IAAI,CAAA;IACxC,CAAC;IAEM,GAAG,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;QACpC,IAAI,CAAC,OAAO,EAAE,CAAA;IAClB,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAEO,OAAO;QACX,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAE9B,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB;YACvE,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE;YACjD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAY,CAAC,CAAC,CAAC,CAAC,CAAA;SACtC;IACL,CAAC;IAEM,IAAI;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;IACnB,CAAC;CACJ;AA3CD,8CA2CC"}
+{"version":3,"file":"DuplicateDetector.js","sourceRoot":"","sources":["../../../../src/dht/routing/DuplicateDetector.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;IAElB,MAAM,GAAgB,IAAI,GAAG,EAAE,CAAA;IAC/B,KAAK,GAAkB,EAAE,CAAA;IACzB,YAAY,CAAQ;IAE5B,YACI,YAAoB;QAEpB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAEM,GAAG,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACtB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,CAAA;YACnC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC;IACL,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAEM,IAAI;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;IACnB,CAAC;CACJ;AAjCD,8CAiCC"}

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

@@ -1,50 +1,34 @@
 import { Message, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
 import { RoutingMode, RoutingSession } from './RoutingSession';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-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"
-}
+import { DhtAddress } from '../../identifiers';
 export interface RouterConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     localPeerDescriptor: PeerDescriptor;
-    connections: Map<PeerIDKey, DhtNodeRpcRemote>;
+    connections: Map<DhtAddress, DhtNodeRpcRemote>;
     addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
-    serviceId: ServiceID;
-    connectionManager?: ConnectionManager;
-    rpcRequestTimeout?: number;
-}
-export interface IRouter {
-    doRouteMessage(routedMessage: RouteMessageWrapper, mode: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
-    send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
-    isMostLikelyDuplicate(requestId: string): boolean;
-    addToDuplicateDetector(requestId: string): void;
-    addRoutingSession(session: RoutingSession): void;
-    removeRoutingSession(sessionId: string): void;
-    stop(): void;
+    handleMessage: (message: Message) => void;
 }
-export declare class Router implements IRouter {
-    private readonly rpcCommunicator;
-    private readonly localPeerDescriptor;
-    private readonly connections;
-    private readonly serviceId;
+export declare class Router {
     private readonly forwardingTable;
+    private readonly routingTablesCache;
     private ongoingRoutingSessions;
     private readonly duplicateRequestDetector;
     private stopped;
+    private readonly config;
     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?: DhtAddress): RouteMessageAck;
     private createRoutingSession;
     isMostLikelyDuplicate(requestId: string): boolean;
     addToDuplicateDetector(requestId: string): void;
     addRoutingSession(session: RoutingSession): void;
     removeRoutingSession(sessionId: string): void;
+    onNodeConnected(peerDescriptor: PeerDescriptor): void;
+    onNodeDisconnected(peerDescriptor: PeerDescriptor): void;
+    resetCache(): void;
     stop(): void;
     private setForwardingEntries;
 }

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

@@ -1,99 +1,108 @@
 "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");
 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 identifiers_1 = require("../../identifiers");
+const RoutingTablesCache_1 = require("./RoutingTablesCache");
 const logger = new utils_1.Logger(module);
 class Router {
+    forwardingTable = new Map();
+    routingTablesCache = new RoutingTablesCache_1.RoutingTablesCache();
+    ongoingRoutingSessions = new Map();
+    // TODO use config option or named constant?
+    duplicateRequestDetector = new DuplicateDetector_1.DuplicateDetector(10000);
+    stopped = false;
+    config;
     constructor(config) {
-        this.forwardingTable = new Map();
-        this.ongoingRoutingSessions = new Map();
-        this.duplicateRequestDetector = new DuplicateDetector_1.DuplicateDetector(100000, 100);
-        this.stopped = false;
-        this.rpcCommunicator = config.rpcCommunicator;
-        this.localPeerDescriptor = config.localPeerDescriptor;
-        this.connections = config.connections;
-        this.serviceId = config.serviceId;
-        this.registerLocalRpcMethods(config);
+        this.config = config;
+        this.registerLocalRpcMethods();
     }
-    registerLocalRpcMethods(config) {
+    registerLocalRpcMethods() {
         const rpcLocal = new RouterRpcLocal_1.RouterRpcLocal({
             doRouteMessage: (routedMessage, mode) => this.doRouteMessage(routedMessage, mode),
-            addContact: (contact, setActive) => config.addContact(contact, setActive),
+            addContact: (contact, setActive) => this.config.addContact(contact, setActive),
             setForwardingEntries: (routedMessage) => this.setForwardingEntries(routedMessage),
             duplicateRequestDetector: this.duplicateRequestDetector,
-            localPeerDescriptor: this.localPeerDescriptor,
-            connectionManager: config.connectionManager
+            localPeerDescriptor: this.config.localPeerDescriptor,
+            handleMessage: this.config.handleMessage
         });
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeMessage', async (routedMessage) => {
+        this.config.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) => {
+        this.config.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) {
-        msg.sourceDescriptor = this.localPeerDescriptor;
+    send(msg, reachableThrough) {
+        msg.sourceDescriptor = this.config.localPeerDescriptor;
         const targetPeerDescriptor = msg.targetDescriptor;
-        const forwardingEntry = this.forwardingTable.get((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor));
+        const forwardingEntry = this.forwardingTable.get((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor));
         if (forwardingEntry && forwardingEntry.peerDescriptors.length > 0) {
-            const forwardingPeer = forwardingEntry.peerDescriptors[0];
             const forwardedMessage = {
                 message: msg,
                 requestId: (0, uuid_1.v4)(),
-                destinationPeer: forwardingPeer,
-                sourcePeer: this.localPeerDescriptor,
+                target: forwardingEntry.peerDescriptors[0].nodeId,
+                sourcePeer: this.config.localPeerDescriptor,
                 reachableThrough,
-                routingPath: []
+                routingPath: [],
+                parallelRootNodeIds: []
             };
-            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 = {
                 message: msg,
                 requestId: (0, uuid_1.v4)(),
-                destinationPeer: targetPeerDescriptor,
-                sourcePeer: this.localPeerDescriptor,
+                target: targetPeerDescriptor.nodeId,
+                sourcePeer: this.config.localPeerDescriptor,
                 reachableThrough,
-                routingPath: []
+                routingPath: [],
+                parallelRootNodeIds: []
             };
-            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();
+        logger.trace(`Routing message ${routedMessage.requestId} from ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer)} `
+            + `to ${(0, identifiers_1.getDhtAddressFromRaw)(routedMessage.target)}`);
+        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);
             });
             setImmediate(async () => {
                 try {
+                    // TODO use config option or named constant?
                     await (0, utils_1.withTimeout)(eventReceived, 10000);
                     logger.trace('raceEvents ended from routingSession: ' + session.sessionId);
                 }
@@ -107,16 +116,30 @@ 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) {
-        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)));
+    createRoutingSession(routedMessage, mode, excludedNode) {
+        const excludedNodeIds = new Set(routedMessage.routingPath.map((descriptor) => (0, identifiers_1.getNodeIdFromPeerDescriptor)(descriptor)));
+        if (excludedNode) {
+            excludedNodeIds.add(excludedNode);
+        }
+        routedMessage.parallelRootNodeIds.forEach((nodeId) => {
+            excludedNodeIds.add(nodeId);
+        });
+        logger.trace('routing session created with connections: ' + this.config.connections.size);
+        return new RoutingSession_1.RoutingSession({
+            rpcCommunicator: this.config.rpcCommunicator,
+            localPeerDescriptor: this.config.localPeerDescriptor,
+            routedMessage,
+            connections: this.config.connections,
+            // TODO use config option or named constant?
+            parallelism: (0, identifiers_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1,
+            mode,
+            excludedNodeIds,
+            routingTablesCache: this.routingTablesCache
+        });
     }
     isMostLikelyDuplicate(requestId) {
         return this.duplicateRequestDetector.isMostLikelyDuplicate(requestId);
@@ -130,6 +153,16 @@ class Router {
     removeRoutingSession(sessionId) {
         this.ongoingRoutingSessions.delete(sessionId);
     }
+    onNodeConnected(peerDescriptor) {
+        const remote = new RoutingSession_1.RoutingRemoteContact(peerDescriptor, this.config.localPeerDescriptor, this.config.rpcCommunicator);
+        this.routingTablesCache.onNodeConnected(remote);
+    }
+    onNodeDisconnected(peerDescriptor) {
+        this.routingTablesCache.onNodeDisconnected((0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
+    }
+    resetCache() {
+        this.routingTablesCache.reset();
+    }
     stop() {
         this.stopped = true;
         this.ongoingRoutingSessions.forEach((session, _id) => {
@@ -141,25 +174,26 @@ class Router {
         });
         this.forwardingTable.clear();
         this.duplicateRequestDetector.clear();
+        this.routingTablesCache.reset();
     }
     setForwardingEntries(routedMessage) {
         const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
-            return !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.localPeerDescriptor);
+            return !(0, identifiers_1.areEqualPeerDescriptors)(peer, this.config.localPeerDescriptor);
         });
         if (reachableThroughWithoutSelf.length > 0) {
-            const sourceKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer);
-            if (this.forwardingTable.has(sourceKey)) {
-                const oldEntry = this.forwardingTable.get(sourceKey);
+            const sourceNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer);
+            if (this.forwardingTable.has(sourceNodeId)) {
+                const oldEntry = this.forwardingTable.get(sourceNodeId);
                 clearTimeout(oldEntry.timeout);
-                this.forwardingTable.delete(sourceKey);
+                this.forwardingTable.delete(sourceNodeId);
             }
             const forwardingEntry = {
                 peerDescriptors: reachableThroughWithoutSelf,
                 timeout: setTimeout(() => {
-                    this.forwardingTable.delete(sourceKey);
-                }, 10000)
+                    this.forwardingTable.delete(sourceNodeId);
+                }, 10000) // TODO use config option or named constant?
             };
-            this.forwardingTable.set(sourceKey, forwardingEntry);
+            this.forwardingTable.set(sourceNodeId, forwardingEntry);
         }
     }
 }