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

package/dist/src/logic/inspect/Inspector.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Inspector = void 0;
 const InspectSession_1 = require("./InspectSession");
 const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const utils_1 = require("@streamr/utils");
 const TemporaryConnectionRpcRemote_1 = require("../temporary-connection/TemporaryConnectionRpcRemote");
 const identifiers_1 = require("../../identifiers");
@@ -14,13 +13,13 @@ class Inspector {
         this.sessions = new Map();
         this.streamPartId = config.streamPartId;
         this.localPeerDescriptor = config.localPeerDescriptor;
-        this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.TemporaryConnectionRpcClient(config.rpcCommunicator.getRpcClientTransport()));
+        this.rpcCommunicator = config.rpcCommunicator;
         this.connectionLocker = config.connectionLocker;
         this.inspectionTimeout = config.inspectionTimeout ?? DEFAULT_TIMEOUT;
         this.openInspectConnection = config.openInspectConnection ?? this.defaultOpenInspectConnection;
     }
     async defaultOpenInspectConnection(peerDescriptor, lockId) {
-        const rpcRemote = new TemporaryConnectionRpcRemote_1.TemporaryConnectionRpcRemote(this.localPeerDescriptor, peerDescriptor, this.streamPartId, this.client);
+        const rpcRemote = new TemporaryConnectionRpcRemote_1.TemporaryConnectionRpcRemote(this.localPeerDescriptor, peerDescriptor, this.streamPartId, this.rpcCommunicator, NetworkRpc_client_1.TemporaryConnectionRpcClient);
         await rpcRemote.openConnection();
         this.connectionLocker.lockConnection(peerDescriptor, lockId);
     }

package/dist/src/logic/inspect/Inspector.js.map

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

package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.d.ts

@@ -1,5 +1,4 @@
-import { Empty } from '../../proto/google/protobuf/empty';
-import { InterleaveNotice, StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
+import { InterleaveRequest, InterleaveResponse, StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { NodeList } from '../NodeList';
 import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
@@ -13,6 +12,7 @@ interface HandshakeRpcLocalConfig {
     targetNeighbors: NodeList;
     connectionLocker: ConnectionLocker;
     ongoingHandshakes: Set<NodeID>;
+    ongoingInterleaves: Set<NodeID>;
     maxNeighborCount: number;
     createRpcRemote: (target: PeerDescriptor) => HandshakeRpcRemote;
     createDeliveryRpcRemote: (peerDescriptor: PeerDescriptor) => DeliveryRpcRemote;
@@ -26,6 +26,6 @@ export declare class HandshakeRpcLocal implements IHandshakeRpc {
     private acceptHandshake;
     private rejectHandshake;
     private acceptHandshakeWithInterleaving;
-    interleaveNotice(message: InterleaveNotice, context: ServerCallContext): Promise<Empty>;
+    interleaveRequest(message: InterleaveRequest, context: ServerCallContext): Promise<InterleaveResponse>;
 }
 export {};

package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandshakeRpcLocal = void 0;
-const empty_1 = require("../../proto/google/protobuf/empty");
 const identifiers_1 = require("../../identifiers");
 const utils_1 = require("@streamr/utils");
+const logger = new utils_1.Logger(module);
 class HandshakeRpcLocal {
     constructor(config) {
         this.config = config;
@@ -14,14 +14,19 @@ class HandshakeRpcLocal {
     handleRequest(request, context) {
         const senderDescriptor = context.incomingSourceDescriptor;
         const getInterleaveSourceIds = () => (request.interleaveSourceId !== undefined) ? [(0, utils_1.binaryToHex)(request.interleaveSourceId)] : [];
-        if (this.config.targetNeighbors.hasNode(senderDescriptor)
+        if (this.config.ongoingInterleaves.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(senderDescriptor))) {
+            return this.rejectHandshake(request);
+        }
+        else if (this.config.targetNeighbors.hasNode(senderDescriptor)
             || this.config.ongoingHandshakes.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(senderDescriptor))) {
             return this.acceptHandshake(request, senderDescriptor);
         }
         else if (this.config.targetNeighbors.size() + this.config.ongoingHandshakes.size < this.config.maxNeighborCount) {
             return this.acceptHandshake(request, senderDescriptor);
         }
-        else if (this.config.targetNeighbors.size(getInterleaveSourceIds()) >= 2) {
+        else if (this.config.targetNeighbors.size(getInterleaveSourceIds()) - this.config.ongoingInterleaves.size >= 2) {
+            // Do not accept the handshakes requests if the target neighbor count can potentially drop below 2 
+            // due to interleaving. This ensures that a stable number of connections is kept during high churn.
             return this.acceptHandshakeWithInterleaving(request, senderDescriptor);
         }
         else {
@@ -46,7 +51,9 @@ class HandshakeRpcLocal {
         return res;
     }
     acceptHandshakeWithInterleaving(request, requester) {
-        const exclude = request.neighborIds.map((id) => (0, utils_1.binaryToHex)(id));
+        const exclude = [];
+        request.neighborIds.forEach((id) => exclude.push((0, utils_1.binaryToHex)(id)));
+        this.config.ongoingInterleaves.forEach((id) => exclude.push(id));
         exclude.push((0, identifiers_1.getNodeIdFromPeerDescriptor)(requester));
         if (request.interleaveSourceId !== undefined) {
             exclude.push((0, utils_1.binaryToHex)(request.interleaveSourceId));
@@ -54,10 +61,25 @@ class HandshakeRpcLocal {
         const furthest = this.config.targetNeighbors.getFurthest(exclude);
         const furthestPeerDescriptor = furthest ? furthest.getPeerDescriptor() : undefined;
         if (furthest) {
+            const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(furthest.getPeerDescriptor());
             const remote = this.config.createRpcRemote(furthest.getPeerDescriptor());
-            remote.interleaveNotice(requester);
-            this.config.targetNeighbors.remove(furthest.getPeerDescriptor());
-            this.config.connectionLocker.unlockConnection(furthestPeerDescriptor, this.config.streamPartId);
+            this.config.ongoingInterleaves.add(nodeId);
+            // Run this with then catch instead of setImmediate to avoid changes in state
+            // eslint-disable-next-line promise/catch-or-return
+            remote.interleaveRequest(requester).then((response) => {
+                // If response is accepted, remove the furthest node from the target neighbors
+                // and unlock the connection
+                // If response is not accepted, keep the furthest node as a neighbor
+                if (response.accepted) {
+                    this.config.targetNeighbors.remove(furthest.getPeerDescriptor());
+                    this.config.connectionLocker.unlockConnection(furthestPeerDescriptor, this.config.streamPartId);
+                }
+                return;
+            }).catch(() => {
+                // no-op: InterleaveRequest cannot reject
+            }).finally(() => {
+                this.config.ongoingInterleaves.delete(nodeId);
+            });
         }
         this.config.targetNeighbors.add(this.config.createDeliveryRpcRemote(requester));
         this.config.connectionLocker.lockConnection(requester, this.config.streamPartId);
@@ -67,17 +89,21 @@ class HandshakeRpcLocal {
             interleaveTargetDescriptor: furthestPeerDescriptor
         };
     }
-    async interleaveNotice(message, context) {
-        if (message.streamPartId === this.config.streamPartId) {
-            const senderPeerDescriptor = context.incomingSourceDescriptor;
-            const senderId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+    async interleaveRequest(message, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const senderId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        try {
+            await this.config.handshakeWithInterleaving(message.interleaveTargetDescriptor, senderId);
             if (this.config.targetNeighbors.hasNodeById(senderId)) {
                 this.config.connectionLocker.unlockConnection(senderPeerDescriptor, this.config.streamPartId);
                 this.config.targetNeighbors.remove(senderPeerDescriptor);
             }
-            this.config.handshakeWithInterleaving(message.interleaveTargetDescriptor, senderId).catch((_e) => { });
+            return { accepted: true };
+        }
+        catch (err) {
+            logger.debug(`interleaveRequest to ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(message.interleaveTargetDescriptor)} failed: ${err}`);
+            return { accepted: false };
         }
-        return empty_1.Empty;
     }
 }
 exports.HandshakeRpcLocal = HandshakeRpcLocal;

package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js.map

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

package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.d.ts

@@ -1,12 +1,14 @@
 import { PeerDescriptor, RpcRemote } from '@streamr/dht';
 import { NodeID } from '../../identifiers';
-import { IHandshakeRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
+import { InterleaveResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
+import { HandshakeRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
 interface HandshakeResponse {
     accepted: boolean;
     interleaveTargetDescriptor?: PeerDescriptor;
 }
-export declare class HandshakeRpcRemote extends RpcRemote<IHandshakeRpcClient> {
+export declare const INTERLEAVE_REQUEST_TIMEOUT = 15000;
+export declare class HandshakeRpcRemote extends RpcRemote<HandshakeRpcClient> {
     handshake(neighborIds: NodeID[], concurrentHandshakeTargetId?: NodeID, interleaveSourceId?: NodeID): Promise<HandshakeResponse>;
-    interleaveNotice(originatorDescriptor: PeerDescriptor): void;
+    interleaveRequest(originatorDescriptor: PeerDescriptor): Promise<InterleaveResponse>;
 }
 export {};

package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HandshakeRpcRemote = void 0;
+exports.HandshakeRpcRemote = exports.INTERLEAVE_REQUEST_TIMEOUT = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
 const uuid_1 = require("uuid");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
+exports.INTERLEAVE_REQUEST_TIMEOUT = 15000;
 class HandshakeRpcRemote extends dht_1.RpcRemote {
     async handshake(neighborIds, concurrentHandshakeTargetId, interleaveSourceId) {
         const request = {
@@ -29,17 +30,26 @@ class HandshakeRpcRemote extends dht_1.RpcRemote {
             };
         }
     }
-    interleaveNotice(originatorDescriptor) {
-        const notification = {
-            streamPartId: this.getServiceId(),
+    async interleaveRequest(originatorDescriptor) {
+        const request = {
             interleaveTargetDescriptor: originatorDescriptor
         };
         const options = this.formDhtRpcOptions({
-            notification: true
-        });
-        this.getClient().interleaveNotice(notification, options).catch(() => {
-            logger.debug('Failed to send interleaveNotice');
+            connect: false,
+            timeout: exports.INTERLEAVE_REQUEST_TIMEOUT
         });
+        try {
+            const res = await this.getClient().interleaveRequest(request, options);
+            return {
+                accepted: res.accepted
+            };
+        }
+        catch (err) {
+            logger.debug(`interleaveRequest to ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} failed: ${err}`);
+            return {
+                accepted: false
+            };
+        }
     }
 }
 exports.HandshakeRpcRemote = HandshakeRpcRemote;

package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAwD;AACxD,0CAAoD;AACpD,+BAAyB;AACzB,mDAAuE;AAIvE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,kBAAmB,SAAQ,eAA8B;IAElE,KAAK,CAAC,SAAS,CACX,WAAqB,EACrB,2BAAoC,EACpC,kBAA2B;QAE3B,MAAM,OAAO,GAA+B;YACxC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,CAAC,CAAC;YACrD,2BAA2B,EAAE,CAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,SAAS;YAC/H,kBAAkB,EAAE,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,SAAS;SACvG,CAAA;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACpF,OAAO;gBACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,0BAA0B,EAAE,QAAQ,CAAC,0BAA0B;aAClE,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YACpG,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;SACJ;IACL,CAAC;IAED,gBAAgB,CAAC,oBAAoC;QACjD,MAAM,YAAY,GAAqB;YACnC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,0BAA0B,EAAE,oBAAoB;SACnD,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAChE,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACnD,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAxCD,gDAwCC"}
+{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAwD;AACxD,0CAAoD;AACpD,+BAAyB;AACzB,mDAAuE;AAIvE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOpB,QAAA,0BAA0B,GAAG,KAAK,CAAA;AAE/C,MAAa,kBAAmB,SAAQ,eAA6B;IAEjE,KAAK,CAAC,SAAS,CACX,WAAqB,EACrB,2BAAoC,EACpC,kBAA2B;QAE3B,MAAM,OAAO,GAA+B;YACxC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,CAAC,CAAC;YACrD,2BAA2B,EAAE,CAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,SAAS;YAC/H,kBAAkB,EAAE,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,SAAS;SACvG,CAAA;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACpF,OAAO;gBACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,0BAA0B,EAAE,QAAQ,CAAC,0BAA0B;aAClE,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YACpG,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,oBAAoC;QACxD,MAAM,OAAO,GAAsB;YAC/B,0BAA0B,EAAE,oBAAoB;SACnD,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAA0B;SACtC,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO;gBACH,QAAQ,EAAE,GAAG,CAAC,QAAQ;aACzB,CAAA;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC5G,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;SACJ;IAEL,CAAC;CACJ;AAjDD,gDAiDC"}

package/dist/src/logic/neighbor-discovery/Handshaker.d.ts

@@ -14,14 +14,9 @@ interface HandshakerConfig {
     maxNeighborCount: number;
     rpcRequestTimeout?: number;
 }
-export interface IHandshaker {
-    attemptHandshakesOnContacts(excludedIds: NodeID[]): Promise<NodeID[]>;
-    getOngoingHandshakes(): Set<NodeID>;
-}
-export declare class Handshaker implements IHandshaker {
+export declare class Handshaker {
     private readonly ongoingHandshakes;
     private config;
-    private readonly client;
     private readonly rpcLocal;
     constructor(config: HandshakerConfig);
     attemptHandshakesOnContacts(excludedIds: NodeID[]): Promise<NodeID[]>;

package/dist/src/logic/neighbor-discovery/Handshaker.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Handshaker = void 0;
 const DeliveryRpcRemote_1 = require("../DeliveryRpcRemote");
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
 const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
 const utils_1 = require("@streamr/utils");
@@ -15,21 +14,22 @@ class Handshaker {
     constructor(config) {
         this.ongoingHandshakes = new Set();
         this.config = config;
-        this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.HandshakeRpcClient(this.config.rpcCommunicator.getRpcClientTransport()));
         this.rpcLocal = new HandshakeRpcLocal_1.HandshakeRpcLocal({
             streamPartId: this.config.streamPartId,
             targetNeighbors: this.config.targetNeighbors,
             connectionLocker: this.config.connectionLocker,
             ongoingHandshakes: this.ongoingHandshakes,
+            ongoingInterleaves: new Set(),
             maxNeighborCount: this.config.maxNeighborCount,
             handshakeWithInterleaving: (target, senderId) => this.handshakeWithInterleaving(target, senderId),
             createRpcRemote: (target) => this.createRpcRemote(target),
             createDeliveryRpcRemote: (target) => this.createDeliveryRpcRemote(target)
         });
-        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.InterleaveNotice, 'interleaveNotice', (req, context) => this.rpcLocal.interleaveNotice(req, context));
+        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.InterleaveRequest, NetworkRpc_1.InterleaveResponse, 'interleaveRequest', (req, context) => this.rpcLocal.interleaveRequest(req, context), { timeout: HandshakeRpcRemote_1.INTERLEAVE_REQUEST_TIMEOUT });
         this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.StreamPartHandshakeRequest, NetworkRpc_1.StreamPartHandshakeResponse, 'handshake', (req, context) => this.rpcLocal.handshake(req, context));
     }
     async attemptHandshakesOnContacts(excludedIds) {
+        // TODO use config option or named constant? or why the value 2?
         if (this.config.targetNeighbors.size() + this.ongoingHandshakes.size < this.config.maxNeighborCount - 2) {
             logger.trace(`Attempting parallel handshakes with ${PARALLEL_HANDSHAKE_COUNT} targets`);
             return this.selectParallelTargetsAndHandshake(excludedIds);
@@ -96,7 +96,7 @@ class Handshaker {
         return result.accepted;
     }
     async handshakeWithInterleaving(target, interleaveSourceId) {
-        const targetNeighbor = new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.localPeerDescriptor, target, this.config.streamPartId, this.client, this.config.rpcRequestTimeout);
+        const targetNeighbor = this.createRpcRemote(target);
         const targetNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetNeighbor.getPeerDescriptor());
         this.ongoingHandshakes.add(targetNodeId);
         const result = await targetNeighbor.handshake(this.config.targetNeighbors.getIds(), undefined, interleaveSourceId);
@@ -108,10 +108,10 @@ class Handshaker {
         return result.accepted;
     }
     createRpcRemote(targetPeerDescriptor) {
-        return new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.client, this.config.rpcRequestTimeout);
+        return new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.config.rpcCommunicator, NetworkRpc_client_1.HandshakeRpcClient, this.config.rpcRequestTimeout);
     }
     createDeliveryRpcRemote(targetPeerDescriptor) {
-        return new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.config.rpcCommunicator.getRpcClientTransport())), this.config.rpcRequestTimeout);
+        return new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.config.rpcCommunicator, NetworkRpc_client_1.DeliveryRpcClient, this.config.rpcRequestTimeout);
     }
     getOngoingHandshakes() {
         return this.ongoingHandshakes;

package/dist/src/logic/neighbor-discovery/Handshaker.js.map

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

package/dist/src/logic/neighbor-discovery/NeighborFinder.d.ts

@@ -6,12 +6,7 @@ interface FindNeighborsSessionConfig {
     doFindNeighbors: (excludedNodes: NodeID[]) => Promise<NodeID[]>;
     minCount: number;
 }
-export interface INeighborFinder {
-    start(excluded?: NodeID[]): void;
-    stop(): void;
-    isRunning(): boolean;
-}
-export declare class NeighborFinder implements INeighborFinder {
+export declare class NeighborFinder {
     private readonly abortController;
     private readonly config;
     private running;

package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map

@@ -1 +1 @@
-{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAWpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAQpB,MAAa,cAAc;IAKvB,YAAY,MAAkC;QAFtC,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAkB;QAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE;YACrH,mDAAmD;YACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SACpG;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;SACvB;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAqB,EAAE;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,mDAAmD;QACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACtG,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AA3CD,wCA2CC"}
+{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAWpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB,MAAa,cAAc;IAKvB,YAAY,MAAkC;QAFtC,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAkB;QAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE;YACrH,mDAAmD;YACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SACpG;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;SACvB;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAqB,EAAE;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,mDAAmD;QACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACtG,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AA3CD,wCA2CC"}

package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.d.ts

@@ -1,24 +1,19 @@
 import { ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
-import { INeighborFinder } from './NeighborFinder';
+import { NeighborFinder } from './NeighborFinder';
 import { NodeList } from '../NodeList';
 import { StreamPartID } from '@streamr/protocol';
 interface NeighborUpdateManagerConfig {
     localPeerDescriptor: PeerDescriptor;
     targetNeighbors: NodeList;
     nearbyNodeView: NodeList;
-    neighborFinder: INeighborFinder;
+    neighborFinder: NeighborFinder;
     streamPartId: StreamPartID;
     rpcCommunicator: ListeningRpcCommunicator;
     neighborUpdateInterval: number;
 }
-export interface INeighborUpdateManager {
-    start(): Promise<void>;
-    stop(): void;
-}
-export declare class NeighborUpdateManager implements INeighborUpdateManager {
+export declare class NeighborUpdateManager {
     private readonly abortController;
     private readonly config;
-    private readonly client;
     private readonly rpcLocal;
     constructor(config: NeighborUpdateManagerConfig);
     start(): Promise<void>;

package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NeighborUpdateManager = void 0;
 const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
 const utils_1 = require("@streamr/utils");
 const NeighborUpdateRpcRemote_1 = require("./NeighborUpdateRpcRemote");
@@ -12,7 +11,6 @@ const logger = new utils_1.Logger(module);
 class NeighborUpdateManager {
     constructor(config) {
         this.abortController = new AbortController();
-        this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NeighborUpdateRpcClient(config.rpcCommunicator.getRpcClientTransport()));
         this.rpcLocal = new NeighborUpdateRpcLocal_1.NeighborUpdateRpcLocal(config);
         this.config = config;
         this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NeighborUpdate, NetworkRpc_1.NeighborUpdate, 'neighborUpdate', (req, context) => this.rpcLocal.neighborUpdate(req, context));
@@ -35,7 +33,7 @@ class NeighborUpdateManager {
         }));
     }
     createRemote(targetPeerDescriptor) {
-        return new NeighborUpdateRpcRemote_1.NeighborUpdateRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.client);
+        return new NeighborUpdateRpcRemote_1.NeighborUpdateRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.config.rpcCommunicator, NetworkRpc_client_1.NeighborUpdateRpcClient);
     }
 }
 exports.NeighborUpdateManager = NeighborUpdateManager;

package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,2FAA2F;AAE3F,kDAAqE;AACrE,yGAA2G;AAC3G,0CAA2D;AAG3D,uEAAmE;AACnE,qEAAiE;AACjE,mDAA+D;AAa/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,qBAAqB;IAO9B,YAAY,MAAmC;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,2CAAuB,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QAC3G,IAAI,CAAC,QAAQ,GAAG,IAAI,+CAAsB,CAAC,MAAM,CAAC,CAAA;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC1F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACrF,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACrI,CAAC;IAED,IAAI;QACA,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAChH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAA;YACtG,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;gBAChE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAA,yCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;aAChG;QACL,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,YAAY,CAAC,oBAAoC;QACrD,OAAO,IAAI,iDAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpI,CAAC;CACJ;AAvCD,sDAuCC"}
+{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,2FAA2F;AAE3F,yGAA2G;AAC3G,0CAA2D;AAG3D,uEAAmE;AACnE,qEAAiE;AACjE,mDAA+D;AAa/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,qBAAqB;IAM9B,YAAY,MAAmC;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,QAAQ,GAAG,IAAI,+CAAsB,CAAC,MAAM,CAAC,CAAA;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC1F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACrF,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACrI,CAAC;IAED,IAAI;QACA,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAChH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAA;YACtG,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;gBAChE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAA,yCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;aAChG;QACL,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,YAAY,CAAC,oBAAoC;QACrD,OAAO,IAAI,iDAAuB,CAC9B,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAC/B,oBAAoB,EACpB,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAI,CAAC,MAAM,CAAC,eAAe,EAC3B,2CAAuB,CAC1B,CAAA;IACL,CAAC;CACJ;AA3CD,sDA2CC"}

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.d.ts

@@ -3,14 +3,14 @@ import { ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
 import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 import { INeighborUpdateRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
 import { NodeList } from '../NodeList';
-import { INeighborFinder } from './NeighborFinder';
+import { NeighborFinder } from './NeighborFinder';
 import { StreamPartID } from '@streamr/protocol';
 interface NeighborUpdateRpcLocalConfig {
     localPeerDescriptor: PeerDescriptor;
     streamPartId: StreamPartID;
     targetNeighbors: NodeList;
     nearbyNodeView: NodeList;
-    neighborFinder: INeighborFinder;
+    neighborFinder: NeighborFinder;
     rpcCommunicator: ListeningRpcCommunicator;
 }
 export declare class NeighborUpdateRpcLocal implements INeighborUpdateRpc {

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NeighborUpdateRpcLocal = void 0;
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const identifiers_1 = require("../../identifiers");
 const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
 const DeliveryRpcRemote_1 = require("../DeliveryRpcRemote");
@@ -20,7 +19,7 @@ class NeighborUpdateRpcLocal {
                 const ownNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
                 return nodeId !== ownNodeId && !this.config.targetNeighbors.getIds().includes(nodeId);
             });
-            newPeerDescriptors.forEach((peerDescriptor) => this.config.nearbyNodeView.add(new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, peerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
+            newPeerDescriptors.forEach((peerDescriptor) => this.config.nearbyNodeView.add(new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, peerDescriptor, this.config.streamPartId, this.config.rpcCommunicator, NetworkRpc_client_1.DeliveryRpcClient)));
             this.config.neighborFinder.start();
             const response = {
                 streamPartId: this.config.streamPartId,

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"NeighborUpdateRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts"],"names":[],"mappings":";;;AAEA,kDAAqD;AACrD,mDAA+D;AAE/D,yGAAqG;AAGrG,4DAAwD;AAaxD,MAAa,sBAAsB;IAI/B,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,OAA0B;QACpE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YACnD,MAAM,kBAAkB,GAAG,OAAO,CAAC,mBAAmB;iBACjD,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;gBAC1D,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;gBAC9E,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzF,CAAC,CAAC,CAAA;YACN,kBAAkB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CACzE,IAAI,qCAAiB,CACjB,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAC/B,cAAc,EACd,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAA,4BAAgB,EAAC,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC/F,CAAC,CACL,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YAClC,MAAM,QAAQ,GAAmB;gBAC7B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;gBACtC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACzG,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;aAAM;YACH,MAAM,QAAQ,GAAmB;gBAC7B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;gBACtC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACzG,QAAQ,EAAE,IAAI;aACjB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;IACL,CAAC;CACJ;AA3CD,wDA2CC"}
+{"version":3,"file":"NeighborUpdateRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts"],"names":[],"mappings":";;;AAEA,mDAA+D;AAE/D,yGAAqG;AAGrG,4DAAwD;AAaxD,MAAa,sBAAsB;IAI/B,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,OAA0B;QACpE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YACnD,MAAM,kBAAkB,GAAG,OAAO,CAAC,mBAAmB;iBACjD,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;gBAC1D,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;gBAC9E,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzF,CAAC,CAAC,CAAA;YACN,kBAAkB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CACzE,IAAI,qCAAiB,CACjB,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAC/B,cAAc,EACd,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAI,CAAC,MAAM,CAAC,eAAe,EAC3B,qCAAiB,CACpB,CAAC,CACL,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YAClC,MAAM,QAAQ,GAAmB;gBAC7B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;gBACtC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACzG,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;aAAM;YACH,MAAM,QAAQ,GAAmB;gBAC7B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;gBACtC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACzG,QAAQ,EAAE,IAAI;aACjB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;IACL,CAAC;CACJ;AA5CD,wDA4CC"}

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.d.ts

@@ -1,10 +1,10 @@
 import { PeerDescriptor, RpcRemote } from '@streamr/dht';
-import { INeighborUpdateRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
+import { NeighborUpdateRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
 interface UpdateNeighborsResponse {
     peerDescriptors: PeerDescriptor[];
     removeMe: boolean;
 }
-export declare class NeighborUpdateRpcRemote extends RpcRemote<INeighborUpdateRpcClient> {
+export declare class NeighborUpdateRpcRemote extends RpcRemote<NeighborUpdateRpcClient> {
     updateNeighbors(neighbors: PeerDescriptor[]): Promise<UpdateNeighborsResponse>;
 }
 export {};

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAwD;AACxD,0CAAuC;AACvC,mDAA+D;AAI/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,eAAmC;IAE5E,KAAK,CAAC,eAAe,CAAC,SAA2B;QAC7C,MAAM,OAAO,GAAmB;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,mBAAmB,EAAE,SAAS;YAC9B,QAAQ,EAAE,KAAK;SAClB,CAAA;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACzF,OAAO;gBACH,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC1G,OAAO;gBACH,eAAe,EAAE,EAAE;gBACnB,QAAQ,EAAE,IAAI;aACjB,CAAA;SACJ;IACL,CAAC;CACJ;AAtBD,0DAsBC"}
+{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAwD;AACxD,0CAAuC;AACvC,mDAA+D;AAI/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,eAAkC;IAE3E,KAAK,CAAC,eAAe,CAAC,SAA2B;QAC7C,MAAM,OAAO,GAAmB;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,mBAAmB,EAAE,SAAS;YAC9B,QAAQ,EAAE,KAAK;SAClB,CAAA;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACzF,OAAO;gBACH,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC1G,OAAO;gBACH,eAAe,EAAE,EAAE;gBACnB,QAAQ,EAAE,IAAI;aACjB,CAAA;SACJ;IACL,CAAC;CACJ;AAtBD,0DAsBC"}

package/dist/src/logic/proxy/ProxyClient.d.ts

@@ -13,7 +13,10 @@ interface ProxyClientConfig {
     connectionLocker: ConnectionLocker;
     minPropagationTargets?: number;
 }
-export declare class ProxyClient extends EventEmitter {
+interface Events {
+    message: (message: StreamMessage) => void;
+}
+export declare class ProxyClient extends EventEmitter<Events> {
     private readonly rpcCommunicator;
     private readonly deliveryRpcLocal;
     private readonly config;

package/dist/src/logic/proxy/ProxyClient.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyClient = exports.retry = void 0;
 const dht_1 = require("@streamr/dht");
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = require("eventemitter3");
 const lodash_1 = require("lodash");
@@ -16,6 +15,7 @@ const Propagation_1 = require("../propagation/Propagation");
 const utils_2 = require("../utils");
 const ProxyConnectionRpcRemote_1 = require("./ProxyConnectionRpcRemote");
 const formStreamPartDeliveryServiceId_1 = require("../formStreamPartDeliveryServiceId");
+// TODO use config option or named constant?
 const retry = async (task, description, abortSignal, delay = 10000) => {
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -41,6 +41,7 @@ class ProxyClient extends eventemitter3_1.EventEmitter {
         this.connections = new Map();
         this.config = config;
         this.rpcCommunicator = new dht_1.ListeningRpcCommunicator((0, formStreamPartDeliveryServiceId_1.formStreamPartDeliveryServiceId)(config.streamPartId), config.transport);
+        // TODO use config option or named constant?
         this.targetNeighbors = new NodeList_1.NodeList((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), 1000);
         this.deliveryRpcLocal = new DeliveryRpcLocal_1.DeliveryRpcLocal({
             localPeerDescriptor: this.config.localPeerDescriptor,
@@ -58,6 +59,7 @@ class ProxyClient extends eventemitter3_1.EventEmitter {
             markForInspection: () => { }
         });
         this.propagation = new Propagation_1.Propagation({
+            // TODO use config option or named constant?
             minPropagationTargets: config.minPropagationTargets ?? 2,
             sendToNeighbor: async (neighborId, msg) => {
                 const remote = this.targetNeighbors.get(neighborId);
@@ -116,13 +118,12 @@ class ProxyClient extends eventemitter3_1.EventEmitter {
     }
     async attemptConnection(nodeId, direction, userId) {
         const peerDescriptor = this.definition.nodes.get(nodeId);
-        const client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.ProxyConnectionRpcClient(this.rpcCommunicator.getRpcClientTransport()));
-        const rpcRemote = new ProxyConnectionRpcRemote_1.ProxyConnectionRpcRemote(this.config.localPeerDescriptor, peerDescriptor, this.config.streamPartId, client);
+        const rpcRemote = new ProxyConnectionRpcRemote_1.ProxyConnectionRpcRemote(this.config.localPeerDescriptor, peerDescriptor, this.config.streamPartId, this.rpcCommunicator, NetworkRpc_client_1.ProxyConnectionRpcClient);
         const accepted = await rpcRemote.requestConnection(direction, userId);
         if (accepted) {
             this.config.connectionLocker.lockConnection(peerDescriptor, SERVICE_ID);
             this.connections.set(nodeId, direction);
-            const remote = new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, peerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            const remote = new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, peerDescriptor, this.config.streamPartId, this.rpcCommunicator, NetworkRpc_client_1.DeliveryRpcClient);
             this.targetNeighbors.add(remote);
             this.propagation.onNeighborJoined(nodeId);
             logger.info('Open proxy connection', {
@@ -147,7 +148,7 @@ class ProxyClient extends eventemitter3_1.EventEmitter {
                 nodeId
             });
             const server = this.targetNeighbors.get(nodeId);
-            server?.leaveStreamPartNotice();
+            server?.leaveStreamPartNotice(false);
             this.removeConnection(nodeId);
         }
     }
@@ -185,7 +186,7 @@ class ProxyClient extends eventemitter3_1.EventEmitter {
     stop() {
         this.targetNeighbors.getAll().map((remote) => {
             this.config.connectionLocker.unlockConnection(remote.getPeerDescriptor(), SERVICE_ID);
-            remote.leaveStreamPartNotice();
+            remote.leaveStreamPartNotice(false);
         });
         this.targetNeighbors.stop();
         this.rpcCommunicator.destroy();