@streamr/dht 100.0.0-testnet-two.4 → 100.0.0-testnet-three.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/dht",
-    "version": "100.0.0-testnet-two.4",
+    "version": "100.0.0-testnet-three.1",
     "description": "Streamr Network DHT",
     "repository": {
         "type": "git",
@@ -18,7 +18,6 @@
         "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}'",
-        "prepublishOnly": "npm run clean && NODE_ENV=production tsc -b tsconfig.node.json",
         "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",
@@ -31,9 +30,9 @@
     "dependencies": {
         "@protobuf-ts/runtime": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/autocertifier-client": "100.0.0-testnet-two.4",
-        "@streamr/proto-rpc": "100.0.0-testnet-two.4",
-        "@streamr/utils": "100.0.0-testnet-two.4",
+        "@streamr/autocertifier-client": "100.0.0-testnet-three.1",
+        "@streamr/proto-rpc": "100.0.0-testnet-three.1",
+        "@streamr/utils": "100.0.0-testnet-three.1",
         "eventemitter3": "^5.0.0",
         "heap": "^0.2.6",
         "ipaddr.js": "^2.0.1",
@@ -45,19 +44,19 @@
     },
     "devDependencies": {
         "@streamr/browser-test-runner": "^0.0.1",
-        "@streamr/test-utils": "100.0.0-testnet-two.4",
+        "@streamr/test-utils": "100.0.0-testnet-three.1",
         "@types/express": "^4.17.21",
         "@types/heap": "^0.2.34",
         "@types/k-bucket": "^5.0.1",
         "@types/lodash": "^4.14.202",
-        "@types/sinon": "^10.0.15",
+        "@types/sinon": "^17.0.3",
         "@types/uuid": "^9.0.7",
-        "@types/websocket": "^1.0.3",
+        "@types/websocket": "^1.0.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.1"
+        "ts-node": "^10.9.2"
     },
     "optionalDependencies": {
         "bufferutil": "^4.0.8",

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

@@ -4,9 +4,9 @@ export declare class ConnectionLockHandler {
     private localLocks;
     private remoteLocks;
     private weakLocks;
-    getNumberOfLocalLockedConnections(): number;
-    getNumberOfRemoteLockedConnections(): number;
-    getNumberOfWeakLockedConnections(): number;
+    getLocalLockedConnectionCount(): number;
+    getRemoteLockedConnectionCount(): number;
+    getWeakLockedConnectionCount(): number;
     isLocalLocked(id: DhtAddress, lockId?: LockID): boolean;
     isRemoteLocked(id: DhtAddress, lockId?: LockID): boolean;
     private isWeakLocked;

package/dist/src/connection/ConnectionLockHandler.js

@@ -4,20 +4,18 @@
 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 Set();
+    getLocalLockedConnectionCount() {
         return this.localLocks.size;
     }
-    getNumberOfRemoteLockedConnections() {
+    getRemoteLockedConnectionCount() {
         return this.remoteLocks.size;
     }
-    getNumberOfWeakLockedConnections() {
+    getWeakLockedConnectionCount() {
         return this.weakLocks.size;
     }
     isLocalLocked(id, lockId) {

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.js

@@ -2,23 +2,24 @@
 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;
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.config.getLocalPeerDescriptor())) {
+        if ((0, identifiers_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.config.getLocalPeerDescriptor())) {
             const response = {
                 accepted: false
             };
             return response;
         }
-        const remoteNodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
         this.config.addRemoteLocked(remoteNodeId, lockRequest.lockId);
         const response = {
             accepted: true
@@ -27,7 +28,7 @@ class ConnectionLockRpcLocal {
     }
     async unlockRequest(unlockRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
         this.config.removeRemoteLocked(nodeId, unlockRequest.lockId);
         return {};
     }

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,kFAG4C;AAE5C,gEAO4C;AAG5C,2DAA0E;AAW1E,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,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,MAAM,YAAY,GAAG,IAAA,sDAA2B,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,sDAA2B,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;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.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionLockRpcRemote = void 0;
 const utils_1 = require("@streamr/utils");
 const RpcRemote_1 = require("../dht/contact/RpcRemote");
-const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
+const identifiers_1 = require("../identifiers");
 const logger = new utils_1.Logger(module);
 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
         };
@@ -22,7 +22,7 @@ class ConnectionLockRpcRemote extends RpcRemote_1.RpcRemote {
         }
     }
     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
         };
@@ -34,7 +34,7 @@ class ConnectionLockRpcRemote extends RpcRemote_1.RpcRemote {
         });
     }
     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
         };

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

@@ -1 +1 @@
-{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,wDAAoD;AACpD,kFAAiF;AAKjF,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,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,0BAA0B,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;YACxD,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,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"}
+{"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

@@ -45,17 +45,17 @@ 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;
+    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;
+    hasConnection(nodeId: DhtAddress): boolean;
+    hasLocalLockedConnection(nodeId: DhtAddress): boolean;
+    hasRemoteLockedConnection(nodeId: DhtAddress): boolean;
     handleMessage(message: Message): void;
     private onData;
     private onConnected;
@@ -69,6 +69,6 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
     weakUnlockConnection(nodeId: DhtAddress): void;
     private gracefullyDisconnectAsync;
     private doGracefullyDisconnectAsync;
-    getAllConnectionPeerDescriptors(): PeerDescriptor[];
+    getConnections(): PeerDescriptor[];
     private onConnectionCountChange;
 }

package/dist/src/connection/ConnectionManager.js

@@ -29,7 +29,6 @@ const eventemitter3_1 = require("eventemitter3");
 const SortedContactList_1 = require("../dht/contact/SortedContactList");
 const DuplicateDetector_1 = require("../dht/routing/DuplicateDetector");
 const Err = __importStar(require("../helpers/errors"));
-const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const DhtRpc_client_1 = require("../proto/packages/dht/protos/DhtRpc.client");
 const ITransport_1 = require("../transport/ITransport");
@@ -38,6 +37,8 @@ const ConnectionLockHandler_1 = require("./ConnectionLockHandler");
 const ConnectionLockRpcRemote_1 = require("./ConnectionLockRpcRemote");
 const NodeWebrtcConnection_1 = require("./webrtc/NodeWebrtcConnection");
 const ConnectionLockRpcLocal_1 = require("./ConnectionLockRpcLocal");
+const identifiers_1 = require("../identifiers");
+const offering_1 = require("../helpers/offering");
 var NatType;
 (function (NatType) {
     NatType["OPEN_INTERNET"] = "open_internet";
@@ -63,7 +64,7 @@ const INTERNAL_SERVICE_ID = 'system/connection-manager';
 // - if ManagedConnection#peerDescriptor is never undefined
 const getNodeIdOrUnknownFromPeerDescriptor = (peerDescriptor) => {
     if (peerDescriptor !== undefined) {
-        return (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        return (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
     }
     else {
         return 'unknown';
@@ -71,13 +72,19 @@ const getNodeIdOrUnknownFromPeerDescriptor = (peerDescriptor) => {
 };
 exports.getNodeIdOrUnknownFromPeerDescriptor = getNodeIdOrUnknownFromPeerDescriptor;
 class ConnectionManager extends eventemitter3_1.EventEmitter {
+    config;
+    metricsContext;
+    // TODO use config option or named constant?
+    duplicateMessageDetector = new DuplicateDetector_1.DuplicateDetector(100000);
+    metrics;
+    locks = new ConnectionLockHandler_1.ConnectionLockHandler();
+    connections = new Map();
+    connectorFacade;
+    rpcCommunicator;
+    disconnectorIntervalRef;
+    state = ConnectionManagerState.IDLE;
     constructor(config) {
         super();
-        // TODO use config option or named constant?
-        this.duplicateMessageDetector = new DuplicateDetector_1.DuplicateDetector(100000, 100);
-        this.locks = new ConnectionLockHandler_1.ConnectionLockHandler();
-        this.connections = new Map();
-        this.state = ConnectionManagerState.IDLE;
         this.config = config;
         this.onData = this.onData.bind(this);
         this.send = this.send.bind(this);
@@ -108,15 +115,15 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         });
         this.rpcCommunicator.registerRpcMethod(DhtRpc_1.LockRequest, DhtRpc_1.LockResponse, 'lockRequest', (req, context) => lockRpcLocal.lockRequest(req, context));
         this.rpcCommunicator.registerRpcNotification(DhtRpc_1.UnlockRequest, 'unlockRequest', (req, context) => lockRpcLocal.unlockRequest(req, context));
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.DisconnectNotice, DhtRpc_1.DisconnectNoticeResponse, 'gracefulDisconnect', (req, context) => lockRpcLocal.gracefulDisconnect(req, context));
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.DisconnectNotice, 'gracefulDisconnect', (req, context) => lockRpcLocal.gracefulDisconnect(req, context));
     }
     garbageCollectConnections(maxConnections, lastUsedLimit) {
         if (this.connections.size <= maxConnections) {
             return;
         }
         const disconnectionCandidates = new SortedContactList_1.SortedContactList({
-            referenceId: (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()),
-            maxSize: 100000,
+            referenceId: (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()),
+            maxSize: 100000, // TODO use config option or named constant?
             allowToContainReferenceId: false,
             emitEvents: false
         });
@@ -130,7 +137,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         const targetNum = this.connections.size - maxConnections;
         for (let i = 0; i < sortedCandidates.length && i < targetNum; i++) {
             const peerDescriptor = sortedCandidates[sortedCandidates.length - 1 - i].getPeerDescriptor();
-            logger.trace('garbageCollecting ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
+            logger.trace('garbageCollecting ' + (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
             this.gracefullyDisconnectAsync(peerDescriptor, DhtRpc_1.DisconnectMode.NORMAL).catch((_e) => { });
         }
     }
@@ -140,7 +147,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         }
         this.state = ConnectionManagerState.RUNNING;
         logger.trace(`Starting ConnectionManager...`);
-        await this.connectorFacade.start((connection) => this.onNewConnection(connection), (peerDescriptor) => this.hasConnection(peerDescriptor), this);
+        await this.connectorFacade.start((connection) => this.onNewConnection(connection), (nodeId) => this.hasConnection(nodeId), this);
         // Garbage collection of connections
         this.disconnectorIntervalRef = setInterval(() => {
             logger.trace('disconnectorInterval');
@@ -192,24 +199,24 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         //   (i.e the this.gracefullyDisconnectAsync() calls above)
         NodeWebrtcConnection_1.WEBRTC_CLEANUP.cleanUp();
     }
-    getNumberOfLocalLockedConnections() {
-        return this.locks.getNumberOfLocalLockedConnections();
+    getLocalLockedConnectionCount() {
+        return this.locks.getLocalLockedConnectionCount();
     }
-    getNumberOfRemoteLockedConnections() {
-        return this.locks.getNumberOfRemoteLockedConnections();
+    getRemoteLockedConnectionCount() {
+        return this.locks.getRemoteLockedConnectionCount();
     }
-    getNumberOfWeakLockedConnections() {
-        return this.locks.getNumberOfWeakLockedConnections();
+    getWeakLockedConnectionCount() {
+        return this.locks.getWeakLockedConnectionCount();
     }
     async send(message, opts = ITransport_1.DEFAULT_SEND_OPTIONS) {
-        if (this.state === ConnectionManagerState.STOPPED && !opts.sendIfStopped) {
+        if ((this.state === ConnectionManagerState.STOPPED || this.state === ConnectionManagerState.STOPPING) && !opts.sendIfStopped) {
             return;
         }
         const peerDescriptor = message.targetDescriptor;
         if (this.isConnectionToSelf(peerDescriptor)) {
             throw new Err.CannotConnectToSelf('Cannot send to self');
         }
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
         logger.trace(`Sending message to: ${nodeId}`);
         message = {
             ...message,
@@ -229,7 +236,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         return connection.send(binary, opts.connect);
     }
     isConnectionToSelf(peerDescriptor) {
-        return (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peerDescriptor, this.getLocalPeerDescriptor()) || this.isOwnWebsocketServer(peerDescriptor);
+        return (0, identifiers_1.areEqualPeerDescriptors)(peerDescriptor, this.getLocalPeerDescriptor()) || this.isOwnWebsocketServer(peerDescriptor);
     }
     isOwnWebsocketServer(peerDescriptor) {
         const localPeerDescriptor = this.getLocalPeerDescriptor();
@@ -241,23 +248,19 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             return false;
         }
     }
-    getConnection(peerDescriptor) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+    getConnection(nodeId) {
         return this.connections.get(nodeId);
     }
     getLocalPeerDescriptor() {
         return this.connectorFacade.getLocalPeerDescriptor();
     }
-    hasConnection(peerDescriptor) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+    hasConnection(nodeId) {
         return this.connections.has(nodeId);
     }
-    hasLocalLockedConnection(peerDescriptor) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+    hasLocalLockedConnection(nodeId) {
         return this.locks.isLocalLocked(nodeId);
     }
-    hasRemoteLockedConnection(peerDescriptor) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+    hasRemoteLockedConnection(nodeId) {
         return this.locks.isRemoteLocked(nodeId);
     }
     handleMessage(message) {
@@ -267,7 +270,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             return;
         }
         if (this.duplicateMessageDetector.isMostLikelyDuplicate(message.messageId)) {
-            logger.trace('handleMessage filtered duplicate ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(message.sourceDescriptor)
+            logger.trace('handleMessage filtered duplicate ' + (0, identifiers_1.getNodeIdFromPeerDescriptor)(message.sourceDescriptor)
                 + ' ' + message.serviceId + ' ' + message.messageId);
             return;
         }
@@ -276,7 +279,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             this.rpcCommunicator?.handleMessageFromPeer(message);
         }
         else {
-            logger.trace('emit "message" ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(message.sourceDescriptor)
+            logger.trace('emit "message" ' + (0, identifiers_1.getNodeIdFromPeerDescriptor)(message.sourceDescriptor)
                 + ' ' + message.serviceId + ' ' + message.messageId);
             this.emit('message', message);
         }
@@ -306,14 +309,14 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
     onConnected(connection) {
         const peerDescriptor = connection.getPeerDescriptor();
         this.emit('connected', peerDescriptor);
-        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' onConnected() ' + connection.connectionType);
+        logger.trace((0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' onConnected() ' + connection.connectionType);
         this.onConnectionCountChange();
     }
     onDisconnected(connection, gracefulLeave) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(connection.getPeerDescriptor());
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(connection.getPeerDescriptor());
         logger.trace(nodeId + ' onDisconnected() gracefulLeave: ' + gracefulLeave);
         const storedConnection = this.connections.get(nodeId);
-        if (storedConnection && storedConnection.connectionId.equals(connection.connectionId)) {
+        if (storedConnection && (storedConnection.connectionId === connection.connectionId)) {
             this.locks.clearAllLocks(nodeId);
             this.connections.delete(nodeId);
             logger.trace(nodeId + ' deleted connection in onDisconnected() gracefulLeave: ' + gracefulLeave);
@@ -323,8 +326,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         else {
             logger.trace(nodeId + ' onDisconnected() did nothing, no such connection in connectionManager');
             if (storedConnection) {
-                const connectionId = storedConnection.connectionId.toString();
-                logger.trace(nodeId + ' connectionIds do not match ' + connectionId + ' ' + connection.connectionId.toString());
+                logger.trace(nodeId + ' connectionIds do not match ' + storedConnection.connectionId + ' ' + connection.connectionId.toString());
             }
         }
     }
@@ -351,11 +353,10 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         return true;
     }
     acceptNewConnection(newConnection) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(newConnection.getPeerDescriptor());
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(newConnection.getPeerDescriptor());
         logger.trace(nodeId + ' acceptIncomingConnection()');
         if (this.connections.has(nodeId)) {
-            const newPeerID = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(newConnection.getPeerDescriptor());
-            if (newPeerID.hasSmallerHashThan((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.getLocalPeerDescriptor()))) {
+            if ((0, offering_1.getOfferer)((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()), nodeId) === 'remote') {
                 logger.trace(nodeId + ' acceptIncomingConnection() replace current connection');
                 // replace the current connection
                 const oldConnection = this.connections.get(nodeId);
@@ -376,7 +377,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         return true;
     }
     async closeConnection(peerDescriptor, gracefulLeave, reason) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
         logger.trace(nodeId + ' ' + 'closeConnection() ' + reason);
         this.locks.clearAllLocks(nodeId);
         if (this.connections.has(nodeId)) {
@@ -389,10 +390,10 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         }
     }
     lockConnection(targetDescriptor, lockId) {
-        if (this.state === ConnectionManagerState.STOPPED || (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetDescriptor, this.getLocalPeerDescriptor())) {
+        if (this.state === ConnectionManagerState.STOPPED || (0, identifiers_1.areEqualPeerDescriptors)(targetDescriptor, this.getLocalPeerDescriptor())) {
             return;
         }
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
         const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getLocalPeerDescriptor(), targetDescriptor, this.rpcCommunicator, DhtRpc_client_1.ConnectionLockRpcClient);
         this.locks.addLocalLocked(nodeId, lockId);
         rpcRemote.lockRequest(lockId)
@@ -400,10 +401,10 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             .catch((err) => { logger.debug(err); });
     }
     unlockConnection(targetDescriptor, lockId) {
-        if (this.state === ConnectionManagerState.STOPPED || (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetDescriptor, this.getLocalPeerDescriptor())) {
+        if (this.state === ConnectionManagerState.STOPPED || (0, identifiers_1.areEqualPeerDescriptors)(targetDescriptor, this.getLocalPeerDescriptor())) {
             return;
         }
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
         this.locks.removeLocalLocked(nodeId, lockId);
         const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getLocalPeerDescriptor(), targetDescriptor, this.rpcCommunicator, DhtRpc_client_1.ConnectionLockRpcClient);
         if (this.connections.has(nodeId)) {
@@ -411,19 +412,19 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         }
     }
     weakLockConnection(nodeId) {
-        if (this.state === ConnectionManagerState.STOPPED || (nodeId === (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()))) {
+        if (this.state === ConnectionManagerState.STOPPED || (nodeId === (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()))) {
             return;
         }
         this.locks.addWeakLocked(nodeId);
     }
     weakUnlockConnection(nodeId) {
-        if (this.state === ConnectionManagerState.STOPPED || (nodeId === (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()))) {
+        if (this.state === ConnectionManagerState.STOPPED || (nodeId === (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()))) {
             return;
         }
         this.locks.removeWeakLocked(nodeId);
     }
     async gracefullyDisconnectAsync(targetDescriptor, disconnectMode) {
-        const connection = this.connections.get((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetDescriptor));
+        const connection = this.connections.get((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor));
         if (!connection) {
             logger.debug('gracefullyDisconnectedAsync() tried on a non-existing connection');
             return;
@@ -445,15 +446,13 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
                 resolve();
             });
         });
-        this.doGracefullyDisconnectAsync(targetDescriptor, disconnectMode)
-            .then(() => { return; })
-            .catch((e) => {
-            logger.error(e);
-        });
-        await promise;
+        await Promise.all([
+            promise,
+            this.doGracefullyDisconnectAsync(targetDescriptor, disconnectMode)
+        ]);
     }
     async doGracefullyDisconnectAsync(targetDescriptor, disconnectMode) {
-        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
         logger.trace(nodeId + ' gracefullyDisconnectAsync()');
         const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getLocalPeerDescriptor(), targetDescriptor, this.rpcCommunicator, DhtRpc_client_1.ConnectionLockRpcClient);
         try {
@@ -463,7 +462,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             logger.trace(nodeId + ' remote.gracefulDisconnect() failed' + ex);
         }
     }
-    getAllConnectionPeerDescriptors() {
+    getConnections() {
         return Array.from(this.connections.values())
             .filter((managedConnection) => managedConnection.isHandshakeCompleted())
             .map((managedConnection) => managedConnection.getPeerDescriptor());