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

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

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

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

@@ -5,17 +5,17 @@ const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/Ne
 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 RemoteNeighborUpdateManager_1 = require("./RemoteNeighborUpdateManager");
-const NeighborUpdateManagerServer_1 = require("./NeighborUpdateManagerServer");
+const NeighborUpdateRpcRemote_1 = require("./NeighborUpdateRpcRemote");
+const NeighborUpdateRpcLocal_1 = require("./NeighborUpdateRpcLocal");
 const identifiers_1 = require("../../identifiers");
 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.server = new NeighborUpdateManagerServer_1.NeighborUpdateManagerServer(config);
+        this.rpcLocal = new NeighborUpdateRpcLocal_1.NeighborUpdateRpcLocal(config);
         this.config = config;
-        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NeighborUpdate, NetworkRpc_1.NeighborUpdate, 'neighborUpdate', (req, context) => this.server.neighborUpdate(req, context));
+        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NeighborUpdate, NetworkRpc_1.NeighborUpdate, 'neighborUpdate', (req, context) => this.rpcLocal.neighborUpdate(req, context));
     }
     async start() {
         await (0, utils_1.scheduleAtInterval)(() => this.updateNeighborInfo(), this.config.neighborUpdateInterval, false, this.abortController.signal);
@@ -35,7 +35,7 @@ class NeighborUpdateManager {
         }));
     }
     createRemote(targetPeerDescriptor) {
-        return new RemoteNeighborUpdateManager_1.RemoteNeighborUpdateManager(this.config.ownPeerDescriptor, targetPeerDescriptor, this.config.randomGraphId, this.client);
+        return new NeighborUpdateRpcRemote_1.NeighborUpdateRpcRemote(this.config.ownPeerDescriptor, targetPeerDescriptor, this.config.streamPartId, this.client);
     }
 }
 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,+EAA2E;AAC3E,+EAA2E;AAC3E,mDAA+D;AAY/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,qBAAqB;IAK9B,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,MAAM,GAAG,IAAI,yDAA2B,CAAC,MAAM,CAAC,CAAA;QACrD,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,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACnF,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,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;IAEM,IAAI;QACP,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,yDAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACvI,CAAC;CACJ;AArCD,sDAqCC"}
+{"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,iBAAiB,EAAE,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAClI,CAAC;CACJ;AAvCD,sDAuCC"}

package/dist/src/logic/neighbor-discovery/{NeighborUpdateManagerServer.d.ts → NeighborUpdateRpcLocal.d.ts}

@@ -1,21 +1,21 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
-import { ListeningRpcCommunicator } from '@streamr/dht';
-import { PeerDescriptor } from '@streamr/dht/src/exports';
+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';
-interface NeighborUpdateManagerConfig {
+import { StreamPartID } from '@streamr/protocol';
+interface NeighborUpdateRpcLocalConfig {
     ownPeerDescriptor: PeerDescriptor;
-    randomGraphId: string;
+    streamPartId: StreamPartID;
     targetNeighbors: NodeList;
     nearbyNodeView: NodeList;
     neighborFinder: INeighborFinder;
     rpcCommunicator: ListeningRpcCommunicator;
 }
-export declare class NeighborUpdateManagerServer implements INeighborUpdateRpc {
+export declare class NeighborUpdateRpcLocal implements INeighborUpdateRpc {
     private readonly config;
-    constructor(config: NeighborUpdateManagerConfig);
+    constructor(config: NeighborUpdateRpcLocalConfig);
     neighborUpdate(message: NeighborUpdate, context: ServerCallContext): Promise<NeighborUpdate>;
 }
 export {};

package/dist/src/logic/neighbor-discovery/{NeighborUpdateManagerServer.js → NeighborUpdateRpcLocal.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NeighborUpdateManagerServer = void 0;
+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 RemoteRandomGraphNode_1 = require("../RemoteRandomGraphNode");
-class NeighborUpdateManagerServer {
+const DeliveryRpcRemote_1 = require("../DeliveryRpcRemote");
+class NeighborUpdateRpcLocal {
     constructor(config) {
         this.config = config;
     }
-    // INetworkRpc server method
+    // INeighborUpdateRpc server method
     async neighborUpdate(message, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
         const senderId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
@@ -20,10 +20,10 @@ class NeighborUpdateManagerServer {
                 const ownNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.ownPeerDescriptor);
                 return nodeId !== ownNodeId && !this.config.targetNeighbors.getIds().includes(nodeId);
             });
-            newPeerDescriptors.forEach((peerDescriptor) => this.config.nearbyNodeView.add(new RemoteRandomGraphNode_1.RemoteRandomGraphNode(this.config.ownPeerDescriptor, peerDescriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
+            newPeerDescriptors.forEach((peerDescriptor) => this.config.nearbyNodeView.add(new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.ownPeerDescriptor, peerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
             this.config.neighborFinder.start();
             const response = {
-                randomGraphId: this.config.randomGraphId,
+                streamPartId: this.config.streamPartId,
                 neighborDescriptors: this.config.targetNeighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor()),
                 removeMe: false
             };
@@ -31,7 +31,7 @@ class NeighborUpdateManagerServer {
         }
         else {
             const response = {
-                randomGraphId: this.config.randomGraphId,
+                streamPartId: this.config.streamPartId,
                 neighborDescriptors: this.config.targetNeighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor()),
                 removeMe: true
             };
@@ -39,5 +39,5 @@ class NeighborUpdateManagerServer {
         }
     }
 }
-exports.NeighborUpdateManagerServer = NeighborUpdateManagerServer;
-//# sourceMappingURL=NeighborUpdateManagerServer.js.map
+exports.NeighborUpdateRpcLocal = NeighborUpdateRpcLocal;
+//# sourceMappingURL=NeighborUpdateRpcLocal.js.map

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

@@ -0,0 +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,iBAAiB,CAAC,CAAA;gBAC5E,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,iBAAiB,EAC7B,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"}

package/dist/src/logic/neighbor-discovery/{RemoteNeighborUpdateManager.d.ts → NeighborUpdateRpcRemote.d.ts}

@@ -4,7 +4,7 @@ interface UpdateNeighborsResponse {
     peerDescriptors: PeerDescriptor[];
     removeMe: boolean;
 }
-export declare class RemoteNeighborUpdateManager extends Remote<INeighborUpdateRpcClient> {
+export declare class NeighborUpdateRpcRemote extends Remote<INeighborUpdateRpcClient> {
     updateNeighbors(neighbors: PeerDescriptor[]): Promise<UpdateNeighborsResponse>;
 }
 export {};

package/dist/src/logic/neighbor-discovery/{RemoteNeighborUpdateManager.js → NeighborUpdateRpcRemote.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteNeighborUpdateManager = void 0;
+exports.NeighborUpdateRpcRemote = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
-class RemoteNeighborUpdateManager extends dht_1.Remote {
+class NeighborUpdateRpcRemote extends dht_1.Remote {
     async updateNeighbors(neighbors) {
         const request = {
-            randomGraphId: this.getServiceId(),
+            streamPartId: this.getServiceId(),
             neighborDescriptors: neighbors,
             removeMe: false
         };
@@ -28,5 +28,5 @@ class RemoteNeighborUpdateManager extends dht_1.Remote {
         }
     }
 }
-exports.RemoteNeighborUpdateManager = RemoteNeighborUpdateManager;
-//# sourceMappingURL=RemoteNeighborUpdateManager.js.map
+exports.NeighborUpdateRpcRemote = NeighborUpdateRpcRemote;
+//# sourceMappingURL=NeighborUpdateRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqD;AACrD,0CAAuC;AACvC,mDAA+D;AAI/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,YAAgC;IAEzE,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/propagation/Propagation.js

@@ -35,8 +35,8 @@ class Propagation {
      * Node should invoke this when it learns about a new node stream assignment
      */
     onNeighborJoined(neighborId) {
-        const tasksOfStream = this.activeTaskStore.get();
-        for (const task of tasksOfStream) {
+        const tasks = this.activeTaskStore.get();
+        for (const task of tasks) {
             this.sendAndAwaitThenMark(task, neighborId);
         }
     }

package/dist/src/logic/propagation/Propagation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Propagation.js","sourceRoot":"","sources":["../../../../src/logic/propagation/Propagation.ts"],"names":[],"mappings":";;;AAEA,iEAA8E;AAW9E,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAA;AAE7B;;;;;;GAMG;AAEH,MAAa,WAAW;IAKpB,YAAY,EACR,cAAc,EACd,qBAAqB,EACrB,GAAG,GAAG,WAAW,EACjB,WAAW,GAAG,oBAAoB,EACjB;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,eAAe,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IACrE,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,OAAsB,EAAE,OAAiB,EAAE,MAAqB;QAC9E,MAAM,IAAI,GAAG;YACT,OAAO;YACP,MAAM;YACN,gBAAgB,EAAE,IAAI,GAAG,EAAU;SACtC,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;SAC1C;IACL,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,UAAkB;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAA;QAChD,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;YAC9B,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;SAC9C;IACL,CAAC;IAEO,oBAAoB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAmB,EAAE,UAAkB;QACnG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,UAAU,KAAK,MAAM,EAAE;YAC5D,CAAC,KAAK,IAAI,EAAE;gBACR,IAAI;oBACA,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;iBACjD;gBAAC,MAAM;oBACJ,OAAM;iBACT;gBACD,qGAAqG;gBACrG,4FAA4F;gBAC5F,0DAA0D;gBAC1D,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBAChC,IAAI,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,qBAAqB,EAAE;oBACrD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAU,CAAC,CAAA;iBAClD;YACL,CAAC,CAAC,EAAE,CAAA;SACP;IACL,CAAC;CACJ;AA3DD,kCA2DC"}
+{"version":3,"file":"Propagation.js","sourceRoot":"","sources":["../../../../src/logic/propagation/Propagation.ts"],"names":[],"mappings":";;;AAEA,iEAA8E;AAW9E,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAA;AAE7B;;;;;;GAMG;AAEH,MAAa,WAAW;IAKpB,YAAY,EACR,cAAc,EACd,qBAAqB,EACrB,GAAG,GAAG,WAAW,EACjB,WAAW,GAAG,oBAAoB,EACjB;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,eAAe,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IACrE,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,OAAsB,EAAE,OAAiB,EAAE,MAAqB;QAC9E,MAAM,IAAI,GAAG;YACT,OAAO;YACP,MAAM;YACN,gBAAgB,EAAE,IAAI,GAAG,EAAU;SACtC,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;SAC1C;IACL,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,UAAkB;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAA;QACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;SAC9C;IACL,CAAC;IAEO,oBAAoB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAmB,EAAE,UAAkB;QACnG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,UAAU,KAAK,MAAM,EAAE;YAC5D,CAAC,KAAK,IAAI,EAAE;gBACR,IAAI;oBACA,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;iBACjD;gBAAC,MAAM;oBACJ,OAAM;iBACT;gBACD,qGAAqG;gBACrG,4FAA4F;gBAC5F,0DAA0D;gBAC1D,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBAChC,IAAI,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,qBAAqB,EAAE;oBACrD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAU,CAAC,CAAA;iBAClD;YACL,CAAC,CAAC,EAAE,CAAA;SACP;IACL,CAAC;CACJ;AA3DD,kCA2DC"}

package/dist/src/logic/proxy/{ProxyStreamConnectionClient.d.ts → ProxyClient.d.ts}

@@ -1,24 +1,21 @@
 /// <reference types="node" />
-import { ITransport, PeerDescriptor } from '@streamr/dht';
-import { ConnectionLocker } from '@streamr/dht/src/exports';
+import { ConnectionLocker, ITransport, PeerDescriptor } from '@streamr/dht';
 import { StreamPartID } from '@streamr/protocol';
 import { EthereumAddress } from '@streamr/utils';
 import { EventEmitter } from 'eventemitter3';
 import { NodeID } from '../../identifiers';
 import { ProxyDirection, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 export declare const retry: <T>(task: () => Promise<T>, description: string, abortSignal: AbortSignal, delay?: number) => Promise<T>;
-interface ProxyStreamConnectionClientConfig {
+interface ProxyClientConfig {
     P2PTransport: ITransport;
     ownPeerDescriptor: PeerDescriptor;
     streamPartId: StreamPartID;
     connectionLocker: ConnectionLocker;
-    userId: EthereumAddress;
-    nodeName?: string;
     minPropagationTargets?: number;
 }
-export declare class ProxyStreamConnectionClient extends EventEmitter {
+export declare class ProxyClient extends EventEmitter {
     private readonly rpcCommunicator;
-    private readonly server;
+    private readonly deliveryRpcLocal;
     private readonly config;
     private readonly duplicateDetectors;
     private definition?;
@@ -26,9 +23,9 @@ export declare class ProxyStreamConnectionClient extends EventEmitter {
     private readonly propagation;
     private readonly targetNeighbors;
     private readonly abortController;
-    constructor(config: ProxyStreamConnectionClientConfig);
+    constructor(config: ProxyClientConfig);
     private registerDefaultServerMethods;
-    setProxies(streamPartId: StreamPartID, nodes: PeerDescriptor[], direction: ProxyDirection, userId: EthereumAddress, connectionCount?: number): Promise<void>;
+    setProxies(nodes: PeerDescriptor[], direction: ProxyDirection, userId: EthereumAddress, connectionCount?: number): Promise<void>;
     private updateConnections;
     private getInvalidConnections;
     private openRandomConnections;

package/dist/src/logic/proxy/{ProxyStreamConnectionClient.js → ProxyClient.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxyStreamConnectionClient = exports.retry = void 0;
+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");
@@ -10,11 +10,12 @@ const identifiers_1 = require("../../identifiers");
 const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
 const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
 const NodeList_1 = require("../NodeList");
-const RemoteRandomGraphNode_1 = require("../RemoteRandomGraphNode");
-const StreamNodeServer_1 = require("../StreamNodeServer");
+const DeliveryRpcRemote_1 = require("../DeliveryRpcRemote");
+const DeliveryRpcLocal_1 = require("../DeliveryRpcLocal");
 const Propagation_1 = require("../propagation/Propagation");
 const utils_2 = require("../utils");
-const RemoteProxyServer_1 = require("./RemoteProxyServer");
+const ProxyConnectionRpcRemote_1 = require("./ProxyConnectionRpcRemote");
+const formStreamPartDeliveryServiceId_1 = require("../formStreamPartDeliveryServiceId");
 const retry = async (task, description, abortSignal, delay = 10000) => {
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -32,17 +33,18 @@ const retry = async (task, description, abortSignal, delay = 10000) => {
 };
 exports.retry = retry;
 const logger = new utils_1.Logger(module);
-class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
+const SERVICE_ID = 'system/proxy-client';
+class ProxyClient extends eventemitter3_1.EventEmitter {
     constructor(config) {
         super();
         this.duplicateDetectors = new Map();
         this.connections = new Map();
         this.config = config;
-        this.rpcCommunicator = new dht_1.ListeningRpcCommunicator(`layer2-${config.streamPartId}`, config.P2PTransport);
+        this.rpcCommunicator = new dht_1.ListeningRpcCommunicator((0, formStreamPartDeliveryServiceId_1.formStreamPartDeliveryServiceId)(config.streamPartId), config.P2PTransport);
         this.targetNeighbors = new NodeList_1.NodeList((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.ownPeerDescriptor), 1000);
-        this.server = new StreamNodeServer_1.StreamNodeServer({
+        this.deliveryRpcLocal = new DeliveryRpcLocal_1.DeliveryRpcLocal({
             ownPeerDescriptor: this.config.ownPeerDescriptor,
-            randomGraphId: this.config.streamPartId,
+            streamPartId: this.config.streamPartId,
             markAndCheckDuplicate: (msg, prev) => (0, utils_2.markAndCheckDuplicate)(this.duplicateDetectors, msg, prev),
             broadcast: (message, previousNode) => this.broadcast(message, previousNode),
             onLeaveNotice: (senderId) => {
@@ -52,7 +54,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
                 }
             },
             rpcCommunicator: this.rpcCommunicator,
-            markForInspection: (_senderId, _messageId) => { }
+            markForInspection: () => { }
         });
         this.propagation = new Propagation_1.Propagation({
             minPropagationTargets: config.minPropagationTargets ?? 2,
@@ -69,11 +71,11 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
         this.abortController = new AbortController();
     }
     registerDefaultServerMethods() {
-        this.rpcCommunicator.registerRpcNotification(NetworkRpc_1.StreamMessage, 'sendStreamMessage', (msg, context) => this.server.sendStreamMessage(msg, context));
-        this.rpcCommunicator.registerRpcNotification(NetworkRpc_1.LeaveStreamPartNotice, 'leaveStreamPartNotice', (req, context) => this.server.leaveStreamPartNotice(req, context));
+        this.rpcCommunicator.registerRpcNotification(NetworkRpc_1.StreamMessage, 'sendStreamMessage', (msg, context) => this.deliveryRpcLocal.sendStreamMessage(msg, context));
+        this.rpcCommunicator.registerRpcNotification(NetworkRpc_1.LeaveStreamPartNotice, 'leaveStreamPartNotice', (req, context) => this.deliveryRpcLocal.leaveStreamPartNotice(req, context));
     }
-    async setProxies(streamPartId, nodes, direction, userId, connectionCount) {
-        logger.trace('Setting proxies', { streamPartId, peerDescriptors: nodes, direction, userId, connectionCount });
+    async setProxies(nodes, direction, userId, connectionCount) {
+        logger.trace('Setting proxies', { streamPartId: this.config.streamPartId, peerDescriptors: nodes, direction, userId, connectionCount });
         if (connectionCount !== undefined && connectionCount > nodes.length) {
             throw Error('Cannot set connectionCount above the size of the configured array of nodes');
         }
@@ -114,12 +116,12 @@ class ProxyStreamConnectionClient 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 proxyNode = new RemoteProxyServer_1.RemoteProxyServer(this.config.ownPeerDescriptor, peerDescriptor, this.config.streamPartId, client);
-        const accepted = await proxyNode.requestConnection(direction, userId);
+        const rpcRemote = new ProxyConnectionRpcRemote_1.ProxyConnectionRpcRemote(this.config.ownPeerDescriptor, peerDescriptor, this.config.streamPartId, client);
+        const accepted = await rpcRemote.requestConnection(direction, userId);
         if (accepted) {
-            this.config.connectionLocker.lockConnection(peerDescriptor, 'proxy-stream-connection-client');
+            this.config.connectionLocker.lockConnection(peerDescriptor, SERVICE_ID);
             this.connections.set(nodeId, direction);
-            const remote = new RemoteRandomGraphNode_1.RemoteRandomGraphNode(this.config.ownPeerDescriptor, peerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            const remote = new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.ownPeerDescriptor, peerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.rpcCommunicator.getRpcClientTransport())));
             this.targetNeighbors.add(remote);
             this.propagation.onNeighborJoined(nodeId);
             logger.info('Open proxy connection', {
@@ -168,7 +170,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
     async onNodeDisconnected(peerDescriptor) {
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
         if (this.connections.has(nodeId)) {
-            this.config.connectionLocker.unlockConnection(peerDescriptor, 'proxy-stream-connection-client');
+            this.config.connectionLocker.unlockConnection(peerDescriptor, SERVICE_ID);
             this.removeConnection(nodeId);
             await (0, exports.retry)(() => this.updateConnections(), 'updating proxy connections', this.abortController.signal);
         }
@@ -179,7 +181,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
     }
     stop() {
         this.targetNeighbors.getAll().map((remote) => {
-            this.config.connectionLocker.unlockConnection(remote.getPeerDescriptor(), 'proxy-stream-connection-client');
+            this.config.connectionLocker.unlockConnection(remote.getPeerDescriptor(), SERVICE_ID);
             remote.leaveStreamPartNotice();
         });
         this.targetNeighbors.stop();
@@ -188,5 +190,5 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
         this.abortController.abort();
     }
 }
-exports.ProxyStreamConnectionClient = ProxyStreamConnectionClient;
-//# sourceMappingURL=ProxyStreamConnectionClient.js.map
+exports.ProxyClient = ProxyClient;
+//# sourceMappingURL=ProxyClient.js.map

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

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

package/dist/src/logic/proxy/{ProxyStreamConnectionServer.d.ts → ProxyConnectionRpcLocal.d.ts}

@@ -1,7 +1,7 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { ProxyConnectionRequest, ProxyConnectionResponse, ProxyDirection, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 import { IProxyConnectionRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
-import { RemoteRandomGraphNode } from '../RemoteRandomGraphNode';
+import { DeliveryRpcRemote } from '../DeliveryRpcRemote';
 import { ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
 import { EventEmitter } from 'eventemitter3';
 import { EthereumAddress } from '@streamr/utils';
@@ -10,9 +10,9 @@ import { NodeID } from '../../identifiers';
 interface ProxyConnection {
     direction: ProxyDirection;
     userId: EthereumAddress;
-    remote: RemoteRandomGraphNode;
+    remote: DeliveryRpcRemote;
 }
-interface ProxyStreamConnectionServerConfig {
+interface ProxyConnectionRpcLocalConfig {
     ownPeerDescriptor: PeerDescriptor;
     streamPartId: StreamPartID;
     rpcCommunicator: ListeningRpcCommunicator;
@@ -20,10 +20,10 @@ interface ProxyStreamConnectionServerConfig {
 export interface Events {
     newConnection: (nodeId: NodeID) => void;
 }
-export declare class ProxyStreamConnectionServer extends EventEmitter<Events> implements IProxyConnectionRpc {
+export declare class ProxyConnectionRpcLocal extends EventEmitter<Events> implements IProxyConnectionRpc {
     private readonly config;
     private readonly connections;
-    constructor(config: ProxyStreamConnectionServerConfig);
+    constructor(config: ProxyConnectionRpcLocalConfig);
     getConnection(nodeId: NodeID): ProxyConnection | undefined;
     hasConnection(nodeId: NodeID): boolean;
     removeConnection(nodeId: NodeID): void;

package/dist/src/logic/proxy/{ProxyStreamConnectionServer.js → ProxyConnectionRpcLocal.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxyStreamConnectionServer = void 0;
+exports.ProxyConnectionRpcLocal = void 0;
 const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
-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 eventemitter3_1 = require("eventemitter3");
 const utils_1 = require("@streamr/utils");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
-class ProxyStreamConnectionServer extends eventemitter3_1.EventEmitter {
+class ProxyConnectionRpcLocal extends eventemitter3_1.EventEmitter {
     constructor(config) {
         super();
         this.connections = new Map();
@@ -58,7 +58,7 @@ class ProxyStreamConnectionServer extends eventemitter3_1.EventEmitter {
         this.connections.set(senderId, {
             direction: request.direction,
             userId: (0, utils_1.toEthereumAddress)((0, utils_1.binaryToHex)(request.userId, true)),
-            remote: new RemoteRandomGraphNode_1.RemoteRandomGraphNode(this.config.ownPeerDescriptor, senderPeerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))
+            remote: new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.ownPeerDescriptor, senderPeerDescriptor, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))
         });
         const response = {
             accepted: true
@@ -68,5 +68,5 @@ class ProxyStreamConnectionServer extends eventemitter3_1.EventEmitter {
         return response;
     }
 }
-exports.ProxyStreamConnectionServer = ProxyStreamConnectionServer;
-//# sourceMappingURL=ProxyStreamConnectionServer.js.map
+exports.ProxyConnectionRpcLocal = ProxyConnectionRpcLocal;
+//# sourceMappingURL=ProxyConnectionRpcLocal.js.map

package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProxyConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyConnectionRpcLocal.ts"],"names":[],"mappings":";;;AACA,2FAOmE;AAEnE,4DAAwD;AAExD,kDAAqD;AACrD,yGAAqG;AACrG,iDAA4C;AAC5C,0CAAwF;AAExF,mDAAuE;AAEvE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAkBjC,MAAa,uBAAwB,SAAQ,4BAAoB;IAK7D,YAAY,MAAqC;QAC7C,KAAK,EAAE,CAAA;QAHM,gBAAW,GAAiC,IAAI,GAAG,EAAE,CAAA;QAIlE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,mCAAsB,EAAE,oCAAuB,EAAE,mBAAmB,EAC9G,CAAC,GAA2B,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACvF,CAAC;IAED,aAAa,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,aAAa,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC3B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,IAAI;QACA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;IAED,qBAAqB,CAAC,GAAkB;QACpC,IAAI,GAAG,CAAC,WAAW,KAAK,8BAAiB,CAAC,iBAAiB,EAAE;YACzD,IAAI;gBACA,MAAM,WAAW,GAAG,4BAAe,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,WAAW,CAAA;gBACvE,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;aACrF;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAA;gBACvD,OAAO,EAAE,CAAA;aACZ;SACJ;aAAM;YACH,OAAO,IAAI,CAAC,cAAc,EAAE,CAAA;SAC/B;IACL,CAAC;IAEO,mBAAmB,CAAC,MAAuB;QAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,MAAM,KAAK,MAAM,CAAC,CAAA;IAClH,CAAC;IAEO,cAAc;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,SAAS,KAAK,2BAAc,CAAC,SAAS,CAAC,CAAA;IACjI,CAAC;IAED,oCAAoC;IACpC,KAAK,CAAC,iBAAiB,CAAC,OAA+B,EAAE,OAA0B;QAC/E,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAClE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC3B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC5D,MAAM,EAAE,IAAI,qCAAiB,CACzB,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;SACJ,CAAC,CAAA;QACF,MAAM,QAAQ,GAA4B;YACtC,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,MAAM,CAAC,KAAK,CAAC,oCAAoC,QAAQ,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAA;QAC3F,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;QACpC,OAAO,QAAQ,CAAA;IACnB,CAAC;CACJ;AAzED,0DAyEC"}

package/dist/src/logic/proxy/{RemoteProxyServer.d.ts → ProxyConnectionRpcRemote.d.ts}

@@ -2,6 +2,6 @@ import { Remote } from '@streamr/dht';
 import { EthereumAddress } from '@streamr/utils';
 import { ProxyDirection } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 import { IProxyConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
-export declare class RemoteProxyServer extends Remote<IProxyConnectionRpcClient> {
+export declare class ProxyConnectionRpcRemote extends Remote<IProxyConnectionRpcClient> {
     requestConnection(direction: ProxyDirection, userId: EthereumAddress): Promise<boolean>;
 }

package/dist/src/logic/proxy/{RemoteProxyServer.js → ProxyConnectionRpcRemote.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteProxyServer = void 0;
+exports.ProxyConnectionRpcRemote = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-class RemoteProxyServer extends dht_1.Remote {
+class ProxyConnectionRpcRemote extends dht_1.Remote {
     async requestConnection(direction, userId) {
         const request = {
             direction,
@@ -23,5 +23,5 @@ class RemoteProxyServer extends dht_1.Remote {
         }
     }
 }
-exports.RemoteProxyServer = RemoteProxyServer;
-//# sourceMappingURL=RemoteProxyServer.js.map
+exports.ProxyConnectionRpcRemote = ProxyConnectionRpcRemote;
+//# sourceMappingURL=ProxyConnectionRpcRemote.js.map

package/dist/src/logic/proxy/ProxyConnectionRpcRemote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProxyConnectionRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyConnectionRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,0CAAqE;AAIrE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,wBAAyB,SAAQ,YAAiC;IAE3E,KAAK,CAAC,iBAAiB,CAAC,SAAyB,EAAE,MAAuB;QACtE,MAAM,OAAO,GAA2B;YACpC,SAAS;YACT,MAAM,EAAE,IAAA,mBAAW,EAAC,MAAM,CAAC;SAC9B,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,GAAG,CAAC,QAAQ,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,6CAA6C,GAAG,EAAE,CAAC,CAAA;YAChE,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CACJ;AAlBD,4DAkBC"}

package/dist/src/logic/temporary-connection/{TemporaryConnectionRpcServer.d.ts → TemporaryConnectionRpcLocal.d.ts}

@@ -4,15 +4,16 @@ import { ITemporaryConnectionRpc } from '../../proto/packages/trackerless-networ
 import { ListeningRpcCommunicator } from '@streamr/dht';
 import { NodeList } from '../NodeList';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-interface TemporaryConnectionRpcServerConfig {
-    randomGraphId: string;
+import { StreamPartID } from '@streamr/protocol';
+interface TemporaryConnectionRpcLocalConfig {
+    streamPartId: StreamPartID;
     rpcCommunicator: ListeningRpcCommunicator;
     ownPeerDescriptor: PeerDescriptor;
 }
-export declare class TemporaryConnectionRpcServer implements ITemporaryConnectionRpc {
+export declare class TemporaryConnectionRpcLocal implements ITemporaryConnectionRpc {
     private readonly config;
     private readonly temporaryNodes;
-    constructor(config: TemporaryConnectionRpcServerConfig);
+    constructor(config: TemporaryConnectionRpcLocalConfig);
     getNodes(): NodeList;
     removeNode(peerDescriptor: PeerDescriptor): void;
     openConnection(_request: TemporaryConnectionRequest, context: ServerCallContext): Promise<TemporaryConnectionResponse>;

package/dist/src/logic/temporary-connection/{TemporaryConnectionRpcServer.js → TemporaryConnectionRpcLocal.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemporaryConnectionRpcServer = void 0;
+exports.TemporaryConnectionRpcLocal = void 0;
 const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
 const NodeList_1 = require("../NodeList");
 const proto_rpc_1 = require("@streamr/proto-rpc");
-const RemoteRandomGraphNode_1 = require("../RemoteRandomGraphNode");
+const DeliveryRpcRemote_1 = require("../DeliveryRpcRemote");
 const identifiers_1 = require("../../identifiers");
-class TemporaryConnectionRpcServer {
+class TemporaryConnectionRpcLocal {
     constructor(config) {
         this.config = config;
         this.temporaryNodes = new NodeList_1.NodeList((0, identifiers_1.getNodeIdFromPeerDescriptor)(config.ownPeerDescriptor), 10);
@@ -19,12 +19,12 @@ class TemporaryConnectionRpcServer {
     }
     async openConnection(_request, context) {
         const sender = context.incomingSourceDescriptor;
-        const remote = new RemoteRandomGraphNode_1.RemoteRandomGraphNode(this.config.ownPeerDescriptor, sender, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())));
+        const remote = new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.ownPeerDescriptor, sender, this.config.streamPartId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.DeliveryRpcClient(this.config.rpcCommunicator.getRpcClientTransport())));
         this.temporaryNodes.add(remote);
         return {
             accepted: true
         };
     }
 }
-exports.TemporaryConnectionRpcServer = TemporaryConnectionRpcServer;
-//# sourceMappingURL=TemporaryConnectionRpcServer.js.map
+exports.TemporaryConnectionRpcLocal = TemporaryConnectionRpcLocal;
+//# sourceMappingURL=TemporaryConnectionRpcLocal.js.map

package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TemporaryConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts"],"names":[],"mappings":";;;AAIA,yGAAqG;AACrG,0CAAsC;AACtC,kDAAqD;AACrD,4DAAwD;AAExD,mDAA+D;AAS/D,MAAa,2BAA2B;IAKpC,YAAY,MAAyC;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,mBAAQ,CAAC,IAAA,yCAA2B,EAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAA;IACjG,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAED,UAAU,CAAC,cAA8B;QACrC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,QAAoC,EACpC,OAA0B;QAE1B,MAAM,MAAM,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QACpE,MAAM,MAAM,GAAG,IAAI,qCAAiB,CAChC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC7B,MAAM,EACN,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;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC/B,OAAO;YACH,QAAQ,EAAE,IAAI;SACjB,CAAA;IACL,CAAC;CACJ;AAlCD,kEAkCC"}

package/dist/src/logic/temporary-connection/{RemoteTemporaryConnectionRpcServer.d.ts → TemporaryConnectionRpcRemote.d.ts}

@@ -1,5 +1,5 @@
 import { Remote } from '@streamr/dht';
 import { ITemporaryConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
-export declare class RemoteTemporaryConnectionRpcServer extends Remote<ITemporaryConnectionRpcClient> {
+export declare class TemporaryConnectionRpcRemote extends Remote<ITemporaryConnectionRpcClient> {
     openConnection(): Promise<boolean>;
 }

package/dist/src/logic/temporary-connection/{RemoteTemporaryConnectionRpcServer.js → TemporaryConnectionRpcRemote.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteTemporaryConnectionRpcServer = void 0;
+exports.TemporaryConnectionRpcRemote = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
-class RemoteTemporaryConnectionRpcServer extends dht_1.Remote {
+class TemporaryConnectionRpcRemote extends dht_1.Remote {
     async openConnection() {
         try {
             const response = await this.getClient().openConnection({}, this.formDhtRpcOptions());
@@ -17,5 +17,5 @@ class RemoteTemporaryConnectionRpcServer extends dht_1.Remote {
         }
     }
 }
-exports.RemoteTemporaryConnectionRpcServer = RemoteTemporaryConnectionRpcServer;
-//# sourceMappingURL=RemoteTemporaryConnectionRpcServer.js.map
+exports.TemporaryConnectionRpcRemote = TemporaryConnectionRpcRemote;
+//# sourceMappingURL=TemporaryConnectionRpcRemote.js.map

package/dist/src/logic/temporary-connection/TemporaryConnectionRpcRemote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TemporaryConnectionRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,0CAAuC;AACvC,mDAA+D;AAG/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,4BAA6B,SAAQ,YAAqC;IAEnF,KAAK,CAAC,cAAc;QAChB,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACpF,OAAO,QAAQ,CAAC,QAAQ,CAAA;SAC3B;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC9G,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CACJ;AAXD,oEAWC"}