@streamr/dht 100.0.0-testnet-one.3 → 100.0.0-testnet-two.0

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

@@ -1,37 +1,22 @@
 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';
+import { NodeID } from '../../helpers/nodeId';
 export interface RouterConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     localPeerDescriptor: PeerDescriptor;
-    connections: Map<PeerIDKey, DhtNodeRpcRemote>;
+    connections: Map<NodeID, 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[]): void;
-    isMostLikelyDuplicate(requestId: string): boolean;
-    addToDuplicateDetector(requestId: string): void;
-    addRoutingSession(session: RoutingSession): void;
-    removeRoutingSession(sessionId: string): void;
-    stop(): 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 ongoingRoutingSessions;
     private readonly duplicateRequestDetector;
     private stopped;
+    private readonly config;
     constructor(config: RouterConfig);
     private registerLocalRpcMethods;
     send(msg: Message, reachableThrough: PeerDescriptor[]): void;

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

@@ -8,35 +8,34 @@ const utils_1 = require("@streamr/utils");
 const DuplicateDetector_1 = require("./DuplicateDetector");
 const uuid_1 = require("uuid");
 const RouterRpcLocal_1 = require("./RouterRpcLocal");
+const nodeId_1 = require("../../helpers/nodeId");
 const logger = new utils_1.Logger(module);
 class Router {
     constructor(config) {
         this.forwardingTable = new Map();
         this.ongoingRoutingSessions = new Map();
+        // TODO use config option or named constant?
         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,
+            connectionManager: this.config.connectionManager
         });
-        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, 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, DhtRpc_1.RouteMessageError.STOPPED);
             }
@@ -44,16 +43,15 @@ class Router {
         });
     }
     send(msg, reachableThrough) {
-        msg.sourceDescriptor = this.localPeerDescriptor;
+        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, peerIdFromPeerDescriptor_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: []
             };
@@ -68,8 +66,8 @@ class Router {
             const routedMessage = {
                 message: msg,
                 requestId: (0, uuid_1.v4)(),
-                destinationPeer: targetPeerDescriptor,
-                sourcePeer: this.localPeerDescriptor,
+                target: targetPeerDescriptor.nodeId,
+                sourcePeer: this.config.localPeerDescriptor,
                 reachableThrough,
                 routingPath: []
             };
@@ -86,7 +84,7 @@ class Router {
             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)}`);
+            + `to ${(0, nodeId_1.getNodeIdFromBinary)(routedMessage.target)}`);
         const session = this.createRoutingSession(routedMessage, mode, excludedPeer);
         const contacts = session.updateAndGetRoutablePeers();
         if (contacts.length > 0) {
@@ -100,6 +98,7 @@ class Router {
             });
             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);
                 }
@@ -117,13 +116,22 @@ class Router {
             return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.NO_TARGETS);
         }
     }
-    createRoutingSession(routedMessage, mode, excludedPeer) {
-        const excludedPeers = routedMessage.routingPath.map((descriptor) => (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(descriptor));
-        if (excludedPeer) {
-            excludedPeers.push((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(excludedPeer));
+    createRoutingSession(routedMessage, mode, excludedNode) {
+        const excludedNodeIds = new Set(routedMessage.routingPath.map((descriptor) => (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(descriptor)));
+        if (excludedNode) {
+            excludedNodeIds.add((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(excludedNode));
         }
-        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, excludedPeers);
+        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, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1,
+            mode,
+            excludedNodeIds
+        });
     }
     isMostLikelyDuplicate(requestId) {
         return this.duplicateRequestDetector.isMostLikelyDuplicate(requestId);
@@ -151,22 +159,22 @@ class Router {
     }
     setForwardingEntries(routedMessage) {
         const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
-            return !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.localPeerDescriptor);
+            return !(0, peerIdFromPeerDescriptor_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, peerIdFromPeerDescriptor_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);
         }
     }
 }

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

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

@@ -5,6 +5,7 @@ const utils_1 = require("@streamr/utils");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const RoutingSession_1 = require("./RoutingSession");
+const nodeId_1 = require("../../helpers/nodeId");
 const logger = new utils_1.Logger(module);
 const createRouteMessageAck = (routedMessage, error) => {
     const ack = {
@@ -21,13 +22,13 @@ class RouterRpcLocal {
     async routeMessage(routedMessage) {
         if (this.config.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
             logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer)} `
-                + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.destinationPeer)} is likely a duplicate`);
+                + `to ${(0, nodeId_1.getNodeIdFromBinary)(routedMessage.target)} is likely a duplicate`);
             return (0, exports.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
         }
         logger.trace(`Processing received routeMessage ${routedMessage.requestId}`);
         this.config.addContact(routedMessage.sourcePeer, true);
         this.config.duplicateRequestDetector.add(routedMessage.requestId);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, routedMessage.destinationPeer)) {
+        if ((0, utils_1.areEqualBinaries)(this.config.localPeerDescriptor.nodeId, routedMessage.target)) {
             logger.trace(`routing message targeted to self ${routedMessage.requestId}`);
             this.config.setForwardingEntries(routedMessage);
             this.config.connectionManager?.handleMessage(routedMessage.message);
@@ -40,13 +41,13 @@ class RouterRpcLocal {
     async forwardMessage(forwardMessage) {
         if (this.config.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
             logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(forwardMessage.sourcePeer)} `
-                + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(forwardMessage.destinationPeer)} is likely a duplicate`);
+                + `to ${(0, nodeId_1.getNodeIdFromBinary)(forwardMessage.target)} is likely a duplicate`);
             return (0, exports.createRouteMessageAck)(forwardMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
         }
         logger.trace(`Processing received forward routeMessage ${forwardMessage.requestId}`);
         this.config.addContact(forwardMessage.sourcePeer, true);
         this.config.duplicateRequestDetector.add(forwardMessage.requestId);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, forwardMessage.destinationPeer)) {
+        if ((0, utils_1.areEqualBinaries)(this.config.localPeerDescriptor.nodeId, forwardMessage.target)) {
             return this.forwardToDestination(forwardMessage);
         }
         else {
@@ -60,7 +61,7 @@ class RouterRpcLocal {
             this.config.connectionManager?.handleMessage(forwardedMessage);
             return (0, exports.createRouteMessageAck)(routedMessage);
         }
-        return this.config.doRouteMessage({ ...routedMessage, destinationPeer: forwardedMessage.targetDescriptor });
+        return this.config.doRouteMessage({ ...routedMessage, target: forwardedMessage.targetDescriptor.nodeId });
     }
 }
 exports.RouterRpcLocal = RouterRpcLocal;

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

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

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

@@ -1,7 +1,7 @@
 import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
-import { IRouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+import { RouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
 import { RpcRemote } from '../contact/RpcRemote';
-export declare class RouterRpcRemote extends RpcRemote<IRouterRpcClient> {
+export declare class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
     routeMessage(params: RouteMessageWrapper): Promise<boolean>;
     forwardMessage(params: RouteMessageWrapper): Promise<boolean>;
 }

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

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterRpcRemote = void 0;
-const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
+const utils_1 = require("@streamr/utils");
 const uuid_1 = require("uuid");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 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 RouterRpcRemote extends RpcRemote_1.RpcRemote {
     async routeMessage(params) {
         const message = {
-            destinationPeer: params.destinationPeer,
+            target: params.target,
             sourcePeer: params.sourcePeer,
             message: params.message,
             requestId: params.requestId ?? (0, uuid_1.v4)(),
@@ -19,13 +19,13 @@ class RouterRpcRemote extends RpcRemote_1.RpcRemote {
             routingPath: params.routingPath
         };
         const options = this.formDhtRpcOptions({
-            doNotConnect: true
+            connect: false
         });
         try {
             const ack = await this.getClient().routeMessage(message, options);
             // Success signal if sent to destination and error includes duplicate
             if (ack.error === DhtRpc_1.RouteMessageError.DUPLICATE
-                && (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(params.destinationPeer, this.getPeerDescriptor())) {
+                && (0, utils_1.areEqualBinaries)(params.target, this.getPeerDescriptor().nodeId)) {
                 return true;
             }
             else if (ack.error !== undefined) {
@@ -44,7 +44,7 @@ class RouterRpcRemote extends RpcRemote_1.RpcRemote {
     }
     async forwardMessage(params) {
         const message = {
-            destinationPeer: params.destinationPeer,
+            target: params.target,
             sourcePeer: params.sourcePeer,
             message: params.message,
             requestId: params.requestId ?? (0, uuid_1.v4)(),
@@ -52,7 +52,7 @@ class RouterRpcRemote extends RpcRemote_1.RpcRemote {
             routingPath: params.routingPath
         };
         const options = this.formDhtRpcOptions({
-            doNotConnect: true
+            connect: false
         });
         try {
             const ack = await this.getClient().forwardMessage(message, options);

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

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

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

@@ -1,43 +1,47 @@
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
-import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import EventEmitter from 'eventemitter3';
 import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
 import { RouterRpcRemote } from './RouterRpcRemote';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
 import { Contact } from '../contact/Contact';
-import { FindRpcRemote } from './FindRpcRemote';
+import { RecursiveOperationRpcRemote } from '../recursive-operation/RecursiveOperationRpcRemote';
+import { NodeID } from '../../helpers/nodeId';
 declare class RemoteContact extends Contact {
     private routerRpcRemote;
-    private findRpcRemote;
+    private recursiveOperationRpcRemote;
     constructor(peer: DhtNodeRpcRemote, localPeerDescriptor: PeerDescriptor, rpcCommunicator: RoutingRpcCommunicator);
     getRouterRpcRemote(): RouterRpcRemote;
-    getFindRpcRemote(): FindRpcRemote;
+    getRecursiveOperationRpcRemote(): RecursiveOperationRpcRemote;
 }
 export interface RoutingSessionEvents {
-    routingSucceeded: (sessionId: string) => void;
-    partialSuccess: (sessionId: string) => void;
-    routingFailed: (sessionId: string) => void;
-    stopped: (sessionId: string) => void;
+    routingSucceeded: () => void;
+    partialSuccess: () => void;
+    routingFailed: () => void;
+    stopped: () => void;
 }
 export declare enum RoutingMode {
     ROUTE = 0,
     FORWARD = 1,
-    FIND = 2
+    RECURSIVE = 2
+}
+interface RoutingSessionConfig {
+    rpcCommunicator: RoutingRpcCommunicator;
+    localPeerDescriptor: PeerDescriptor;
+    routedMessage: RouteMessageWrapper;
+    connections: Map<NodeID, DhtNodeRpcRemote>;
+    parallelism: number;
+    mode: RoutingMode;
+    excludedNodeIds?: Set<NodeID>;
 }
 export declare class RoutingSession extends EventEmitter<RoutingSessionEvents> {
     readonly sessionId: string;
-    private readonly rpcCommunicator;
     private ongoingRequests;
     private contactList;
-    private readonly localPeerDescriptor;
-    private readonly messageToRoute;
-    private connections;
-    private readonly parallelism;
     private failedHopCounter;
     private successfulHopCounter;
-    private readonly mode;
     private stopped;
-    constructor(rpcCommunicator: RoutingRpcCommunicator, localPeerDescriptor: PeerDescriptor, messageToRoute: RouteMessageWrapper, connections: Map<PeerIDKey, DhtNodeRpcRemote>, parallelism: number, mode?: RoutingMode, excludedPeerIDs?: PeerID[]);
+    private readonly config;
+    constructor(config: RoutingSessionConfig);
     private onRequestFailed;
     private emitFailure;
     private onRequestSucceeded;