@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-rc.0

package/README.md

@@ -1,17 +1,99 @@
-# @streamr/dht (WIP)
+# @streamr/dht
 
-An implementation of the Kademlia-based Streamr DHT used for the trackerless network.
+A connectionful Kademlia based P2P distributed hash table (DHT). Implements an in-memory key-value data store where multiple creators of data store values behind a single key. The library is entirely browser compatible.
 
-## Generating Protobuf code
+All communication between peers utilizes [protobuf](https://protobuf.dev/), transported with the help of the custom `@streamr/proto-rpc` library.
 
-Auto-generated protobuf/gRPC code is compiled during the build process.
-```bash
-  npm run build
+Connections in the DHT are established using WebSocket or WebRTC connections. The nodes will decide internally based on peers' connectivity information which connection types to use.
+
+The DHT also provides an interface for sending messages from peer to peer with the `DhtNode#send` function. The sent message is routed over the network to the target node.
+
+## Running a node
+
+Running a bare DhtNode in the Streamr Network is heavily discouraged as it requires advanced configuration. However, if you do wish to run a node here are some recommended configurations.
+
+(the following values are examples. For working production or test values check the @streamr/sdk default network configuration)
+
+```js
+const DhtNode = new DhtNode({
+  // Add a list of known entry points to the network
+  entryPoints: [{
+    kademliaId: new Uint8Array([1, 2, 3])
+  }], 
+  // a list of STUN and TURN servers. Critically important when opening webrtc conenctions behind NATs.
+  iceServers: [{
+    url: "stun.l.google.com",
+    port: 19302
+  }],
+  // A range of ports that the node will attempt to start a WebSocket server in. If you wish to use an exact port give equal values to min and max. If left unspecified the node will start without a server.
+  websocketPortRange: {
+    min: 30000,
+    max: 30500
+  },
+  ...
+})
+```
+
+## WebSocket Server TLS configuration
+
+Setting up TLS is important if you wish to allow nodes running in the browser to connect to your node over websocket. If left unconfigured webrtc connections will be used in such cases.
+
+There two ways to configure TLS for a DhtNode's WS server.
+
+### Auto-certification
+
+When starting a node configure it to automatically fetch TLS certificates for a randomly generated domain name as such:
+
+```js
+const DhtNode = new DhtNode({
+  ...
+  websocketServerEnableTls: true,
+  autoCertifierUrl: 'http://example-autocertifier-url:30000/',
+  autoCertifierConfigFile: '~/.streamr/certificate.json'
+  ...
+})
 ```
 
-Alternatively
+### Custom TLS configuration
+
+If you have your own domain name and/or TLS certificates you can configure the node to use them as follows:
+
+```js
+const DhtNode = new DhtNode({
+  tlsCertificate: {
+    certFileName: 'path/to/file'
+    privateKeyFileName: 'path/to/file'
+  },
+  websocketHost: 'custom-domain.com' // If using a custom domain name give it here to ensure that connectivity checking is correctly pointed to the server 
+})
+```
+
+### Setting up a custom DHT network
+
+To setup a custom DHT network outside the Streamr Networks Mumbai or Polygon environments, you simply need to set up one or multiple entry point DhtNodes to the network and point all newly joining DhtNodes to them. It is also a good idea to configure the entry points to know each other. This makes it possible to restart them without causing network partitioning.
+
+## Development
+
+### local testing and develpment setup
+
+When running a node for testing or develpment a few configurations are important.
+
+```js
+const DhtNode = new DhtNode({
+  entryPoints: [], // Point this to your local dev entry point!
+  iceServers: [], // Keep empty to ensure webrtc connections are local
+  webrtcAllowPrivateAddresses: true, // Make sure that the value is true in local develpment
+  websocketServerEnableTls: false, // Keep as false to ensure that auto-certification is not attempted
+  websocketHost: '127.0.0.1', // Use 127.0.0.1 instead of localhost during develpment! 
+})
+```
+
+### Generating Protobuf code
+
+After making changes to the protobuf definitions you should regenerate the protobuf code with the following command.
+
 ```bash
-  npm run prebuild
+  npm run generate-protoc-code
   # Or
   ./proto.sh
 ```

package/dist/package.json

@@ -0,0 +1,70 @@
+{
+    "name": "@streamr/dht",
+    "version": "100.0.0-rc.0",
+    "description": "Streamr Network DHT",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/streamr-dev/network.git",
+        "directory": "packages/dht"
+    },
+    "main": "dist/src/exports.js",
+    "types": "dist/src/exports.d.ts",
+    "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
+    "author": "Streamr Network AG <contact@streamr.network>",
+    "scripts": {
+        "generate-protoc-code": "./proto.sh",
+        "build": "tsc -b tsconfig.node.json",
+        "build-browser": "webpack --mode=development --progress",
+        "check": "tsc -p ./tsconfig.jest.json --noEmit",
+        "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
+        "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
+        "test": "npm run test-unit && npm run test-integration && npm run test-end-to-end",
+        "test-browser": "karma start karma.config.js",
+        "test-unit": "jest test/unit",
+        "test-integration": "jest --bail test/integration",
+        "test-end-to-end": "jest --bail test/end-to-end",
+        "benchmark": "jest test/benchmark",
+        "prepare-kademlia-simulation": "cd test/data && node --max-old-space-size=8096 -- ../../../../node_modules/.bin/ts-node -P ../../tsconfig.node.json generateGroundTruthData.ts",
+        "run-kademlia-simulation": "ts-node --project tsconfig.node.json $NODE_DEBUG_OPTION --files test/benchmark/kademlia-simulation/KademliaSimulation.ts"
+    },
+    "dependencies": {
+        "@js-sdsl/ordered-map": "^4.4.2",
+        "@protobuf-ts/runtime": "^2.8.2",
+        "@protobuf-ts/runtime-rpc": "^2.8.2",
+        "@streamr/autocertifier-client": "100.0.0-rc.0",
+        "@streamr/cdn-location": "100.0.0-rc.0",
+        "@streamr/proto-rpc": "100.0.0-rc.0",
+        "@streamr/utils": "100.0.0-rc.0",
+        "eventemitter3": "^5.0.0",
+        "heap": "^0.2.6",
+        "ipaddr.js": "^2.0.1",
+        "k-bucket": "^5.1.0",
+        "lodash": "^4.17.21",
+        "lru-cache": "10.2.0",
+        "node-datachannel": "^0.4.3",
+        "querystring": "0.2.1",
+        "uuid": "^9.0.1",
+        "websocket": "^1.0.34",
+        "ws": "^8.16.0"
+    },
+    "devDependencies": {
+        "@streamr/browser-test-runner": "^0.0.1",
+        "@streamr/test-utils": "100.0.0-rc.0",
+        "@types/express": "^4.17.21",
+        "@types/heap": "^0.2.34",
+        "@types/k-bucket": "^5.0.1",
+        "@types/lodash": "^4.14.202",
+        "@types/uuid": "^9.0.8",
+        "@types/websocket": "^1.0.10",
+        "@types/ws": "^8.5.10",
+        "express": "^4.17.1",
+        "jest-leak-detector": "^27.3.1",
+        "patch-package": "^8.0.0",
+        "ts-essentials": "^9.4.1",
+        "ts-node": "^10.9.2"
+    },
+    "optionalDependencies": {
+        "bufferutil": "^4.0.8",
+        "utf-8-validate": "^6.0.3"
+    }
+}

package/dist/src/connection/Connection.d.ts

@@ -9,3 +9,4 @@ export declare class Connection extends EventEmitter<ConnectionEvents> {
     setPeerDescriptor(peerDescriptor: PeerDescriptor): void;
     getPeerDescriptor(): PeerDescriptor | undefined;
 }
+export declare const createRandomConnectionId: () => ConnectionID;

package/dist/src/connection/Connection.js

@@ -3,13 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
+exports.createRandomConnectionId = exports.Connection = void 0;
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
-const IConnection_1 = require("./IConnection");
+const uuid_1 = require("uuid");
 class Connection extends eventemitter3_1.default {
+    connectionId;
+    connectionType;
+    peerDescriptor;
     constructor(connectionType) {
         super();
-        this.connectionId = new IConnection_1.ConnectionID();
+        this.connectionId = (0, exports.createRandomConnectionId)();
         this.connectionType = connectionType;
     }
     setPeerDescriptor(peerDescriptor) {
@@ -20,4 +23,8 @@ class Connection extends eventemitter3_1.default {
     }
 }
 exports.Connection = Connection;
+const createRandomConnectionId = () => {
+    return (0, uuid_1.v4)();
+};
+exports.createRandomConnectionId = createRandomConnectionId;
 //# sourceMappingURL=Connection.js.map

package/dist/src/connection/Connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../../src/connection/Connection.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AAExC,+CAA8E;AAE9E,MAAa,UAAW,SAAQ,uBAA8B;IAK1D,YAAY,cAA8B;QACtC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,YAAY,GAAG,IAAI,0BAAY,EAAE,CAAA;QACtC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAED,iBAAiB,CAAC,cAA8B;QAC5C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;CACJ;AAlBD,gCAkBC"}
+{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../../src/connection/Connection.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AAGxC,+BAAiC;AAEjC,MAAa,UAAW,SAAQ,uBAA8B;IACnD,YAAY,CAAc;IAC1B,cAAc,CAAgB;IAC7B,cAAc,CAAiB;IAEvC,YAAY,cAA8B;QACtC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,YAAY,GAAG,IAAA,gCAAwB,GAAE,CAAA;QAC9C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAED,iBAAiB,CAAC,cAA8B;QAC5C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;CACJ;AAlBD,gCAkBC;AAEM,MAAM,wBAAwB,GAAG,GAAiB,EAAE;IACvD,OAAO,IAAA,SAAI,GAAkB,CAAA;AACjC,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC"}

package/dist/src/connection/ConnectionLockHandler.d.ts

@@ -1,22 +1,22 @@
-import { PeerIDKey } from '../helpers/PeerID';
+import { DhtAddress } from '../identifiers';
 export type LockID = string;
 export declare class ConnectionLockHandler {
     private localLocks;
     private remoteLocks;
     private weakLocks;
-    getNumberOfLocalLockedConnections(): number;
-    getNumberOfRemoteLockedConnections(): number;
-    getNumberOfWeakLockedConnections(): number;
-    isLocalLocked(id: PeerIDKey, lockId?: LockID): boolean;
-    isRemoteLocked(id: PeerIDKey, lockId?: LockID): boolean;
+    getLocalLockedConnectionCount(): number;
+    getRemoteLockedConnectionCount(): number;
+    getWeakLockedConnectionCount(): number;
+    isLocalLocked(id: DhtAddress, lockId?: LockID): boolean;
+    isRemoteLocked(id: DhtAddress, lockId?: LockID): boolean;
     private isWeakLocked;
-    isLocked(id: PeerIDKey): boolean;
-    addLocalLocked(id: PeerIDKey, lockId: LockID): void;
-    addRemoteLocked(id: PeerIDKey, lockId: LockID): void;
-    addWeakLocked(id: PeerIDKey): void;
-    removeLocalLocked(id: PeerIDKey, lockId: LockID): void;
-    removeRemoteLocked(id: PeerIDKey, lockId: LockID): void;
-    removeWeakLocked(id: PeerIDKey): void;
-    clearAllLocks(id: PeerIDKey): void;
+    isLocked(id: DhtAddress): boolean;
+    addLocalLocked(id: DhtAddress, lockId: LockID): void;
+    addRemoteLocked(id: DhtAddress, lockId: LockID): void;
+    addWeakLocked(id: DhtAddress, lockId: LockID): void;
+    removeLocalLocked(id: DhtAddress, lockId: LockID): void;
+    removeRemoteLocked(id: DhtAddress, lockId: LockID): void;
+    removeWeakLocked(id: DhtAddress, lockId: LockID): void;
+    clearAllLocks(id: DhtAddress): void;
     clear(): void;
 }

package/dist/src/connection/ConnectionLockHandler.js

@@ -4,24 +4,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionLockHandler = void 0;
 class ConnectionLockHandler {
-    constructor() {
-        this.localLocks = new Map();
-        this.remoteLocks = new Map();
-        // TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
-        // simply do not send lock requests.
-        this.weakLocks = new Set();
-    }
-    getNumberOfLocalLockedConnections() {
+    localLocks = new Map();
+    remoteLocks = new Map();
+    // TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
+    // simply do not send lock requests.
+    weakLocks = new Map();
+    getLocalLockedConnectionCount() {
         return this.localLocks.size;
     }
-    getNumberOfRemoteLockedConnections() {
+    getRemoteLockedConnectionCount() {
         return this.remoteLocks.size;
     }
-    getNumberOfWeakLockedConnections() {
+    getWeakLockedConnectionCount() {
         return this.weakLocks.size;
     }
     isLocalLocked(id, lockId) {
-        if (!lockId) {
+        if (lockId === undefined) {
             return this.localLocks.has(id);
         }
         else {
@@ -29,7 +27,7 @@ class ConnectionLockHandler {
         }
     }
     isRemoteLocked(id, lockId) {
-        if (!lockId) {
+        if (lockId === undefined) {
             return this.remoteLocks.has(id);
         }
         else {
@@ -59,8 +57,11 @@ class ConnectionLockHandler {
         }
         this.remoteLocks.get(id).add(lockId);
     }
-    addWeakLocked(id) {
-        this.weakLocks.add(id);
+    addWeakLocked(id, lockId) {
+        if (!this.weakLocks.has(id)) {
+            this.weakLocks.set(id, new Set());
+        }
+        this.weakLocks.get(id).add(lockId);
     }
     removeLocalLocked(id, lockId) {
         if (this.localLocks.has(id)) {
@@ -78,8 +79,13 @@ class ConnectionLockHandler {
             }
         }
     }
-    removeWeakLocked(id) {
-        this.weakLocks.delete(id);
+    removeWeakLocked(id, lockId) {
+        if (this.weakLocks.has(id)) {
+            this.weakLocks.get(id)?.delete(lockId);
+            if (this.weakLocks.get(id)?.size === 0) {
+                this.weakLocks.delete(id);
+            }
+        }
     }
     clearAllLocks(id) {
         this.localLocks.delete(id);

package/dist/src/connection/ConnectionLockHandler.js.map

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

package/dist/src/connection/ConnectionLockRpcLocal.d.ts

@@ -2,11 +2,11 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { Empty } from '../proto/google/protobuf/empty';
 import { DisconnectNotice, LockRequest, LockResponse, PeerDescriptor, UnlockRequest } from '../proto/packages/dht/protos/DhtRpc';
 import { IConnectionLockRpc } from '../proto/packages/dht/protos/DhtRpc.server';
-import { PeerIDKey } from '../helpers/PeerID';
 import { LockID } from './ConnectionLockHandler';
+import { DhtAddress } from '../identifiers';
 interface ConnectionLockRpcLocalConfig {
-    addRemoteLocked: (id: PeerIDKey, lockId: LockID) => void;
-    removeRemoteLocked: (id: PeerIDKey, lockId: LockID) => void;
+    addRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
+    removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
     closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void;
     getLocalPeerDescriptor: () => PeerDescriptor;
 }

package/dist/src/connection/ConnectionLockRpcLocal.js

@@ -2,24 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionLockRpcLocal = void 0;
 const utils_1 = require("@streamr/utils");
-const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const ConnectionManager_1 = require("./ConnectionManager");
+const identifiers_1 = require("../identifiers");
 const logger = new utils_1.Logger(module);
 class ConnectionLockRpcLocal {
+    config;
     constructor(config) {
         this.config = config;
     }
     async lockRequest(lockRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
-        const remotePeerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(senderPeerDescriptor);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.config.getLocalPeerDescriptor())) {
+        if ((0, identifiers_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.config.getLocalPeerDescriptor())) {
             const response = {
                 accepted: false
             };
             return response;
         }
-        this.config.addRemoteLocked(remotePeerId.toKey(), lockRequest.lockId);
+        const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        this.config.addRemoteLocked(remoteNodeId, lockRequest.lockId);
         const response = {
             accepted: true
         };
@@ -27,8 +28,8 @@ class ConnectionLockRpcLocal {
     }
     async unlockRequest(unlockRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
-        const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(senderPeerDescriptor);
-        this.config.removeRemoteLocked(peerIdKey, unlockRequest.lockId);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        this.config.removeRemoteLocked(nodeId, unlockRequest.lockId);
         return {};
     }
     async gracefulDisconnect(disconnectNotice, context) {

package/dist/src/connection/ConnectionLockRpcLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionLockRpcLocal.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AACvC,kFAI4C;AAE5C,gEAO4C;AAI5C,2DAA0E;AAU1E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAI/B,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,OAA0B;QAClE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,YAAY,GAAG,IAAA,mDAAwB,EAAC,oBAAoB,CAAC,CAAA;QACnE,IAAI,IAAA,kDAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC,EAAE;YACrF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;QACD,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QACrE,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,OAA0B;QACxE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,SAAS,GAAG,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAA;QAC7D,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC/D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,OAA0B;QACnF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,oBAAoB,CAAC,GAAG,qCAAqC,CAAC,CAAA;QAEhH,IAAI,gBAAgB,CAAC,cAAc,KAAK,uBAAc,CAAC,OAAO,EAAE;YAC5D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;SACrF;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;SAC3F;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA1CD,wDA0CC"}
+{"version":3,"file":"ConnectionLockRpcLocal.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,gEAO4C;AAG5C,2DAA0E;AAE1E,gDAAiG;AASjG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAEd,MAAM,CAA8B;IAErD,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,OAA0B;QAClE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACtF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC7D,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,OAA0B;QACxE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,OAA0B;QACnF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,oBAAoB,CAAC,GAAG,qCAAqC,CAAC,CAAA;QAEhH,IAAI,gBAAgB,CAAC,cAAc,KAAK,uBAAc,CAAC,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;QACtF,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;QAC5F,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA1CD,wDA0CC"}

package/dist/src/connection/ConnectionLockRpcRemote.d.ts

@@ -1,10 +1,8 @@
-import { ProtoRpcClient } from '@streamr/proto-rpc';
-import { IConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
-import { PeerDescriptor, DisconnectMode } from '../proto/packages/dht/protos/DhtRpc';
-import { Remote } from '../dht/contact/Remote';
+import { RpcRemote } from '../dht/contact/RpcRemote';
+import { DisconnectMode } from '../proto/packages/dht/protos/DhtRpc';
+import { ConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
 import { LockID } from './ConnectionLockHandler';
-export declare class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
-    constructor(localPeerDescriptor: PeerDescriptor, targetPeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IConnectionLockRpcClient>);
+export declare class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient> {
     lockRequest(lockId: LockID): Promise<boolean>;
     unlockRequest(lockId: LockID): void;
     gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void>;

package/dist/src/connection/ConnectionLockRpcRemote.js

@@ -1,40 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionLockRpcRemote = void 0;
 const utils_1 = require("@streamr/utils");
-const Err = __importStar(require("../helpers/errors"));
-const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
-const Remote_1 = require("../dht/contact/Remote");
+const RpcRemote_1 = require("../dht/contact/RpcRemote");
+const identifiers_1 = require("../identifiers");
 const logger = new utils_1.Logger(module);
-class ConnectionLockRpcRemote extends Remote_1.Remote {
-    constructor(localPeerDescriptor, targetPeerDescriptor, client) {
-        super(localPeerDescriptor, targetPeerDescriptor, 'DUMMY', client);
-    }
+class ConnectionLockRpcRemote extends RpcRemote_1.RpcRemote {
     async lockRequest(lockId) {
-        logger.trace(`Requesting locked connection to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Requesting locked connection to ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
             lockId
         };
@@ -44,12 +17,12 @@ class ConnectionLockRpcRemote extends Remote_1.Remote {
             return res.accepted;
         }
         catch (err) {
-            logger.debug(new Err.ConnectionLocker('Connection lock rejected', err).stack);
+            logger.debug('Connection lock rejected', { error: err });
             return false;
         }
     }
     unlockRequest(lockId) {
-        logger.trace(`Requesting connection to be unlocked from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Requesting connection to be unlocked from ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
             lockId
         };
@@ -61,14 +34,14 @@ class ConnectionLockRpcRemote extends Remote_1.Remote {
         });
     }
     async gracefulDisconnect(disconnectMode) {
-        logger.trace(`Notifying a graceful disconnect to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Notifying a graceful disconnect to ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
             disconnectMode
         };
         const options = this.formDhtRpcOptions({
-            doNotConnect: true,
-            doNotMindStopped: true,
-            timeout: 2000
+            connect: false,
+            sendIfStopped: true,
+            timeout: 2000 // TODO use config option or named constant?
         });
         await this.getClient().gracefulDisconnect(request, options);
     }

package/dist/src/connection/ConnectionLockRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuC;AAIvC,uDAAwC;AACxC,kFAAiF;AACjF,kDAA8C;AAG9C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,eAAgC;IAEzE,YACI,mBAAmC,EACnC,oBAAoC,EACpC,MAAgD;QAEhD,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACrE,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxG,MAAM,OAAO,GAAgB;YACzB,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC,KAAM,CAAC,CAAA;YAC9E,OAAO,KAAK,CAAA;SACf;IACL,CAAC;IAEM,aAAa,CAAC,MAAc;QAC/B,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAAkB;YAC3B,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1D,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC1D,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC3G,MAAM,OAAO,GAAqB;YAC9B,cAAc;SACjB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AAlDD,0DAkDC"}
+{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,wDAAoD;AAIpD,gDAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,qBAAkC;IAEpE,KAAK,CAAC,WAAW,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxG,MAAM,OAAO,GAAgB;YACzB,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;YACxD,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,MAAc;QAC/B,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAAkB;YAC3B,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1D,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC1D,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC3G,MAAM,OAAO,GAAqB;YAC9B,cAAc;SACjB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI,CAAE,4CAA4C;SAC9D,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AA1CD,0DA0CC"}

package/dist/src/connection/ConnectionManager.d.ts

@@ -1,10 +1,11 @@
 import { MetricsContext } from '@streamr/utils';
 import { EventEmitter } from 'eventemitter3';
 import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
-import { ITransport, TransportEvents } from '../transport/ITransport';
+import { ITransport, SendOptions, TransportEvents } from '../transport/ITransport';
 import { LockID } from './ConnectionLockHandler';
 import { ConnectorFacade } from './ConnectorFacade';
 import { ManagedConnection } from './ManagedConnection';
+import { DhtAddress } from '../identifiers';
 export interface ConnectionManagerConfig {
     maxConnections?: number;
     metricsContext: MetricsContext;
@@ -14,12 +15,11 @@ export declare enum NatType {
     OPEN_INTERNET = "open_internet",
     UNKNOWN = "unknown"
 }
-type ServiceId = string;
 export interface ConnectionLocker {
-    lockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;
-    unlockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;
-    weakLockConnection(targetDescriptor: PeerDescriptor): void;
-    weakUnlockConnection(targetDescriptor: PeerDescriptor): void;
+    lockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
+    unlockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
+    weakLockConnection(nodeId: DhtAddress, lockId: LockID): void;
+    weakUnlockConnection(nodeId: DhtAddress, lockId: LockID): void;
 }
 export interface PortRange {
     min: number;
@@ -45,19 +45,19 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
     garbageCollectConnections(maxConnections: number, lastUsedLimit: number): void;
     start(): Promise<void>;
     stop(): Promise<void>;
-    getNumberOfLocalLockedConnections(): number;
-    getNumberOfRemoteLockedConnections(): number;
-    getNumberOfWeakLockedConnections(): number;
-    send(message: Message, doNotConnect?: boolean, doNotMindStopped?: boolean): Promise<void>;
+    getLocalLockedConnectionCount(): number;
+    getRemoteLockedConnectionCount(): number;
+    getWeakLockedConnectionCount(): number;
+    send(message: Message, opts?: SendOptions): Promise<void>;
     private isConnectionToSelf;
     private isOwnWebsocketServer;
-    getConnection(peerDescriptor: PeerDescriptor): ManagedConnection | undefined;
+    getConnection(nodeId: DhtAddress): ManagedConnection | undefined;
     getLocalPeerDescriptor(): PeerDescriptor;
-    hasConnection(peerDescriptor: PeerDescriptor): boolean;
-    hasLocalLockedConnection(peerDescriptor: PeerDescriptor): boolean;
-    hasRemoteLockedConnection(peerDescriptor: PeerDescriptor): boolean;
-    private canConnect;
-    handleMessage(message: Message): void;
+    hasConnection(nodeId: DhtAddress): boolean;
+    hasLocalLockedConnection(nodeId: DhtAddress): boolean;
+    hasRemoteLockedConnection(nodeId: DhtAddress): boolean;
+    private handleMessage;
+    handleIncomingMessage(message: Message): boolean;
     private onData;
     private onConnected;
     private onDisconnected;
@@ -66,11 +66,10 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
     private closeConnection;
     lockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
     unlockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
-    weakLockConnection(targetDescriptor: PeerDescriptor): void;
-    weakUnlockConnection(targetDescriptor: PeerDescriptor): void;
+    weakLockConnection(nodeId: DhtAddress, lockId: LockID): void;
+    weakUnlockConnection(nodeId: DhtAddress, lockId: LockID): void;
     private gracefullyDisconnectAsync;
     private doGracefullyDisconnectAsync;
-    getAllConnectionPeerDescriptors(): PeerDescriptor[];
+    getConnections(): PeerDescriptor[];
     private onConnectionCountChange;
 }
-export {};