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

package/dist/src/logic/StreamrNode.js

@@ -7,9 +7,9 @@ const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = require("eventemitter3");
 const lodash_1 = require("lodash");
 const identifiers_1 = require("../identifiers");
-const StreamPartEntryPointDiscovery_1 = require("./StreamPartEntryPointDiscovery");
+const EntryPointDiscovery_1 = require("./EntryPointDiscovery");
 const createRandomGraphNode_1 = require("./createRandomGraphNode");
-const ProxyStreamConnectionClient_1 = require("./proxy/ProxyStreamConnectionClient");
+const ProxyClient_1 = require("./proxy/ProxyClient");
 const logger = new utils_1.Logger(module);
 let cleanUp = async () => { };
 // TODO rename class?
@@ -21,26 +21,24 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
         this.destroyed = false;
         this.createLayer1Node = (streamPartId, entryPoints) => {
             return new dht_1.DhtNode({
-                transportLayer: this.layer0,
+                transport: this.layer0Node,
                 serviceId: 'layer1::' + streamPartId,
-                peerDescriptor: this.layer0.getPeerDescriptor(),
+                peerDescriptor: this.layer0Node.getPeerDescriptor(),
                 entryPoints,
                 numberOfNodesPerKBucket: 4,
                 rpcRequestTimeout: 5000,
-                dhtJoinTimeout: 20000,
-                nodeName: this.config.nodeName + ':layer1'
+                dhtJoinTimeout: 20000
             });
         };
-        this.createRandomGraphNode = (streamPartId, layer1) => {
+        this.createRandomGraphNode = (streamPartId, layer1Node) => {
             return (0, createRandomGraphNode_1.createRandomGraphNode)({
-                randomGraphId: streamPartId,
-                P2PTransport: this.P2PTransport,
-                layer1,
+                streamPartId,
+                transport: this.transport,
+                layer1Node,
                 connectionLocker: this.connectionLocker,
-                ownPeerDescriptor: this.layer0.getPeerDescriptor(),
+                ownPeerDescriptor: this.layer0Node.getPeerDescriptor(),
                 minPropagationTargets: this.config.streamPartitionMinPropagationTargets,
                 numOfTargetNeighbors: this.config.streamPartitionNumOfNeighbors,
-                name: this.config.nodeName,
                 acceptProxyConnections: this.config.acceptProxyConnections
             });
         };
@@ -53,14 +51,14 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
         };
         this.metricsContext.addMetrics('node', this.metrics);
     }
-    async start(startedAndJoinedLayer0, transport, connectionLocker) {
+    async start(startedAndJoinedLayer0Node, transport, connectionLocker) {
         if (this.started || this.destroyed) {
             return;
         }
-        logger.info(`Starting new StreamrNode with id ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(startedAndJoinedLayer0.getPeerDescriptor())}`);
+        logger.info(`Starting new StreamrNode with id ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(startedAndJoinedLayer0Node.getPeerDescriptor())}`);
         this.started = true;
-        this.layer0 = startedAndJoinedLayer0;
-        this.P2PTransport = transport;
+        this.layer0Node = startedAndJoinedLayer0Node;
+        this.transport = transport;
         this.connectionLocker = connectionLocker;
         cleanUp = () => this.destroy();
     }
@@ -70,13 +68,14 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
         }
         logger.trace('Destroying StreamrNode...');
         this.destroyed = true;
-        this.streamParts.forEach((stream) => stream.stop());
+        this.streamParts.forEach((streamPart) => streamPart.stop());
         this.streamParts.clear();
         this.removeAllListeners();
-        await this.layer0.stop();
-        await this.P2PTransport.stop();
-        this.layer0 = undefined;
-        this.P2PTransport = undefined;
+        // TODO stopping should be in NetworkStack#stop?
+        await this.layer0Node.stop();
+        await this.transport.stop();
+        this.layer0Node = undefined;
+        this.transport = undefined;
         this.connectionLocker = undefined;
     }
     broadcast(msg) {
@@ -87,47 +86,46 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
         this.metrics.broadcastBytesPerSecond.record(msg.content.length);
     }
     leaveStreamPart(streamPartId) {
-        const stream = this.streamParts.get(streamPartId);
-        if (stream) {
-            stream.stop();
+        const streamPart = this.streamParts.get(streamPartId);
+        if (streamPart) {
+            streamPart.stop();
             this.streamParts.delete(streamPartId);
         }
     }
     joinStreamPart(streamPartId) {
         logger.debug(`Join stream part ${streamPartId}`);
-        let stream = this.streamParts.get(streamPartId);
-        if (stream !== undefined) {
+        let streamPart = this.streamParts.get(streamPartId);
+        if (streamPart !== undefined) {
             return;
         }
-        const layer1 = this.createLayer1Node(streamPartId, this.knownStreamPartEntryPoints.get(streamPartId) ?? []);
-        const node = this.createRandomGraphNode(streamPartId, layer1);
-        const entryPointDiscovery = new StreamPartEntryPointDiscovery_1.StreamPartEntryPointDiscovery({
+        const layer1Node = this.createLayer1Node(streamPartId, this.knownStreamPartEntryPoints.get(streamPartId) ?? []);
+        const node = this.createRandomGraphNode(streamPartId, layer1Node);
+        const entryPointDiscovery = new EntryPointDiscovery_1.EntryPointDiscovery({
             streamPartId,
             ownPeerDescriptor: this.getPeerDescriptor(),
-            layer1,
-            getEntryPointData: (key) => this.layer0.getDataFromDht(key),
-            getEntryPointDataViaNode: (key, node) => this.layer0.findDataViaPeer(key, node),
-            storeEntryPointData: (key, data) => this.layer0.storeDataToDht(key, data),
+            layer1Node,
+            getEntryPointData: (key) => this.layer0Node.getDataFromDht(key),
+            storeEntryPointData: (key, data) => this.layer0Node.storeDataToDht(key, data),
             deleteEntryPointData: async (key) => {
                 if (this.destroyed) {
                     return;
                 }
-                return this.layer0.deleteDataFromDht(key);
+                return this.layer0Node.deleteDataFromDht(key);
             }
         });
-        stream = {
+        streamPart = {
             proxied: false,
-            layer1,
+            layer1Node,
             node,
             entryPointDiscovery,
             broadcast: (msg) => node.broadcast(msg),
             stop: () => {
                 entryPointDiscovery.destroy();
                 node.stop();
-                layer1.stop();
+                layer1Node.stop();
             }
         };
-        this.streamParts.set(streamPartId, stream);
+        this.streamParts.set(streamPartId, streamPart);
         node.on('message', (message) => {
             this.emit('newMessage', message);
         });
@@ -136,24 +134,23 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
                 await this.startLayersAndJoinDht(streamPartId, entryPointDiscovery);
             }
             catch (err) {
-                logger.warn(`Failed to join to stream ${streamPartId} with error: ${err}`);
+                logger.warn(`Failed to join to stream part ${streamPartId} with error: ${err}`);
             }
         });
     }
     async startLayersAndJoinDht(streamPartId, entryPointDiscovery) {
         logger.debug(`Start layers and join DHT for stream part ${streamPartId}`);
-        const stream = this.streamParts.get(streamPartId);
-        if ((stream === undefined) || stream.proxied) {
-            // leaveStream has been called (or leaveStream called, and then setProxies called)
+        const streamPart = this.streamParts.get(streamPartId);
+        if ((streamPart === undefined) || streamPart.proxied) {
+            // leaveStreamPart has been called (or leaveStreamPart called, and then setProxies called)
             return;
         }
-        await stream.layer1.start();
-        await stream.node.start();
+        await streamPart.layer1Node.start();
+        await streamPart.node.start();
         let entryPoints = this.knownStreamPartEntryPoints.get(streamPartId) ?? [];
-        const forwardingNode = this.layer0.isJoinOngoing() ? this.layer0.getKnownEntryPoints()[0] : undefined;
-        const discoveryResult = await entryPointDiscovery.discoverEntryPointsFromDht(entryPoints.length, forwardingNode);
+        const discoveryResult = await entryPointDiscovery.discoverEntryPointsFromDht(entryPoints.length);
         entryPoints = entryPoints.concat(discoveryResult.discoveredEntryPoints);
-        await stream.layer1.joinDht((0, lodash_1.sampleSize)(entryPoints, StreamPartEntryPointDiscovery_1.NETWORK_SPLIT_AVOIDANCE_LIMIT));
+        await streamPart.layer1Node.joinDht((0, lodash_1.sampleSize)(entryPoints, EntryPointDiscovery_1.NETWORK_SPLIT_AVOIDANCE_LIMIT));
         if (discoveryResult.entryPointsFromDht) {
             await entryPointDiscovery.storeSelfAsEntryPointIfNecessary(entryPoints.length);
         }
@@ -164,78 +161,72 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
         }
         const enable = (nodes.length > 0) && ((connectionCount === undefined) || (connectionCount > 0));
         if (enable) {
-            let proxyClient;
+            let client;
             const alreadyProxied = this.isProxiedStreamPart(streamPartId);
             if (alreadyProxied) {
-                proxyClient = this.streamParts.get(streamPartId).client;
+                client = this.streamParts.get(streamPartId).client;
             }
             else {
-                proxyClient = this.createProxyStream(streamPartId, userId);
-                await proxyClient.start();
+                client = this.createProxyClient(streamPartId);
+                this.streamParts.set(streamPartId, {
+                    proxied: true,
+                    client,
+                    broadcast: (msg) => client.broadcast(msg),
+                    stop: () => client.stop()
+                });
+                client.on('message', (message) => {
+                    this.emit('newMessage', message);
+                });
+                await client.start();
             }
-            await proxyClient.setProxies(streamPartId, nodes, direction, userId, connectionCount);
+            await client.setProxies(nodes, direction, userId, connectionCount);
         }
         else {
             this.streamParts.get(streamPartId)?.stop();
             this.streamParts.delete(streamPartId);
         }
     }
-    createProxyStream(streamPartId, userId) {
-        const client = this.createProxyStreamConnectionClient(streamPartId, userId);
-        this.streamParts.set(streamPartId, {
-            proxied: true,
-            client,
-            broadcast: (msg) => client.broadcast(msg),
-            stop: () => client.stop()
-        });
-        client.on('message', (message) => {
-            this.emit('newMessage', message);
-        });
-        return client;
-    }
-    createProxyStreamConnectionClient(streamPartId, userId) {
-        return new ProxyStreamConnectionClient_1.ProxyStreamConnectionClient({
-            P2PTransport: this.P2PTransport,
-            ownPeerDescriptor: this.layer0.getPeerDescriptor(),
+    createProxyClient(streamPartId) {
+        return new ProxyClient_1.ProxyClient({
+            transport: this.transport,
+            ownPeerDescriptor: this.layer0Node.getPeerDescriptor(),
             streamPartId,
             connectionLocker: this.connectionLocker,
-            minPropagationTargets: this.config.streamPartitionMinPropagationTargets,
-            nodeName: this.config.nodeName,
-            userId
+            minPropagationTargets: this.config.streamPartitionMinPropagationTargets
         });
     }
     async inspect(peerDescriptor, streamPartId) {
-        const stream = this.streamParts.get(streamPartId);
-        if ((stream !== undefined) && !stream.proxied) {
-            return stream.node.inspect(peerDescriptor);
+        const streamPart = this.streamParts.get(streamPartId);
+        if ((streamPart !== undefined) && !streamPart.proxied) {
+            return streamPart.node.inspect(peerDescriptor);
         }
         return false;
     }
     setStreamPartEntryPoints(streamPartId, entryPoints) {
         this.knownStreamPartEntryPoints.set(streamPartId, entryPoints);
     }
-    isProxiedStreamPart(streamId, direction) {
-        const stream = this.streamParts.get(streamId);
-        return (stream !== undefined)
-            && stream.proxied
-            && ((direction === undefined) || (stream.client.getDirection() === direction));
+    isProxiedStreamPart(streamPartId, direction) {
+        const streamPart = this.streamParts.get(streamPartId);
+        return (streamPart !== undefined)
+            && streamPart.proxied
+            && ((direction === undefined) || (streamPart.client.getDirection() === direction));
     }
-    getStream(streamPartId) {
+    getStreamPartDelivery(streamPartId) {
         return this.streamParts.get(streamPartId);
     }
-    hasStream(streamPartId) {
+    hasStreamPart(streamPartId) {
         return this.streamParts.has(streamPartId);
     }
     getPeerDescriptor() {
-        return this.layer0.getPeerDescriptor();
+        return this.layer0Node.getPeerDescriptor();
     }
     getNodeId() {
-        return this.layer0.getNodeId().toKey();
+        return (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.layer0Node.getPeerDescriptor());
     }
     getNeighbors(streamPartId) {
-        const stream = this.streamParts.get(streamPartId);
-        return (stream !== undefined) && (stream.proxied === false)
-            ? stream.node.getTargetNeighborIds()
+        const streamPart = this.streamParts.get(streamPartId);
+        return (streamPart !== undefined) && (streamPart.proxied === false)
+            ? streamPart.node.getTargetNeighborIds()
             : [];
     }
     getStreamParts() {

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

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

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

@@ -1,5 +1,10 @@
 import { StrictRandomGraphNodeConfig, RandomGraphNode } from './RandomGraphNode';
 import { MarkOptional } from 'ts-essentials';
-type RandomGraphNodeConfig = MarkOptional<StrictRandomGraphNodeConfig, 'nearbyNodeView' | 'randomNodeView' | 'targetNeighbors' | 'propagation' | 'handshaker' | 'neighborFinder' | 'neighborUpdateManager' | 'name' | 'numOfTargetNeighbors' | 'maxNumberOfContacts' | 'minPropagationTargets' | 'rpcCommunicator' | 'nodeViewSize' | 'acceptProxyConnections' | 'neighborUpdateInterval' | 'inspector' | 'temporaryConnectionServer'>;
+type RandomGraphNodeConfig = MarkOptional<StrictRandomGraphNodeConfig, 'nearbyNodeView' | 'randomNodeView' | 'targetNeighbors' | 'propagation' | 'handshaker' | 'neighborFinder' | 'neighborUpdateManager' | 'numOfTargetNeighbors' | 'rpcCommunicator' | 'nodeViewSize' | 'inspector' | 'temporaryConnectionRpcLocal'> & {
+    maxNumberOfContacts?: number;
+    minPropagationTargets?: number;
+    acceptProxyConnections?: boolean;
+    neighborUpdateInterval?: number;
+};
 export declare const createRandomGraphNode: (config: RandomGraphNodeConfig) => RandomGraphNode;
 export {};

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.transport);
     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;