@streamr/trackerless-network 0.0.1-tatum.6 → 0.0.1-tatum.7

package/dist/src/logic/createRandomGraphNode.js

@@ -8,15 +8,14 @@ const NeighborUpdateManager_1 = require("./neighbor-discovery/NeighborUpdateMana
 const RandomGraphNode_1 = require("./RandomGraphNode");
 const NodeList_1 = require("./NodeList");
 const Propagation_1 = require("./propagation/Propagation");
-const ProxyStreamConnectionServer_1 = require("./proxy/ProxyStreamConnectionServer");
+const ProxyConnectionRpcLocal_1 = require("./proxy/ProxyConnectionRpcLocal");
 const Inspector_1 = require("./inspect/Inspector");
-const TemporaryConnectionRpcServer_1 = require("./temporary-connection/TemporaryConnectionRpcServer");
-const protocol_1 = require("@streamr/protocol");
+const TemporaryConnectionRpcLocal_1 = require("./temporary-connection/TemporaryConnectionRpcLocal");
 const identifiers_1 = require("../identifiers");
+const formStreamPartDeliveryServiceId_1 = require("./formStreamPartDeliveryServiceId");
 const createConfigWithDefaults = (config) => {
     const ownNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(config.ownPeerDescriptor);
-    const rpcCommunicator = config.rpcCommunicator ?? new dht_1.ListeningRpcCommunicator(`layer2-${config.randomGraphId}`, config.P2PTransport);
-    const name = config.name ?? ownNodeId;
+    const rpcCommunicator = config.rpcCommunicator ?? new dht_1.ListeningRpcCommunicator((0, formStreamPartDeliveryServiceId_1.formStreamPartDeliveryServiceId)(config.streamPartId), config.P2PTransport);
     const numOfTargetNeighbors = config.numOfTargetNeighbors ?? 4;
     const maxNumberOfContacts = config.maxNumberOfContacts ?? 20;
     const minPropagationTargets = config.minPropagationTargets ?? 2;
@@ -25,21 +24,21 @@ const createConfigWithDefaults = (config) => {
     const nearbyNodeView = config.nearbyNodeView ?? new NodeList_1.NodeList(ownNodeId, numOfTargetNeighbors + 1);
     const randomNodeView = config.randomNodeView ?? new NodeList_1.NodeList(ownNodeId, maxNumberOfContacts);
     const targetNeighbors = config.targetNeighbors ?? new NodeList_1.NodeList(ownNodeId, maxNumberOfContacts);
-    const temporaryConnectionServer = new TemporaryConnectionRpcServer_1.TemporaryConnectionRpcServer({
-        randomGraphId: config.randomGraphId,
+    const temporaryConnectionRpcLocal = new TemporaryConnectionRpcLocal_1.TemporaryConnectionRpcLocal({
+        streamPartId: config.streamPartId,
         rpcCommunicator,
         ownPeerDescriptor: config.ownPeerDescriptor
     });
-    const proxyConnectionServer = acceptProxyConnections ? new ProxyStreamConnectionServer_1.ProxyStreamConnectionServer({
+    const proxyConnectionRpcLocal = acceptProxyConnections ? new ProxyConnectionRpcLocal_1.ProxyConnectionRpcLocal({
         ownPeerDescriptor: config.ownPeerDescriptor,
-        streamPartId: protocol_1.StreamPartIDUtils.parse(config.randomGraphId),
+        streamPartId: config.streamPartId,
         rpcCommunicator
     }) : undefined;
     const propagation = config.propagation ?? new Propagation_1.Propagation({
         minPropagationTargets,
         sendToNeighbor: async (neighborId, msg) => {
-            const remote = targetNeighbors.get(neighborId) ?? temporaryConnectionServer.getNodes().get(neighborId);
-            const proxyConnection = proxyConnectionServer?.getConnection(neighborId);
+            const remote = targetNeighbors.get(neighborId) ?? temporaryConnectionRpcLocal.getNodes().get(neighborId);
+            const proxyConnection = proxyConnectionRpcLocal?.getConnection(neighborId);
             if (remote) {
                 await remote.sendStreamMessage(msg);
             }
@@ -53,33 +52,33 @@ const createConfigWithDefaults = (config) => {
     });
     const handshaker = config.handshaker ?? new Handshaker_1.Handshaker({
         ownPeerDescriptor: config.ownPeerDescriptor,
-        randomGraphId: config.randomGraphId,
+        streamPartId: config.streamPartId,
         connectionLocker: config.connectionLocker,
         rpcCommunicator,
         nearbyNodeView,
         randomNodeView,
         targetNeighbors,
-        N: numOfTargetNeighbors
+        maxNeighborCount: numOfTargetNeighbors
     });
     const neighborFinder = config.neighborFinder ?? new NeighborFinder_1.NeighborFinder({
         targetNeighbors,
         nearbyNodeView,
         doFindNeighbors: (excludedIds) => handshaker.attemptHandshakesOnContacts(excludedIds),
-        N: numOfTargetNeighbors
+        minCount: numOfTargetNeighbors
     });
     const neighborUpdateManager = config.neighborUpdateManager ?? new NeighborUpdateManager_1.NeighborUpdateManager({
         targetNeighbors,
         nearbyNodeView,
         ownPeerDescriptor: config.ownPeerDescriptor,
         neighborFinder,
-        randomGraphId: config.randomGraphId,
+        streamPartId: config.streamPartId,
         rpcCommunicator,
         neighborUpdateInterval
     });
     const inspector = config.inspector ?? new Inspector_1.Inspector({
         ownPeerDescriptor: config.ownPeerDescriptor,
         rpcCommunicator,
-        graphId: config.randomGraphId,
+        streamPartId: config.streamPartId,
         connectionLocker: config.connectionLocker
     });
     return {
@@ -93,15 +92,10 @@ const createConfigWithDefaults = (config) => {
         neighborUpdateManager,
         propagation,
         numOfTargetNeighbors,
-        minPropagationTargets,
-        maxNumberOfContacts,
-        name,
         nodeViewSize: maxNumberOfContacts,
-        acceptProxyConnections,
-        proxyConnectionServer,
-        neighborUpdateInterval,
+        proxyConnectionRpcLocal,
         inspector,
-        temporaryConnectionServer
+        temporaryConnectionRpcLocal
     };
 };
 const createRandomGraphNode = (config) => {

package/dist/src/logic/createRandomGraphNode.js.map

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

package/dist/src/logic/formStreamPartDeliveryServiceId.d.ts

@@ -0,0 +1,2 @@
+import { StreamPartID } from '@streamr/protocol';
+export declare const formStreamPartDeliveryServiceId: (streamPartId: StreamPartID) => string;

package/dist/src/logic/formStreamPartDeliveryServiceId.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formStreamPartDeliveryServiceId = void 0;
+const formStreamPartDeliveryServiceId = (streamPartId) => {
+    return `stream-part-delivery-${streamPartId}`;
+};
+exports.formStreamPartDeliveryServiceId = formStreamPartDeliveryServiceId;
+//# sourceMappingURL=formStreamPartDeliveryServiceId.js.map

package/dist/src/logic/formStreamPartDeliveryServiceId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formStreamPartDeliveryServiceId.js","sourceRoot":"","sources":["../../../src/logic/formStreamPartDeliveryServiceId.ts"],"names":[],"mappings":";;;AAEO,MAAM,+BAA+B,GAAG,CAAC,YAA0B,EAAU,EAAE;IAClF,OAAO,wBAAwB,YAAY,EAAE,CAAA;AACjD,CAAC,CAAA;AAFY,QAAA,+BAA+B,mCAE3C"}

package/dist/src/logic/inspect/Inspector.d.ts

@@ -2,9 +2,10 @@ import { PeerDescriptor, ConnectionLocker } from '@streamr/dht';
 import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 import { RpcCommunicator } from '@streamr/proto-rpc';
 import { NodeID } from '../../identifiers';
+import { StreamPartID } from '@streamr/protocol';
 interface InspectorConfig {
     ownPeerDescriptor: PeerDescriptor;
-    graphId: string;
+    streamPartId: StreamPartID;
     rpcCommunicator: RpcCommunicator;
     connectionLocker: ConnectionLocker;
     inspectionTimeout?: number;
@@ -18,7 +19,7 @@ export interface IInspector {
 }
 export declare class Inspector implements IInspector {
     private readonly sessions;
-    private readonly graphId;
+    private readonly streamPartId;
     private readonly client;
     private readonly ownPeerDescriptor;
     private readonly connectionLocker;

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

@@ -5,14 +5,14 @@ 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 RemoteTemporaryConnectionRpcServer_1 = require("../temporary-connection/RemoteTemporaryConnectionRpcServer");
+const TemporaryConnectionRpcRemote_1 = require("../temporary-connection/TemporaryConnectionRpcRemote");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 const DEFAULT_TIMEOUT = 60 * 1000;
 class Inspector {
     constructor(config) {
         this.sessions = new Map();
-        this.graphId = config.graphId;
+        this.streamPartId = config.streamPartId;
         this.ownPeerDescriptor = config.ownPeerDescriptor;
         this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.TemporaryConnectionRpcClient(config.rpcCommunicator.getRpcClientTransport()));
         this.connectionLocker = config.connectionLocker;
@@ -20,8 +20,8 @@ class Inspector {
         this.openInspectConnection = config.openInspectConnection ?? this.defaultOpenInspectConnection;
     }
     async defaultOpenInspectConnection(peerDescriptor, lockId) {
-        const remoteRandomGraphNode = new RemoteTemporaryConnectionRpcServer_1.RemoteTemporaryConnectionRpcServer(this.ownPeerDescriptor, peerDescriptor, this.graphId, this.client);
-        await remoteRandomGraphNode.openConnection();
+        const rpcRemote = new TemporaryConnectionRpcRemote_1.TemporaryConnectionRpcRemote(this.ownPeerDescriptor, peerDescriptor, this.streamPartId, this.client);
+        await rpcRemote.openConnection();
         this.connectionLocker.lockConnection(peerDescriptor, lockId);
     }
     async inspect(peerDescriptor) {
@@ -29,7 +29,7 @@ class Inspector {
         const session = new InspectSession_1.InspectSession({
             inspectedNode: nodeId
         });
-        const lockId = `inspector-${this.graphId}`;
+        const lockId = `inspector-${this.streamPartId}`;
         this.sessions.set(nodeId, session);
         await this.openInspectConnection(peerDescriptor, lockId);
         let success = false;

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/{HandshakerServer.d.ts → HandshakeRpcLocal.d.ts}

@@ -4,23 +4,23 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { NodeList } from '../NodeList';
 import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
 import { IHandshakeRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
-import { RemoteHandshaker } from './RemoteHandshaker';
-import { RemoteRandomGraphNode } from '../RemoteRandomGraphNode';
+import { HandshakeRpcRemote } from './HandshakeRpcRemote';
+import { DeliveryRpcRemote } from '../DeliveryRpcRemote';
 import { NodeID } from '../../identifiers';
-interface HandshakerServerConfig {
-    randomGraphId: string;
-    ownPeerDescriptor: PeerDescriptor;
+import { StreamPartID } from '@streamr/protocol';
+interface HandshakeRpcLocalConfig {
+    streamPartId: StreamPartID;
     targetNeighbors: NodeList;
     connectionLocker: ConnectionLocker;
     ongoingHandshakes: Set<NodeID>;
-    N: number;
-    createRemoteHandshaker: (target: PeerDescriptor) => RemoteHandshaker;
-    createRemoteNode: (peerDescriptor: PeerDescriptor) => RemoteRandomGraphNode;
+    maxNeighborCount: number;
+    createRpcRemote: (target: PeerDescriptor) => HandshakeRpcRemote;
+    createDeliveryRpcRemote: (peerDescriptor: PeerDescriptor) => DeliveryRpcRemote;
     handshakeWithInterleaving: (target: PeerDescriptor, senderId: NodeID) => Promise<boolean>;
 }
-export declare class HandshakerServer implements IHandshakeRpc {
+export declare class HandshakeRpcLocal implements IHandshakeRpc {
     private readonly config;
-    constructor(config: HandshakerServerConfig);
+    constructor(config: HandshakeRpcLocalConfig);
     handshake(request: StreamPartHandshakeRequest, context: ServerCallContext): Promise<StreamPartHandshakeResponse>;
     private handleRequest;
     private acceptHandshake;

package/dist/src/logic/neighbor-discovery/{HandshakerServer.js → HandshakeRpcLocal.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HandshakerServer = void 0;
+exports.HandshakeRpcLocal = void 0;
 const empty_1 = require("../../proto/google/protobuf/empty");
 const identifiers_1 = require("../../identifiers");
 const utils_1 = require("@streamr/utils");
-class HandshakerServer {
+class HandshakeRpcLocal {
     constructor(config) {
         this.config = config;
     }
@@ -18,7 +18,7 @@ class HandshakerServer {
             || 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.N) {
+        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) {
@@ -33,8 +33,8 @@ class HandshakerServer {
             requestId: request.requestId,
             accepted: true
         };
-        this.config.targetNeighbors.add(this.config.createRemoteNode(requester));
-        this.config.connectionLocker.lockConnection(requester, this.config.randomGraphId);
+        this.config.targetNeighbors.add(this.config.createDeliveryRpcRemote(requester));
+        this.config.connectionLocker.lockConnection(requester, this.config.streamPartId);
         return res;
     }
     // eslint-disable-next-line class-methods-use-this
@@ -54,13 +54,13 @@ class HandshakerServer {
         const furthest = this.config.targetNeighbors.getFurthest(exclude);
         const furthestPeerDescriptor = furthest ? furthest.getPeerDescriptor() : undefined;
         if (furthest) {
-            const remote = this.config.createRemoteHandshaker(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.randomGraphId);
+            this.config.connectionLocker.unlockConnection(furthestPeerDescriptor, this.config.streamPartId);
         }
-        this.config.targetNeighbors.add(this.config.createRemoteNode(requester));
-        this.config.connectionLocker.lockConnection(requester, this.config.randomGraphId);
+        this.config.targetNeighbors.add(this.config.createDeliveryRpcRemote(requester));
+        this.config.connectionLocker.lockConnection(requester, this.config.streamPartId);
         return {
             requestId: request.requestId,
             accepted: true,
@@ -68,11 +68,11 @@ class HandshakerServer {
         };
     }
     async interleaveNotice(message, context) {
-        if (message.randomGraphId === this.config.randomGraphId) {
+        if (message.streamPartId === this.config.streamPartId) {
             const senderPeerDescriptor = context.incomingSourceDescriptor;
             const senderId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
             if (this.config.targetNeighbors.hasNodeById(senderId)) {
-                this.config.connectionLocker.unlockConnection(senderPeerDescriptor, this.config.randomGraphId);
+                this.config.connectionLocker.unlockConnection(senderPeerDescriptor, this.config.streamPartId);
                 this.config.targetNeighbors.remove(senderPeerDescriptor);
             }
             this.config.handshakeWithInterleaving(message.interleaveTargetDescriptor, senderId).catch((_e) => { });
@@ -80,5 +80,5 @@ class HandshakerServer {
         return empty_1.Empty;
     }
 }
-exports.HandshakerServer = HandshakerServer;
-//# sourceMappingURL=HandshakerServer.js.map
+exports.HandshakeRpcLocal = HandshakeRpcLocal;
+//# sourceMappingURL=HandshakeRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"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/{RemoteHandshaker.d.ts → HandshakeRpcRemote.d.ts}

@@ -5,7 +5,7 @@ interface HandshakeResponse {
     accepted: boolean;
     interleaveTargetDescriptor?: PeerDescriptor;
 }
-export declare class RemoteHandshaker extends Remote<IHandshakeRpcClient> {
+export declare class HandshakeRpcRemote extends Remote<IHandshakeRpcClient> {
     handshake(neighborIds: NodeID[], concurrentHandshakeTargetId?: NodeID, interleaveSourceId?: NodeID): Promise<HandshakeResponse>;
     interleaveNotice(originatorDescriptor: PeerDescriptor): void;
 }

package/dist/src/logic/neighbor-discovery/{RemoteHandshaker.js → HandshakeRpcRemote.js}

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteHandshaker = void 0;
+exports.HandshakeRpcRemote = 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);
-class RemoteHandshaker extends dht_1.Remote {
+class HandshakeRpcRemote extends dht_1.Remote {
     async handshake(neighborIds, concurrentHandshakeTargetId, interleaveSourceId) {
         const request = {
-            randomGraphId: this.getServiceId(),
-            requestId: new dht_1.UUID().toString(),
+            streamPartId: this.getServiceId(),
+            requestId: (0, uuid_1.v4)(),
             neighborIds: neighborIds.map((id) => (0, utils_1.hexToBinary)(id)),
             concurrentHandshakeTargetId: (concurrentHandshakeTargetId !== undefined) ? (0, utils_1.hexToBinary)(concurrentHandshakeTargetId) : undefined,
             interleaveSourceId: (interleaveSourceId !== undefined) ? (0, utils_1.hexToBinary)(interleaveSourceId) : undefined
@@ -30,7 +31,7 @@ class RemoteHandshaker extends dht_1.Remote {
     }
     interleaveNotice(originatorDescriptor) {
         const notification = {
-            randomGraphId: this.getServiceId(),
+            streamPartId: this.getServiceId(),
             interleaveTargetDescriptor: originatorDescriptor
         };
         const options = this.formDhtRpcOptions({
@@ -41,5 +42,5 @@ class RemoteHandshaker extends dht_1.Remote {
         });
     }
 }
-exports.RemoteHandshaker = RemoteHandshaker;
-//# sourceMappingURL=RemoteHandshaker.js.map
+exports.HandshakeRpcRemote = HandshakeRpcRemote;
+//# sourceMappingURL=HandshakeRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqD;AACrD,0CAAoD;AACpD,+BAAyB;AACzB,mDAAuE;AAIvE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,kBAAmB,SAAQ,YAA2B;IAE/D,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"}

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

@@ -2,25 +2,26 @@ import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
 import { NodeList } from '../NodeList';
 import { RpcCommunicator } from '@streamr/proto-rpc';
 import { NodeID } from '../../identifiers';
+import { StreamPartID } from '@streamr/protocol';
 interface HandshakerConfig {
     ownPeerDescriptor: PeerDescriptor;
-    randomGraphId: string;
+    streamPartId: StreamPartID;
     connectionLocker: ConnectionLocker;
     targetNeighbors: NodeList;
     nearbyNodeView: NodeList;
     randomNodeView: NodeList;
     rpcCommunicator: RpcCommunicator;
-    N: number;
+    maxNeighborCount: number;
 }
 export interface IHandshaker {
     attemptHandshakesOnContacts(excludedIds: NodeID[]): Promise<NodeID[]>;
-    getOngoingHandshakes(): Set<string>;
+    getOngoingHandshakes(): Set<NodeID>;
 }
 export declare class Handshaker implements IHandshaker {
     private readonly ongoingHandshakes;
     private config;
     private readonly client;
-    private readonly server;
+    private readonly rpcLocal;
     constructor(config: HandshakerConfig);
     attemptHandshakesOnContacts(excludedIds: NodeID[]): Promise<NodeID[]>;
     private selectParallelTargetsAndHandshake;
@@ -29,8 +30,8 @@ export declare class Handshaker implements IHandshaker {
     private selectNewTargetAndHandshake;
     private handshakeWithTarget;
     private handshakeWithInterleaving;
-    private createRemoteHandshaker;
-    private createRemoteNode;
-    getOngoingHandshakes(): Set<string>;
+    private createRpcRemote;
+    private createDeliveryRpcRemote;
+    getOngoingHandshakes(): Set<NodeID>;
 }
 export {};

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Handshaker = void 0;
-const RemoteRandomGraphNode_1 = require("../RemoteRandomGraphNode");
+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");
-const RemoteHandshaker_1 = require("./RemoteHandshaker");
-const HandshakerServer_1 = require("./HandshakerServer");
+const HandshakeRpcRemote_1 = require("./HandshakeRpcRemote");
+const HandshakeRpcLocal_1 = require("./HandshakeRpcLocal");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 const PARALLEL_HANDSHAKE_COUNT = 2;
@@ -16,26 +16,25 @@ class Handshaker {
         this.ongoingHandshakes = new Set();
         this.config = config;
         this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.HandshakeRpcClient(this.config.rpcCommunicator.getRpcClientTransport()));
-        this.server = new HandshakerServer_1.HandshakerServer({
-            randomGraphId: this.config.randomGraphId,
-            ownPeerDescriptor: this.config.ownPeerDescriptor,
+        this.rpcLocal = new HandshakeRpcLocal_1.HandshakeRpcLocal({
+            streamPartId: this.config.streamPartId,
             targetNeighbors: this.config.targetNeighbors,
             connectionLocker: this.config.connectionLocker,
             ongoingHandshakes: this.ongoingHandshakes,
-            N: this.config.N,
+            maxNeighborCount: this.config.maxNeighborCount,
             handshakeWithInterleaving: (target, senderId) => this.handshakeWithInterleaving(target, senderId),
-            createRemoteHandshaker: (target) => this.createRemoteHandshaker(target),
-            createRemoteNode: (target) => this.createRemoteNode(target)
+            createRpcRemote: (target) => this.createRpcRemote(target),
+            createDeliveryRpcRemote: (target) => this.createDeliveryRpcRemote(target)
         });
-        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.InterleaveNotice, 'interleaveNotice', (req, context) => this.server.interleaveNotice(req, context));
-        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.StreamPartHandshakeRequest, NetworkRpc_1.StreamPartHandshakeResponse, 'handshake', (req, context) => this.server.handshake(req, context));
+        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.InterleaveNotice, 'interleaveNotice', (req, context) => this.rpcLocal.interleaveNotice(req, context));
+        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.StreamPartHandshakeRequest, NetworkRpc_1.StreamPartHandshakeResponse, 'handshake', (req, context) => this.rpcLocal.handshake(req, context));
     }
     async attemptHandshakesOnContacts(excludedIds) {
-        if (this.config.targetNeighbors.size() + this.ongoingHandshakes.size < this.config.N - 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);
         }
-        else if (this.config.targetNeighbors.size() + this.ongoingHandshakes.size < this.config.N) {
+        else if (this.config.targetNeighbors.size() + this.ongoingHandshakes.size < this.config.maxNeighborCount) {
             logger.trace(`Attempting handshake with new target`);
             return this.selectNewTargetAndHandshake(excludedIds);
         }
@@ -55,7 +54,7 @@ class Handshaker {
                 targetNeighbors.push(random);
             }
         }
-        return targetNeighbors.map((neighbor) => this.createRemoteHandshaker(neighbor.getPeerDescriptor()));
+        return targetNeighbors.map((neighbor) => this.createRpcRemote(neighbor.getPeerDescriptor()));
     }
     async doParallelHandshakes(targets, excludedIds) {
         const results = await Promise.allSettled(Array.from(targets.values()).map(async (target, i) => {
@@ -74,7 +73,7 @@ class Handshaker {
         const exclude = excludedIds.concat(this.config.targetNeighbors.getIds());
         const targetNeighbor = this.config.nearbyNodeView.getClosest(exclude) ?? this.config.randomNodeView.getRandom(exclude);
         if (targetNeighbor) {
-            const accepted = await this.handshakeWithTarget(this.createRemoteHandshaker(targetNeighbor.getPeerDescriptor()));
+            const accepted = await this.handshakeWithTarget(this.createRpcRemote(targetNeighbor.getPeerDescriptor()));
             if (!accepted) {
                 excludedIds.push((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetNeighbor.getPeerDescriptor()));
             }
@@ -86,8 +85,8 @@ class Handshaker {
         this.ongoingHandshakes.add(targetNodeId);
         const result = await targetNeighbor.handshake(this.config.targetNeighbors.getIds(), concurrentNodeId);
         if (result.accepted) {
-            this.config.targetNeighbors.add(this.createRemoteNode(targetNeighbor.getPeerDescriptor()));
-            this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.randomGraphId);
+            this.config.targetNeighbors.add(this.createDeliveryRpcRemote(targetNeighbor.getPeerDescriptor()));
+            this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.streamPartId);
         }
         if (result.interleaveTargetDescriptor) {
             await this.handshakeWithInterleaving(result.interleaveTargetDescriptor, targetNodeId);
@@ -96,22 +95,22 @@ class Handshaker {
         return result.accepted;
     }
     async handshakeWithInterleaving(target, interleaveSourceId) {
-        const targetNeighbor = new RemoteHandshaker_1.RemoteHandshaker(this.config.ownPeerDescriptor, target, this.config.randomGraphId, this.client);
+        const targetNeighbor = new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.ownPeerDescriptor, target, this.config.streamPartId, this.client);
         const targetNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetNeighbor.getPeerDescriptor());
         this.ongoingHandshakes.add(targetNodeId);
         const result = await targetNeighbor.handshake(this.config.targetNeighbors.getIds(), undefined, interleaveSourceId);
         if (result.accepted) {
-            this.config.targetNeighbors.add(this.createRemoteNode(targetNeighbor.getPeerDescriptor()));
-            this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.randomGraphId);
+            this.config.targetNeighbors.add(this.createDeliveryRpcRemote(targetNeighbor.getPeerDescriptor()));
+            this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.streamPartId);
         }
         this.ongoingHandshakes.delete(targetNodeId);
         return result.accepted;
     }
-    createRemoteHandshaker(targetPeerDescriptor) {
-        return new RemoteHandshaker_1.RemoteHandshaker(this.config.ownPeerDescriptor, targetPeerDescriptor, this.config.randomGraphId, this.client);
+    createRpcRemote(targetPeerDescriptor) {
+        return new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.ownPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.client);
     }
-    createRemoteNode(targetPeerDescriptor) {
-        return new RemoteRandomGraphNode_1.RemoteRandomGraphNode(this.config.ownPeerDescriptor, targetPeerDescriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())));
+    createDeliveryRpcRemote(targetPeerDescriptor) {
+        return new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.ownPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.config.rpcCommunicator.getRpcClientTransport())));
     }
     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":";;;AAEA,4DAAwD;AACxD,kDAAsF;AACtF,yGAG0E;AAC1E,2FAImE;AACnE,0CAAuC;AAEvC,6DAAyD;AACzD,2DAAuD;AACvD,mDAAuE;AAcvE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,wBAAwB,GAAG,CAAC,CAAA;AAOlC,MAAa,UAAU;IAOnB,YAAY,MAAwB;QALnB,sBAAiB,GAAgB,IAAI,GAAG,EAAE,CAAA;QAMvD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,sCAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QAC3G,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC;YAClC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACtC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YAC5C,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAC9C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAC9C,yBAAyB,EAAE,CAAC,MAAsB,EAAE,QAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,QAAQ,CAAC;YACzH,eAAe,EAAE,CAAC,MAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;YACzE,uBAAuB,EAAE,CAAC,MAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;SAC5F,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,uBAAuB,CAAC,6BAAgB,EAAE,kBAAkB,EACpF,CAAC,GAAqB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QACrF,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,uCAA0B,EAAE,wCAA2B,EAAE,WAAW,EAC9G,CAAC,GAA+B,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC5F,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,WAAqB;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,CAAC,EAAE;YACrG,MAAM,CAAC,KAAK,CAAC,uCAAuC,wBAAwB,UAAU,CAAC,CAAA;YACvF,OAAO,IAAI,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAA;SAC7D;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YACxG,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACpD,OAAO,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAA;SACvD;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,iCAAiC,CAAC,WAAqB;QACjE,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAA;QACxE,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;QAC3D,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAA,yCAA2B,EAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;QAC1H,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC;IAEO,qBAAqB,CAAC,WAAqB;QAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;QACrF,OAAO,eAAe,CAAC,MAAM,GAAG,wBAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YAC1G,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;YAChE,IAAI,MAAM,EAAE;gBACR,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aAC/B;SACJ;QACD,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;IAChG,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,OAA6B,EAAE,WAAqB;QACnF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACpC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAA0B,EAAE,CAAC,EAAE,EAAE;YACrE,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YACnD,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,yCAA2B,EAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtG,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QACxD,CAAC,CAAC,CACL,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACnB,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;gBAC1C,WAAW,CAAC,IAAI,CAAC,IAAA,yCAA2B,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;aAChF;QACL,CAAC,CAAC,CAAA;QACF,OAAO,WAAW,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,WAAqB;QAC3D,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAA;QACxE,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACtH,IAAI,cAAc,EAAE;YAChB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;YACzG,IAAI,CAAC,QAAQ,EAAE;gBACX,WAAW,CAAC,IAAI,CAAC,IAAA,yCAA2B,EAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;aACpF;SACJ;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,cAAkC,EAAE,gBAAyB;QAC3F,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAA;QACpF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACxC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,CACzC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,EACpC,gBAAgB,CACnB,CAAA;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;YACjG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SAC5G;QACD,IAAI,MAAM,CAAC,0BAA0B,EAAE;YACnC,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,0BAA0B,EAAE,YAAY,CAAC,CAAA;SACxF;QACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1B,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,MAAsB,EAAE,kBAA0B;QACtF,MAAM,cAAc,GAAG,IAAI,uCAAkB,CACzC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC7B,MAAM,EACN,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAI,CAAC,MAAM,CACd,CAAA;QACD,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAA;QACpF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACxC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,CACzC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,EACpC,SAAS,EACT,kBAAkB,CACrB,CAAA;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;YACjG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SAC5G;QACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1B,CAAC;IAEO,eAAe,CAAC,oBAAoC;QACxD,OAAO,IAAI,uCAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC7H,CAAC;IAEO,uBAAuB,CAAC,oBAAoC;QAChE,OAAO,IAAI,qCAAiB,CACxB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC7B,oBAAoB,EACpB,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAA,4BAAgB,EAAC,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC/F,CAAA;IACL,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;CAEJ;AA5ID,gCA4IC"}

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

@@ -4,7 +4,7 @@ interface FindNeighborsSessionConfig {
     targetNeighbors: NodeList;
     nearbyNodeView: NodeList;
     doFindNeighbors: (excludedNodes: NodeID[]) => Promise<NodeID[]>;
-    N: number;
+    minCount: number;
 }
 export interface INeighborFinder {
     start(excluded?: NodeID[]): void;

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

@@ -15,7 +15,7 @@ class NeighborFinder {
             return;
         }
         const newExcludes = await this.config.doFindNeighbors(excluded);
-        if (this.config.targetNeighbors.size() < this.config.N && newExcludes.length < this.config.nearbyNodeView.size()) {
+        if (this.config.targetNeighbors.size() < this.config.minCount && newExcludes.length < this.config.nearbyNodeView.size()) {
             (0, utils_1.setAbortableTimeout)(() => this.findNeighbors(newExcludes), INTERVAL, this.abortController.signal);
         }
         else {

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,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE;YAC9G,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,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;AAzCD,wCAyCC"}
+{"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,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,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;AAzCD,wCAyCC"}