@streamr/dht 101.1.2 → 102.0.0-beta.1

package/dist/src/helpers/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/helpers/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,KAAK,CAAA;AAE3C;;;;;;;GAOG;AACI,MAAM,uBAAuB,GAAG,CAAC,aAAqB,EAAW,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,oBAAY,EAAC,8BAAsB,CAAE,CAAC,KAAK,CAAA;IAC9D,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,EAAE,KAAK,CAAA;IACtD,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAA;IAChB,CAAC;SAAM,CAAC;QACJ,sEAAsE;QACtE,OAAO,IAAI,CAAA;IACf,CAAC;AACL,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC;AAEM,MAAM,YAAY,GAAG,CAAC,OAAe,EAAgD,EAAE;IAC1F,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;QACjD,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC,CAAA;AAVY,QAAA,YAAY,gBAUxB"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/helpers/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,KAAK,CAAA;AAE3C;;;;;;;GAOG;AACI,MAAM,+BAA+B,GAAG,CAAC,aAAqB,EAAW,EAAE;IAC9E,MAAM,UAAU,GAAG,IAAA,oBAAY,EAAC,8BAAsB,CAAE,CAAC,KAAK,CAAA;IAC9D,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,EAAE,KAAK,CAAA;IACtD,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAA;IAChB,CAAC;SAAM,CAAC;QACJ,sEAAsE;QACtE,OAAO,IAAI,CAAA;IACf,CAAC;AACL,CAAC,CAAA;AATY,QAAA,+BAA+B,mCAS3C;AAEM,MAAM,YAAY,GAAG,CAAC,OAAe,EAAgD,EAAE;IAC1F,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;QACjD,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC,CAAA;AAVY,QAAA,YAAY,gBAUxB"}

package/dist/src/identifiers.d.ts

@@ -1,10 +1,10 @@
 import { BrandedString } from '@streamr/utils';
-import { PeerDescriptor } from './proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor } from '../generated/packages/dht/protos/DhtRpc';
 export declare const KADEMLIA_ID_LENGTH_IN_BYTES = 20;
 export type DhtAddress = BrandedString<'DhtAddress'>;
 export type DhtAddressRaw = Uint8Array;
-export declare const getDhtAddressFromRaw: (raw: DhtAddressRaw) => DhtAddress;
-export declare const getRawFromDhtAddress: (address: DhtAddress) => DhtAddressRaw;
-export declare const getNodeIdFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => DhtAddress;
+export declare const toDhtAddress: (raw: DhtAddressRaw) => DhtAddress;
+export declare const toDhtAddressRaw: (address: DhtAddress) => DhtAddressRaw;
+export declare const toNodeId: (peerDescriptor: PeerDescriptor) => DhtAddress;
 export declare const areEqualPeerDescriptors: (peerDescriptor1: PeerDescriptor, peerDescriptor2: PeerDescriptor) => boolean;
-export declare const createRandomDhtAddress: () => DhtAddress;
+export declare const randomDhtAddress: () => DhtAddress;

package/dist/src/identifiers.js

@@ -3,29 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRandomDhtAddress = exports.areEqualPeerDescriptors = exports.getNodeIdFromPeerDescriptor = exports.getRawFromDhtAddress = exports.getDhtAddressFromRaw = exports.KADEMLIA_ID_LENGTH_IN_BYTES = void 0;
+exports.randomDhtAddress = exports.areEqualPeerDescriptors = exports.toNodeId = exports.toDhtAddressRaw = exports.toDhtAddress = exports.KADEMLIA_ID_LENGTH_IN_BYTES = void 0;
 const utils_1 = require("@streamr/utils");
 const crypto_1 = __importDefault(require("crypto"));
 // https://www.scs.stanford.edu/~dm/home/papers/kpos.pdf
 exports.KADEMLIA_ID_LENGTH_IN_BYTES = 20;
-const getDhtAddressFromRaw = (raw) => {
+const toDhtAddress = (raw) => {
     return (0, utils_1.binaryToHex)(raw);
 };
-exports.getDhtAddressFromRaw = getDhtAddressFromRaw;
-const getRawFromDhtAddress = (address) => {
+exports.toDhtAddress = toDhtAddress;
+const toDhtAddressRaw = (address) => {
     return (0, utils_1.hexToBinary)(address);
 };
-exports.getRawFromDhtAddress = getRawFromDhtAddress;
-const getNodeIdFromPeerDescriptor = (peerDescriptor) => {
-    return (0, exports.getDhtAddressFromRaw)(peerDescriptor.nodeId);
+exports.toDhtAddressRaw = toDhtAddressRaw;
+const toNodeId = (peerDescriptor) => {
+    return (0, exports.toDhtAddress)(peerDescriptor.nodeId);
 };
-exports.getNodeIdFromPeerDescriptor = getNodeIdFromPeerDescriptor;
+exports.toNodeId = toNodeId;
 const areEqualPeerDescriptors = (peerDescriptor1, peerDescriptor2) => {
     return (0, utils_1.areEqualBinaries)(peerDescriptor1.nodeId, peerDescriptor2.nodeId);
 };
 exports.areEqualPeerDescriptors = areEqualPeerDescriptors;
-const createRandomDhtAddress = () => {
-    return (0, exports.getDhtAddressFromRaw)(crypto_1.default.randomBytes(exports.KADEMLIA_ID_LENGTH_IN_BYTES));
+const randomDhtAddress = () => {
+    return (0, exports.toDhtAddress)(crypto_1.default.randomBytes(exports.KADEMLIA_ID_LENGTH_IN_BYTES));
 };
-exports.createRandomDhtAddress = createRandomDhtAddress;
+exports.randomDhtAddress = randomDhtAddress;
 //# sourceMappingURL=identifiers.js.map

package/dist/src/identifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/identifiers.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA0F;AAC1F,oDAA2B;AAG3B,wDAAwD;AAC3C,QAAA,2BAA2B,GAAG,EAAE,CAAA;AAKtC,MAAM,oBAAoB,GAAG,CAAC,GAAkB,EAAc,EAAE;IACnE,OAAO,IAAA,mBAAW,EAAC,GAAG,CAA0B,CAAA;AACpD,CAAC,CAAA;AAFY,QAAA,oBAAoB,wBAEhC;AAEM,MAAM,oBAAoB,GAAG,CAAC,OAAmB,EAAiB,EAAE;IACvE,OAAO,IAAA,mBAAW,EAAC,OAAO,CAA6B,CAAA;AAC3D,CAAC,CAAA;AAFY,QAAA,oBAAoB,wBAEhC;AAEM,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAc,EAAE;IACtF,OAAO,IAAA,4BAAoB,EAAC,cAAc,CAAC,MAAM,CAAC,CAAA;AACtD,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC;AAEM,MAAM,uBAAuB,GAAG,CAAC,eAA+B,EAAE,eAA+B,EAAW,EAAE;IACjH,OAAO,IAAA,wBAAgB,EAAC,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;AAC3E,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC;AAEM,MAAM,sBAAsB,GAAG,GAAe,EAAE;IACnD,OAAO,IAAA,4BAAoB,EAAC,gBAAM,CAAC,WAAW,CAAC,mCAA2B,CAAC,CAAC,CAAA;AAChF,CAAC,CAAA;AAFY,QAAA,sBAAsB,0BAElC"}
+{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/identifiers.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA0F;AAC1F,oDAA2B;AAG3B,wDAAwD;AAC3C,QAAA,2BAA2B,GAAG,EAAE,CAAA;AAKtC,MAAM,YAAY,GAAG,CAAC,GAAkB,EAAc,EAAE;IAC3D,OAAO,IAAA,mBAAW,EAAC,GAAG,CAA0B,CAAA;AACpD,CAAC,CAAA;AAFY,QAAA,YAAY,gBAExB;AAEM,MAAM,eAAe,GAAG,CAAC,OAAmB,EAAiB,EAAE;IAClE,OAAO,IAAA,mBAAW,EAAC,OAAO,CAA6B,CAAA;AAC3D,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,QAAQ,GAAG,CAAC,cAA8B,EAAc,EAAE;IACnE,OAAO,IAAA,oBAAY,EAAC,cAAc,CAAC,MAAM,CAAC,CAAA;AAC9C,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,uBAAuB,GAAG,CAAC,eAA+B,EAAE,eAA+B,EAAW,EAAE;IACjH,OAAO,IAAA,wBAAgB,EAAC,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;AAC3E,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC;AAEM,MAAM,gBAAgB,GAAG,GAAe,EAAE;IAC7C,OAAO,IAAA,oBAAY,EAAC,gBAAM,CAAC,WAAW,CAAC,mCAA2B,CAAC,CAAC,CAAA;AACxE,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B"}

package/dist/src/rpc-protocol/DhtCallContext.d.ts

@@ -1,5 +1,5 @@
 import { ProtoCallContext } from '@streamr/proto-rpc';
-import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
 import { DhtRpcOptions } from './DhtRpcOptions';
 export declare class DhtCallContext extends ProtoCallContext implements DhtRpcOptions {
     targetDescriptor?: PeerDescriptor;

package/dist/src/rpc-protocol/DhtRpcOptions.d.ts

@@ -1,5 +1,5 @@
 import { ProtoRpcOptions } from '@streamr/proto-rpc';
-import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
 export interface DhtRpcOptions extends ProtoRpcOptions {
     targetDescriptor?: PeerDescriptor;
     sourceDescriptor?: PeerDescriptor;

package/dist/src/transport/ITransport.d.ts

@@ -1,4 +1,4 @@
-import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { Message, PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
 export interface TransportEvents {
     disconnected: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void;
     message: (message: Message) => void;
@@ -25,4 +25,5 @@ export interface ITransport {
     send(msg: Message, opts?: SendOptions): Promise<void>;
     getLocalPeerDescriptor(): PeerDescriptor;
     stop(): void | Promise<void>;
+    getDiagnosticInfo(): Record<string, unknown>;
 }

package/dist/src/transport/ListeningRpcCommunicator.d.ts

@@ -4,7 +4,8 @@ import { RpcCommunicatorOptions } from '@streamr/proto-rpc';
 import { ServiceID } from '../types/ServiceID';
 export declare class ListeningRpcCommunicator extends RoutingRpcCommunicator {
     private readonly transport;
-    private readonly listener;
+    private readonly messageListener;
+    private readonly disconnectedListener;
     constructor(ownServiceId: ServiceID, transport: ITransport, options?: RpcCommunicatorOptions);
     destroy(): void;
 }

package/dist/src/transport/ListeningRpcCommunicator.js

@@ -2,19 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListeningRpcCommunicator = void 0;
 const RoutingRpcCommunicator_1 = require("./RoutingRpcCommunicator");
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const identifiers_1 = require("../identifiers");
 class ListeningRpcCommunicator extends RoutingRpcCommunicator_1.RoutingRpcCommunicator {
     transport;
-    listener;
+    messageListener;
+    disconnectedListener;
     constructor(ownServiceId, transport, options) {
         super(ownServiceId, (msg, opts) => transport.send(msg, opts), options);
-        this.listener = (msg) => {
+        this.messageListener = (msg) => {
             this.handleMessageFromPeer(msg);
         };
+        this.disconnectedListener = (peerDescriptor) => {
+            const requests = this.getRequestIds((request) => (0, identifiers_1.areEqualPeerDescriptors)(peerDescriptor, request.getCallContext().targetDescriptor));
+            requests.forEach((id) => this.handleClientError(id, new proto_rpc_1.RpcError.Disconnected('Peer disconnected')));
+        };
         this.transport = transport;
-        transport.on('message', this.listener);
+        transport.on('message', this.messageListener);
+        transport.on('disconnected', this.disconnectedListener);
     }
     destroy() {
-        this.transport.off('message', this.listener);
+        this.transport.off('message', this.messageListener);
+        this.transport.off('disconnected', this.disconnectedListener);
         this.stop();
     }
 }

package/dist/src/transport/ListeningRpcCommunicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListeningRpcCommunicator.js","sourceRoot":"","sources":["../../../src/transport/ListeningRpcCommunicator.ts"],"names":[],"mappings":";;;AACA,qEAAiE;AAKjE,MAAa,wBAAyB,SAAQ,+CAAsB;IAC/C,SAAS,CAAY;IACrB,QAAQ,CAAwB;IAEjD,YAAY,YAAuB,EAAE,SAAqB,EAAE,OAAgC;QACxF,KAAK,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;QACtE,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAY,EAAE,EAAE;YAC7B,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;QACnC,CAAC,CAAA;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC5C,IAAI,CAAC,IAAI,EAAE,CAAA;IACf,CAAC;CACJ;AAjBD,4DAiBC"}
+{"version":3,"file":"ListeningRpcCommunicator.js","sourceRoot":"","sources":["../../../src/transport/ListeningRpcCommunicator.ts"],"names":[],"mappings":";;;AACA,qEAAiE;AACjE,kDAAqE;AAGrE,gDAAwD;AAExD,MAAa,wBAAyB,SAAQ,+CAAsB;IAC/C,SAAS,CAAY;IACrB,eAAe,CAAwB;IACvC,oBAAoB,CAA0C;IAE/E,YAAY,YAAuB,EAAE,SAAqB,EAAE,OAAgC;QACxF,KAAK,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;QACtE,IAAI,CAAC,eAAe,GAAG,CAAC,GAAY,EAAE,EAAE;YACpC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;QACnC,CAAC,CAAA;QACD,IAAI,CAAC,oBAAoB,GAAG,CAAC,cAA8B,EAAE,EAAE;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,qCAAuB,EAAC,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,gBAAiB,CAAC,CAAC,CAAA;YACrI,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,oBAAQ,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAA;QACxG,CAAC,CAAA;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QAC7C,SAAS,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAC3D,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QACnD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAA;QAC7D,IAAI,CAAC,IAAI,EAAE,CAAA;IACf,CAAC;CACJ;AAxBD,4DAwBC"}

package/dist/src/transport/RoutingRpcCommunicator.d.ts

@@ -1,4 +1,4 @@
-import { Message } from '../proto/packages/dht/protos/DhtRpc';
+import { Message } from '../../generated/packages/dht/protos/DhtRpc';
 import { RpcCommunicator, RpcCommunicatorOptions } from '@streamr/proto-rpc';
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext';
 import { ServiceID } from '../types/ServiceID';

package/eslint.config.mjs

@@ -0,0 +1,12 @@
+import baseConfig from '../../eslint.config.mjs'
+
+export default [
+    {
+        // TODO remove when https://github.com/streamr-dev/network/pull/2848 merged to main
+        ignores: [
+            'src/connection/webrtc/BrowserWebrtcConnection.ts',
+            'src/connection/websocket/BrowserWebsocketClientConnection.ts'
+        ]
+    },
+    ...baseConfig
+]

package/jest.config.ts

@@ -0,0 +1,12 @@
+import type { Config } from '@jest/types'
+import defaultConfig from '../../jest.config'
+
+const config: Config.InitialOptions = {
+    ...defaultConfig,
+    setupFilesAfterEnv: [
+        ...defaultConfig.setupFilesAfterEnv,
+        './test/utils/customMatchers.ts',
+    ],
+}
+
+export default config

package/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/proto.sh

@@ -1,3 +1,2 @@
-mkdir -p ./src/proto
-# npx protoc --ts_out ./src/proto --ts_opt server_generic,generate_dependencies --proto_path ../.. packages/trackerless-network/protos/NetworkRpc.proto
-npx protoc --ts_out ./src/proto --ts_opt server_generic,generate_dependencies,long_type_number --proto_path ../.. packages/dht/protos/DhtRpc.proto
+mkdir -p ./generated
+npx protoc --ts_out ./generated --ts_opt server_generic,generate_dependencies,long_type_number --proto_path ../.. packages/dht/protos/DhtRpc.proto

package/protos/DhtRpc.proto

@@ -50,6 +50,7 @@ service ConnectionLockRpc {
   rpc lockRequest (LockRequest) returns (LockResponse);
   rpc unlockRequest (UnlockRequest) returns (google.protobuf.Empty);
   rpc gracefulDisconnect (DisconnectNotice) returns (google.protobuf.Empty);
+  rpc setPrivate (SetPrivateRequest) returns (google.protobuf.Empty);
 }
 
 service ExternalApiRpc {
@@ -214,7 +215,7 @@ message ConnectivityResponse {
   string natType = 2;
   ConnectivityMethod websocket = 3;
   uint32 ipAddress = 4;
-  string version = 5;
+  string protocolVersion = 5;
   optional double latitude = 6;
   optional double longitude = 7;
 }
@@ -222,19 +223,21 @@ message ConnectivityResponse {
 message HandshakeRequest {
   PeerDescriptor sourcePeerDescriptor = 1;
   optional PeerDescriptor targetPeerDescriptor = 2;
-  string version = 3;
+  string protocolVersion = 3;
+  string applicationVersion = 4;
 }
 
 message HandshakeResponse {
   PeerDescriptor sourcePeerDescriptor = 1;
   optional HandshakeError error = 2;
-  string version = 3;
+  string protocolVersion = 3;
+  string applicationVersion = 4;
 }
 
 enum HandshakeError {
   DUPLICATE_CONNECTION = 0;
   INVALID_TARGET_PEER_DESCRIPTOR = 1;
-  UNSUPPORTED_VERSION = 2;
+  UNSUPPORTED_PROTOCOL_VERSION = 2;
 }
 
 // Wraps all messages
@@ -301,6 +304,10 @@ message DisconnectNotice {
   DisconnectMode disconnectMode = 1;
 }
 
+message SetPrivateRequest {
+  bool isPrivate = 1;
+}
+
 message ExternalFetchDataRequest {
   bytes key = 1;
 }

package/src/connection/Connection.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'
 import { v4 as uuid } from 'uuid'
 

package/src/connection/ConnectionLockRpcLocal.ts

@@ -1,25 +1,27 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Logger } from '@streamr/utils'
-import { Empty } from '../proto/google/protobuf/empty'
+import { Empty } from '../../generated/google/protobuf/empty'
 import {
     DisconnectMode,
     DisconnectNotice,
     LockRequest,
     LockResponse,
     PeerDescriptor,
-    UnlockRequest
-} from '../proto/packages/dht/protos/DhtRpc'
-import { IConnectionLockRpc } from '../proto/packages/dht/protos/DhtRpc.server'
+    UnlockRequest,
+    SetPrivateRequest
+} from '../../generated/packages/dht/protos/DhtRpc'
+import { IConnectionLockRpc } from '../../generated/packages/dht/protos/DhtRpc.server'
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
 import { getNodeIdOrUnknownFromPeerDescriptor } from './ConnectionManager'
 import { LockID } from './ConnectionLockStates'
-import { DhtAddress, areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from '../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, toNodeId } from '../identifiers'
 
 interface ConnectionLockRpcLocalOptions {
     addRemoteLocked: (id: DhtAddress, lockId: LockID) => void
     removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void
     closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => Promise<void>
     getLocalPeerDescriptor: () => PeerDescriptor
+    setPrivate: (id: DhtAddress, isPrivate: boolean) => void
 }
 
 const logger = new Logger(module)
@@ -40,7 +42,7 @@ export class ConnectionLockRpcLocal implements IConnectionLockRpc {
             }
             return response
         }
-        const remoteNodeId = getNodeIdFromPeerDescriptor(senderPeerDescriptor)
+        const remoteNodeId = toNodeId(senderPeerDescriptor)
         this.options.addRemoteLocked(remoteNodeId, lockRequest.lockId)
         const response: LockResponse = {
             accepted: true
@@ -50,7 +52,7 @@ export class ConnectionLockRpcLocal implements IConnectionLockRpc {
 
     async unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty> {
         const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-        const nodeId = getNodeIdFromPeerDescriptor(senderPeerDescriptor)
+        const nodeId = toNodeId(senderPeerDescriptor)
         this.options.removeRemoteLocked(nodeId, unlockRequest.lockId)
         return {}
     }
@@ -66,4 +68,11 @@ export class ConnectionLockRpcLocal implements IConnectionLockRpc {
         }
         return {}
     }
+
+    async setPrivate(request: SetPrivateRequest, context: ServerCallContext): Promise<Empty> {
+        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
+        const senderId = toNodeId(senderPeerDescriptor)            
+        this.options.setPrivate(senderId, request.isPrivate)
+        return {}
+    }
 }

package/src/connection/ConnectionLockRpcRemote.ts

@@ -1,16 +1,16 @@
 import { Logger } from '@streamr/utils'
 import { RpcRemote } from '../dht/contact/RpcRemote'
-import { DisconnectMode, DisconnectNotice, LockRequest, UnlockRequest } from '../proto/packages/dht/protos/DhtRpc'
-import { ConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
+import { DisconnectMode, DisconnectNotice, LockRequest, UnlockRequest, SetPrivateRequest } from '../../generated/packages/dht/protos/DhtRpc'
+import { ConnectionLockRpcClient } from '../../generated/packages/dht/protos/DhtRpc.client'
 import { LockID } from './ConnectionLockStates'
-import { getNodeIdFromPeerDescriptor } from '../identifiers'
+import { toNodeId } from '../identifiers'
 
 const logger = new Logger(module)
 
 export class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient> {
 
     public async lockRequest(lockId: LockID): Promise<boolean> {
-        logger.trace(`Requesting locked connection to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
+        logger.trace(`Requesting locked connection to ${toNodeId(this.getPeerDescriptor())}`)
         const request: LockRequest = {
             lockId
         }
@@ -25,7 +25,7 @@ export class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient>
     }
 
     public unlockRequest(lockId: LockID): void {
-        logger.trace(`Requesting connection to be unlocked from ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
+        logger.trace(`Requesting connection to be unlocked from ${toNodeId(this.getPeerDescriptor())}`)
         const request: UnlockRequest = {
             lockId
         }
@@ -38,7 +38,7 @@ export class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient>
     }
 
     public async gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void> {
-        logger.trace(`Notifying a graceful disconnect to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
+        logger.trace(`Notifying a graceful disconnect to ${toNodeId(this.getPeerDescriptor())}`)
         const request: DisconnectNotice = {
             disconnectMode
         }
@@ -49,4 +49,16 @@ export class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient>
         })
         await this.getClient().gracefulDisconnect(request, options)
     }
+
+    public async setPrivate(isPrivate: boolean): Promise<void> {
+        logger.trace(`Setting isPrivate: ${isPrivate} for ${toNodeId(this.getPeerDescriptor())}`)
+        const request: SetPrivateRequest = {
+            isPrivate
+        }
+        const options = this.formDhtRpcOptions({
+            connect: false,
+            notification: true
+        })
+        await this.getClient().setPrivate(request, options)
+    }
 }

package/src/connection/ConnectionLockStates.ts

@@ -12,6 +12,8 @@ export class ConnectionLockStates {
     // TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
     // simply do not send lock requests.
     private weakLocks: Map<DhtAddress, Set<LockID>> = new Map()
+    // Used to filter proxy connections from the connections view
+    private remotePrivateConnections: Set<DhtAddress> = new Set()
 
     public getLocalLockedConnectionCount(): number {
         return this.localLocks.size
@@ -99,6 +101,22 @@ export class ConnectionLockStates {
         }
     }
 
+    public addPrivate(id: DhtAddress): void {
+        this.remotePrivateConnections.add(id)
+    }
+
+    public removePrivate(id: DhtAddress): void {
+        this.remotePrivateConnections.delete(id)
+    }
+
+    public getPrivateConnections(): Set<DhtAddress> {
+        return this.remotePrivateConnections
+    }
+
+    public isPrivate(id: DhtAddress): boolean {
+        return this.remotePrivateConnections.has(id)
+    }
+
     public clearAllLocks(id: DhtAddress): void {
         this.localLocks.delete(id)
         this.remoteLocks.delete(id)