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

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

@@ -5,15 +5,15 @@ const utils_1 = require("@streamr/utils");
 const Remote_1 = require("../contact/Remote");
 const logger = new utils_1.Logger(module);
 class RemoteRecursiveFindSession extends Remote_1.Remote {
-    reportRecursiveFindResult(routingPath, closestNodes, dataEntries, noCloserNodesFound) {
+    sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound) {
         const report = {
             routingPath,
-            nodes: closestNodes,
+            closestConnectedPeers: closestNodes,
             dataEntries,
             noCloserNodesFound
         };
-        this.getClient().reportRecursiveFindResult(report, this.formDhtRpcOptions()).catch((_e) => {
-            logger.trace('Failed to send RecursiveFindResult');
+        this.getClient().sendFindResponse(report, this.formDhtRpcOptions()).catch((_e) => {
+            logger.trace('Failed to send FindResult');
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"RemoteRecursiveFindSession.js","sourceRoot":"","sources":["../../../../src/dht/find/RemoteRecursiveFindSession.ts"],"names":[],"mappings":";;;AAMA,0CAAuC;AACvC,8CAA0C;AAE1C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,0BAA2B,SAAQ,eAA0C;IAEtF,yBAAyB,CAAC,WAA6B,EAAE,YAA8B,EACnF,WAAwB,EAAE,kBAA2B;QACrD,MAAM,MAAM,GAAwB;YAChC,WAAW;YACX,KAAK,EAAE,YAAY;YACnB,WAAW;YACX,kBAAkB;SACrB,CAAA;QACD,IAAI,CAAC,SAAS,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACtF,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACtD,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAdD,gEAcC"}
+{"version":3,"file":"RemoteRecursiveFindSession.js","sourceRoot":"","sources":["../../../../src/dht/find/RemoteRecursiveFindSession.ts"],"names":[],"mappings":";;;AAMA,0CAAuC;AACvC,8CAA0C;AAE1C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,0BAA2B,SAAQ,eAA0C;IAEtF,gBAAgB,CAAC,WAA6B,EAAE,YAA8B,EAC1E,WAAwB,EAAE,kBAA2B;QACrD,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,2BAA2B,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAdD,gEAcC"}

package/dist/src/dht/registerExternalApiRpcMethods.d.ts

@@ -1,2 +1,2 @@
-import { DhtNode } from '../exports';
+import { DhtNode } from '../dht/DhtNode';
 export declare const registerExternalApiRpcMethods: (thisNode: DhtNode) => void;

package/dist/src/dht/registerExternalApiRpcMethods.js

@@ -4,13 +4,14 @@ exports.registerExternalApiRpcMethods = void 0;
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const registerExternalApiRpcMethods = (thisNode) => {
     const rpcCommunicator = thisNode.getRpcCommunicator();
-    rpcCommunicator.registerRpcMethod(DhtRpc_1.FindDataRequest, DhtRpc_1.FindDataResponse, 'findData', (req) => findData(thisNode, req), { timeout: 10000 });
+    rpcCommunicator.registerRpcMethod(DhtRpc_1.FindDataRequest, DhtRpc_1.FindDataResponse, 'findData', (req, context) => findData(thisNode, req, context), { timeout: 10000 });
     rpcCommunicator.registerRpcMethod(DhtRpc_1.ExternalStoreDataRequest, DhtRpc_1.ExternalStoreDataResponse, 'externalStoreData', (req) => externalStoreData(thisNode, req), { timeout: 10000 });
 };
 exports.registerExternalApiRpcMethods = registerExternalApiRpcMethods;
 // IDHTRpcService method for external findRecursive calls
-const findData = async (thisNode, findDataRequest) => {
-    const result = await thisNode.startRecursiveFind(findDataRequest.kademliaId, DhtRpc_1.FindMode.DATA, findDataRequest.requestor);
+const findData = async (thisNode, findDataRequest, context) => {
+    const senderPeerDescriptor = context.incomingSourceDescriptor;
+    const result = await thisNode.startRecursiveFind(findDataRequest.kademliaId, true, senderPeerDescriptor);
     if (result.dataEntries) {
         return DhtRpc_1.FindDataResponse.create({ dataEntries: result.dataEntries });
     }

package/dist/src/dht/registerExternalApiRpcMethods.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerExternalApiRpcMethods.js","sourceRoot":"","sources":["../../../src/dht/registerExternalApiRpcMethods.ts"],"names":[],"mappings":";;;AACA,gEAAsJ;AAE/I,MAAM,6BAA6B,GAAG,CAAC,QAAiB,EAAQ,EAAE;IACrE,MAAM,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAA;IACrD,eAAe,CAAC,iBAAiB,CAC7B,wBAAe,EACf,yBAAgB,EAChB,UAAU,EACV,CAAC,GAAoB,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,EACjD,EAAE,OAAO,EAAE,KAAK,EAAE,CACrB,CAAA;IACD,eAAe,CAAC,iBAAiB,CAC7B,iCAAwB,EACxB,kCAAyB,EACzB,mBAAmB,EACnB,CAAC,GAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,EACnE,EAAE,OAAO,EAAE,KAAK,EAAE,CACrB,CAAA;AACL,CAAC,CAAA;AAhBY,QAAA,6BAA6B,iCAgBzC;AAED,yDAAyD;AACzD,MAAM,QAAQ,GAAG,KAAK,EAAE,QAAiB,EAAE,eAAgC,EAA6B,EAAE;IACtG,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,UAAU,EAAE,iBAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACtH,IAAI,MAAM,CAAC,WAAW,EAAE;QACpB,OAAO,yBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;KACtE;SAAM;QACH,OAAO,yBAAgB,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,EAAE;YACf,KAAK,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACL;AACL,CAAC,CAAA;AAED,qDAAqD;AACrD,MAAM,iBAAiB,GAAG,KAAK,EAAE,QAAiB,EAAE,OAAiC,EAAsC,EAAE;IACzH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAK,CAAC,CAAA;IACxE,OAAO,kCAAyB,CAAC,MAAM,CAAC;QACpC,OAAO,EAAE,MAAM;KAClB,CAAC,CAAA;AACN,CAAC,CAAA"}
+{"version":3,"file":"registerExternalApiRpcMethods.js","sourceRoot":"","sources":["../../../src/dht/registerExternalApiRpcMethods.ts"],"names":[],"mappings":";;;AACA,gEAA4I;AAIrI,MAAM,6BAA6B,GAAG,CAAC,QAAiB,EAAQ,EAAE;IACrE,MAAM,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAA;IACrD,eAAe,CAAC,iBAAiB,CAC7B,wBAAe,EACf,yBAAgB,EAChB,UAAU,EACV,CAAC,GAAoB,EAAE,OAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,EACtF,EAAE,OAAO,EAAE,KAAK,EAAE,CACrB,CAAA;IACD,eAAe,CAAC,iBAAiB,CAC7B,iCAAwB,EACxB,kCAAyB,EACzB,mBAAmB,EACnB,CAAC,GAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,EACnE,EAAE,OAAO,EAAE,KAAK,EAAE,CACrB,CAAA;AACL,CAAC,CAAA;AAhBY,QAAA,6BAA6B,iCAgBzC;AAED,yDAAyD;AACzD,MAAM,QAAQ,GAAG,KAAK,EAAE,QAAiB,EAAE,eAAgC,EAAE,OAA0B,EAA6B,EAAE;IAClI,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;IAClF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAA;IACxG,IAAI,MAAM,CAAC,WAAW,EAAE;QACpB,OAAO,yBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;KACtE;SAAM;QACH,OAAO,yBAAgB,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,EAAE;YACf,KAAK,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACL;AACL,CAAC,CAAA;AAED,qDAAqD;AACrD,MAAM,iBAAiB,GAAG,KAAK,EAAE,QAAiB,EAAE,OAAiC,EAAsC,EAAE;IACzH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAK,CAAC,CAAA;IACxE,OAAO,kCAAyB,CAAC,MAAM,CAAC;QACpC,OAAO,EAAE,MAAM;KAClB,CAAC,CAAA;AACN,CAAC,CAAA"}

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

@@ -1,11 +1,10 @@
-import { Message } from '../../proto/packages/dht/protos/DhtRpc';
 export declare class DuplicateDetector {
     private values;
     private queue;
     private maxAge;
     private maxNumberOfValues;
     constructor(maxNumberOfValues: number, maxAgeInSeconds: number);
-    add(value: string, senderId: string, message?: Message): void;
+    add(value: string): void;
     isMostLikelyDuplicate(value: string): boolean;
     private cleanUp;
     size(): number;

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

@@ -8,14 +8,9 @@ class DuplicateDetector {
         this.maxNumberOfValues = maxNumberOfValues;
         this.maxAge = maxAgeInSeconds * 1000;
     }
-    add(value, senderId, message) {
+    add(value) {
         this.values.add(value);
-        if (message) {
-            this.queue.push([Date.now(), value, senderId, message]);
-        }
-        else {
-            this.queue.push([Date.now(), value, senderId]);
-        }
+        this.queue.push([Date.now(), value]);
         this.cleanUp();
     }
     isMostLikelyDuplicate(value) {

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

@@ -1 +1 @@
-{"version":3,"file":"DuplicateDetector.js","sourceRoot":"","sources":["../../../../src/dht/routing/DuplicateDetector.ts"],"names":[],"mappings":";;;AAIA,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,EAAE,QAAgB,EAAE,OAAiB;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;SAC1D;aAAM;YACH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;SACjD;QACD,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;CAEJ;AAhDD,8CAgDC"}
+{"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"}

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

@@ -1,11 +1,10 @@
 import { Message, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { RoutingMode, RoutingSession } from './RoutingSession';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-import { PeerID, PeerIDKey } from '../../helpers/PeerID';
+import { PeerIDKey } from '../../helpers/PeerID';
 import { ConnectionManager } from '../../connection/ConnectionManager';
-import { DhtPeer } from '../DhtPeer';
-import { IRoutingService } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { RemoteDhtNode } from '../RemoteDhtNode';
+import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 export declare const createRouteMessageAck: (routedMessage: RouteMessageWrapper, error?: string) => RouteMessageAck;
 export declare enum RoutingErrors {
     NO_CANDIDATES_FOUND = "No routing candidates found",
@@ -14,8 +13,7 @@ export declare enum RoutingErrors {
 export interface RouterConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     ownPeerDescriptor: PeerDescriptor;
-    ownPeerId: PeerID;
-    connections: Map<PeerIDKey, DhtPeer>;
+    connections: Map<PeerIDKey, RemoteDhtNode>;
     addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
     serviceId: string;
     connectionManager?: ConnectionManager;
@@ -23,38 +21,37 @@ export interface RouterConfig {
 interface IRouterFunc {
     doRouteMessage(routedMessage: RouteMessageWrapper, mode: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
     send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
-    checkDuplicate(messageId: string): boolean;
-    addToDuplicateDetector(messageId: string, senderId: string, message?: Message): void;
+    isMostLikelyDuplicate(requestId: string): boolean;
+    addToDuplicateDetector(requestId: string): void;
     addRoutingSession(session: RoutingSession): void;
     removeRoutingSession(sessionId: string): void;
     stop(): void;
 }
-export interface IRouter extends Omit<IRoutingService, 'findRecursively'>, IRouterFunc {
+export interface IRouter extends Omit<IRouterRpc, 'findRecursively'>, IRouterFunc {
 }
 export declare class Router implements IRouter {
     private readonly rpcCommunicator;
     private readonly ownPeerDescriptor;
-    private readonly ownPeerId;
     private readonly connections;
     private readonly addContact;
     private readonly serviceId;
     private readonly connectionManager?;
     private readonly forwardingTable;
     private ongoingRoutingSessions;
-    private readonly routerDuplicateDetector;
+    private readonly duplicateRequestDetector;
     private stopped;
     constructor(config: RouterConfig);
     send(msg: Message, reachableThrough: PeerDescriptor[]): Promise<void>;
     doRouteMessage(routedMessage: RouteMessageWrapper, mode?: RoutingMode, excludedPeer?: PeerDescriptor): RouteMessageAck;
     private createRoutingSession;
-    checkDuplicate(messageId: string): boolean;
-    addToDuplicateDetector(messageId: string, senderId: string, message?: Message): void;
+    isMostLikelyDuplicate(requestId: string): boolean;
+    addToDuplicateDetector(requestId: string): void;
     addRoutingSession(session: RoutingSession): void;
     removeRoutingSession(sessionId: string): void;
     stop(): void;
-    routeMessage(routedMessage: RouteMessageWrapper, _context: ServerCallContext): Promise<RouteMessageAck>;
+    routeMessage(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
     private setForwardingEntries;
-    forwardMessage(forwardMessage: RouteMessageWrapper, _context: ServerCallContext): Promise<RouteMessageAck>;
+    forwardMessage(forwardMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
     private forwardToDestination;
 }
 export {};

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

@@ -10,8 +10,6 @@ const uuid_1 = require("uuid");
 const createRouteMessageAck = (routedMessage, error) => {
     const ack = {
         requestId: routedMessage.requestId,
-        destinationPeer: routedMessage.sourcePeer,
-        sourcePeer: routedMessage.destinationPeer,
         error: error ? error : ''
     };
     return ack;
@@ -27,17 +25,16 @@ class Router {
     constructor(config) {
         this.forwardingTable = new Map();
         this.ongoingRoutingSessions = new Map();
-        this.routerDuplicateDetector = new DuplicateDetector_1.DuplicateDetector(100000, 100);
+        this.duplicateRequestDetector = new DuplicateDetector_1.DuplicateDetector(100000, 100);
         this.stopped = false;
         this.rpcCommunicator = config.rpcCommunicator;
         this.ownPeerDescriptor = config.ownPeerDescriptor;
-        this.ownPeerId = config.ownPeerId;
         this.connections = config.connections;
         this.addContact = config.addContact;
         this.serviceId = config.serviceId;
         this.connectionManager = config.connectionManager;
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'forwardMessage', (forwardMessage, context) => this.forwardMessage(forwardMessage, context));
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeMessage', (routedMessage, context) => this.routeMessage(routedMessage, context));
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'forwardMessage', (forwardMessage) => this.forwardMessage(forwardMessage));
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeMessage', (routedMessage) => this.routeMessage(routedMessage));
     }
     async send(msg, reachableThrough) {
         msg.sourceDescriptor = this.ownPeerDescriptor;
@@ -71,8 +68,8 @@ class Router {
         if (this.stopped) {
             return (0, exports.createRouteMessageAck)(routedMessage, RoutingErrors.STOPPED);
         }
-        logger.trace(`Peer ${this.ownPeerId.value} routing message ${routedMessage.requestId} 
-            from ${routedMessage.sourcePeer?.kademliaId} to ${routedMessage.destinationPeer?.kademliaId}`);
+        logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer)} `
+            + `to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.destinationPeer)}`);
         routedMessage.routingPath.push(this.ownPeerDescriptor);
         const session = this.createRoutingSession(routedMessage, mode, excludedPeer);
         this.addRoutingSession(session);
@@ -96,7 +93,7 @@ class Router {
             session.start();
         }
         catch (e) {
-            if ((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.sourcePeer).equals(this.ownPeerId)) {
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(routedMessage.sourcePeer, this.ownPeerDescriptor)) {
                 logger.warn(`Failed to send (routeMessage: ${this.serviceId}) to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.destinationPeer)}: ${e}`);
             }
             return (0, exports.createRouteMessageAck)(routedMessage, RoutingErrors.NO_CANDIDATES_FOUND);
@@ -109,13 +106,13 @@ class Router {
             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.ownPeerDescriptor, routedMessage, this.connections, this.ownPeerId.equals((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.sourcePeer)) ? 2 : 1, mode, undefined, excludedPeers);
+        return new RoutingSession_1.RoutingSession(this.rpcCommunicator, this.ownPeerDescriptor, routedMessage, this.connections, (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1, mode, undefined, excludedPeers);
     }
-    checkDuplicate(messageId) {
-        return this.routerDuplicateDetector.isMostLikelyDuplicate(messageId);
+    isMostLikelyDuplicate(requestId) {
+        return this.duplicateRequestDetector.isMostLikelyDuplicate(requestId);
     }
-    addToDuplicateDetector(messageId, senderId, message) {
-        this.routerDuplicateDetector.add(messageId, senderId, message);
+    addToDuplicateDetector(requestId) {
+        this.duplicateRequestDetector.add(requestId);
     }
     addRoutingSession(session) {
         this.ongoingRoutingSessions.set(session.sessionId, session);
@@ -133,23 +130,23 @@ class Router {
             clearTimeout(entry.timeout);
         });
         this.forwardingTable.clear();
-        this.routerDuplicateDetector.clear();
+        this.duplicateRequestDetector.clear();
     }
-    // IRoutingService method
-    async routeMessage(routedMessage, _context) {
+    // IRouterRpc method
+    async routeMessage(routedMessage) {
         if (this.stopped) {
             return (0, exports.createRouteMessageAck)(routedMessage, 'routeMessage() service is not running');
         }
-        else if (this.routerDuplicateDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
-            logger.trace(`Peer ${this.ownPeerId?.value} routing message ${routedMessage.requestId} 
-                from ${routedMessage.sourcePeer.kademliaId} to ${routedMessage.destinationPeer.kademliaId} is likely a duplicate`);
+        else if (this.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
+            logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer)} `
+                + `to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.destinationPeer)} is likely a duplicate`);
             return (0, exports.createRouteMessageAck)(routedMessage, 'message given to routeMessage() service is likely a duplicate');
         }
         logger.trace(`Processing received routeMessage ${routedMessage.requestId}`);
         this.addContact(routedMessage.sourcePeer, true);
-        this.addToDuplicateDetector(routedMessage.requestId, (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer));
-        if (this.ownPeerId.equals((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.destinationPeer))) {
-            logger.trace(`${this.ownPeerDescriptor.nodeName} routing message targeted to self ${routedMessage.requestId}`);
+        this.addToDuplicateDetector(routedMessage.requestId);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, routedMessage.destinationPeer)) {
+            logger.trace(`routing message targeted to self ${routedMessage.requestId}`);
             this.setForwardingEntries(routedMessage);
             this.connectionManager?.handleMessage(routedMessage.message);
             return (0, exports.createRouteMessageAck)(routedMessage);
@@ -160,7 +157,7 @@ class Router {
     }
     setForwardingEntries(routedMessage) {
         const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
-            return !(0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(peer).equals(this.ownPeerId);
+            return !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.ownPeerDescriptor);
         });
         if (reachableThroughWithoutSelf.length > 0) {
             const sourceKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(routedMessage.sourcePeer);
@@ -178,20 +175,20 @@ class Router {
             this.forwardingTable.set(sourceKey, forwardingEntry);
         }
     }
-    // IRoutingService method
-    async forwardMessage(forwardMessage, _context) {
+    // IRouterRpc method
+    async forwardMessage(forwardMessage) {
         if (this.stopped) {
             return (0, exports.createRouteMessageAck)(forwardMessage, 'forwardMessage() service is not running');
         }
-        else if (this.routerDuplicateDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
-            logger.trace(`Peer ${this.ownPeerId.value} forwarding message ${forwardMessage.requestId} 
-        from ${forwardMessage.sourcePeer?.kademliaId} to ${forwardMessage.destinationPeer?.kademliaId} is likely a duplicate`);
+        else if (this.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
+            logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(forwardMessage.sourcePeer)} `
+                + `to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(forwardMessage.destinationPeer)} is likely a duplicate`);
             return (0, exports.createRouteMessageAck)(forwardMessage, 'message given to forwardMessage() service is likely a duplicate');
         }
         logger.trace(`Processing received forward routeMessage ${forwardMessage.requestId}`);
         this.addContact(forwardMessage.sourcePeer, true);
-        this.addToDuplicateDetector(forwardMessage.requestId, (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(forwardMessage.sourcePeer));
-        if (this.ownPeerId.equals((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(forwardMessage.destinationPeer))) {
+        this.addToDuplicateDetector(forwardMessage.requestId);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, forwardMessage.destinationPeer)) {
             return this.forwardToDestination(forwardMessage);
         }
         else {
@@ -199,9 +196,9 @@ class Router {
         }
     }
     forwardToDestination(routedMessage) {
-        logger.trace(`Peer ${this.ownPeerId.value} forwarding found message targeted to self ${routedMessage.requestId}`);
+        logger.trace(`Forwarding found message targeted to self ${routedMessage.requestId}`);
         const forwardedMessage = routedMessage.message;
-        if (this.ownPeerId.equals((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(forwardedMessage.targetDescriptor))) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, forwardedMessage.targetDescriptor)) {
             this.connectionManager?.handleMessage(forwardedMessage);
             return (0, exports.createRouteMessageAck)(routedMessage);
         }

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/{RemoteRouter.d.ts → RouterRpcRemote.d.ts}

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

package/dist/src/dht/routing/{RemoteRouter.js → RouterRpcRemote.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteRouter = void 0;
+exports.RouterRpcRemote = void 0;
 const uuid_1 = require("uuid");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const Remote_1 = require("../contact/Remote");
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-class RemoteRouter extends Remote_1.Remote {
+class RouterRpcRemote extends Remote_1.Remote {
     async routeMessage(params) {
         const message = {
             destinationPeer: params.destinationPeer,
@@ -23,7 +23,7 @@ class RemoteRouter extends Remote_1.Remote {
         try {
             const ack = await this.getClient().routeMessage(message, options);
             // Success signal if sent to destination and error includes duplicate
-            if ((0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(params.destinationPeer, this.getPeerDescriptor())
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(params.destinationPeer, this.getPeerDescriptor())
                 && ack.error.includes('duplicate')) {
                 return true;
             }
@@ -94,5 +94,5 @@ class RemoteRouter extends Remote_1.Remote {
         return true;
     }
 }
-exports.RemoteRouter = RemoteRouter;
-//# sourceMappingURL=RemoteRouter.js.map
+exports.RouterRpcRemote = RouterRpcRemote;
+//# sourceMappingURL=RouterRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"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,8 +1,7 @@
-import { PeerDescriptor } from '../../exports';
-import { DhtPeer } from '../DhtPeer';
+import { RemoteDhtNode } from '../RemoteDhtNode';
 import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import EventEmitter from 'eventemitter3';
-import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
 export interface RoutingSessionEvents {
     routingSucceeded: (sessionId: string) => void;
@@ -29,7 +28,7 @@ export declare class RoutingSession extends EventEmitter<RoutingSessionEvents> {
     private successfulHopCounter;
     private readonly mode;
     private stopped;
-    constructor(rpcCommunicator: RoutingRpcCommunicator, ownPeerDescriptor: PeerDescriptor, messageToRoute: RouteMessageWrapper, connections: Map<PeerIDKey, DhtPeer>, parallelism: number, mode?: RoutingMode, destinationId?: Uint8Array, excludedPeerIDs?: PeerID[]);
+    constructor(rpcCommunicator: RoutingRpcCommunicator, ownPeerDescriptor: PeerDescriptor, messageToRoute: RouteMessageWrapper, connections: Map<PeerIDKey, RemoteDhtNode>, parallelism: number, mode?: RoutingMode, destinationId?: Uint8Array, excludedPeerIDs?: PeerID[]);
     private onRequestFailed;
     private emitFailure;
     private onRequestSucceeded;

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

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutingSession = exports.RoutingMode = void 0;
 const SortedContactList_1 = require("../contact/SortedContactList");
 const PeerID_1 = require("../../helpers/PeerID");
+const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const uuid_1 = require("uuid");
-const RemoteRouter_1 = require("./RemoteRouter");
+const RouterRpcRemote_1 = require("./RouterRpcRemote");
 const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
 const proto_rpc_1 = require("@streamr/proto-rpc");
 const Contact_1 = require("../contact/Contact");
@@ -18,7 +19,7 @@ const MAX_FAILED_HOPS = 2;
 class RemoteContact extends Contact_1.Contact {
     constructor(peer, ownPeerDescriptor, rpcCommunicator) {
         super(peer.getPeerDescriptor());
-        this.router = new RemoteRouter_1.RemoteRouter(ownPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RoutingServiceClient(rpcCommunicator.getRpcClientTransport())));
+        this.router = new RouterRpcRemote_1.RouterRpcRemote(ownPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RouterRpcClient(rpcCommunicator.getRpcClientTransport())));
     }
     getRouter() {
         return this.router;
@@ -67,7 +68,7 @@ class RoutingSession extends eventemitter3_1.default {
                 this.emit('routingFailed', this.sessionId);
             }
         };
-        this.onRequestSucceeded = (_peerId) => {
+        this.onRequestSucceeded = () => {
             logger.trace('onRequestSucceeded() sessionId: ' + this.sessionId);
             if (this.stopped) {
                 return;
@@ -132,14 +133,14 @@ class RoutingSession extends eventemitter3_1.default {
             while ((this.ongoingRequests.size) < this.parallelism && (uncontacted.length > 0) && !this.stopped) {
                 const nextPeer = uncontacted.shift();
                 // eslint-disable-next-line max-len
-                logger.trace(`Sending routeMessage request from ${this.ownPeerDescriptor.kademliaId} to contact: ${nextPeer.getPeerId()} (sessionId=${this.sessionId})`);
+                logger.trace(`Sending routeMessage request to contact: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
                 this.contactList.setContacted(nextPeer.getPeerId());
                 this.ongoingRequests.add(nextPeer.getPeerId().toKey());
                 setImmediate(async () => {
                     try {
                         const succeeded = await this.sendRouteMessageRequest(nextPeer);
                         if (succeeded) {
-                            this.onRequestSucceeded(nextPeer.getPeerId());
+                            this.onRequestSucceeded();
                         }
                         else {
                             this.onRequestFailed(nextPeer.getPeerId());

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

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

package/dist/src/dht/store/{DataStore.d.ts → StoreRpcLocal.d.ts}

@@ -4,10 +4,10 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
 import { IRecursiveFinder } from '../find/RecursiveFinder';
 import { LocalDataStore } from './LocalDataStore';
-import { IStoreService } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { IStoreRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import EventEmitter from 'eventemitter3';
 import { Events } from '../DhtNode';
-import { DhtPeer } from '../DhtPeer';
+import { RemoteDhtNode } from '../RemoteDhtNode';
 interface DataStoreConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     recursiveFinder: IRecursiveFinder;
@@ -16,11 +16,11 @@ interface DataStoreConfig {
     serviceId: string;
     maxTtl: number;
     highestTtl: number;
-    numberOfCopies: number;
+    redundancyFactor: number;
     dhtNodeEmitter: EventEmitter<Events>;
-    getNodesClosestToIdFromBucket: (id: Uint8Array, n?: number) => DhtPeer[];
+    getNodesClosestToIdFromBucket: (id: Uint8Array, n?: number) => RemoteDhtNode[];
 }
-export declare class DataStore implements IStoreService {
+export declare class StoreRpcLocal implements IStoreRpc {
     private readonly rpcCommunicator;
     private readonly recursiveFinder;
     private readonly ownPeerDescriptor;
@@ -28,7 +28,7 @@ export declare class DataStore implements IStoreService {
     private readonly serviceId;
     private readonly maxTtl;
     private readonly highestTtl;
-    private readonly numberOfCopies;
+    private readonly redundancyFactor;
     private readonly dhtNodeEmitter;
     private readonly getNodesClosestToIdFromBucket;
     constructor(config: DataStoreConfig);