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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/trackerless-network",
-    "version": "0.0.1-tatum.5",
+    "version": "0.0.1-tatum.7",
     "description": "Minimal and extendable implementation of the Streamr Network node.",
     "repository": {
         "type": "git",
@@ -30,20 +30,22 @@
     "dependencies": {
         "@protobuf-ts/runtime": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/dht": "0.0.1-tatum.5",
-        "@streamr/proto-rpc": "0.0.1-tatum.5",
-        "@streamr/protocol": "0.0.1-tatum.5",
-        "@streamr/test-utils": "0.0.1-tatum.5",
-        "@streamr/utils": "0.0.1-tatum.5",
+        "@streamr/dht": "0.0.1-tatum.7",
+        "@streamr/proto-rpc": "0.0.1-tatum.7",
+        "@streamr/protocol": "0.0.1-tatum.7",
+        "@streamr/test-utils": "0.0.1-tatum.7",
+        "@streamr/utils": "0.0.1-tatum.7",
         "eventemitter3": "^5.0.0",
         "lodash": "^4.17.21",
+        "uuid": "^9.0.1",
         "yallist": "^4.0.0"
     },
     "devDependencies": {
         "@streamr/browser-test-runner": "^0.0.1",
-        "@types/lodash": "^4.14.199",
+        "@types/lodash": "^4.14.200",
+        "@types/uuid": "^9.0.6",
         "@types/yallist": "^4.0.1",
-        "commander": "^11.0.0",
+        "commander": "^11.1.0",
         "expect": "^29.6.2",
         "express": "^4.17.1",
         "ts-essentials": "^9.4.1",

package/dist/src/NetworkNode.js

@@ -71,7 +71,7 @@ class NetworkNode {
         return this.stack.getStreamrNode().getNeighbors(streamPartId);
     }
     hasStreamPart(streamPartId) {
-        return this.stack.getStreamrNode().hasStream(streamPartId);
+        return this.stack.getStreamrNode().hasStreamPart(streamPartId);
     }
     async stop() {
         this.stopped = true;

package/dist/src/NetworkNode.js.map

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

package/dist/src/NetworkStack.d.ts

@@ -24,9 +24,7 @@ export declare class NetworkStack extends EventEmitter<NetworkStackEvents> {
     }): Promise<void>;
     broadcast(msg: StreamMessage): Promise<void>;
     start(doJoin?: boolean): Promise<void>;
-    private joinDht;
-    private waitForFirstConnection;
-    joinLayer0IfRequired(streamPartId: StreamPartID): Promise<void>;
+    private ensureConnectedToControlLayer;
     getStreamrNode(): StreamrNode;
     getLayer0DhtNode(): DhtNode;
     getMetricsContext(): MetricsContext;

package/dist/src/NetworkStack.js

@@ -7,26 +7,6 @@ const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = require("eventemitter3");
 const protocol_1 = require("@streamr/protocol");
 const NetworkRpc_1 = require("./proto/packages/trackerless-network/protos/NetworkRpc");
-class ReadinessListener {
-    constructor(networkStack, dhtNode) {
-        this.emitter = new eventemitter3_1.EventEmitter();
-        this.onDone = () => {
-            this.networkStack.off('stopped', this.onDone);
-            this.dhtNode.off('connected', this.onDone);
-            this.emitter.emit('done');
-        };
-        this.networkStack = networkStack;
-        this.dhtNode = dhtNode;
-        this.networkStack.on('stopped', this.onDone);
-        this.dhtNode.on('connected', this.onDone);
-    }
-    async waitUntilReady(timeout) {
-        if (this.dhtNode.getNumberOfConnections() === 0) {
-            await (0, utils_1.waitForEvent3)(this.emitter, 'done', timeout);
-        }
-    }
-}
-const DEFAULT_FIRST_CONNECTION_TIMEOUT = 5000;
 class NetworkStack extends eventemitter3_1.EventEmitter {
     constructor(options) {
         super();
@@ -38,7 +18,6 @@ class NetworkStack extends eventemitter3_1.EventEmitter {
         });
         this.streamrNode = new StreamrNode_1.StreamrNode({
             ...options.networkNode,
-            nodeName: options.networkNode?.nodeName ?? options.layer0?.nodeName,
             metricsContext: this.metricsContext
         });
     }
@@ -46,7 +25,7 @@ class NetworkStack extends eventemitter3_1.EventEmitter {
         if (this.getStreamrNode().isProxiedStreamPart(streamPartId)) {
             throw new Error(`Cannot join to ${streamPartId} as proxy connections have been set`);
         }
-        await this.joinLayer0IfRequired(streamPartId);
+        await this.ensureConnectedToControlLayer();
         this.getStreamrNode().joinStreamPart(streamPartId);
         if (neighborRequirement !== undefined) {
             await (0, utils_1.waitForCondition)(() => {
@@ -59,47 +38,39 @@ class NetworkStack extends eventemitter3_1.EventEmitter {
         if (this.getStreamrNode().isProxiedStreamPart(streamPartId, NetworkRpc_1.ProxyDirection.SUBSCRIBE) && (msg.messageType === NetworkRpc_1.StreamMessageType.MESSAGE)) {
             throw new Error(`Cannot broadcast to ${streamPartId} as proxy subscribe connections have been set`);
         }
-        await this.joinLayer0IfRequired(streamPartId);
+        // TODO could combine these two calls to isProxiedStreamPart?
+        if (!this.streamrNode.isProxiedStreamPart(streamPartId)) {
+            await this.ensureConnectedToControlLayer();
+        }
         this.getStreamrNode().broadcast(msg);
     }
     async start(doJoin = true) {
         await this.layer0DhtNode.start();
         const connectionManager = this.layer0DhtNode.getTransport();
-        if ((this.options.layer0?.entryPoints !== undefined) && (this.options.layer0.entryPoints.some((entryPoint) => (0, dht_1.isSamePeerDescriptor)(entryPoint, this.layer0DhtNode.getPeerDescriptor())))) {
+        if ((this.options.layer0?.entryPoints !== undefined) && (this.options.layer0.entryPoints.some((entryPoint) => (0, dht_1.areEqualPeerDescriptors)(entryPoint, this.layer0DhtNode.getPeerDescriptor())))) {
             await this.layer0DhtNode?.joinDht(this.options.layer0.entryPoints);
         }
         else {
             if (doJoin) {
-                await this.joinDht();
+                // in practice there aren't be existing connections and therefore this always connects
+                await this.ensureConnectedToControlLayer();
             }
         }
         await this.streamrNode?.start(this.layer0DhtNode, connectionManager, connectionManager);
     }
-    async joinDht() {
-        setImmediate(async () => {
-            if (this.options.layer0?.entryPoints !== undefined) {
-                // TODO should catch possible rejection?
-                await this.layer0DhtNode?.joinDht(this.options.layer0.entryPoints);
-            }
-        });
-        await this.waitForFirstConnection();
-    }
-    async waitForFirstConnection() {
-        const readinessListener = new ReadinessListener(this, this.layer0DhtNode);
-        const timeout = this.options.networkNode?.firstConnectionTimeout ?? DEFAULT_FIRST_CONNECTION_TIMEOUT;
-        await readinessListener.waitUntilReady(timeout);
-    }
-    async joinLayer0IfRequired(streamPartId) {
-        if (this.streamrNode.isProxiedStreamPart(streamPartId)) {
-            return;
-        }
+    async ensureConnectedToControlLayer() {
         // TODO we could wrap joinDht with pOnce and call it here (no else-if needed in that case)
         if (!this.layer0DhtNode.hasJoined()) {
-            await this.joinDht();
-        }
-        else if (this.layer0DhtNode.getNumberOfConnections() < 1) {
-            await this.waitForFirstConnection();
+            setImmediate(async () => {
+                if (this.options.layer0?.entryPoints !== undefined) {
+                    // TODO should catch possible rejection?
+                    // the question mark is there to avoid problems when stop() is called before start()
+                    // -> TODO change to exlamation mark if we don't support that (and remove NetworkStackStoppedDuringStart.test)
+                    await this.layer0DhtNode?.joinDht(this.options.layer0.entryPoints);
+                }
+            });
         }
+        await this.layer0DhtNode.waitForNetworkConnectivity();
     }
     getStreamrNode() {
         return this.streamrNode;

package/dist/src/NetworkStack.js.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkStack.js","sourceRoot":"","sources":["../../src/NetworkStack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NetworkStack.js","sourceRoot":"","sources":["../../src/NetworkStack.ts"],"names":[],"mappings":";;;AAAA,sCAAkG;AAClG,qDAAoE;AACpE,0CAAiE;AACjE,iDAA4C;AAC5C,gDAA0E;AAC1E,uFAAyH;AAYzH,MAAa,YAAa,SAAQ,4BAAgC;IAO9D,YAAY,OAAuB;QAC/B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,IAAI,sBAAc,EAAE,CAAA;QACpE,IAAI,CAAC,aAAa,GAAG,IAAI,aAAO,CAAC;YAC7B,GAAG,OAAO,CAAC,MAAM;YACjB,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAW,CAAC;YAC/B,GAAG,OAAO,CAAC,WAAW;YACtB,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,YAA0B,EAAE,mBAA2D;QACxG,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,kBAAkB,YAAY,qCAAqC,CAAC,CAAA;SACvF;QACD,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAA;QAC1C,IAAI,CAAC,cAAc,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;QAClD,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACnC,MAAM,IAAA,wBAAgB,EAAC,GAAG,EAAE;gBACxB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAA;YAClG,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAA;SAClC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAkB;QAC9B,MAAM,YAAY,GAAG,IAAA,yBAAc,EAAC,GAAG,CAAC,SAAU,CAAC,QAAoB,EAAE,GAAG,CAAC,SAAU,CAAC,eAAe,CAAC,CAAA;QACxG,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,mBAAmB,CAAC,YAAY,EAAE,2BAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,8BAAiB,CAAC,OAAO,CAAC,EAAE;YACtI,MAAM,IAAI,KAAK,CAAC,uBAAuB,YAAY,+CAA+C,CAAC,CAAA;SACtG;QACD,6DAA6D;QAC7D,IAAI,CAAC,IAAI,CAAC,WAAY,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE;YACtD,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAA;SAC7C;QACD,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI;QACrB,MAAM,IAAI,CAAC,aAAc,CAAC,KAAK,EAAE,CAAA;QACjC,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAc,CAAC,YAAY,EAAuB,CAAA;QACjF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CACzG,IAAA,6BAAuB,EAAC,UAAU,EAAE,IAAI,CAAC,aAAc,CAAC,iBAAiB,EAAE,CAAC,CAC/E,CAAC,EAAE;YACA,MAAM,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;SACrE;aAAM;YACH,IAAI,MAAM,EAAE;gBACR,sFAAsF;gBACtF,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAA;aAC7C;SACJ;QACD,MAAM,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,aAAc,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;IAC5F,CAAC;IAEO,KAAK,CAAC,6BAA6B;QACvC,0FAA0F;QAC1F,IAAI,CAAC,IAAI,CAAC,aAAc,CAAC,SAAS,EAAE,EAAE;YAClC,YAAY,CAAC,KAAK,IAAI,EAAE;gBACpB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,KAAK,SAAS,EAAE;oBAChD,wCAAwC;oBACxC,oFAAoF;oBACpF,8GAA8G;oBAC9G,MAAM,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;iBACrE;YACL,CAAC,CAAC,CAAA;SACL;QACD,MAAM,IAAI,CAAC,aAAc,CAAC,0BAA0B,EAAE,CAAA;IAC1D,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,WAAY,CAAA;IAC5B,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAc,CAAA;IAC9B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,WAAY,CAAC,OAAO,EAAE,CAAA;QACjC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAC5B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;CAEJ;AAhGD,oCAgGC"}

package/dist/src/identifiers.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNodeIdFromPeerDescriptor = void 0;
-const dht_1 = require("@streamr/dht");
+const utils_1 = require("@streamr/utils");
 const getNodeIdFromPeerDescriptor = (peerDescriptor) => {
-    return (0, dht_1.keyFromPeerDescriptor)(peerDescriptor);
+    return (0, utils_1.binaryToHex)(peerDescriptor.kademliaId);
 };
 exports.getNodeIdFromPeerDescriptor = getNodeIdFromPeerDescriptor;
 //# sourceMappingURL=identifiers.js.map

package/dist/src/identifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/identifiers.ts"],"names":[],"mappings":";;;AAAA,sCAAoE;AAK7D,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAU,EAAE;IAClF,OAAO,IAAA,2BAAqB,EAAC,cAAc,CAAsB,CAAA;AACrE,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC"}
+{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/identifiers.ts"],"names":[],"mappings":";;;AACA,0CAA2D;AAIpD,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAU,EAAE;IAClF,OAAO,IAAA,mBAAW,EAAC,cAAc,CAAC,UAAU,CAAsB,CAAA;AACtE,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC"}

package/dist/src/logic/{StreamNodeServer.d.ts → DeliveryRpcLocal.d.ts}

@@ -1,21 +1,22 @@
 import { ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
 import { Empty } from '../proto/google/protobuf/empty';
 import { LeaveStreamPartNotice, MessageID, MessageRef, StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc';
-import { INetworkRpc } from '../proto/packages/trackerless-network/protos/NetworkRpc.server';
+import { IDeliveryRpc } from '../proto/packages/trackerless-network/protos/NetworkRpc.server';
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { NodeID } from '../identifiers';
-export interface StreamNodeServerConfig {
+import { StreamPartID } from '@streamr/protocol';
+export interface DeliveryRpcLocalConfig {
     ownPeerDescriptor: PeerDescriptor;
-    randomGraphId: string;
+    streamPartId: StreamPartID;
     markAndCheckDuplicate: (messageId: MessageID, previousMessageRef?: MessageRef) => boolean;
     broadcast: (message: StreamMessage, previousNode?: NodeID) => void;
     onLeaveNotice(senderId: NodeID): void;
     markForInspection(senderId: NodeID, messageId: MessageID): void;
     rpcCommunicator: ListeningRpcCommunicator;
 }
-export declare class StreamNodeServer implements INetworkRpc {
+export declare class DeliveryRpcLocal implements IDeliveryRpc {
     private readonly config;
-    constructor(config: StreamNodeServerConfig);
+    constructor(config: DeliveryRpcLocalConfig);
     sendStreamMessage(message: StreamMessage, context: ServerCallContext): Promise<Empty>;
     leaveStreamPartNotice(message: LeaveStreamPartNotice, context: ServerCallContext): Promise<Empty>;
 }

package/dist/src/logic/{StreamNodeServer.js → DeliveryRpcLocal.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamNodeServer = void 0;
+exports.DeliveryRpcLocal = void 0;
 const empty_1 = require("../proto/google/protobuf/empty");
 const identifiers_1 = require("../identifiers");
-class StreamNodeServer {
+class DeliveryRpcLocal {
     constructor(config) {
         this.config = config;
     }
@@ -16,7 +16,7 @@ class StreamNodeServer {
         return empty_1.Empty;
     }
     async leaveStreamPartNotice(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);
             this.config.onLeaveNotice(senderId);
@@ -24,5 +24,5 @@ class StreamNodeServer {
         return empty_1.Empty;
     }
 }
-exports.StreamNodeServer = StreamNodeServer;
-//# sourceMappingURL=StreamNodeServer.js.map
+exports.DeliveryRpcLocal = DeliveryRpcLocal;
+//# sourceMappingURL=DeliveryRpcLocal.js.map

package/dist/src/logic/{StreamNodeServer.js.map → DeliveryRpcLocal.js.map}

@@ -1 +1 @@
-{"version":3,"file":"StreamNodeServer.js","sourceRoot":"","sources":["../../../src/logic/StreamNodeServer.ts"],"names":[],"mappings":";;;AACA,0DAAsD;AAStD,gDAAoE;AAYpE,MAAa,gBAAgB;IAIzB,YAAY,MAA8B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAsB,EAAE,OAA0B;QACtE,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACvG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,SAAU,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,SAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE;YACnF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;SAC/C;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,OAA8B,EAAE,OAA0B;QAClF,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACrD,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;YAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;YAClE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;SACtC;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;CACJ;AAzBD,4CAyBC"}
+{"version":3,"file":"DeliveryRpcLocal.js","sourceRoot":"","sources":["../../../src/logic/DeliveryRpcLocal.ts"],"names":[],"mappings":";;;AACA,0DAAsD;AAStD,gDAAoE;AAapE,MAAa,gBAAgB;IAIzB,YAAY,MAA8B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAsB,EAAE,OAA0B;QACtE,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACvG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,SAAU,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,SAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE;YACnF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;SAC/C;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,OAA8B,EAAE,OAA0B;QAClF,IAAI,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACnD,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;YAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;YAClE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;SACtC;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;CACJ;AAzBD,4CAyBC"}

package/dist/src/logic/{RemoteRandomGraphNode.d.ts → DeliveryRpcRemote.d.ts}

@@ -1,7 +1,7 @@
 import { Remote } from '@streamr/dht';
 import { StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc';
-import { INetworkRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client';
-export declare class RemoteRandomGraphNode extends Remote<INetworkRpcClient> {
+import { IDeliveryRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client';
+export declare class DeliveryRpcRemote extends Remote<IDeliveryRpcClient> {
     sendStreamMessage(msg: StreamMessage): Promise<void>;
     leaveStreamPartNotice(): void;
 }

package/dist/src/logic/{RemoteRandomGraphNode.js → DeliveryRpcRemote.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteRandomGraphNode = void 0;
+exports.DeliveryRpcRemote = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-class RemoteRandomGraphNode extends dht_1.Remote {
+class DeliveryRpcRemote extends dht_1.Remote {
     async sendStreamMessage(msg) {
         const options = this.formDhtRpcOptions({
             notification: true
@@ -15,7 +15,7 @@ class RemoteRandomGraphNode extends dht_1.Remote {
     }
     leaveStreamPartNotice() {
         const notification = {
-            randomGraphId: this.getServiceId()
+            streamPartId: this.getServiceId()
         };
         const options = this.formDhtRpcOptions({
             notification: true
@@ -25,5 +25,5 @@ class RemoteRandomGraphNode extends dht_1.Remote {
         });
     }
 }
-exports.RemoteRandomGraphNode = RemoteRandomGraphNode;
-//# sourceMappingURL=RemoteRandomGraphNode.js.map
+exports.DeliveryRpcRemote = DeliveryRpcRemote;
+//# sourceMappingURL=DeliveryRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"DeliveryRpcRemote.js","sourceRoot":"","sources":["../../../src/logic/DeliveryRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,0CAAuC;AAOvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,iBAAkB,SAAQ,YAA0B;IAE7D,KAAK,CAAC,iBAAiB,CAAC,GAAkB;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACxD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,qBAAqB;QACjB,MAAM,YAAY,GAA0B;YACxC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;SACpC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACrE,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAtBD,8CAsBC"}

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

@@ -0,0 +1,35 @@
+import { DataEntry, PeerDescriptor } from '@streamr/dht';
+import { StreamPartID } from '@streamr/protocol';
+import { Any } from '../proto/google/protobuf/any';
+import { ILayer1 } from './ILayer1';
+export declare const streamPartIdToDataKey: (streamPartId: StreamPartID) => Uint8Array;
+interface FindEntryPointsResult {
+    entryPointsFromDht: boolean;
+    discoveredEntryPoints: PeerDescriptor[];
+}
+export declare const NETWORK_SPLIT_AVOIDANCE_LIMIT = 4;
+interface EntryPointDiscoveryConfig {
+    streamPartId: StreamPartID;
+    ownPeerDescriptor: PeerDescriptor;
+    layer1: ILayer1;
+    getEntryPointData: (key: Uint8Array) => Promise<DataEntry[]>;
+    storeEntryPointData: (key: Uint8Array, data: Any) => Promise<PeerDescriptor[]>;
+    deleteEntryPointData: (key: Uint8Array) => Promise<void>;
+    storeInterval?: number;
+}
+export declare class EntryPointDiscovery {
+    private readonly abortController;
+    private readonly config;
+    private readonly storeInterval;
+    private readonly networkSplitAvoidedNodes;
+    constructor(config: EntryPointDiscoveryConfig);
+    discoverEntryPointsFromDht(knownEntryPointCount: number): Promise<FindEntryPointsResult>;
+    private discoverEntryPoints;
+    private queryEntrypoints;
+    storeSelfAsEntryPointIfNecessary(currentEntrypointCount: number): Promise<void>;
+    private storeSelfAsEntryPoint;
+    private keepSelfAsEntryPoint;
+    private avoidNetworkSplit;
+    destroy(): Promise<void>;
+}
+export {};

package/dist/src/logic/EntryPointDiscovery.js

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntryPointDiscovery = exports.NETWORK_SPLIT_AVOIDANCE_LIMIT = exports.streamPartIdToDataKey = void 0;
+const dht_1 = require("@streamr/dht");
+const utils_1 = require("@streamr/utils");
+const crypto_1 = require("crypto");
+const identifiers_1 = require("../identifiers");
+const any_1 = require("../proto/google/protobuf/any");
+const streamPartIdToDataKey = (streamPartId) => {
+    return new Uint8Array((0, crypto_1.createHash)('md5').update(streamPartId).digest());
+};
+exports.streamPartIdToDataKey = streamPartIdToDataKey;
+const parseEntryPointData = (dataEntries) => {
+    return dataEntries.filter((entry) => !entry.deleted).map((entry) => any_1.Any.unpack(entry.data, dht_1.PeerDescriptor));
+};
+const exponentialRunOff = async (task, description, abortSignal, baseDelay = 500, maxAttempts = 6) => {
+    for (let i = 1; i <= maxAttempts; i++) {
+        if (abortSignal.aborted) {
+            return;
+        }
+        const factor = 2 ** i;
+        const delay = baseDelay * factor;
+        try {
+            await task();
+        }
+        catch (e) {
+            logger.trace(`${description} failed, retrying in ${delay} ms`);
+        }
+        try { // Abort controller throws unexpected errors in destroy?
+            await (0, utils_1.wait)(delay, abortSignal);
+        }
+        catch (err) {
+            logger.trace(`${err}`);
+        }
+    }
+};
+const logger = new utils_1.Logger(module);
+const ENTRYPOINT_STORE_LIMIT = 8;
+exports.NETWORK_SPLIT_AVOIDANCE_LIMIT = 4;
+class EntryPointDiscovery {
+    constructor(config) {
+        this.networkSplitAvoidedNodes = new Set();
+        this.config = config;
+        this.abortController = new AbortController();
+        this.storeInterval = this.config.storeInterval ?? 60000;
+    }
+    async discoverEntryPointsFromDht(knownEntryPointCount) {
+        if (knownEntryPointCount > 0) {
+            return {
+                entryPointsFromDht: false,
+                discoveredEntryPoints: []
+            };
+        }
+        const discoveredEntryPoints = await this.discoverEntryPoints();
+        if (discoveredEntryPoints.length === 0) {
+            discoveredEntryPoints.push(this.config.ownPeerDescriptor);
+        }
+        return {
+            discoveredEntryPoints,
+            entryPointsFromDht: true
+        };
+    }
+    async discoverEntryPoints() {
+        const dataKey = (0, exports.streamPartIdToDataKey)(this.config.streamPartId);
+        const discoveredEntryPoints = await this.queryEntrypoints(dataKey);
+        const filtered = discoveredEntryPoints.filter((node) => !this.networkSplitAvoidedNodes.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(node)));
+        // If all discovered entry points have previously been detected as offline, try again
+        if (filtered.length > 0) {
+            return filtered;
+        }
+        else {
+            return discoveredEntryPoints;
+        }
+    }
+    async queryEntrypoints(key) {
+        logger.trace(`Finding data from dht node ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.ownPeerDescriptor)}`);
+        try {
+            const result = await this.config.getEntryPointData(key);
+            return parseEntryPointData(result);
+        }
+        catch (err) {
+            return [];
+        }
+    }
+    async storeSelfAsEntryPointIfNecessary(currentEntrypointCount) {
+        if (this.abortController.signal.aborted) {
+            return;
+        }
+        const possibleNetworkSplitDetected = this.config.layer1.getBucketSize() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT;
+        if ((currentEntrypointCount < ENTRYPOINT_STORE_LIMIT) || possibleNetworkSplitDetected) {
+            await this.storeSelfAsEntryPoint();
+            await this.keepSelfAsEntryPoint();
+        }
+        if (possibleNetworkSplitDetected) {
+            setImmediate(() => this.avoidNetworkSplit());
+        }
+    }
+    async storeSelfAsEntryPoint() {
+        const ownPeerDescriptor = this.config.ownPeerDescriptor;
+        const dataToStore = any_1.Any.pack(ownPeerDescriptor, dht_1.PeerDescriptor);
+        try {
+            await this.config.storeEntryPointData((0, exports.streamPartIdToDataKey)(this.config.streamPartId), dataToStore);
+        }
+        catch (err) {
+            logger.warn(`Failed to store self as entrypoint for ${this.config.streamPartId}`);
+        }
+    }
+    async keepSelfAsEntryPoint() {
+        await (0, utils_1.scheduleAtInterval)(async () => {
+            logger.trace(`Attempting to keep self as entrypoint for ${this.config.streamPartId}`);
+            try {
+                const discovered = await this.discoverEntryPoints();
+                if (discovered.length < ENTRYPOINT_STORE_LIMIT
+                    || discovered.some((peerDescriptor) => (0, dht_1.areEqualPeerDescriptors)(peerDescriptor, this.config.ownPeerDescriptor))) {
+                    await this.storeSelfAsEntryPoint();
+                }
+            }
+            catch (err) {
+                logger.debug(`Failed to keep self as entrypoint for ${this.config.streamPartId}`);
+            }
+        }, this.storeInterval, false, this.abortController.signal);
+    }
+    async avoidNetworkSplit() {
+        await exponentialRunOff(async () => {
+            const rediscoveredEntrypoints = await this.discoverEntryPoints();
+            await this.config.layer1.joinDht(rediscoveredEntrypoints, false, false);
+            if (this.config.layer1.getBucketSize() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT) {
+                // Filter out nodes that are not in the k-bucket, assumed to be offline
+                const nodesToAvoid = rediscoveredEntrypoints
+                    .filter((peer) => !this.config.layer1.getKBucketPeers().includes(peer))
+                    .map((peer) => (0, identifiers_1.getNodeIdFromPeerDescriptor)(peer));
+                nodesToAvoid.forEach((node) => this.networkSplitAvoidedNodes.add(node));
+                throw new Error(`Network split is still possible`);
+            }
+        }, 'avoid network split', this.abortController.signal);
+        this.networkSplitAvoidedNodes.clear();
+        logger.trace(`Network split avoided`);
+    }
+    async destroy() {
+        this.abortController.abort();
+        await this.config.deleteEntryPointData((0, exports.streamPartIdToDataKey)(this.config.streamPartId));
+    }
+}
+exports.EntryPointDiscovery = EntryPointDiscovery;
+//# sourceMappingURL=EntryPointDiscovery.js.map

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

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

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

@@ -1,13 +1,10 @@
-import { DataEntry, ITransport, PeerDescriptor, PeerID, RecursiveFindResult } from '@streamr/dht';
+import { DataEntry, ITransport, PeerDescriptor } from '@streamr/dht';
 import { Any } from '../proto/google/protobuf/any';
 export interface ILayer0 extends ITransport {
     getPeerDescriptor(): PeerDescriptor;
-    getNodeId(): PeerID;
-    getDataFromDht(key: Uint8Array): Promise<RecursiveFindResult>;
-    findDataViaPeer(key: Uint8Array, node: PeerDescriptor): Promise<DataEntry[]>;
+    getDataFromDht(key: Uint8Array): Promise<DataEntry[]>;
     storeDataToDht(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
     deleteDataFromDht(key: Uint8Array): Promise<void>;
-    getKnownEntryPoints(): PeerDescriptor[];
-    isJoinOngoing(): boolean;
+    waitForNetworkConnectivity(): Promise<void>;
     stop(): Promise<void>;
 }

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

@@ -1,4 +1,4 @@
-import { PeerDescriptor, SortedContactList, DhtPeer } from '@streamr/dht';
+import { PeerDescriptor } from '@streamr/dht';
 export interface ILayer1Events {
     newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
     contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
@@ -10,7 +10,7 @@ export interface ILayer1 {
     once<T extends keyof ILayer1Events>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void;
     off<T extends keyof ILayer1Events>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void;
     removeContact: (peerDescriptor: PeerDescriptor, removeFromOpenInternetPeers?: boolean) => void;
-    getNeighborList: () => SortedContactList<DhtPeer>;
+    getClosestContacts: (maxCount?: number) => PeerDescriptor[];
     getKBucketPeers: () => PeerDescriptor[];
     getBucketSize: () => number;
     joinDht: (entryPoints: PeerDescriptor[], doRandomJoin?: boolean, retry?: boolean) => Promise<void>;

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

@@ -1,28 +1,28 @@
 import { PeerDescriptor } from '@streamr/dht';
-import { RemoteRandomGraphNode } from './RemoteRandomGraphNode';
+import { DeliveryRpcRemote } from './DeliveryRpcRemote';
 import { EventEmitter } from 'eventemitter3';
 import { NodeID } from '../identifiers';
 export interface Events {
-    nodeAdded: (id: NodeID, remote: RemoteRandomGraphNode) => any;
+    nodeAdded: (id: NodeID, remote: DeliveryRpcRemote) => any;
 }
 export declare class NodeList extends EventEmitter<Events> {
     private readonly nodes;
     private readonly limit;
     private ownId;
     constructor(ownId: NodeID, limit: number);
-    add(remote: RemoteRandomGraphNode): void;
+    add(remote: DeliveryRpcRemote): void;
     remove(peerDescriptor: PeerDescriptor): void;
     removeById(nodeId: NodeID): void;
     hasNode(peerDescriptor: PeerDescriptor): boolean;
     hasNodeById(nodeId: NodeID): boolean;
-    replaceAll(neighbors: RemoteRandomGraphNode[]): void;
+    replaceAll(neighbors: DeliveryRpcRemote[]): void;
     getIds(): NodeID[];
-    getNeighborById(id: NodeID): RemoteRandomGraphNode | undefined;
+    get(id: NodeID): DeliveryRpcRemote | undefined;
     size(exclude?: NodeID[]): number;
-    getRandom(exclude: NodeID[]): RemoteRandomGraphNode | undefined;
-    getClosest(exclude: NodeID[]): RemoteRandomGraphNode | undefined;
-    getClosestAndFurthest(exclude: NodeID[]): RemoteRandomGraphNode[];
-    getFurthest(exclude: NodeID[]): RemoteRandomGraphNode | undefined;
-    getNodes(): RemoteRandomGraphNode[];
+    getRandom(exclude: NodeID[]): DeliveryRpcRemote | undefined;
+    getClosest(exclude: NodeID[]): DeliveryRpcRemote | undefined;
+    getClosestAndFurthest(exclude: NodeID[]): DeliveryRpcRemote[];
+    getFurthest(exclude: NodeID[]): DeliveryRpcRemote | undefined;
+    getAll(): DeliveryRpcRemote[];
     stop(): void;
 }

package/dist/src/logic/NodeList.js

@@ -48,7 +48,7 @@ class NodeList extends eventemitter3_1.EventEmitter {
     getIds() {
         return Array.from(this.nodes.keys());
     }
-    getNeighborById(id) {
+    get(id) {
         return this.nodes.get(id);
     }
     size(exclude = []) {
@@ -72,7 +72,7 @@ class NodeList extends eventemitter3_1.EventEmitter {
         const included = getValuesOfIncludedKeys(this.nodes, exclude);
         return included[included.length - 1];
     }
-    getNodes() {
+    getAll() {
         return Array.from(this.nodes.values());
     }
     stop() {