@streamr/trackerless-network 100.2.5-beta.1 → 101.0.0-beta.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/trackerless-network",
-    "version": "100.2.5-beta.1",
+    "version": "101.0.0-beta.1",
     "description": "Minimal and extendable implementation of the Streamr Network node.",
     "repository": {
         "type": "git",
@@ -30,11 +30,11 @@
     "dependencies": {
         "@protobuf-ts/runtime": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/dht": "100.2.5-beta.1",
-        "@streamr/proto-rpc": "100.2.5-beta.1",
-        "@streamr/protocol": "100.2.5-beta.1",
-        "@streamr/test-utils": "100.2.5-beta.1",
-        "@streamr/utils": "100.2.5-beta.1",
+        "@streamr/dht": "101.0.0-beta.1",
+        "@streamr/proto-rpc": "101.0.0-beta.1",
+        "@streamr/protocol": "101.0.0-beta.1",
+        "@streamr/test-utils": "101.0.0-beta.1",
+        "@streamr/utils": "101.0.0-beta.1",
         "eventemitter3": "^5.0.0",
         "lodash": "^4.17.21",
         "uuid": "^9.0.1",

package/dist/src/NetworkNode.js

@@ -79,7 +79,7 @@ class NetworkNode {
         await this.stack.stop();
     }
     getPeerDescriptor() {
-        return this.stack.getLayer0Node().getLocalPeerDescriptor();
+        return this.stack.getControlLayerNode().getLocalPeerDescriptor();
     }
     getMetricsContext() {
         return this.stack.getMetricsContext();

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

@@ -1,17 +1,17 @@
 import { DhtNodeOptions, PeerDescriptor } from '@streamr/dht';
 import { StreamPartID } from '@streamr/protocol';
 import { MetricsContext } from '@streamr/utils';
-import { ContentDeliveryManager, ContentDeliveryManagerConfig } from './logic/ContentDeliveryManager';
-import { Layer0Node } from './logic/Layer0Node';
+import { ContentDeliveryManager, ContentDeliveryManagerOptions } from './logic/ContentDeliveryManager';
+import { ControlLayerNode } from './logic/ControlLayerNode';
 import { NodeInfoResponse, StreamMessage } from './proto/packages/trackerless-network/protos/NetworkRpc';
 export interface NetworkOptions {
     layer0?: DhtNodeOptions;
-    networkNode?: ContentDeliveryManagerConfig;
+    networkNode?: ContentDeliveryManagerOptions;
     metricsContext?: MetricsContext;
 }
 export type NodeInfo = Required<NodeInfoResponse>;
 export declare class NetworkStack {
-    private layer0Node?;
+    private controlLayerNode?;
     private contentDeliveryManager?;
     private stopped;
     private readonly metricsContext;
@@ -27,7 +27,7 @@ export declare class NetworkStack {
     start(doJoin?: boolean): Promise<void>;
     private ensureConnectedToControlLayer;
     getContentDeliveryManager(): ContentDeliveryManager;
-    getLayer0Node(): Layer0Node;
+    getControlLayerNode(): ControlLayerNode;
     getMetricsContext(): MetricsContext;
     fetchNodeInfo(node: PeerDescriptor): Promise<NodeInfo>;
     createNodeInfo(): NodeInfo;

package/dist/src/NetworkStack.js

@@ -35,7 +35,7 @@ if (typeof window === 'object') {
     });
 }
 class NetworkStack {
-    layer0Node;
+    controlLayerNode;
     contentDeliveryManager;
     stopped = false;
     metricsContext;
@@ -45,7 +45,7 @@ class NetworkStack {
     constructor(options) {
         this.options = options;
         this.metricsContext = options.metricsContext ?? new utils_1.MetricsContext();
-        this.layer0Node = new dht_1.DhtNode({
+        this.controlLayerNode = new dht_1.DhtNode({
             ...options.layer0,
             metricsContext: this.metricsContext
         });
@@ -81,49 +81,49 @@ class NetworkStack {
     }
     async start(doJoin = true) {
         logger.info('Starting a Streamr Network Node');
-        await this.layer0Node.start();
-        logger.info(`Node id is ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.layer0Node.getLocalPeerDescriptor())}`);
-        const connectionManager = this.layer0Node.getTransport();
-        if ((this.options.layer0?.entryPoints !== undefined) && (this.options.layer0.entryPoints.some((entryPoint) => (0, dht_1.areEqualPeerDescriptors)(entryPoint, this.layer0Node.getLocalPeerDescriptor())))) {
-            await this.layer0Node?.joinDht(this.options.layer0.entryPoints);
+        await this.controlLayerNode.start();
+        logger.info(`Node id is ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.controlLayerNode.getLocalPeerDescriptor())}`);
+        const connectionManager = this.controlLayerNode.getTransport();
+        if ((this.options.layer0?.entryPoints !== undefined) && (this.options.layer0.entryPoints.some((entryPoint) => (0, dht_1.areEqualPeerDescriptors)(entryPoint, this.controlLayerNode.getLocalPeerDescriptor())))) {
+            await this.controlLayerNode?.joinDht(this.options.layer0.entryPoints);
         }
         else if (doJoin) {
             // in practice there aren't be existing connections and therefore this always connects
             await this.ensureConnectedToControlLayer();
         }
         // TODO: remove undefined checks here. Assume that start is approproately awaited before stop is called.
-        await this.contentDeliveryManager?.start(this.layer0Node, connectionManager, connectionManager);
+        await this.contentDeliveryManager?.start(this.controlLayerNode, connectionManager, connectionManager);
         if (this.contentDeliveryManager) {
             const infoRpcCommunicator = new dht_1.ListeningRpcCommunicator(NodeInfoRpcLocal_1.NODE_INFO_RPC_SERVICE_ID, this.getConnectionManager());
             this.nodeInfoRpcLocal = new NodeInfoRpcLocal_1.NodeInfoRpcLocal(this, infoRpcCommunicator);
-            this.nodeInfoClient = new NodeInfoClient_1.NodeInfoClient(this.layer0Node.getLocalPeerDescriptor(), infoRpcCommunicator);
+            this.nodeInfoClient = new NodeInfoClient_1.NodeInfoClient(this.controlLayerNode.getLocalPeerDescriptor(), infoRpcCommunicator);
         }
     }
     async ensureConnectedToControlLayer() {
         // TODO we could wrap joinDht with pOnce and call it here (no else-if needed in that case)
-        if (!this.layer0Node.hasJoined()) {
+        if (!this.controlLayerNode.hasJoined()) {
             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.layer0Node?.joinDht(this.options.layer0.entryPoints);
+                    await this.controlLayerNode?.joinDht(this.options.layer0.entryPoints);
                 }
             });
-            await this.layer0Node.waitForNetworkConnectivity();
+            await this.controlLayerNode.waitForNetworkConnectivity();
         }
     }
     getContentDeliveryManager() {
         return this.contentDeliveryManager;
     }
-    getLayer0Node() {
-        return this.layer0Node;
+    getControlLayerNode() {
+        return this.controlLayerNode;
     }
     getMetricsContext() {
         return this.metricsContext;
     }
     async fetchNodeInfo(node) {
-        if (!(0, dht_1.areEqualPeerDescriptors)(node, this.getLayer0Node().getLocalPeerDescriptor())) {
+        if (!(0, dht_1.areEqualPeerDescriptors)(node, this.getControlLayerNode().getLocalPeerDescriptor())) {
             return this.nodeInfoClient.getInfo(node);
         }
         else {
@@ -132,10 +132,10 @@ class NetworkStack {
     }
     createNodeInfo() {
         return {
-            peerDescriptor: this.getLayer0Node().getLocalPeerDescriptor(),
+            peerDescriptor: this.getControlLayerNode().getLocalPeerDescriptor(),
             controlLayer: {
-                connections: this.getLayer0Node().getConnectionsView().getConnections(),
-                neighbors: this.getLayer0Node().getNeighbors()
+                connections: this.getControlLayerNode().getConnectionsView().getConnections(),
+                neighbors: this.getControlLayerNode().getNeighbors()
             },
             streamPartitions: this.getContentDeliveryManager().getNodeInfo(),
             version: package_json_1.version
@@ -145,16 +145,16 @@ class NetworkStack {
         return this.options;
     }
     getConnectionManager() {
-        return this.layer0Node.getTransport();
+        return this.controlLayerNode.getTransport();
     }
     async stop() {
         if (!this.stopped) {
             this.stopped = true;
             (0, lodash_1.pull)(instances, this);
             await this.contentDeliveryManager.destroy();
-            await this.layer0Node.stop();
+            await this.controlLayerNode.stop();
             this.contentDeliveryManager = undefined;
-            this.layer0Node = undefined;
+            this.controlLayerNode = undefined;
         }
     }
 }

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":"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"}

package/dist/src/exports.d.ts

@@ -1,6 +1,6 @@
 export { NetworkStack, NetworkOptions, NodeInfo } from './NetworkStack';
 export { NetworkNode, createNetworkNode } from './NetworkNode';
-export { ContentDeliveryManagerConfig } from './logic/ContentDeliveryManager';
+export { ContentDeliveryManagerOptions } from './logic/ContentDeliveryManager';
 export { ProxyDirection, GroupKeyRequest, GroupKeyResponse } from './proto/packages/trackerless-network/protos/NetworkRpc';
-export { streamPartIdToDataKey } from './logic/EntryPointDiscovery';
+export { streamPartIdToDataKey } from './logic/ContentDeliveryManager';
 export { convertStreamMessageToBytes, convertBytesToStreamMessage, convertGroupKeyRequestToBytes, convertBytesToGroupKeyRequest, convertGroupKeyResponseToBytes, convertBytesToGroupKeyResponse } from './logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils';

package/dist/src/exports.js

@@ -10,8 +10,8 @@ var NetworkRpc_1 = require("./proto/packages/trackerless-network/protos/NetworkR
 Object.defineProperty(exports, "ProxyDirection", { enumerable: true, get: function () { return NetworkRpc_1.ProxyDirection; } });
 Object.defineProperty(exports, "GroupKeyRequest", { enumerable: true, get: function () { return NetworkRpc_1.GroupKeyRequest; } });
 Object.defineProperty(exports, "GroupKeyResponse", { enumerable: true, get: function () { return NetworkRpc_1.GroupKeyResponse; } });
-var EntryPointDiscovery_1 = require("./logic/EntryPointDiscovery");
-Object.defineProperty(exports, "streamPartIdToDataKey", { enumerable: true, get: function () { return EntryPointDiscovery_1.streamPartIdToDataKey; } });
+var ContentDeliveryManager_1 = require("./logic/ContentDeliveryManager");
+Object.defineProperty(exports, "streamPartIdToDataKey", { enumerable: true, get: function () { return ContentDeliveryManager_1.streamPartIdToDataKey; } });
 var oldStreamMessageBinaryUtils_1 = require("./logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils");
 Object.defineProperty(exports, "convertStreamMessageToBytes", { enumerable: true, get: function () { return oldStreamMessageBinaryUtils_1.convertStreamMessageToBytes; } });
 Object.defineProperty(exports, "convertBytesToStreamMessage", { enumerable: true, get: function () { return oldStreamMessageBinaryUtils_1.convertBytesToStreamMessage; } });

package/dist/src/exports.js.map

@@ -1 +1 @@
-{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAA8D;AAArD,0GAAA,WAAW,OAAA;AAAE,gHAAA,iBAAiB,OAAA;AAEvC,qFAA0H;AAAjH,4GAAA,cAAc,OAAA;AAAE,6GAAA,eAAe,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAC1D,mEAAmE;AAA1D,4HAAA,qBAAqB,OAAA;AAC9B,uHAOgF;AAN5E,0IAAA,2BAA2B,OAAA;AAC3B,0IAAA,2BAA2B,OAAA;AAC3B,4IAAA,6BAA6B,OAAA;AAC7B,4IAAA,6BAA6B,OAAA;AAC7B,6IAAA,8BAA8B,OAAA;AAC9B,6IAAA,8BAA8B,OAAA"}
+{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAA8D;AAArD,0GAAA,WAAW,OAAA;AAAE,gHAAA,iBAAiB,OAAA;AAEvC,qFAA0H;AAAjH,4GAAA,cAAc,OAAA;AAAE,6GAAA,eAAe,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAC1D,yEAAsE;AAA7D,+HAAA,qBAAqB,OAAA;AAC9B,uHAOgF;AAN5E,0IAAA,2BAA2B,OAAA;AAC3B,0IAAA,2BAA2B,OAAA;AAC3B,4IAAA,6BAA6B,OAAA;AAC7B,4IAAA,6BAA6B,OAAA;AAC7B,6IAAA,8BAA8B,OAAA;AAC9B,6IAAA,8BAA8B,OAAA"}

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

@@ -9,16 +9,16 @@ import { NeighborUpdateManager } from './neighbor-discovery/NeighborUpdateManage
 import { ProxyConnectionRpcLocal } from './proxy/ProxyConnectionRpcLocal';
 import { Inspector } from './inspect/Inspector';
 import { TemporaryConnectionRpcLocal } from './temporary-connection/TemporaryConnectionRpcLocal';
-import { Layer1Node } from './Layer1Node';
+import { DiscoveryLayerNode } from './DiscoveryLayerNode';
 import { StreamPartID } from '@streamr/protocol';
 export interface Events {
     message: (message: StreamMessage) => void;
     neighborConnected: (nodeId: DhtAddress) => void;
     entryPointLeaveDetected: () => void;
 }
-export interface StrictContentDeliveryLayerNodeConfig {
+export interface StrictContentDeliveryLayerNodeOptions {
     streamPartId: StreamPartID;
-    layer1Node: Layer1Node;
+    discoveryLayerNode: DiscoveryLayerNode;
     transport: ITransport;
     connectionLocker: ConnectionLocker;
     localPeerDescriptor: PeerDescriptor;
@@ -43,10 +43,10 @@ export interface StrictContentDeliveryLayerNodeConfig {
 export declare class ContentDeliveryLayerNode extends EventEmitter<Events> {
     private started;
     private readonly duplicateDetectors;
-    private config;
+    private options;
     private readonly contentDeliveryRpcLocal;
     private abortController;
-    constructor(config: StrictContentDeliveryLayerNodeConfig);
+    constructor(options: StrictContentDeliveryLayerNodeOptions);
     start(): Promise<void>;
     private registerDefaultServerMethods;
     private onRingContactsUpdated;

package/dist/src/logic/ContentDeliveryLayerNode.js

@@ -14,93 +14,93 @@ const logger = new utils_1.Logger(module);
 class ContentDeliveryLayerNode extends eventemitter3_1.EventEmitter {
     started = false;
     duplicateDetectors;
-    config;
+    options;
     contentDeliveryRpcLocal;
     abortController = new AbortController();
-    constructor(config) {
+    constructor(options) {
         super();
-        this.config = config;
+        this.options = options;
         this.duplicateDetectors = new Map();
         this.contentDeliveryRpcLocal = new ContentDeliveryRpcLocal_1.ContentDeliveryRpcLocal({
-            localPeerDescriptor: this.config.localPeerDescriptor,
-            streamPartId: this.config.streamPartId,
-            rpcCommunicator: this.config.rpcCommunicator,
+            localPeerDescriptor: this.options.localPeerDescriptor,
+            streamPartId: this.options.streamPartId,
+            rpcCommunicator: this.options.rpcCommunicator,
             markAndCheckDuplicate: (msg, prev) => (0, utils_2.markAndCheckDuplicate)(this.duplicateDetectors, msg, prev),
             broadcast: (message, previousNode) => this.broadcast(message, previousNode),
-            onLeaveNotice: (sourceId, sourceIsStreamEntryPoint) => {
+            onLeaveNotice: (remoteNodeId, sourceIsStreamEntryPoint) => {
                 if (this.abortController.signal.aborted) {
                     return;
                 }
-                const contact = this.config.nearbyNodeView.get(sourceId)
-                    || this.config.randomNodeView.get(sourceId)
-                    || this.config.neighbors.get(sourceId)
-                    || this.config.proxyConnectionRpcLocal?.getConnection(sourceId)?.remote;
+                const contact = this.options.nearbyNodeView.get(remoteNodeId)
+                    || this.options.randomNodeView.get(remoteNodeId)
+                    || this.options.neighbors.get(remoteNodeId)
+                    || this.options.proxyConnectionRpcLocal?.getConnection(remoteNodeId)?.remote;
                 // TODO: check integrity of notifier?
                 if (contact) {
-                    this.config.layer1Node.removeContact(sourceId);
-                    this.config.neighbors.remove(sourceId);
-                    this.config.nearbyNodeView.remove(sourceId);
-                    this.config.randomNodeView.remove(sourceId);
-                    this.config.leftNodeView.remove(sourceId);
-                    this.config.rightNodeView.remove(sourceId);
-                    this.config.neighborFinder.start([sourceId]);
-                    this.config.proxyConnectionRpcLocal?.removeConnection(sourceId);
+                    this.options.discoveryLayerNode.removeContact(remoteNodeId);
+                    this.options.neighbors.remove(remoteNodeId);
+                    this.options.nearbyNodeView.remove(remoteNodeId);
+                    this.options.randomNodeView.remove(remoteNodeId);
+                    this.options.leftNodeView.remove(remoteNodeId);
+                    this.options.rightNodeView.remove(remoteNodeId);
+                    this.options.neighborFinder.start([remoteNodeId]);
+                    this.options.proxyConnectionRpcLocal?.removeConnection(remoteNodeId);
                 }
                 if (sourceIsStreamEntryPoint) {
                     this.emit('entryPointLeaveDetected');
                 }
             },
-            markForInspection: (senderId, messageId) => this.config.inspector.markMessage(senderId, messageId)
+            markForInspection: (remoteNodeId, messageId) => this.options.inspector.markMessage(remoteNodeId, messageId)
         });
     }
     async start() {
         this.started = true;
         this.registerDefaultServerMethods();
-        (0, utils_1.addManagedEventListener)(this.config.layer1Node, 'nearbyContactAdded', () => this.onNearbyContactAdded(), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.layer1Node, 'nearbyContactRemoved', () => this.onNearbyContactRemoved(), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.layer1Node, 'randomContactAdded', () => this.onRandomContactAdded(), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.layer1Node, 'randomContactRemoved', () => this.onRandomContactRemoved(), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.layer1Node, 'ringContactAdded', () => this.onRingContactsUpdated(), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.layer1Node, 'ringContactRemoved', () => this.onRingContactsUpdated(), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.transport, 'disconnected', (peerDescriptor) => this.onNodeDisconnected(peerDescriptor), this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.neighbors, 'nodeAdded', (id, remote) => {
-            this.config.propagation.onNeighborJoined(id);
-            this.config.connectionLocker.weakLockConnection((0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor()), this.config.streamPartId);
+        (0, utils_1.addManagedEventListener)(this.options.discoveryLayerNode, 'nearbyContactAdded', () => this.onNearbyContactAdded(), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.discoveryLayerNode, 'nearbyContactRemoved', () => this.onNearbyContactRemoved(), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.discoveryLayerNode, 'randomContactAdded', () => this.onRandomContactAdded(), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.discoveryLayerNode, 'randomContactRemoved', () => this.onRandomContactRemoved(), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.discoveryLayerNode, 'ringContactAdded', () => this.onRingContactsUpdated(), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.discoveryLayerNode, 'ringContactRemoved', () => this.onRingContactsUpdated(), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.transport, 'disconnected', (peerDescriptor) => this.onNodeDisconnected(peerDescriptor), this.abortController.signal);
+        (0, utils_1.addManagedEventListener)(this.options.neighbors, 'nodeAdded', (id, remote) => {
+            this.options.propagation.onNeighborJoined(id);
+            this.options.connectionLocker.weakLockConnection((0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor()), this.options.streamPartId);
             this.emit('neighborConnected', id);
         }, this.abortController.signal);
-        (0, utils_1.addManagedEventListener)(this.config.neighbors, 'nodeRemoved', (_id, remote) => {
-            this.config.connectionLocker.weakUnlockConnection((0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor()), this.config.streamPartId);
+        (0, utils_1.addManagedEventListener)(this.options.neighbors, 'nodeRemoved', (_id, remote) => {
+            this.options.connectionLocker.weakUnlockConnection((0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor()), this.options.streamPartId);
         }, this.abortController.signal);
-        if (this.config.proxyConnectionRpcLocal !== undefined) {
-            (0, utils_1.addManagedEventListener)(this.config.proxyConnectionRpcLocal, 'newConnection', (id) => this.config.propagation.onNeighborJoined(id), this.abortController.signal);
+        if (this.options.proxyConnectionRpcLocal !== undefined) {
+            (0, utils_1.addManagedEventListener)(this.options.proxyConnectionRpcLocal, 'newConnection', (id) => this.options.propagation.onNeighborJoined(id), this.abortController.signal);
         }
-        this.config.neighborFinder.start();
-        await this.config.neighborUpdateManager.start();
+        this.options.neighborFinder.start();
+        await this.options.neighborUpdateManager.start();
     }
     registerDefaultServerMethods() {
-        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.StreamMessage, 'sendStreamMessage', (msg, context) => this.contentDeliveryRpcLocal.sendStreamMessage(msg, context));
-        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.LeaveStreamPartNotice, 'leaveStreamPartNotice', (req, context) => this.contentDeliveryRpcLocal.leaveStreamPartNotice(req, context));
-        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.TemporaryConnectionRequest, NetworkRpc_1.TemporaryConnectionResponse, 'openConnection', (req, context) => this.config.temporaryConnectionRpcLocal.openConnection(req, context));
-        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.CloseTemporaryConnection, 'closeConnection', (req, context) => this.config.temporaryConnectionRpcLocal.closeConnection(req, context));
+        this.options.rpcCommunicator.registerRpcNotification(NetworkRpc_1.StreamMessage, 'sendStreamMessage', (msg, context) => this.contentDeliveryRpcLocal.sendStreamMessage(msg, context));
+        this.options.rpcCommunicator.registerRpcNotification(NetworkRpc_1.LeaveStreamPartNotice, 'leaveStreamPartNotice', (req, context) => this.contentDeliveryRpcLocal.leaveStreamPartNotice(req, context));
+        this.options.rpcCommunicator.registerRpcMethod(NetworkRpc_1.TemporaryConnectionRequest, NetworkRpc_1.TemporaryConnectionResponse, 'openConnection', (req, context) => this.options.temporaryConnectionRpcLocal.openConnection(req, context));
+        this.options.rpcCommunicator.registerRpcNotification(NetworkRpc_1.CloseTemporaryConnection, 'closeConnection', (req, context) => this.options.temporaryConnectionRpcLocal.closeConnection(req, context));
     }
     onRingContactsUpdated() {
         logger.trace('onRingContactsUpdated');
         if (this.isStopped()) {
             return;
         }
-        const contacts = this.config.layer1Node.getRingContacts();
-        this.config.leftNodeView.replaceAll(contacts.left.map((peer) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.config.localPeerDescriptor, peer, this.config.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.config.rpcRequestTimeout)));
-        this.config.rightNodeView.replaceAll(contacts.right.map((peer) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.config.localPeerDescriptor, peer, this.config.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.config.rpcRequestTimeout)));
+        const contacts = this.options.discoveryLayerNode.getRingContacts();
+        this.options.leftNodeView.replaceAll(contacts.left.map((peer) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, peer, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout)));
+        this.options.rightNodeView.replaceAll(contacts.right.map((peer) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, peer, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout)));
     }
     onNearbyContactAdded() {
         logger.trace(`New nearby contact found`);
         if (this.isStopped()) {
             return;
         }
-        const closestContacts = this.config.layer1Node.getClosestContacts();
+        const closestContacts = this.options.discoveryLayerNode.getClosestContacts();
         this.updateNearbyNodeView(closestContacts);
-        if (this.config.neighbors.size() < this.config.neighborTargetCount) {
-            this.config.neighborFinder.start();
+        if (this.options.neighbors.size() < this.options.neighborTargetCount) {
+            this.options.neighborFinder.start();
         }
     }
     onNearbyContactRemoved() {
@@ -108,26 +108,26 @@ class ContentDeliveryLayerNode extends eventemitter3_1.EventEmitter {
         if (this.isStopped()) {
             return;
         }
-        const closestContacts = this.config.layer1Node.getClosestContacts();
+        const closestContacts = this.options.discoveryLayerNode.getClosestContacts();
         this.updateNearbyNodeView(closestContacts);
     }
     updateNearbyNodeView(nodes) {
-        this.config.nearbyNodeView.replaceAll(Array.from(nodes).map((descriptor) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.config.localPeerDescriptor, descriptor, this.config.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.config.rpcRequestTimeout)));
-        for (const descriptor of this.config.layer1Node.getNeighbors()) {
-            if (this.config.nearbyNodeView.size() >= this.config.nodeViewSize) {
+        this.options.nearbyNodeView.replaceAll(Array.from(nodes).map((descriptor) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, descriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout)));
+        for (const descriptor of this.options.discoveryLayerNode.getNeighbors()) {
+            if (this.options.nearbyNodeView.size() >= this.options.nodeViewSize) {
                 break;
             }
-            this.config.nearbyNodeView.add(new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.config.localPeerDescriptor, descriptor, this.config.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.config.rpcRequestTimeout));
+            this.options.nearbyNodeView.add(new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, descriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout));
         }
     }
     onRandomContactAdded() {
         if (this.isStopped()) {
             return;
         }
-        const randomContacts = this.config.layer1Node.getRandomContacts(RANDOM_NODE_VIEW_SIZE);
-        this.config.randomNodeView.replaceAll(randomContacts.map((descriptor) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.config.localPeerDescriptor, descriptor, this.config.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.config.rpcRequestTimeout)));
-        if (this.config.neighbors.size() < this.config.neighborTargetCount) {
-            this.config.neighborFinder.start();
+        const randomContacts = this.options.discoveryLayerNode.getRandomContacts(RANDOM_NODE_VIEW_SIZE);
+        this.options.randomNodeView.replaceAll(randomContacts.map((descriptor) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, descriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout)));
+        if (this.options.neighbors.size() < this.options.neighborTargetCount) {
+            this.options.neighborFinder.start();
         }
     }
     onRandomContactRemoved() {
@@ -135,20 +135,20 @@ class ContentDeliveryLayerNode extends eventemitter3_1.EventEmitter {
         if (this.isStopped()) {
             return;
         }
-        const randomContacts = this.config.layer1Node.getRandomContacts(RANDOM_NODE_VIEW_SIZE);
-        this.config.randomNodeView.replaceAll(randomContacts.map((descriptor) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.config.localPeerDescriptor, descriptor, this.config.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.config.rpcRequestTimeout)));
+        const randomContacts = this.options.discoveryLayerNode.getRandomContacts(RANDOM_NODE_VIEW_SIZE);
+        this.options.randomNodeView.replaceAll(randomContacts.map((descriptor) => new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, descriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout)));
     }
     onNodeDisconnected(peerDescriptor) {
         const nodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
-        if (this.config.neighbors.has(nodeId)) {
-            this.config.neighbors.remove(nodeId);
-            this.config.neighborFinder.start([nodeId]);
-            this.config.temporaryConnectionRpcLocal.removeNode(nodeId);
+        if (this.options.neighbors.has(nodeId)) {
+            this.options.neighbors.remove(nodeId);
+            this.options.neighborFinder.start([nodeId]);
+            this.options.temporaryConnectionRpcLocal.removeNode(nodeId);
         }
     }
     hasProxyConnection(nodeId) {
-        if (this.config.proxyConnectionRpcLocal) {
-            return this.config.proxyConnectionRpcLocal.hasConnection(nodeId);
+        if (this.options.proxyConnectionRpcLocal) {
+            return this.options.proxyConnectionRpcLocal.hasConnection(nodeId);
         }
         return false;
     }
@@ -157,53 +157,53 @@ class ContentDeliveryLayerNode extends eventemitter3_1.EventEmitter {
             return;
         }
         this.abortController.abort();
-        this.config.proxyConnectionRpcLocal?.stop();
-        this.config.neighbors.getAll().map((remote) => {
-            remote.leaveStreamPartNotice(this.config.streamPartId, this.config.isLocalNodeEntryPoint());
-            this.config.connectionLocker.weakUnlockConnection((0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor()), this.config.streamPartId);
+        this.options.proxyConnectionRpcLocal?.stop();
+        this.options.neighbors.getAll().map((remote) => {
+            remote.leaveStreamPartNotice(this.options.streamPartId, this.options.isLocalNodeEntryPoint());
+            this.options.connectionLocker.weakUnlockConnection((0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor()), this.options.streamPartId);
         });
-        this.config.rpcCommunicator.destroy();
+        this.options.rpcCommunicator.destroy();
         this.removeAllListeners();
-        this.config.nearbyNodeView.stop();
-        this.config.neighbors.stop();
-        this.config.randomNodeView.stop();
-        this.config.neighborFinder.stop();
-        this.config.neighborUpdateManager.stop();
-        this.config.inspector.stop();
+        this.options.nearbyNodeView.stop();
+        this.options.neighbors.stop();
+        this.options.randomNodeView.stop();
+        this.options.neighborFinder.stop();
+        this.options.neighborUpdateManager.stop();
+        this.options.inspector.stop();
     }
     broadcast(msg, previousNode) {
         if (!previousNode) {
             (0, utils_2.markAndCheckDuplicate)(this.duplicateDetectors, msg.messageId, msg.previousMessageRef);
         }
         this.emit('message', msg);
-        const skipBackPropagation = previousNode !== undefined && !this.config.temporaryConnectionRpcLocal.hasNode(previousNode);
-        this.config.propagation.feedUnseenMessage(msg, this.getPropagationTargets(msg), skipBackPropagation ? previousNode : null);
+        const skipBackPropagation = previousNode !== undefined && !this.options.temporaryConnectionRpcLocal.hasNode(previousNode);
+        this.options.propagation.feedUnseenMessage(msg, this.getPropagationTargets(msg), skipBackPropagation ? previousNode : null);
     }
     inspect(peerDescriptor) {
-        return this.config.inspector.inspect(peerDescriptor);
+        return this.options.inspector.inspect(peerDescriptor);
     }
     getPropagationTargets(msg) {
-        let propagationTargets = this.config.neighbors.getIds();
-        if (this.config.proxyConnectionRpcLocal) {
-            propagationTargets = propagationTargets.concat(this.config.proxyConnectionRpcLocal.getPropagationTargets(msg));
+        let propagationTargets = this.options.neighbors.getIds();
+        if (this.options.proxyConnectionRpcLocal) {
+            propagationTargets = propagationTargets.concat(this.options.proxyConnectionRpcLocal.getPropagationTargets(msg));
         }
-        propagationTargets = propagationTargets.concat(this.config.temporaryConnectionRpcLocal.getNodes().getIds());
+        propagationTargets = propagationTargets.concat(this.options.temporaryConnectionRpcLocal.getNodes().getIds());
         return propagationTargets;
     }
     getOwnNodeId() {
-        return (0, dht_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
+        return (0, dht_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor);
     }
     getOutgoingHandshakeCount() {
-        return this.config.handshaker.getOngoingHandshakes().size;
+        return this.options.handshaker.getOngoingHandshakes().size;
     }
     getNeighbors() {
         if (!this.started && this.isStopped()) {
             return [];
         }
-        return this.config.neighbors.getAll().map((n) => n.getPeerDescriptor());
+        return this.options.neighbors.getAll().map((n) => n.getPeerDescriptor());
     }
     getNearbyNodeView() {
-        return this.config.nearbyNodeView;
+        return this.options.nearbyNodeView;
     }
     isStopped() {
         return this.abortController.signal.aborted;