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

package/dist/src/connection/webrtc/iceServerAsString.js.map

@@ -1 +1 @@
-{"version":3,"file":"iceServerAsString.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/iceServerAsString.ts"],"names":[],"mappings":";;;AAEA,SAAgB,iBAAiB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAa;IAC/E,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3C,IAAI,QAAQ,KAAK,SAAS,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,EAAE,CAAC,CAAA;KACtD;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QAClD,OAAO,GAAG,QAAQ,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;KAC3C;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QAClD,OAAO,GAAG,QAAQ,IAAI,QAAQ,IAAI,QAAQ,IAAI,QAAQ,IAAI,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;KACjG;IACD,MAAM,IAAI,KAAK,CAAC,aAAa,QAAQ,mBAAmB,QAAQ,6BAA6B,CAAC,CAAA;AAClG,CAAC;AAZD,8CAYC"}
+{"version":3,"file":"iceServerAsString.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/iceServerAsString.ts"],"names":[],"mappings":";;;AAEA,SAAgB,iBAAiB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAa;IAC/E,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,EAAE,CAAC,CAAA;IACvD,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnD,OAAO,GAAG,QAAQ,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;IAC5C,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnD,OAAO,GAAG,QAAQ,IAAI,QAAQ,IAAI,QAAQ,IAAI,QAAQ,IAAI,IAAI,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IAClH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,aAAa,QAAQ,mBAAmB,QAAQ,6BAA6B,CAAC,CAAA;AAClG,CAAC;AAZD,8CAYC"}

package/dist/src/connection/websocket/AutoCertifierClientFacade.d.ts

@@ -17,8 +17,7 @@ interface AutoCertifierClientFacadeConfig {
 export declare class AutoCertifierClientFacade {
     private autoCertifierClient;
     private readonly rpcCommunicator;
-    private readonly setHost;
-    private readonly updateCertificate;
+    private readonly config;
     constructor(config: AutoCertifierClientFacadeConfig);
     start(): Promise<void>;
     stop(): void;

package/dist/src/connection/websocket/AutoCertifierClientFacade.js

@@ -10,17 +10,19 @@ const defaultAutoCertifierClientFactory = (configFile, autoCertifierUrl, autoCer
 });
 const logger = new utils_1.Logger(module);
 class AutoCertifierClientFacade {
+    autoCertifierClient;
+    rpcCommunicator;
+    config;
     constructor(config) {
-        this.setHost = config.setHost;
-        this.updateCertificate = config.updateCertificate;
+        this.config = config;
         this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(autocertifier_client_1.SERVICE_ID, config.transport);
         this.autoCertifierClient = config.createClientFactory ? config.createClientFactory()
             : defaultAutoCertifierClientFactory(config.configFile, config.url, this.rpcCommunicator, config.wsServerPort);
     }
     async start() {
         this.autoCertifierClient.on('updatedCertificate', (subdomain) => {
-            this.setHost(subdomain.fqdn);
-            this.updateCertificate(subdomain.certificate, subdomain.privateKey);
+            this.config.setHost(subdomain.fqdn);
+            this.config.updateCertificate(subdomain.certificate, subdomain.privateKey);
             logger.trace(`Updated certificate`);
         });
         await Promise.all([

package/dist/src/connection/websocket/AutoCertifierClientFacade.js.map

@@ -1 +1 @@
-{"version":3,"file":"AutoCertifierClientFacade.js","sourceRoot":"","sources":["../../../../src/connection/websocket/AutoCertifierClientFacade.ts"],"names":[],"mappings":";;;AAAA,wEAOsC;AACtC,uFAAmF;AACnF,0CAAsD;AAGtD,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAA;AAE/B,MAAM,iCAAiC,GAAG,CACtC,UAAkB,EAClB,gBAAwB,EACxB,4BAAsD,EACtD,YAAoB,EACtB,EAAE,CAAC,IAAI,0CAAmB,CACxB,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,CAAC,UAAkB,EAAE,aAAqB,EAAE,MAAkB,EAAE,EAAE;IAC9D,4BAA4B,CAAC,iBAAiB,CAC1C,wCAAiB,EACjB,yCAAkB,EAClB,aAAa,EACb,MAAM,CACT,CAAA;AACL,CAAC,CACJ,CAAA;AAoBD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,yBAAyB;IAOlC,YAAY,MAAuC;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;QACjD,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,iCAAyB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;QAChG,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAChF,CAAC,CAAC,iCAAiC,CAC/B,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,GAAG,EACV,IAAI,CAAC,eAAe,EACpB,MAAM,CAAC,YAAY,CACtB,CAAA;IACT,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,SAA6B,EAAE,EAAE;YAChF,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAC5B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;YACnE,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,IAAA,qBAAa,EAAC,IAAI,CAAC,mBAA0B,EAAE,oBAAoB,EAAE,aAAa,CAAC;YACnF,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE;SACnC,CAAC,CAAA;IACN,CAAC;IAED,IAAI;QACA,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAA;QAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;CAEJ;AArCD,8DAqCC"}
+{"version":3,"file":"AutoCertifierClientFacade.js","sourceRoot":"","sources":["../../../../src/connection/websocket/AutoCertifierClientFacade.ts"],"names":[],"mappings":";;;AAAA,wEAOsC;AACtC,uFAAmF;AACnF,0CAAsD;AAGtD,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAA;AAE/B,MAAM,iCAAiC,GAAG,CACtC,UAAkB,EAClB,gBAAwB,EACxB,4BAAsD,EACtD,YAAoB,EACtB,EAAE,CAAC,IAAI,0CAAmB,CACxB,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,CAAC,UAAkB,EAAE,aAAqB,EAAE,MAAkB,EAAE,EAAE;IAC9D,4BAA4B,CAAC,iBAAiB,CAC1C,wCAAiB,EACjB,yCAAkB,EAClB,aAAa,EACb,MAAM,CACT,CAAA;AACL,CAAC,CACJ,CAAA;AAoBD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,yBAAyB;IAE1B,mBAAmB,CAAsB;IAChC,eAAe,CAA0B;IACzC,MAAM,CAAiC;IAExD,YAAY,MAAuC;QAC/C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,iCAAyB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;QAChG,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAChF,CAAC,CAAC,iCAAiC,CAC/B,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,GAAG,EACV,IAAI,CAAC,eAAe,EACpB,MAAM,CAAC,YAAY,CACtB,CAAA;IACT,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,SAA6B,EAAE,EAAE;YAChF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACnC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;YAC1E,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,IAAA,qBAAa,EAAC,IAAI,CAAC,mBAA0B,EAAE,oBAAoB,EAAE,aAAa,CAAC;YACnF,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE;SACnC,CAAC,CAAA;IACN,CAAC;IAED,IAAI;QACA,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAA;QAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;CAEJ;AAnCD,8DAmCC"}

package/dist/src/connection/websocket/ClientWebsocket.d.ts

@@ -1,6 +1,7 @@
 import EventEmitter from 'eventemitter3';
 import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from '../IConnection';
 export declare const GOING_AWAY = 1001;
+export declare const CUSTOM_GOING_AWAY = 3001;
 export declare class ClientWebsocket extends EventEmitter<ConnectionEvents> implements IConnection {
     readonly connectionId: ConnectionID;
     private socket?;

package/dist/src/connection/websocket/ClientWebsocket.js

@@ -3,23 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientWebsocket = exports.GOING_AWAY = void 0;
+exports.ClientWebsocket = exports.CUSTOM_GOING_AWAY = exports.GOING_AWAY = void 0;
 const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const websocket_1 = require("websocket");
 const IConnection_1 = require("../IConnection");
+const Connection_1 = require("../Connection");
 const logger = new utils_1.Logger(module);
 // https://kapeli.com/cheat_sheets/WebSocket_Status_Codes.docset/Contents/Resources/Documents/index
 // Browsers send this automatically when closing a tab
 exports.GOING_AWAY = 1001;
+// The GOING_AWAY is a reserved code and we shouldn't send that from the application. Therefore
+// we have a custom counterpart
+exports.CUSTOM_GOING_AWAY = 3001;
 const BINARY_TYPE = 'arraybuffer';
 class ClientWebsocket extends eventemitter3_1.default {
+    connectionId;
+    socket;
+    connectionType = IConnection_1.ConnectionType.WEBSOCKET_CLIENT;
+    destroyed = false;
     constructor() {
         super();
-        this.connectionType = IConnection_1.ConnectionType.WEBSOCKET_CLIENT;
-        this.destroyed = false;
-        this.connectionId = new IConnection_1.ConnectionID();
+        this.connectionId = (0, Connection_1.createRandomConnectionId)();
     }
+    // TODO explicit default value for "selfSigned" or make it required
     connect(address, selfSigned) {
         if (!this.destroyed) {
             this.socket = new websocket_1.w3cwebsocket(address, undefined, undefined, undefined, { rejectUnauthorized: !selfSigned });
@@ -63,7 +70,7 @@ class ClientWebsocket extends eventemitter3_1.default {
         this.destroyed = true;
         this.stopListening();
         this.socket = undefined;
-        const gracefulLeave = code === exports.GOING_AWAY;
+        const gracefulLeave = (code === exports.GOING_AWAY) || (code === exports.CUSTOM_GOING_AWAY);
         this.emit('disconnected', gracefulLeave, code, reason);
         this.removeAllListeners();
     }
@@ -85,8 +92,8 @@ class ClientWebsocket extends eventemitter3_1.default {
         this.emit('disconnected', gracefulLeave, undefined, 'close() called');
         this.removeAllListeners();
         if (!this.destroyed) {
-            logger.trace(`Closing socket for connection ${this.connectionId.toString()}`);
-            this.socket?.close(gracefulLeave === true ? exports.GOING_AWAY : undefined);
+            logger.trace(`Closing socket for connection ${this.connectionId}`);
+            this.socket?.close(gracefulLeave ? exports.CUSTOM_GOING_AWAY : undefined);
         }
         else {
             logger.debug('Tried to close() a stopped connection');

package/dist/src/connection/websocket/ClientWebsocket.js.map

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

package/dist/src/connection/websocket/WebsocketConnector.d.ts

@@ -2,12 +2,13 @@ import { ITransport } from '../../transport/ITransport';
 import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ManagedConnection } from '../ManagedConnection';
 import { PortRange, TlsCertificate } from '../ConnectionManager';
+import { DhtAddress } from '../../identifiers';
 export type Action = 'connectivityRequest' | 'connectivityProbe';
 export declare const connectivityMethodToWebsocketUrl: (ws: ConnectivityMethod, action?: Action) => string;
 export interface WebsocketConnectorConfig {
     transport: ITransport;
-    canConnect: (peerDescriptor: PeerDescriptor) => boolean;
     onNewConnection: (connection: ManagedConnection) => boolean;
+    hasConnection: (nodeId: DhtAddress) => boolean;
     portRange?: PortRange;
     maxMessageSize?: number;
     host?: string;
@@ -22,21 +23,14 @@ export declare class WebsocketConnector {
     private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
     private readonly rpcCommunicator;
     private readonly websocketServer?;
-    private connectivityChecker?;
     private readonly ongoingConnectRequests;
-    private onNewConnection;
     private host?;
-    private readonly entrypoints?;
-    private readonly tlsCertificate?;
-    private readonly autoCertifierTransport;
-    private readonly autoCertifierUrl;
-    private readonly autoCertifierConfigFile;
-    private readonly serverEnableTls;
     private autoCertifierClient?;
     private selectedPort?;
     private localPeerDescriptor?;
     private connectingConnections;
     private abortController;
+    private readonly config;
     constructor(config: WebsocketConnectorConfig);
     private registerLocalRpcMethods;
     private attachHandshaker;

package/dist/src/connection/websocket/WebsocketConnector.js

@@ -1,4 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketConnector = exports.connectivityMethodToWebsocketUrl = void 0;
 const ClientWebsocket_1 = require("./ClientWebsocket");
@@ -11,15 +37,18 @@ const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client")
 const utils_1 = require("@streamr/utils");
 const ManagedConnection_1 = require("../ManagedConnection");
 const WebsocketServer_1 = require("./WebsocketServer");
-const ConnectivityChecker_1 = require("../ConnectivityChecker");
+const connectivityChecker_1 = require("../connectivityChecker");
 const ConnectionManager_1 = require("../ConnectionManager");
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const Handshaker_1 = require("../Handshaker");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const querystring_1 = __importDefault(require("querystring"));
 const lodash_1 = require("lodash");
 const Connectivity_1 = require("../../helpers/Connectivity");
 const errors_1 = require("../../helpers/errors");
 const AutoCertifierClientFacade_1 = require("./AutoCertifierClientFacade");
+const connectivityRequestHandler_1 = require("../connectivityRequestHandler");
+const Err = __importStar(require("../../helpers/errors"));
+const identifiers_1 = require("../../identifiers");
+const version_1 = require("../../helpers/version");
 const logger = new utils_1.Logger(module);
 const connectivityMethodToWebsocketUrl = (ws, action) => {
     return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port + ((action !== undefined) ? '?action=' + action : '');
@@ -27,56 +56,68 @@ const connectivityMethodToWebsocketUrl = (ws, action) => {
 exports.connectivityMethodToWebsocketUrl = connectivityMethodToWebsocketUrl;
 const ENTRY_POINT_CONNECTION_ATTEMPTS = 5;
 class WebsocketConnector {
+    static WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
+    rpcCommunicator;
+    websocketServer;
+    ongoingConnectRequests = new Map();
+    host;
+    autoCertifierClient;
+    selectedPort;
+    localPeerDescriptor;
+    connectingConnections = new Map();
+    abortController = new AbortController();
+    config;
     constructor(config) {
-        this.ongoingConnectRequests = new Map();
-        this.connectingConnections = new Map();
-        this.abortController = new AbortController();
+        this.config = config;
         this.websocketServer = config.portRange ? new WebsocketServer_1.WebsocketServer({
             portRange: config.portRange,
             tlsCertificate: config.tlsCertificate,
             maxMessageSize: config.maxMessageSize,
             enableTls: config.serverEnableTls
         }) : undefined;
-        this.onNewConnection = config.onNewConnection;
         this.host = config.host;
-        this.entrypoints = config.entrypoints;
-        this.tlsCertificate = config.tlsCertificate;
-        this.autoCertifierTransport = config.autoCertifierTransport;
-        this.autoCertifierUrl = config.autoCertifierUrl;
-        this.autoCertifierConfigFile = config.autoCertifierConfigFile;
-        this.serverEnableTls = config.serverEnableTls;
         this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebsocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID, config.transport, {
-            rpcRequestTimeout: 15000
+            rpcRequestTimeout: 15000 // TODO use config option or named constant?
         });
         this.registerLocalRpcMethods(config);
     }
     registerLocalRpcMethods(config) {
         const rpcLocal = new WebsocketConnectorRpcLocal_1.WebsocketConnectorRpcLocal({
-            canConnect: (peerDescriptor) => config.canConnect(peerDescriptor),
             connect: (targetPeerDescriptor) => this.connect(targetPeerDescriptor),
+            hasConnection: (nodeId) => {
+                if (this.connectingConnections.has(nodeId)
+                    || this.connectingConnections.has(nodeId)
+                    || this.ongoingConnectRequests.has(nodeId)
+                    || config.hasConnection(nodeId)) {
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            },
             onNewConnection: (connection) => config.onNewConnection(connection),
             abortSignal: this.abortController.signal
         });
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebsocketConnectionRequest, DhtRpc_1.WebsocketConnectionResponse, 'requestConnection', async (req, context) => {
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebsocketConnectionRequest, 'requestConnection', async (req, context) => {
             if (!this.abortController.signal.aborted) {
                 return rpcLocal.requestConnection(req, context);
             }
             else {
-                return { accepted: false };
+                return {};
             }
         });
     }
     attachHandshaker(connection) {
         const handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, connection);
-        handshaker.once('handshakeRequest', (localPeerDescriptor, remotePeerDescriptor) => {
-            this.onServerSocketHandshakeRequest(localPeerDescriptor, connection, remotePeerDescriptor);
+        handshaker.once('handshakeRequest', (localPeerDescriptor, sourceVersion, remotePeerDescriptor) => {
+            this.onServerSocketHandshakeRequest(localPeerDescriptor, connection, sourceVersion, remotePeerDescriptor);
         });
     }
     async autoCertify() {
         this.autoCertifierClient = new AutoCertifierClientFacade_1.AutoCertifierClientFacade({
-            configFile: this.autoCertifierConfigFile,
-            transport: this.autoCertifierTransport,
-            url: this.autoCertifierUrl,
+            configFile: this.config.autoCertifierConfigFile,
+            transport: this.config.autoCertifierTransport,
+            url: this.config.autoCertifierUrl,
             wsServerPort: this.selectedPort,
             setHost: (hostName) => this.setHost(hostName),
             updateCertificate: (certificate, privateKey) => this.websocketServer.updateCertificate(certificate, privateKey)
@@ -87,64 +128,82 @@ class WebsocketConnector {
     setHost(hostName) {
         logger.trace(`Setting host name to ${hostName}`);
         this.host = hostName;
-        this.connectivityChecker.setHost(hostName);
     }
     async start() {
         if (!this.abortController.signal.aborted && this.websocketServer) {
             this.websocketServer.on('connected', (connection) => {
                 const serverSocket = connection;
-                const query = serverSocket.resourceURL.query;
-                const action = query?.action;
-                logger.trace('WebSocket client connected', { action, remoteAddress: serverSocket.getRemoteAddress() });
+                const query = querystring_1.default.parse(serverSocket.resourceURL.query ?? '');
+                const action = query.action;
+                logger.trace('WebSocket client connected', { action, remoteAddress: serverSocket.remoteIpAddress });
                 if (action === 'connectivityRequest') {
-                    this.connectivityChecker.listenToIncomingConnectivityRequests(serverSocket);
+                    (0, connectivityRequestHandler_1.attachConnectivityRequestHandler)(serverSocket);
                 }
                 else if (action === 'connectivityProbe') {
                     // no-op
                 }
                 else {
-                    this.attachHandshaker(connection);
+                    // The localPeerDescriptor can be undefined here as the WS server is used for connectivity checks
+                    // before the localPeerDescriptor is set during start.
+                    // Handshaked connections should be rejected before the localPeerDescriptor is set.
+                    if (this.localPeerDescriptor !== undefined) {
+                        this.attachHandshaker(connection);
+                    }
+                    else {
+                        logger.trace('incoming Websocket connection before localPeerDescriptor was set, closing connection');
+                        connection.close(false).catch(() => { });
+                    }
                 }
             });
             const port = await this.websocketServer.start();
             this.selectedPort = port;
-            this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.serverEnableTls, this.host);
         }
     }
     async checkConnectivity(selfSigned) {
-        // TODO: this could throw if the server is not running
-        const noServerConnectivityResponse = {
-            host: '127.0.0.1',
-            natType: ConnectionManager_1.NatType.UNKNOWN
-        };
+        // TODO: this could throw?
         if (this.abortController.signal.aborted) {
-            return noServerConnectivityResponse;
+            return {
+                host: '127.0.0.1',
+                natType: ConnectionManager_1.NatType.UNKNOWN,
+                ipAddress: (0, utils_1.ipv4ToNumber)('127.0.0.1'),
+                version: version_1.LOCAL_PROTOCOL_VERSION
+            };
+        }
+        if (!this.config.entrypoints || this.config.entrypoints.length === 0) {
+            // return connectivity info given in config
+            return {
+                host: this.host,
+                natType: ConnectionManager_1.NatType.OPEN_INTERNET,
+                websocket: {
+                    host: this.host,
+                    port: this.selectedPort,
+                    tls: this.config.tlsCertificate !== undefined
+                },
+                // TODO: Resolve the given host name or or use as is if IP was given. 
+                ipAddress: (0, utils_1.ipv4ToNumber)('127.0.0.1'),
+                version: version_1.LOCAL_PROTOCOL_VERSION
+            };
         }
         for (const reattempt of (0, lodash_1.range)(ENTRY_POINT_CONNECTION_ATTEMPTS)) {
-            const entryPoint = (0, lodash_1.sample)(this.entrypoints);
+            const entryPoint = (0, lodash_1.sample)(this.config.entrypoints);
             try {
-                if (!this.websocketServer) {
-                    return noServerConnectivityResponse;
+                // Do real connectivity checking
+                const connectivityRequest = {
+                    port: this.selectedPort ?? connectivityRequestHandler_1.DISABLE_CONNECTIVITY_PROBE,
+                    host: this.host,
+                    tls: this.websocketServer ? this.config.serverEnableTls : false,
+                    selfSigned
+                };
+                if (!this.abortController.signal.aborted) {
+                    return await (0, connectivityChecker_1.sendConnectivityRequest)(connectivityRequest, entryPoint);
                 }
                 else {
-                    if (!this.entrypoints || this.entrypoints.length === 0) {
-                        // return connectivity info given in config
-                        const preconfiguredConnectivityResponse = {
-                            host: this.host,
-                            natType: ConnectionManager_1.NatType.OPEN_INTERNET,
-                            websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
-                        };
-                        return preconfiguredConnectivityResponse;
-                    }
-                    else {
-                        // Do real connectivity checking
-                        return await this.connectivityChecker.sendConnectivityRequest(entryPoint, selfSigned);
-                    }
+                    throw new Err.ConnectionFailed('ConnectivityChecker is destroyed');
                 }
             }
             catch (err) {
                 if (reattempt < ENTRY_POINT_CONNECTION_ATTEMPTS) {
-                    const error = `Failed to connect to entrypoint with id ${(0, utils_1.binaryToHex)(entryPoint.kademliaId)} `
+                    const error = `Failed to connect to entrypoint with id ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(entryPoint)} `
                         + `and URL ${(0, exports.connectivityMethodToWebsocketUrl)(entryPoint.websocket)}`;
                     logger.error(error, { error: err });
                     await (0, utils_1.wait)(2000);
@@ -158,8 +217,8 @@ class WebsocketConnector {
         return (connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT || connectionType === IConnection_1.ConnectionType.WEBSOCKET_SERVER);
     }
     connect(targetPeerDescriptor) {
-        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
-        const existingConnection = this.connectingConnections.get(peerKey);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
+        const existingConnection = this.connectingConnections.get(nodeId);
         if (existingConnection) {
             return existingConnection;
         }
@@ -171,10 +230,10 @@ class WebsocketConnector {
             const url = (0, exports.connectivityMethodToWebsocketUrl)(targetPeerDescriptor.websocket);
             const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined, targetPeerDescriptor);
             managedConnection.setRemotePeerDescriptor(targetPeerDescriptor);
-            this.connectingConnections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
+            this.connectingConnections.set(nodeId, managedConnection);
             const delFunc = () => {
-                if (this.connectingConnections.has(peerKey)) {
-                    this.connectingConnections.delete(peerKey);
+                if (this.connectingConnections.has(nodeId)) {
+                    this.connectingConnections.delete(nodeId);
                 }
                 socket.off('disconnected', delFunc);
                 managedConnection.off('handshakeCompleted', delFunc);
@@ -187,35 +246,46 @@ class WebsocketConnector {
     }
     requestConnectionFromPeer(localPeerDescriptor, targetPeerDescriptor) {
         setImmediate(() => {
-            const remoteConnector = new WebsocketConnectorRpcRemote_1.WebsocketConnectorRpcRemote(localPeerDescriptor, targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebsocketConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
-            remoteConnector.requestConnection(localPeerDescriptor.websocket.host, localPeerDescriptor.websocket.port);
+            const remoteConnector = new WebsocketConnectorRpcRemote_1.WebsocketConnectorRpcRemote(localPeerDescriptor, targetPeerDescriptor, this.rpcCommunicator, DhtRpc_client_1.WebsocketConnectorRpcClient);
+            remoteConnector.requestConnection().then(() => {
+                logger.trace('Sent WebsocketConnectionRequest notification to peer', { targetPeerDescriptor });
+                return;
+            }, (err) => {
+                logger.debug('Failed to send WebsocketConnectionRequest notification to peer ', {
+                    error: err, targetPeerDescriptor
+                });
+            });
         });
         const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, undefined, targetPeerDescriptor);
-        managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)));
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
+        managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete(nodeId));
         managedConnection.setRemotePeerDescriptor(targetPeerDescriptor);
-        this.ongoingConnectRequests.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
+        this.ongoingConnectRequests.set(nodeId, managedConnection);
         return managedConnection;
     }
-    onServerSocketHandshakeRequest(sourcePeerDescriptor, serverWebsocket, targetPeerDescriptor) {
-        const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(sourcePeerDescriptor);
-        if (this.ongoingConnectRequests.has(peerId.toKey())) {
-            const ongoingConnectRequest = this.ongoingConnectRequests.get(peerId.toKey());
-            ongoingConnectRequest.attachImplementation(serverWebsocket);
-            if (targetPeerDescriptor && !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor)) {
-                ongoingConnectRequest.rejectHandshake(DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR);
+    onServerSocketHandshakeRequest(sourcePeerDescriptor, websocketServerConnection, remoteVersion, targetPeerDescriptor) {
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(sourcePeerDescriptor);
+        if (this.ongoingConnectRequests.has(nodeId)) {
+            const ongoingConnectRequest = this.ongoingConnectRequests.get(nodeId);
+            if (!(0, version_1.isMaybeSupportedVersion)(remoteVersion)) {
+                ongoingConnectRequest.rejectHandshake(DhtRpc_1.HandshakeError.UNSUPPORTED_VERSION);
             }
             else {
+                ongoingConnectRequest.attachImplementation(websocketServerConnection);
                 ongoingConnectRequest.acceptHandshake();
-                this.ongoingConnectRequests.delete(peerId.toKey());
             }
+            this.ongoingConnectRequests.delete(nodeId);
         }
         else {
-            const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebsocket, targetPeerDescriptor);
+            const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, websocketServerConnection, targetPeerDescriptor);
             managedConnection.setRemotePeerDescriptor(sourcePeerDescriptor);
-            if (targetPeerDescriptor && !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor)) {
+            if (!(0, version_1.isMaybeSupportedVersion)(remoteVersion)) {
+                managedConnection.rejectHandshake(DhtRpc_1.HandshakeError.UNSUPPORTED_VERSION);
+            }
+            else if (targetPeerDescriptor && !(0, identifiers_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor)) {
                 managedConnection.rejectHandshake(DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR);
             }
-            else if (this.onNewConnection(managedConnection)) {
+            else if (this.config.onNewConnection(managedConnection)) {
                 managedConnection.acceptHandshake();
             }
             else {
@@ -233,10 +303,8 @@ class WebsocketConnector {
         await Promise.allSettled(requests.map((conn) => conn.close(false)));
         const attempts = Array.from(this.connectingConnections.values());
         await Promise.allSettled(attempts.map((conn) => conn.close(false)));
-        this.connectivityChecker?.destroy();
         await this.websocketServer?.stop();
     }
 }
 exports.WebsocketConnector = WebsocketConnector;
-WebsocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
 //# sourceMappingURL=WebsocketConnector.js.map

package/dist/src/connection/websocket/WebsocketConnector.js.map

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

package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts

@@ -1,17 +1,19 @@
 /// <reference types="node" />
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
-import { PeerDescriptor, WebsocketConnectionRequest, WebsocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor, WebsocketConnectionRequest } from '../../proto/packages/dht/protos/DhtRpc';
 import { IWebsocketConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import { ManagedConnection } from '../ManagedConnection';
+import { Empty } from '../../proto/google/protobuf/empty';
+import { DhtAddress } from '../../identifiers';
 interface WebsocketConnectorRpcLocalConfig {
-    canConnect: (peerDescriptor: PeerDescriptor) => boolean;
     connect: (targetPeerDescriptor: PeerDescriptor) => ManagedConnection;
+    hasConnection: (nodeId: DhtAddress) => boolean;
     onNewConnection: (connection: ManagedConnection) => boolean;
     abortSignal: AbortSignal;
 }
 export declare class WebsocketConnectorRpcLocal implements IWebsocketConnectorRpc {
     private readonly config;
     constructor(config: WebsocketConnectorRpcLocalConfig);
-    requestConnection(_request: WebsocketConnectionRequest, context: ServerCallContext): Promise<WebsocketConnectionResponse>;
+    requestConnection(_request: WebsocketConnectionRequest, context: ServerCallContext): Promise<Empty>;
 }
 export {};