@streamr/dht 101.1.2 → 102.0.0-beta.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/dht",
-    "version": "101.1.2",
+    "version": "102.0.0-beta.1",
     "description": "Streamr Network DHT",
     "repository": {
         "type": "git",
@@ -12,10 +12,10 @@
     "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
     "author": "Streamr Network AG <contact@streamr.network>",
     "scripts": {
-        "generate-protoc-code": "./proto.sh",
+        "prebuild": "./proto.sh",
         "build": "tsc -b tsconfig.node.json",
         "build-browser": "webpack --mode=development --progress",
-        "check": "tsc -p ./tsconfig.jest.json --noEmit",
+        "check": "tsc -p ./tsconfig.jest.json",
         "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",
@@ -29,38 +29,37 @@
         "@js-sdsl/ordered-map": "^4.4.2",
         "@protobuf-ts/runtime": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/autocertifier-client": "101.1.2",
-        "@streamr/cdn-location": "101.1.2",
-        "@streamr/geoip-location": "101.1.2",
-        "@streamr/proto-rpc": "101.1.2",
-        "@streamr/utils": "101.1.2",
+        "@streamr/autocertifier-client": "102.0.0-beta.1",
+        "@streamr/cdn-location": "102.0.0-beta.1",
+        "@streamr/geoip-location": "102.0.0-beta.1",
+        "@streamr/proto-rpc": "102.0.0-beta.1",
+        "@streamr/utils": "102.0.0-beta.1",
         "eventemitter3": "^5.0.0",
         "heap": "^0.2.6",
         "ipaddr.js": "^2.0.1",
         "k-bucket": "^5.1.0",
         "lodash": "^4.17.21",
-        "lru-cache": "11.0.0",
+        "lru-cache": "^11.0.2",
         "node-datachannel": "^0.10.1",
         "querystring": "0.2.1",
-        "uuid": "^10.0.0",
+        "uuid": "^11.0.5",
         "websocket": "^1.0.34",
         "ws": "^8.18.0"
     },
     "devDependencies": {
         "@streamr/browser-test-runner": "^0.0.1",
-        "@streamr/test-utils": "101.1.2",
+        "@streamr/test-utils": "102.0.0-beta.1",
         "@types/heap": "^0.2.34",
         "@types/k-bucket": "^5.0.1",
-        "@types/lodash": "^4.17.7",
-        "@types/uuid": "^10.0.0",
+        "@types/lodash": "^4.17.14",
         "@types/websocket": "^1.0.10",
-        "@types/ws": "^8.5.12",
+        "@types/ws": "^8.5.13",
         "jest-leak-detector": "^27.3.1",
-        "jest-matcher-utils": "^29.5.0",
-        "ts-essentials": "^10.0.2"
+        "jest-matcher-utils": "^29.7.0",
+        "ts-essentials": "^10.0.4"
     },
     "optionalDependencies": {
-        "bufferutil": "^4.0.8",
-        "utf-8-validate": "^6.0.3"
+        "bufferutil": "^4.0.9",
+        "utf-8-validate": "^6.0.5"
     }
 }

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

@@ -1,5 +1,5 @@
 import EventEmitter from 'eventemitter3';
-import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
 import { ConnectionID, ConnectionType, ConnectionEvents } from './IConnection';
 export declare class Connection extends EventEmitter<ConnectionEvents> {
     connectionId: ConnectionID;

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

@@ -1,7 +1,7 @@
 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 { Empty } from '../../generated/google/protobuf/empty';
+import { DisconnectNotice, LockRequest, LockResponse, PeerDescriptor, UnlockRequest, SetPrivateRequest } from '../../generated/packages/dht/protos/DhtRpc';
+import { IConnectionLockRpc } from '../../generated/packages/dht/protos/DhtRpc.server';
 import { LockID } from './ConnectionLockStates';
 import { DhtAddress } from '../identifiers';
 interface ConnectionLockRpcLocalOptions {
@@ -9,6 +9,7 @@ interface ConnectionLockRpcLocalOptions {
     removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
     closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => Promise<void>;
     getLocalPeerDescriptor: () => PeerDescriptor;
+    setPrivate: (id: DhtAddress, isPrivate: boolean) => void;
 }
 export declare class ConnectionLockRpcLocal implements IConnectionLockRpc {
     private readonly options;
@@ -16,5 +17,6 @@ export declare class ConnectionLockRpcLocal implements IConnectionLockRpc {
     lockRequest(lockRequest: LockRequest, context: ServerCallContext): Promise<LockResponse>;
     unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty>;
     gracefulDisconnect(disconnectNotice: DisconnectNotice, context: ServerCallContext): Promise<Empty>;
+    setPrivate(request: SetPrivateRequest, context: ServerCallContext): Promise<Empty>;
 }
 export {};

package/dist/src/connection/ConnectionLockRpcLocal.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionLockRpcLocal = void 0;
 const utils_1 = require("@streamr/utils");
-const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
+const DhtRpc_1 = require("../../generated/packages/dht/protos/DhtRpc");
 const ConnectionManager_1 = require("./ConnectionManager");
 const identifiers_1 = require("../identifiers");
 const logger = new utils_1.Logger(module);
@@ -19,7 +19,7 @@ class ConnectionLockRpcLocal {
             };
             return response;
         }
-        const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        const remoteNodeId = (0, identifiers_1.toNodeId)(senderPeerDescriptor);
         this.options.addRemoteLocked(remoteNodeId, lockRequest.lockId);
         const response = {
             accepted: true
@@ -28,7 +28,7 @@ class ConnectionLockRpcLocal {
     }
     async unlockRequest(unlockRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
-        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
+        const nodeId = (0, identifiers_1.toNodeId)(senderPeerDescriptor);
         this.options.removeRemoteLocked(nodeId, unlockRequest.lockId);
         return {};
     }
@@ -43,6 +43,12 @@ class ConnectionLockRpcLocal {
         }
         return {};
     }
+    async setPrivate(request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const senderId = (0, identifiers_1.toNodeId)(senderPeerDescriptor);
+        this.options.setPrivate(senderId, request.isPrivate);
+        return {};
+    }
 }
 exports.ConnectionLockRpcLocal = ConnectionLockRpcLocal;
 //# sourceMappingURL=ConnectionLockRpcLocal.js.map

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

@@ -1 +1 @@
-{"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,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,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,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACvF,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,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC9D,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,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC7D,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,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;QAC7F,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;QACnG,CAAC;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,uEAQmD;AAGnD,2DAA0E;AAE1E,gDAA8E;AAU9E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAEd,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,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,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACvF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,sBAAQ,EAAC,oBAAoB,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC9D,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,sBAAQ,EAAC,oBAAoB,CAAC,CAAA;QAC7C,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC7D,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,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;QAC7F,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;QACnG,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B,EAAE,OAA0B;QACnE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,QAAQ,GAAG,IAAA,sBAAQ,EAAC,oBAAoB,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;QACpD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAjDD,wDAiDC"}

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

@@ -1,9 +1,10 @@
 import { RpcRemote } from '../dht/contact/RpcRemote';
-import { DisconnectMode } from '../proto/packages/dht/protos/DhtRpc';
-import { ConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
+import { DisconnectMode } from '../../generated/packages/dht/protos/DhtRpc';
+import { ConnectionLockRpcClient } from '../../generated/packages/dht/protos/DhtRpc.client';
 import { LockID } from './ConnectionLockStates';
 export declare class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient> {
     lockRequest(lockId: LockID): Promise<boolean>;
     unlockRequest(lockId: LockID): void;
     gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void>;
+    setPrivate(isPrivate: boolean): Promise<void>;
 }

package/dist/src/connection/ConnectionLockRpcRemote.js

@@ -7,7 +7,7 @@ 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, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Requesting locked connection to ${(0, identifiers_1.toNodeId)(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, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Requesting connection to be unlocked from ${(0, identifiers_1.toNodeId)(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, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
+        logger.trace(`Notifying a graceful disconnect to ${(0, identifiers_1.toNodeId)(this.getPeerDescriptor())}`);
         const request = {
             disconnectMode
         };
@@ -45,6 +45,17 @@ class ConnectionLockRpcRemote extends RpcRemote_1.RpcRemote {
         });
         await this.getClient().gracefulDisconnect(request, options);
     }
+    async setPrivate(isPrivate) {
+        logger.trace(`Setting isPrivate: ${isPrivate} for ${(0, identifiers_1.toNodeId)(this.getPeerDescriptor())}`);
+        const request = {
+            isPrivate
+        };
+        const options = this.formDhtRpcOptions({
+            connect: false,
+            notification: true
+        });
+        await this.getClient().setPrivate(request, options);
+    }
 }
 exports.ConnectionLockRpcRemote = ConnectionLockRpcRemote;
 //# sourceMappingURL=ConnectionLockRpcRemote.js.map

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;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,GAAG,EAAE,CAAC,CAAA;YACjD,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,6CAA6C;SAC/D,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,gDAAyC;AAEzC,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,sBAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACrF,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,GAAG,EAAE,CAAC,CAAA;YACjD,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,MAAc;QAC/B,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,sBAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC/F,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,sBAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxF,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,6CAA6C;SAC/D,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,SAAkB;QACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,SAAS,QAAQ,IAAA,sBAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACzF,MAAM,OAAO,GAAsB;YAC/B,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACvD,CAAC;CACJ;AAtDD,0DAsDC"}

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

@@ -4,6 +4,7 @@ export declare class ConnectionLockStates {
     private localLocks;
     private remoteLocks;
     private weakLocks;
+    private remotePrivateConnections;
     getLocalLockedConnectionCount(): number;
     getRemoteLockedConnectionCount(): number;
     getWeakLockedConnectionCount(): number;
@@ -17,6 +18,10 @@ export declare class ConnectionLockStates {
     removeLocalLocked(id: DhtAddress, lockId: LockID): void;
     removeRemoteLocked(id: DhtAddress, lockId: LockID): void;
     removeWeakLocked(id: DhtAddress, lockId: LockID): void;
+    addPrivate(id: DhtAddress): void;
+    removePrivate(id: DhtAddress): void;
+    getPrivateConnections(): Set<DhtAddress>;
+    isPrivate(id: DhtAddress): boolean;
     clearAllLocks(id: DhtAddress): void;
     clear(): void;
 }

package/dist/src/connection/ConnectionLockStates.js

@@ -9,6 +9,8 @@ class ConnectionLockStates {
     // TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
     // simply do not send lock requests.
     weakLocks = new Map();
+    // Used to filter proxy connections from the connections view
+    remotePrivateConnections = new Set();
     getLocalLockedConnectionCount() {
         return this.localLocks.size;
     }
@@ -85,6 +87,18 @@ class ConnectionLockStates {
             }
         }
     }
+    addPrivate(id) {
+        this.remotePrivateConnections.add(id);
+    }
+    removePrivate(id) {
+        this.remotePrivateConnections.delete(id);
+    }
+    getPrivateConnections() {
+        return this.remotePrivateConnections;
+    }
+    isPrivate(id) {
+        return this.remotePrivateConnections.has(id);
+    }
     clearAllLocks(id) {
         this.localLocks.delete(id);
         this.remoteLocks.delete(id);

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

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

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

@@ -1,6 +1,6 @@
 import { MetricsContext } from '@streamr/utils';
 import { EventEmitter } from 'eventemitter3';
-import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { Message, PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
 import { ITransport, SendOptions, TransportEvents } from '../transport/ITransport';
 import { LockID } from './ConnectionLockStates';
 import { ConnectorFacade } from './ConnectorFacade';
@@ -9,6 +9,7 @@ import { ConnectionsView } from './ConnectionsView';
 export interface ConnectionManagerOptions {
     maxConnections?: number;
     metricsContext: MetricsContext;
+    allowIncomingPrivateConnections: boolean;
     createConnectorFacade: () => ConnectorFacade;
 }
 export declare enum NatType {
@@ -44,6 +45,7 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
     private rpcCommunicator?;
     private disconnectorIntervalRef?;
     private state;
+    private privateClientMode;
     constructor(options: ConnectionManagerOptions);
     garbageCollectConnections(maxConnections: number, maxIdleTime: number): void;
     start(): Promise<void>;
@@ -70,8 +72,13 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
     unlockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
     weakLockConnection(nodeId: DhtAddress, lockId: LockID): void;
     weakUnlockConnection(nodeId: DhtAddress, lockId: LockID): void;
+    enablePrivateClientMode(): Promise<void>;
+    disablePrivateClientMode(): Promise<void>;
+    isPrivateClientMode(): boolean;
+    private setPrivateForConnection;
     private gracefullyDisconnectAsync;
     private doGracefullyDisconnectAsync;
     getConnections(): PeerDescriptor[];
     private onConnectionCountChange;
+    getDiagnosticInfo(): Record<string, unknown>;
 }