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

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

@@ -0,0 +1,22 @@
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import KBucket from 'k-bucket';
+import { Empty } from '../proto/google/protobuf/empty';
+import { ClosestPeersRequest, ClosestPeersResponse, LeaveNotice, PeerDescriptor, PingRequest, PingResponse } from '../proto/packages/dht/protos/DhtRpc';
+import { IDhtNodeRpc } from '../proto/packages/dht/protos/DhtRpc.server';
+import { DhtNodeRpcRemote } from './DhtNodeRpcRemote';
+interface DhtNodeRpcLocalConfig {
+    bucket: KBucket<DhtNodeRpcRemote>;
+    serviceId: string;
+    peerDiscoveryQueryBatchSize: number;
+    addNewContact: (contact: PeerDescriptor) => void;
+    removeContact: (contact: PeerDescriptor) => void;
+}
+export declare class DhtNodeRpcLocal implements IDhtNodeRpc {
+    private readonly config;
+    constructor(config: DhtNodeRpcLocalConfig);
+    getClosestPeers(request: ClosestPeersRequest, context: ServerCallContext): Promise<ClosestPeersResponse>;
+    private getClosestPeerDescriptors;
+    ping(request: PingRequest, context: ServerCallContext): Promise<PingResponse>;
+    leaveNotice(_request: LeaveNotice, context: ServerCallContext): Promise<Empty>;
+}
+export {};

package/dist/src/dht/DhtNodeRpcLocal.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DhtNodeRpcLocal = void 0;
+const utils_1 = require("@streamr/utils");
+const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
+const logger = new utils_1.Logger(module);
+class DhtNodeRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async getClosestPeers(request, context) {
+        this.config.addNewContact(context.incomingSourceDescriptor);
+        const response = {
+            peers: this.getClosestPeerDescriptors(request.kademliaId, this.config.peerDiscoveryQueryBatchSize),
+            requestId: request.requestId
+        };
+        return response;
+    }
+    getClosestPeerDescriptors(kademliaId, limit) {
+        const closestPeers = this.config.bucket.closest(kademliaId, limit);
+        return closestPeers.map((rpcRemote) => rpcRemote.getPeerDescriptor());
+    }
+    async ping(request, context) {
+        logger.trace('received ping request: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(context.incomingSourceDescriptor));
+        setImmediate(() => {
+            this.config.addNewContact(context.incomingSourceDescriptor);
+        });
+        const response = {
+            requestId: request.requestId
+        };
+        return response;
+    }
+    async leaveNotice(_request, context) {
+        // TODO check signature??
+        const sender = context.incomingSourceDescriptor;
+        logger.trace('received leave notice: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sender));
+        this.config.removeContact(sender);
+        return {};
+    }
+}
+exports.DhtNodeRpcLocal = DhtNodeRpcLocal;
+//# sourceMappingURL=DhtNodeRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"DhtNodeRpcLocal.js","sourceRoot":"","sources":["../../../src/dht/DhtNodeRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,kFAA2E;AAsB3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,eAAe;IAIxB,YAAY,MAA6B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAA4B,EAAE,OAA0B;QAC1E,IAAI,CAAC,MAAM,CAAC,aAAa,CAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QAChF,MAAM,QAAQ,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC;YAClG,SAAS,EAAE,OAAO,CAAC,SAAS;SAC/B,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAEO,yBAAyB,CAAC,UAAsB,EAAE,KAAa;QACnE,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QAClE,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,SAA2B,EAAE,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC,CAAA;IAC3F,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAoB,EAAE,OAA0B;QACvD,MAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,IAAA,gDAAqB,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAC,CAAA;QACtH,YAAY,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,aAAa,CAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACpF,CAAC,CAAC,CAAA;QACF,MAAM,QAAQ,GAAiB;YAC3B,SAAS,EAAE,OAAO,CAAC,SAAS;SAC/B,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAqB,EAAE,OAA0B;QAC/D,yBAAyB;QACzB,MAAM,MAAM,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QACpE,MAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,IAAA,gDAAqB,EAAC,MAAM,CAAC,CAAC,CAAA;QACvE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QACjC,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAxCD,0CAwCC"}

package/dist/src/dht/{RemoteDhtNode.d.ts → DhtNodeRpcRemote.d.ts}

@@ -1,18 +1,20 @@
-import { IDhtRpcServiceClient } from '../proto/packages/dht/protos/DhtRpc.client';
+import { IDhtNodeRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
 import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { ProtoRpcClient } from '@streamr/proto-rpc';
 import { Remote } from './contact/Remote';
 import { PeerID } from '../helpers/PeerID';
+import { ServiceID } from '../types/ServiceID';
 export interface KBucketContact {
     id: Uint8Array;
     vectorClock: number;
 }
-export declare class RemoteDhtNode extends Remote<IDhtRpcServiceClient> implements KBucketContact {
+export declare class DhtNodeRpcRemote extends Remote<IDhtNodeRpcClient> implements KBucketContact {
     private static counter;
     vectorClock: number;
     readonly id: Uint8Array;
-    constructor(ownPeerDescriptor: PeerDescriptor, peerDescriptor: PeerDescriptor, client: ProtoRpcClient<IDhtRpcServiceClient>, serviceId: string);
+    constructor(localPeerDescriptor: PeerDescriptor, peerDescriptor: PeerDescriptor, client: ProtoRpcClient<IDhtNodeRpcClient>, serviceId: ServiceID, rpcRequestTimeout?: number);
     getClosestPeers(kademliaId: Uint8Array): Promise<PeerDescriptor[]>;
     ping(): Promise<boolean>;
+    leaveNotice(): void;
     getPeerId(): PeerID;
 }

package/dist/src/dht/{RemoteDhtNode.js → DhtNodeRpcRemote.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteDhtNode = void 0;
+exports.DhtNodeRpcRemote = void 0;
 const uuid_1 = require("uuid");
 const utils_1 = require("@streamr/utils");
 const Remote_1 = require("./contact/Remote");
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
-class RemoteDhtNode extends Remote_1.Remote {
-    constructor(ownPeerDescriptor, peerDescriptor, client, serviceId) {
-        super(ownPeerDescriptor, peerDescriptor, serviceId, client);
+class DhtNodeRpcRemote extends Remote_1.Remote {
+    constructor(localPeerDescriptor, peerDescriptor, client, serviceId, rpcRequestTimeout) {
+        super(localPeerDescriptor, peerDescriptor, serviceId, client, rpcRequestTimeout);
         this.id = this.getPeerId().value;
-        this.vectorClock = RemoteDhtNode.counter++;
+        this.vectorClock = DhtNodeRpcRemote.counter++;
     }
     async getClosestPeers(kademliaId) {
         logger.trace(`Requesting getClosestPeers on ${this.getServiceId()} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
@@ -32,9 +32,7 @@ class RemoteDhtNode extends Remote_1.Remote {
         const request = {
             requestId: (0, uuid_1.v4)()
         };
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             const pong = await this.getClient().ping(request, options);
             if (pong.requestId === request.requestId) {
@@ -46,24 +44,22 @@ class RemoteDhtNode extends Remote_1.Remote {
         }
         return false;
     }
-    /*
-    TODO remove or start using this method in NET-1131
-    leaveNotice(): void {
-        logger.trace(`Sending leaveNotice on ${this.getServiceId()} from ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
-        const request: LeaveNotice = {
+    leaveNotice() {
+        logger.trace(`Sending leaveNotice on ${this.getServiceId()} from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        const request = {
             serviceId: this.getServiceId()
-        }
+        };
         const options = this.formDhtRpcOptions({
             notification: true
-        })
+        });
         this.getClient().leaveNotice(request, options).catch((e) => {
-            logger.trace('Failed to send leaveNotice' + e)
-        })
-    }*/
+            logger.trace('Failed to send leaveNotice' + e);
+        });
+    }
     getPeerId() {
         return (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.getPeerDescriptor());
     }
 }
-exports.RemoteDhtNode = RemoteDhtNode;
-RemoteDhtNode.counter = 0;
-//# sourceMappingURL=RemoteDhtNode.js.map
+exports.DhtNodeRpcRemote = DhtNodeRpcRemote;
+DhtNodeRpcRemote.counter = 0;
+//# sourceMappingURL=DhtNodeRpcRemote.js.map

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

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

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

@@ -0,0 +1,16 @@
+import { IExternalApiRpc } from '../proto/packages/dht/protos/DhtRpc.server';
+import { ExternalFindDataRequest, ExternalFindDataResponse, ExternalStoreDataRequest, ExternalStoreDataResponse, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { FindResult } from './find/Finder';
+import { Any } from '../proto/google/protobuf/any';
+interface ExternalApiRpcLocalConfig {
+    startFind: (idToFind: Uint8Array, fetchData: boolean, excludedPeer: PeerDescriptor) => Promise<FindResult>;
+    storeDataToDht: (key: Uint8Array, data: Any) => Promise<PeerDescriptor[]>;
+}
+export declare class ExternalApiRpcLocal implements IExternalApiRpc {
+    private readonly config;
+    constructor(config: ExternalApiRpcLocalConfig);
+    externalFindData(findDataRequest: ExternalFindDataRequest, context: ServerCallContext): Promise<ExternalFindDataResponse>;
+    externalStoreData(request: ExternalStoreDataRequest): Promise<ExternalStoreDataResponse>;
+}
+export {};

package/dist/src/dht/ExternalApiRpcLocal.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExternalApiRpcLocal = void 0;
+const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
+class ExternalApiRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async externalFindData(findDataRequest, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const result = await this.config.startFind(findDataRequest.kademliaId, true, senderPeerDescriptor);
+        if (result.dataEntries) {
+            return DhtRpc_1.ExternalFindDataResponse.create({ dataEntries: result.dataEntries });
+        }
+        else {
+            return DhtRpc_1.ExternalFindDataResponse.create({
+                dataEntries: [],
+                error: 'Could not find data with the given key'
+            });
+        }
+    }
+    async externalStoreData(request) {
+        const result = await this.config.storeDataToDht(request.key, request.data);
+        return DhtRpc_1.ExternalStoreDataResponse.create({
+            storers: result
+        });
+    }
+}
+exports.ExternalApiRpcLocal = ExternalApiRpcLocal;
+//# sourceMappingURL=ExternalApiRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ExternalApiRpcLocal.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcLocal.ts"],"names":[],"mappings":";;;AACA,gEAM4C;AAW5C,MAAa,mBAAmB;IAI5B,YAAY,MAAiC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,eAAwC,EAAE,OAA0B;QACvF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAA;QAClG,IAAI,MAAM,CAAC,WAAW,EAAE;YACpB,OAAO,iCAAwB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;SAC9E;aAAM;YACH,OAAO,iCAAwB,CAAC,MAAM,CAAC;gBACnC,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,wCAAwC;aAClD,CAAC,CAAA;SACL;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAiC;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAK,CAAC,CAAA;QAC3E,OAAO,kCAAyB,CAAC,MAAM,CAAC;YACpC,OAAO,EAAE,MAAM;SAClB,CAAC,CAAA;IACN,CAAC;CACJ;AA3BD,kDA2BC"}

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

@@ -3,6 +3,6 @@ import { DataEntry, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { IExternalApiRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
 import { Remote } from './contact/Remote';
 export declare class ExternalApiRpcRemote extends Remote<IExternalApiRpcClient> {
-    findData(idToFind: Uint8Array): Promise<DataEntry[]>;
+    externalFindData(idToFind: Uint8Array): Promise<DataEntry[]>;
     storeData(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
 }

package/dist/src/dht/ExternalApiRpcRemote.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalApiRpcRemote = void 0;
 const Remote_1 = require("./contact/Remote");
 class ExternalApiRpcRemote extends Remote_1.Remote {
-    async findData(idToFind) {
+    async externalFindData(idToFind) {
         const request = {
             kademliaId: idToFind
         };
@@ -11,7 +11,7 @@ class ExternalApiRpcRemote extends Remote_1.Remote {
             timeout: 10000
         });
         try {
-            const data = await this.getClient().findData(request, options);
+            const data = await this.getClient().externalFindData(request, options);
             return data.dataEntries;
         }
         catch (err) {

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

@@ -1 +1 @@
-{"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAGA,6CAAyC;AAEzC,MAAa,oBAAqB,SAAQ,eAA6B;IAEnE,KAAK,CAAC,QAAQ,CAAC,QAAoB;QAC/B,MAAM,OAAO,GAAoB;YAC7B,UAAU,EAAE,QAAQ;SACvB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC9D,OAAO,IAAI,CAAC,WAAW,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG;YACH,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;CACJ;AAhCD,oDAgCC"}
+{"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAGA,6CAAyC;AAEzC,MAAa,oBAAqB,SAAQ,eAA6B;IAEnE,KAAK,CAAC,gBAAgB,CAAC,QAAoB;QACvC,MAAM,OAAO,GAA4B;YACrC,UAAU,EAAE,QAAQ;SACvB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,WAAW,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG;YACH,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;CACJ;AAhCD,oDAgCC"}

package/dist/src/dht/contact/Remote.d.ts

@@ -1,12 +1,15 @@
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ProtoRpcClient } from '@streamr/proto-rpc';
 import { DhtRpcOptions } from '../../rpc-protocol/DhtRpcOptions';
+import { ServiceID } from '../../types/ServiceID';
+export declare const EXISTING_CONNECTION_TIMEOUT = 5000;
 export declare abstract class Remote<T> {
     private readonly localPeerDescriptor;
     private readonly remotePeerDescriptor;
     private readonly serviceId;
     private readonly client;
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: string, client: ProtoRpcClient<T>);
+    private readonly rpcTimeout?;
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, client: ProtoRpcClient<T>, rpcTimeout?: number);
     getPeerDescriptor(): PeerDescriptor;
     getLocalPeerDescriptor(): PeerDescriptor;
     getServiceId(): string;

package/dist/src/dht/contact/Remote.js

@@ -1,12 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Remote = void 0;
+exports.Remote = exports.EXISTING_CONNECTION_TIMEOUT = void 0;
+const IConnection_1 = require("../../connection/IConnection");
+const Connectivity_1 = require("../../helpers/Connectivity");
+// Should connect directly to the server, timeout can be low
+const WEBSOCKET_CLIENT_TIMEOUT = 5000;
+// Requires a WebsocketConnectionRequest to be routed to the client before the connection can be opened
+// takes a little bit longer than WEBSOCKET_CLIENT
+const WEBSOCKET_SERVER_TIMEOUT = 7500;
+// WebRTC connections require lots of signalling to open and might take a longer time.
+const WEBRTC_TIMEOUT = 15000;
+// default timeout for existing connections
+exports.EXISTING_CONNECTION_TIMEOUT = 5000;
+const getRpcTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
+    const connectionType = (0, Connectivity_1.expectedConnectionType)(localPeerDescriptor, remotePeerDescriptor);
+    if (connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT) {
+        return WEBSOCKET_CLIENT_TIMEOUT;
+    }
+    else if (connectionType === IConnection_1.ConnectionType.WEBSOCKET_SERVER) {
+        return WEBSOCKET_SERVER_TIMEOUT;
+    }
+    else if (connectionType === IConnection_1.ConnectionType.WEBRTC) {
+        return WEBRTC_TIMEOUT;
+    }
+    return WEBRTC_TIMEOUT;
+};
 class Remote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client) {
+    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client, rpcTimeout) {
         this.localPeerDescriptor = localPeerDescriptor;
         this.remotePeerDescriptor = remotePeerDescriptor;
         this.client = client;
         this.serviceId = serviceId;
+        this.rpcTimeout = rpcTimeout;
     }
     getPeerDescriptor() {
         return this.remotePeerDescriptor;
@@ -24,6 +49,7 @@ class Remote {
         return {
             sourceDescriptor: this.localPeerDescriptor,
             targetDescriptor: this.remotePeerDescriptor,
+            timeout: this.rpcTimeout ?? getRpcTimeout(this.localPeerDescriptor, this.remotePeerDescriptor),
             ...opts
         };
     }

package/dist/src/dht/contact/Remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"Remote.js","sourceRoot":"","sources":["../../../../src/dht/contact/Remote.ts"],"names":[],"mappings":";;;AAIA,MAAsB,MAAM;IAOxB,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAiB,EACjB,MAAyB;QAEzB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC9B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AA1CD,wBA0CC"}
+{"version":3,"file":"Remote.js","sourceRoot":"","sources":["../../../../src/dht/contact/Remote.ts"],"names":[],"mappings":";;;AAIA,8DAA6D;AAC7D,6DAAmE;AAEnE,4DAA4D;AAC5D,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,uGAAuG;AACvG,kDAAkD;AAClD,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,sFAAsF;AACtF,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B,2CAA2C;AAC9B,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAE/C,MAAM,aAAa,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAU,EAAE;IACxG,MAAM,cAAc,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IACxF,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,MAAM;IAOxB,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,MAAyB,EACzB,UAAmB;QAEnB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO,EAAE,IAAI,CAAC,UAAU,IAAI,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YAC9F,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AA7CD,wBA6CC"}

package/dist/src/dht/contact/SortedContactList.d.ts

@@ -3,10 +3,10 @@ import { ContactList } from './ContactList';
 export declare class SortedContactList<C extends {
     getPeerId: () => PeerID;
 }> extends ContactList<C> {
-    private allowOwnPeerId;
+    private allowLocalPeerId;
     private peerIdDistanceLimit?;
     private excludedPeerIDs?;
-    constructor(ownId: PeerID, maxSize: number, defaultContactQueryLimit?: number, allowOwnPeerId?: boolean, peerIdDistanceLimit?: PeerID, excludedPeerIDs?: PeerID[]);
+    constructor(ownId: PeerID, maxSize: number, defaultContactQueryLimit?: number, allowLocalPeerId?: boolean, peerIdDistanceLimit?: PeerID, excludedPeerIDs?: PeerID[]);
     getClosestContactId(): PeerID;
     getContactIds(): PeerID[];
     addContact(contact: C): void;

package/dist/src/dht/contact/SortedContactList.js

@@ -7,10 +7,10 @@ exports.SortedContactList = void 0;
 const k_bucket_1 = __importDefault(require("k-bucket"));
 const ContactList_1 = require("./ContactList");
 class SortedContactList extends ContactList_1.ContactList {
-    constructor(ownId, maxSize, defaultContactQueryLimit, allowOwnPeerId = false, peerIdDistanceLimit, excludedPeerIDs) {
+    constructor(ownId, maxSize, defaultContactQueryLimit, allowLocalPeerId = false, peerIdDistanceLimit, excludedPeerIDs) {
         super(ownId, maxSize, defaultContactQueryLimit);
         this.compareIds = this.compareIds.bind(this);
-        this.allowOwnPeerId = allowOwnPeerId;
+        this.allowLocalPeerId = allowLocalPeerId;
         this.peerIdDistanceLimit = peerIdDistanceLimit;
         this.excludedPeerIDs = excludedPeerIDs;
     }
@@ -25,7 +25,7 @@ class SortedContactList extends ContactList_1.ContactList {
             && this.excludedPeerIDs.some((peerId) => contact.getPeerId().equals(peerId))) {
             return;
         }
-        if ((!this.allowOwnPeerId && this.ownId.equals(contact.getPeerId())) ||
+        if ((!this.allowLocalPeerId && this.ownId.equals(contact.getPeerId())) ||
             (this.peerIdDistanceLimit !== undefined && this.compareIds(this.peerIdDistanceLimit, contact.getPeerId()) < 0)) {
             return;
         }

package/dist/src/dht/contact/SortedContactList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SortedContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/SortedContactList.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SortedContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/SortedContactList.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA8B;AAE9B,+CAAyD;AAEzD,MAAa,iBAAyD,SAAQ,yBAAc;IAMxF,YACI,KAAa,EACb,OAAe,EACf,wBAAiC,EACjC,gBAAgB,GAAG,KAAK,EACxB,mBAA4B,EAC5B,eAA0B;QAE1B,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAA;QAC/C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5C,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;IAC1C,CAAC;IAEM,mBAAmB;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAC7B,CAAC;IAEM,aAAa;QAChB,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IAEM,UAAU,CAAC,OAAU;QACxB,IAAI,IAAI,CAAC,eAAe;eACjB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE;YAC9E,OAAM;SACT;QAED,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YAClE,CAAC,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAChH,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACrD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE;gBACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBAC7E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;aACxC;iBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE;gBACpF,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAA;gBACvC,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAU,CAAC,KAAK,EAAE,CAAE,CAAC,OAAO,CAAA;gBACzE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAU,CAAC,KAAK,EAAE,CAAC,CAAA;gBAC5C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBAC7E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACrC,IAAI,CAAC,IAAI,CACL,gBAAgB,EAChB,cAAc,EACd,IAAI,CAAC,kBAAkB,EAAE,CAC5B,CAAA;aACJ;YACD,IAAI,CAAC,IAAI,CACL,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,kBAAkB,EAAE,CAC5B,CAAA;SACJ;IACL,CAAC;IAEM,WAAW,CAAC,QAAa;QAC5B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3D,CAAC;IAEM,YAAY,CAAC,SAAiB;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE;YAC1C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAE,CAAC,SAAS,GAAG,IAAI,CAAA;SAC7D;IACL,CAAC;IAEM,SAAS,CAAC,SAAiB;QAC9B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE;YAC1C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAE,CAAC,MAAM,GAAG,IAAI,CAAA;SAC1D;IACL,CAAC;IAEM,kBAAkB,CAAC,KAAK,GAAG,IAAI,CAAC,wBAAwB;QAC3D,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;YACxD,IAAI,OAAO,EAAE;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,sBAAsB,CAAC,GAAW;QACrC,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;YACxD,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;gBACzB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;oBACnB,OAAO,GAAG,CAAA;iBACb;aACJ;SACJ;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IAEM,iBAAiB,CAAC,KAAc;QACnC,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;YACxD,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;gBAC3B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;SAC7B;aAAM;YACH,OAAO,GAAG,CAAA;SACb;IACL,CAAC;IAEM,UAAU,CAAC,GAAW,EAAE,GAAW;QACtC,MAAM,SAAS,GAAG,kBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC/D,MAAM,SAAS,GAAG,kBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC/D,OAAO,SAAS,GAAG,SAAS,CAAA;IAChC,CAAC;IAEM,aAAa,CAAC,EAAU;QAC3B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAE,CAAC,OAAO,CAAA;YAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;YACxE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;YACpC,IAAI,CAAC,IAAI,CACL,gBAAgB,EAChB,OAAO,EACP,IAAI,CAAC,kBAAkB,EAAE,CAC5B,CAAA;YACD,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,QAAQ,CAAC,EAAU;QACtB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAA;IAChG,CAAC;IAEM,cAAc;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAE,CAAC,OAAO,CAAC,CAAA;IAC1F,CAAC;CACJ;AAtJD,8CAsJC"}

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

@@ -2,17 +2,19 @@ import { RpcCommunicator } from '@streamr/proto-rpc';
 import KBucket from 'k-bucket';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { SortedContactList } from '../contact/SortedContactList';
-import { RemoteDhtNode } from '../RemoteDhtNode';
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
+import { ServiceID } from '../../types/ServiceID';
 interface DiscoverySessionConfig {
-    bucket: KBucket<RemoteDhtNode>;
-    neighborList: SortedContactList<RemoteDhtNode>;
+    bucket: KBucket<DhtNodeRpcRemote>;
+    neighborList: SortedContactList<DhtNodeRpcRemote>;
     targetId: Uint8Array;
-    ownPeerDescriptor: PeerDescriptor;
-    serviceId: string;
+    localPeerDescriptor: PeerDescriptor;
+    serviceId: ServiceID;
     rpcCommunicator: RpcCommunicator;
     parallelism: number;
     noProgressLimit: number;
-    newContactListener?: (remoteDhtNode: RemoteDhtNode) => void;
+    newContactListener?: (rpcRemote: DhtNodeRpcRemote) => void;
+    rpcRequestTimeout?: number;
 }
 export declare class DiscoverySession {
     readonly sessionId: string;
@@ -28,7 +30,7 @@ export declare class DiscoverySession {
     private onClosestPeersRequestSucceeded;
     private onClosestPeersRequestFailed;
     private findMoreContacts;
-    findClosestNodes(timeout: number): Promise<SortedContactList<RemoteDhtNode>>;
+    findClosestNodes(timeout: number): Promise<SortedContactList<DhtNodeRpcRemote>>;
     stop(): void;
 }
 export {};

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

@@ -9,7 +9,7 @@ const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const uuid_1 = require("uuid");
 const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
-const RemoteDhtNode_1 = require("../RemoteDhtNode");
+const DhtNodeRpcRemote_1 = require("../DhtNodeRpcRemote");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
 class DiscoverySession {
@@ -27,13 +27,13 @@ class DiscoverySession {
             return;
         }
         contacts.forEach((contact) => {
-            if (!(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(contact, this.config.ownPeerDescriptor)) {
-                const remoteDhtNode = new RemoteDhtNode_1.RemoteDhtNode(this.config.ownPeerDescriptor, contact, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.config.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
+            if (!(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(contact, this.config.localPeerDescriptor)) {
+                const rpcRemote = new DhtNodeRpcRemote_1.DhtNodeRpcRemote(this.config.localPeerDescriptor, contact, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtNodeRpcClient(this.config.rpcCommunicator.getRpcClientTransport())), this.config.serviceId, this.config.rpcRequestTimeout);
                 if (this.config.newContactListener) {
-                    this.config.newContactListener(remoteDhtNode);
+                    this.config.newContactListener(rpcRemote);
                 }
-                if (!this.config.neighborList.getContact(remoteDhtNode.getPeerId())) {
-                    this.config.neighborList.addContact(remoteDhtNode);
+                if (!this.config.neighborList.getContact(rpcRemote.getPeerId())) {
+                    this.config.neighborList.addContact(rpcRemote);
                 }
             }
         });
@@ -76,7 +76,7 @@ class DiscoverySession {
             return;
         }
         const uncontacted = this.config.neighborList.getUncontactedContacts(this.config.parallelism);
-        if (uncontacted.length < 1 || this.noProgressCounter >= this.config.noProgressLimit) {
+        if (uncontacted.length === 0 || this.noProgressCounter >= this.config.noProgressLimit) {
             this.emitter.emit('discoveryCompleted');
             this.stopped = true;
             return;
@@ -97,7 +97,7 @@ class DiscoverySession {
         }
     }
     async findClosestNodes(timeout) {
-        if (this.config.neighborList.getUncontactedContacts(this.config.parallelism).length < 1) {
+        if (this.config.neighborList.getUncontactedContacts(this.config.parallelism).length === 0) {
             logger.trace('getUncontactedContacts length was 0 in beginning of discovery, this.neighborList.size: '
                 + this.config.neighborList.getSize());
             return this.config.neighborList;

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

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

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

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

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

@@ -22,12 +22,12 @@ class PeerDiscovery {
         this.joinCalled = true;
         logger.debug(`Joining ${this.config.serviceId === 'layer0' ? 'The Streamr Network' : `Control Layer for ${this.config.serviceId}`}`
             + ` via entrypoint ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(entryPointDescriptor)}`);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.ownPeerDescriptor)) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.localPeerDescriptor)) {
             return;
         }
         this.config.connectionManager?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
         this.config.addContact(entryPointDescriptor);
-        const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.ownPeerDescriptor).value;
+        const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value;
         const closest = this.config.bucket.closest(targetId, this.config.peerDiscoveryQueryBatchSize);
         this.config.neighborList.addContacts(closest);
         const sessions = [this.createSession(targetId)];
@@ -42,7 +42,7 @@ class PeerDiscovery {
             bucket: this.config.bucket,
             neighborList: this.config.neighborList,
             targetId,
-            ownPeerDescriptor: this.config.ownPeerDescriptor,
+            localPeerDescriptor: this.config.localPeerDescriptor,
             serviceId: this.config.serviceId,
             rpcCommunicator: this.config.rpcCommunicator,
             parallelism: this.config.parallelism,
@@ -106,9 +106,9 @@ class PeerDiscovery {
         if (this.isStopped()) {
             return;
         }
-        const nodes = this.config.bucket.closest((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.ownPeerDescriptor).value, this.config.parallelism);
+        const nodes = this.config.bucket.closest((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value, this.config.parallelism);
         await Promise.allSettled(nodes.map(async (peer) => {
-            const contacts = await peer.getClosestPeers(this.config.ownPeerDescriptor.kademliaId);
+            const contacts = await peer.getClosestPeers(this.config.localPeerDescriptor.kademliaId);
             contacts.forEach((contact) => {
                 this.config.addContact(contact);
             });

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

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