@streamr/dht 100.0.0-pretestnet.2 → 100.0.0-pretestnet.4

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

@@ -1,5 +1,5 @@
 import { PeerIDKey } from '../helpers/PeerID';
-type ServiceName = string;
+export type LockID = string;
 export declare class ConnectionLockHandler {
     private localLocks;
     private remoteLocks;
@@ -7,17 +7,16 @@ export declare class ConnectionLockHandler {
     getNumberOfLocalLockedConnections(): number;
     getNumberOfRemoteLockedConnections(): number;
     getNumberOfWeakLockedConnections(): number;
-    isLocalLocked(id: PeerIDKey, serviceName?: ServiceName): boolean;
-    isRemoteLocked(id: PeerIDKey, serviceName?: ServiceName): boolean;
+    isLocalLocked(id: PeerIDKey, lockId?: LockID): boolean;
+    isRemoteLocked(id: PeerIDKey, lockId?: LockID): boolean;
     private isWeakLocked;
     isLocked(id: PeerIDKey): boolean;
-    addLocalLocked(id: PeerIDKey, serviceName: ServiceName): void;
-    addRemoteLocked(id: PeerIDKey, serviceName: ServiceName): void;
+    addLocalLocked(id: PeerIDKey, lockId: LockID): void;
+    addRemoteLocked(id: PeerIDKey, lockId: LockID): void;
     addWeakLocked(id: PeerIDKey): void;
-    removeLocalLocked(id: PeerIDKey, serviceName: ServiceName): void;
-    removeRemoteLocked(id: PeerIDKey, serviceName: ServiceName): void;
+    removeLocalLocked(id: PeerIDKey, lockId: LockID): void;
+    removeRemoteLocked(id: PeerIDKey, lockId: LockID): void;
     removeWeakLocked(id: PeerIDKey): void;
     clearAllLocks(id: PeerIDKey): void;
     clear(): void;
 }
-export {};

package/dist/src/connection/ConnectionLockHandler.js

@@ -7,6 +7,8 @@ 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() {
@@ -18,20 +20,20 @@ class ConnectionLockHandler {
     getNumberOfWeakLockedConnections() {
         return this.weakLocks.size;
     }
-    isLocalLocked(id, serviceName) {
-        if (!serviceName) {
+    isLocalLocked(id, lockId) {
+        if (!lockId) {
             return this.localLocks.has(id);
         }
         else {
-            return this.localLocks.has(id) && this.localLocks.get(id).has(serviceName);
+            return this.localLocks.has(id) && this.localLocks.get(id).has(lockId);
         }
     }
-    isRemoteLocked(id, serviceName) {
-        if (!serviceName) {
+    isRemoteLocked(id, lockId) {
+        if (!lockId) {
             return this.remoteLocks.has(id);
         }
         else {
-            if (this.remoteLocks.has(id) && this.remoteLocks.get(id).has(serviceName)) {
+            if (this.remoteLocks.has(id) && this.remoteLocks.get(id).has(lockId)) {
                 return true;
             }
             else {
@@ -45,32 +47,32 @@ class ConnectionLockHandler {
     isLocked(id) {
         return (this.isLocalLocked(id) || this.isRemoteLocked(id) || this.isWeakLocked(id));
     }
-    addLocalLocked(id, serviceName) {
+    addLocalLocked(id, lockId) {
         if (!this.localLocks.has(id)) {
             this.localLocks.set(id, new Set());
         }
-        this.localLocks.get(id).add(serviceName);
+        this.localLocks.get(id).add(lockId);
     }
-    addRemoteLocked(id, serviceName) {
+    addRemoteLocked(id, lockId) {
         if (!this.remoteLocks.has(id)) {
             this.remoteLocks.set(id, new Set());
         }
-        this.remoteLocks.get(id).add(serviceName);
+        this.remoteLocks.get(id).add(lockId);
     }
     addWeakLocked(id) {
         this.weakLocks.add(id);
     }
-    removeLocalLocked(id, serviceName) {
+    removeLocalLocked(id, lockId) {
         if (this.localLocks.has(id)) {
-            this.localLocks.get(id)?.delete(serviceName);
+            this.localLocks.get(id)?.delete(lockId);
             if (this.localLocks.get(id)?.size === 0) {
                 this.localLocks.delete(id);
             }
         }
     }
-    removeRemoteLocked(id, serviceName) {
+    removeRemoteLocked(id, lockId) {
         if (this.remoteLocks.has(id)) {
-            this.remoteLocks.get(id)?.delete(serviceName);
+            this.remoteLocks.get(id)?.delete(lockId);
             if (this.remoteLocks.get(id)?.size === 0) {
                 this.remoteLocks.delete(id);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"ConnectionLockHandler.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockHandler.ts"],"names":[],"mappings":";AAAA,mEAAmE;AACnE,mCAAmC;;;AAMnC,MAAa,qBAAqB;IAAlC;QAEY,eAAU,GAAqC,IAAI,GAAG,EAAE,CAAA;QACxD,gBAAW,GAAqC,IAAI,GAAG,EAAE,CAAA;QACzD,cAAS,GAAmB,IAAI,GAAG,EAAE,CAAA;IA6FjD,CAAC;IA3FU,iCAAiC;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAA;IAC/B,CAAC;IAEM,kCAAkC;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAChC,CAAC;IAEM,gCAAgC;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;IAEM,aAAa,CAAC,EAAa,EAAE,WAAyB;QACzD,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SACjC;aAAM;YACH,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;SAC9E;IACL,CAAC;IAEM,cAAc,CAAC,EAAa,EAAE,WAAyB;QAC1D,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SAClC;aAAM;YACH,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACxE,OAAO,IAAI,CAAA;aACd;iBAAM;gBACH,OAAO,KAAK,CAAA;aACf;SACJ;IACL,CAAC;IAEO,YAAY,CAAC,EAAa;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjC,CAAC;IAEM,QAAQ,CAAC,EAAa;QACzB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAA;IACvF,CAAC;IAEM,cAAc,CAAC,EAAa,EAAE,WAAwB;QACzD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACrC;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAC7C,CAAC;IAEM,eAAe,CAAC,EAAa,EAAE,WAAwB;QAC1D,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACtC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAC9C,CAAC;IAEM,aAAa,CAAC,EAAa;QAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAEM,iBAAiB,CAAC,EAAa,EAAE,WAAwB;QAC5D,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACzB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;YAC5C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;gBACrC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;aAC7B;SACJ;IACL,CAAC;IAEM,kBAAkB,CAAC,EAAa,EAAE,WAAwB;QAC7D,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;YAC7C,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;gBACtC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;aAC9B;SACJ;IACL,CAAC;IAEM,gBAAgB,CAAC,EAAa;QACjC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAEM,aAAa,CAAC,EAAa;QAC9B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC3B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QACvB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QACxB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;IAC1B,CAAC;CACJ;AAjGD,sDAiGC"}
+{"version":3,"file":"ConnectionLockHandler.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockHandler.ts"],"names":[],"mappings":";AAAA,mEAAmE;AACnE,mCAAmC;;;AAMnC,MAAa,qBAAqB;IAAlC;QAEY,eAAU,GAAgC,IAAI,GAAG,EAAE,CAAA;QACnD,gBAAW,GAAgC,IAAI,GAAG,EAAE,CAAA;QAC5D,mGAAmG;QACnG,oCAAoC;QAC5B,cAAS,GAAmB,IAAI,GAAG,EAAE,CAAA;IA6FjD,CAAC;IA3FU,iCAAiC;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAA;IAC/B,CAAC;IAEM,kCAAkC;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAChC,CAAC;IAEM,gCAAgC;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;IAEM,aAAa,CAAC,EAAa,EAAE,MAAe;QAC/C,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SACjC;aAAM;YACH,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;SACzE;IACL,CAAC;IAEM,cAAc,CAAC,EAAa,EAAE,MAAe;QAChD,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SAClC;aAAM;YACH,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACnE,OAAO,IAAI,CAAA;aACd;iBAAM;gBACH,OAAO,KAAK,CAAA;aACf;SACJ;IACL,CAAC;IAEO,YAAY,CAAC,EAAa;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjC,CAAC;IAEM,QAAQ,CAAC,EAAa;QACzB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAA;IACvF,CAAC;IAEM,cAAc,CAAC,EAAa,EAAE,MAAc;QAC/C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACrC;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAEM,eAAe,CAAC,EAAa,EAAE,MAAc;QAChD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACtC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IAEM,aAAa,CAAC,EAAa;QAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAEM,iBAAiB,CAAC,EAAa,EAAE,MAAc;QAClD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACzB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;YACvC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;gBACrC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;aAC7B;SACJ;IACL,CAAC;IAEM,kBAAkB,CAAC,EAAa,EAAE,MAAc;QACnD,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;YACxC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;gBACtC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;aAC9B;SACJ;IACL,CAAC;IAEM,gBAAgB,CAAC,EAAa;QACjC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAEM,aAAa,CAAC,EAAa;QAC9B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC3B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QACvB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QACxB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;IAC1B,CAAC;CACJ;AAnGD,sDAmGC"}

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

@@ -0,0 +1,20 @@
+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';
+interface ConnectionLockRpcLocalConfig {
+    addRemoteLocked: (id: PeerIDKey, lockId: LockID) => void;
+    removeRemoteLocked: (id: PeerIDKey, lockId: LockID) => void;
+    closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void;
+    getLocalPeerDescriptor: () => PeerDescriptor;
+}
+export declare class ConnectionLockRpcLocal implements IConnectionLockRpc {
+    private readonly config;
+    constructor(config: ConnectionLockRpcLocalConfig);
+    lockRequest(lockRequest: LockRequest, context: ServerCallContext): Promise<LockResponse>;
+    unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty>;
+    gracefulDisconnect(disconnectNotice: DisconnectNotice, context: ServerCallContext): Promise<Empty>;
+}
+export {};

package/dist/src/connection/ConnectionLockRpcLocal.js

@@ -0,0 +1,47 @@
+"use strict";
+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 logger = new utils_1.Logger(module);
+class ConnectionLockRpcLocal {
+    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())) {
+            const response = {
+                accepted: false
+            };
+            return response;
+        }
+        this.config.addRemoteLocked(remotePeerId.toKey(), lockRequest.lockId);
+        const response = {
+            accepted: true
+        };
+        return response;
+    }
+    async unlockRequest(unlockRequest, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(senderPeerDescriptor);
+        this.config.removeRemoteLocked(peerIdKey, unlockRequest.lockId);
+        return {};
+    }
+    async gracefulDisconnect(disconnectNotice, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(senderPeerDescriptor) + ' received gracefulDisconnect notice');
+        if (disconnectNotice.disconnectMode === DhtRpc_1.DisconnectMode.LEAVING) {
+            this.config.closeConnection(senderPeerDescriptor, true, 'graceful leave notified');
+        }
+        else {
+            this.config.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified');
+        }
+        return {};
+    }
+}
+exports.ConnectionLockRpcLocal = ConnectionLockRpcLocal;
+//# sourceMappingURL=ConnectionLockRpcLocal.js.map

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

@@ -0,0 +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"}

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

@@ -2,9 +2,10 @@ 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 { LockID } from './ConnectionLockHandler';
 export declare class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
-    constructor(ownPeerDescriptor: PeerDescriptor, targetPeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IConnectionLockRpcClient>);
-    lockRequest(serviceId: string): Promise<boolean>;
-    unlockRequest(serviceId: string): void;
+    constructor(localPeerDescriptor: PeerDescriptor, targetPeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IConnectionLockRpcClient>);
+    lockRequest(lockId: LockID): Promise<boolean>;
+    unlockRequest(lockId: LockID): void;
     gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void>;
 }

package/dist/src/connection/ConnectionLockRpcRemote.js

@@ -30,13 +30,13 @@ const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor"
 const Remote_1 = require("../dht/contact/Remote");
 const logger = new utils_1.Logger(module);
 class ConnectionLockRpcRemote extends Remote_1.Remote {
-    constructor(ownPeerDescriptor, targetPeerDescriptor, client) {
-        super(ownPeerDescriptor, targetPeerDescriptor, 'DUMMY', client);
+    constructor(localPeerDescriptor, targetPeerDescriptor, client) {
+        super(localPeerDescriptor, targetPeerDescriptor, 'DUMMY', client);
     }
-    async lockRequest(serviceId) {
-        logger.trace(`Requesting locked connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
+    async lockRequest(lockId) {
+        logger.trace(`Requesting locked connection to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
-            serviceId
+            lockId
         };
         const options = this.formDhtRpcOptions();
         try {
@@ -48,10 +48,10 @@ class ConnectionLockRpcRemote extends Remote_1.Remote {
             return false;
         }
     }
-    unlockRequest(serviceId) {
-        logger.trace(`Requesting connection to be unlocked from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
+    unlockRequest(lockId) {
+        logger.trace(`Requesting connection to be unlocked from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
-            serviceId
+            lockId
         };
         const options = this.formDhtRpcOptions({
             notification: true
@@ -61,7 +61,7 @@ class ConnectionLockRpcRemote extends Remote_1.Remote {
         });
     }
     async gracefulDisconnect(disconnectMode) {
-        logger.trace(`Notifying a graceful disconnect to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Notifying a graceful disconnect to ${(0, peerIdFromPeerDescriptor_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;AAKvC,uDAAwC;AACxC,kFAA2E;AAC3E,kDAA8C;AAE9C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,eAAgC;IAEzE,YACI,iBAAiC,EACjC,oBAAoC,EACpC,MAAgD;QAEhD,KAAK,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACnE,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAiB;QACtC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClG,MAAM,OAAO,GAAgB;YACzB,SAAS;SACZ,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,SAAiB;QAClC,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC5G,MAAM,OAAO,GAAkB;YAC3B,SAAS;SACZ,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,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACrG,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;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"}

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

@@ -2,6 +2,7 @@ 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 { LockID } from './ConnectionLockHandler';
 import { ConnectorFacade } from './ConnectorFacade';
 import { ManagedConnection } from './ManagedConnection';
 export interface ConnectionManagerConfig {
@@ -14,9 +15,6 @@ export declare enum NatType {
     UNKNOWN = "unknown"
 }
 type ServiceId = string;
-interface ConnectionManagerEvents {
-    newConnection: (connection: ManagedConnection) => void;
-}
 export interface ConnectionLocker {
     lockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;
     unlockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;
@@ -31,9 +29,8 @@ export interface TlsCertificate {
     privateKeyFileName: string;
     certFileName: string;
 }
-export type Events = TransportEvents & ConnectionManagerEvents;
-export declare const keyOrUnknownFromPeerDescriptor: (peerDescriptor: PeerDescriptor | undefined) => string;
-export declare class ConnectionManager extends EventEmitter<Events> implements ITransport, ConnectionLocker {
+export declare const getNodeIdOrUnknownFromPeerDescriptor: (peerDescriptor: PeerDescriptor | undefined) => string;
+export declare class ConnectionManager extends EventEmitter<TransportEvents> implements ITransport, ConnectionLocker {
     private config;
     private readonly metricsContext;
     private readonly duplicateMessageDetector;
@@ -53,10 +50,9 @@ export declare class ConnectionManager extends EventEmitter<Events> implements I
     getNumberOfWeakLockedConnections(): number;
     send(message: Message, doNotConnect?: boolean, doNotMindStopped?: boolean): Promise<void>;
     private isConnectionToSelf;
-    private isOwnWebSocketServer;
+    private isOwnWebsocketServer;
     getConnection(peerDescriptor: PeerDescriptor): ManagedConnection | undefined;
-    getPeerDescriptor(): PeerDescriptor;
-    private getOwnPeerDescriptor;
+    getLocalPeerDescriptor(): PeerDescriptor;
     hasConnection(peerDescriptor: PeerDescriptor): boolean;
     hasLocalLockedConnection(peerDescriptor: PeerDescriptor): boolean;
     hasRemoteLockedConnection(peerDescriptor: PeerDescriptor): boolean;
@@ -65,19 +61,16 @@ export declare class ConnectionManager extends EventEmitter<Events> implements I
     private onData;
     private onConnected;
     private onDisconnected;
-    private onIncomingConnection;
-    private acceptIncomingConnection;
+    private onNewConnection;
+    private acceptNewConnection;
     private closeConnection;
-    lockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;
-    unlockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;
+    lockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
+    unlockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
     weakLockConnection(targetDescriptor: PeerDescriptor): void;
     weakUnlockConnection(targetDescriptor: PeerDescriptor): void;
     private gracefullyDisconnectAsync;
     private doGracefullyDisconnectAsync;
     getAllConnectionPeerDescriptors(): PeerDescriptor[];
-    private lockRequest;
-    private unlockRequest;
-    private gracefulDisconnect;
     private onConnectionCountChange;
 }
 export {};