@streamr/dht 100.2.5-beta.0 → 101.0.0-beta.0

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

@@ -21,16 +21,16 @@ class WebsocketServer extends eventemitter3_1.default {
     httpServer;
     wsServer;
     abortController = new AbortController();
-    config;
-    constructor(config) {
+    options;
+    constructor(options) {
         super();
-        this.config = config;
+        this.options = options;
     }
     async start() {
-        const ports = (0, lodash_1.range)(this.config.portRange.min, this.config.portRange.max + 1);
+        const ports = (0, lodash_1.range)(this.options.portRange.min, this.options.portRange.max + 1);
         for (const port of ports) {
             try {
-                await (0, utils_1.asAbortable)(this.startServer(port, this.config.enableTls), this.abortController.signal);
+                await (0, utils_1.asAbortable)(this.startServer(port, this.options.enableTls), this.abortController.signal);
                 return port;
             }
             catch (err) {
@@ -42,7 +42,7 @@ class WebsocketServer extends eventemitter3_1.default {
                 }
             }
         }
-        throw new errors_1.WebsocketServerStartError(`Failed to start WebSocket server on any port in range: ${this.config.portRange.min}-${this.config.portRange.min}`);
+        throw new errors_1.WebsocketServerStartError(`Failed to start WebSocket server on any port in range: ${this.options.portRange.min}-${this.options.portRange.min}`);
     }
     // If tlsCertificate has been given the tls boolean is ignored
     // TODO: could be simplified?
@@ -53,17 +53,17 @@ class WebsocketServer extends eventemitter3_1.default {
             response.end();
         };
         return new Promise((resolve, reject) => {
-            if (this.config.tlsCertificate) {
+            if (this.options.tlsCertificate) {
                 this.httpServer = (0, https_1.createServer)({
-                    key: fs_1.default.readFileSync(this.config.tlsCertificate.privateKeyFileName),
-                    cert: fs_1.default.readFileSync(this.config.tlsCertificate.certFileName)
+                    key: fs_1.default.readFileSync(this.options.tlsCertificate.privateKeyFileName),
+                    cert: fs_1.default.readFileSync(this.options.tlsCertificate.certFileName)
                 }, requestListener);
             }
             else if (!tls) {
                 this.httpServer = (0, http_1.createServer)(requestListener);
             }
             else {
-                // TODO use config option or named constant?
+                // TODO use options option or named constant?
                 const certificate = (0, autocertifier_client_1.createSelfSignedCertificate)('streamr-self-signed-' + (0, uuid_1.v4)(), 1000);
                 this.httpServer = (0, https_1.createServer)({
                     key: certificate.serverKey,
@@ -135,7 +135,7 @@ class WebsocketServer extends eventemitter3_1.default {
         });
     }
     createWsServer() {
-        const maxPayload = this.config.maxMessageSize ?? 1048576;
+        const maxPayload = this.options.maxMessageSize ?? 1048576;
         return this.wsServer = new ws_1.default.Server({
             noServer: true,
             maxPayload

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

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

package/dist/src/connection/websocket/{WebsocketConnector.d.ts → WebsocketServerConnector.d.ts}

@@ -1,13 +1,12 @@
-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 { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator';
 import { DhtAddress } from '../../identifiers';
-export type Action = 'connectivityRequest' | 'connectivityProbe';
-export declare const connectivityMethodToWebsocketUrl: (ws: ConnectivityMethod, action?: Action) => string;
-export interface WebsocketConnectorConfig {
-    transport: ITransport;
-    onNewConnection: (connection: ManagedConnection) => boolean;
+import { ConnectivityResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { PortRange, TlsCertificate } from '../ConnectionManager';
+import { ITransport } from '../../transport/ITransport';
+import { PendingConnection } from '../PendingConnection';
+export interface WebsocketServerConnectorOptions {
+    onNewConnection: (connection: PendingConnection) => boolean;
+    rpcCommunicator: ListeningRpcCommunicator;
     hasConnection: (nodeId: DhtAddress) => boolean;
     portRange?: PortRange;
     maxMessageSize?: number;
@@ -20,9 +19,7 @@ export interface WebsocketConnectorConfig {
     serverEnableTls: boolean;
     geoIpDatabaseFolder?: string;
 }
-export declare class WebsocketConnector {
-    private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
-    private readonly rpcCommunicator;
+export declare class WebsocketServerConnector {
     private readonly websocketServer?;
     private geoIpLocator?;
     private readonly ongoingConnectRequests;
@@ -30,20 +27,18 @@ export declare class WebsocketConnector {
     private autoCertifierClient?;
     private selectedPort?;
     private localPeerDescriptor?;
-    private connectingConnections;
     private abortController;
-    private readonly config;
-    constructor(config: WebsocketConnectorConfig);
-    private registerLocalRpcMethods;
+    private readonly options;
+    constructor(options: WebsocketServerConnectorOptions);
+    start(): Promise<void>;
     private attachHandshaker;
+    private onServerSocketHandshakeRequest;
+    checkConnectivity(allowSelfSignedCertificate: boolean): Promise<ConnectivityResponse>;
     autoCertify(): Promise<void>;
     private setHost;
-    start(): Promise<void>;
-    checkConnectivity(allowSelfSignedCertificate: boolean): Promise<ConnectivityResponse>;
-    isPossibleToFormConnection(targetPeerDescriptor: PeerDescriptor): boolean;
-    connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
+    connect(targetPeerDescriptor: PeerDescriptor): PendingConnection;
     private requestConnectionFromPeer;
-    private onServerSocketHandshakeRequest;
+    isPossibleToFormConnection(targetPeerDescriptor: PeerDescriptor): boolean;
     setLocalPeerDescriptor(localPeerDescriptor: PeerDescriptor): void;
     destroy(): Promise<void>;
 }

package/dist/src/connection/websocket/{WebsocketConnector.js → WebsocketServerConnector.js}

@@ -26,38 +26,31 @@ 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 NodeWebsocketClientConnection_1 = require("./NodeWebsocketClientConnection");
-const IConnection_1 = require("../IConnection");
-const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
-const WebsocketConnectorRpcLocal_1 = require("./WebsocketConnectorRpcLocal");
-const WebsocketConnectorRpcRemote_1 = require("./WebsocketConnectorRpcRemote");
-const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
-const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
-const utils_1 = require("@streamr/utils");
-const ManagedConnection_1 = require("../ManagedConnection");
+exports.WebsocketServerConnector = void 0;
+const geoip_location_1 = require("@streamr/geoip-location");
+const WebsocketClientConnector_1 = require("./WebsocketClientConnector");
 const WebsocketServer_1 = require("./WebsocketServer");
-const connectivityChecker_1 = require("../connectivityChecker");
+const identifiers_1 = require("../../identifiers");
+const AutoCertifierClientFacade_1 = require("./AutoCertifierClientFacade");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const ConnectionManager_1 = require("../ConnectionManager");
-const Handshaker_1 = require("../Handshaker");
+const utils_1 = require("@streamr/utils");
+const connectivityRequestHandler_1 = require("../connectivityRequestHandler");
+const IConnection_1 = require("../IConnection");
 const querystring_1 = __importDefault(require("querystring"));
+const version_1 = require("../../helpers/version");
 const lodash_1 = require("lodash");
-const Connectivity_1 = require("../../helpers/Connectivity");
+const connectivityChecker_1 = require("../connectivityChecker");
+const Handshaker_1 = require("../Handshaker");
+const WebsocketClientConnectorRpcRemote_1 = require("./WebsocketClientConnectorRpcRemote");
+const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
 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 geoip_location_1 = require("@streamr/geoip-location");
+const Connectivity_1 = require("../../helpers/Connectivity");
+const PendingConnection_1 = require("../PendingConnection");
 const logger = new utils_1.Logger(module);
-const connectivityMethodToWebsocketUrl = (ws, action) => {
-    return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port + ((action !== undefined) ? '?action=' + action : '');
-};
-exports.connectivityMethodToWebsocketUrl = connectivityMethodToWebsocketUrl;
-class WebsocketConnector {
-    static WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
-    rpcCommunicator;
+// TODO: Move server starting logic including autocertification and connectivity checking to WebsocketServer.ts?
+class WebsocketServerConnector {
     websocketServer;
     geoIpLocator;
     ongoingConnectRequests = new Map();
@@ -65,62 +58,17 @@ class WebsocketConnector {
     autoCertifierClient;
     selectedPort;
     localPeerDescriptor;
-    connectingConnections = new Map();
     abortController = new AbortController();
-    config;
-    constructor(config) {
-        this.config = config;
-        this.websocketServer = config.portRange ? new WebsocketServer_1.WebsocketServer({
-            portRange: config.portRange,
-            tlsCertificate: config.tlsCertificate,
-            maxMessageSize: config.maxMessageSize,
-            enableTls: config.serverEnableTls
+    options;
+    constructor(options) {
+        this.options = options;
+        this.websocketServer = options.portRange ? new WebsocketServer_1.WebsocketServer({
+            portRange: options.portRange,
+            tlsCertificate: options.tlsCertificate,
+            maxMessageSize: options.maxMessageSize,
+            enableTls: options.serverEnableTls
         }) : undefined;
-        this.host = config.host;
-        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebsocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID, config.transport, {
-            rpcRequestTimeout: 15000 // TODO use config option or named constant?
-        });
-        this.registerLocalRpcMethods(config);
-    }
-    registerLocalRpcMethods(config) {
-        const rpcLocal = new WebsocketConnectorRpcLocal_1.WebsocketConnectorRpcLocal({
-            connect: (targetPeerDescriptor) => this.connect(targetPeerDescriptor),
-            hasConnection: (nodeId) => (this.connectingConnections.has(nodeId)
-                || this.ongoingConnectRequests.has(nodeId)
-                || config.hasConnection(nodeId)),
-            onNewConnection: (connection) => config.onNewConnection(connection),
-            abortSignal: this.abortController.signal
-        });
-        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebsocketConnectionRequest, 'requestConnection', async (req, context) => {
-            if (!this.abortController.signal.aborted) {
-                return rpcLocal.requestConnection(req, context);
-            }
-            else {
-                return {};
-            }
-        });
-    }
-    attachHandshaker(connection) {
-        const handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, connection);
-        handshaker.once('handshakeRequest', (localPeerDescriptor, sourceVersion, remotePeerDescriptor) => {
-            this.onServerSocketHandshakeRequest(localPeerDescriptor, connection, sourceVersion, remotePeerDescriptor);
-        });
-    }
-    async autoCertify() {
-        this.autoCertifierClient = new AutoCertifierClientFacade_1.AutoCertifierClientFacade({
-            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)
-        });
-        logger.trace(`AutoCertifying subdomain...`);
-        await this.autoCertifierClient.start();
-    }
-    setHost(hostName) {
-        logger.trace(`Setting host name to ${hostName}`);
-        this.host = hostName;
+        this.host = options.host;
     }
     async start() {
         if (!this.abortController.signal.aborted && this.websocketServer) {
@@ -149,8 +97,8 @@ class WebsocketConnector {
                     }
                 }
             });
-            if (this.config.geoIpDatabaseFolder) {
-                const geoIpLocator = new geoip_location_1.GeoIpLocator(this.config.geoIpDatabaseFolder);
+            if (this.options.geoIpDatabaseFolder) {
+                const geoIpLocator = new geoip_location_1.GeoIpLocator(this.options.geoIpDatabaseFolder);
                 try {
                     await geoIpLocator.start();
                     this.geoIpLocator = geoIpLocator;
@@ -163,6 +111,45 @@ class WebsocketConnector {
             this.selectedPort = port;
         }
     }
+    attachHandshaker(connection) {
+        // TODO: use createIncomingHandshaker here?
+        const handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, connection);
+        handshaker.once('handshakeRequest', (localPeerDescriptor, sourceVersion, remotePeerDescriptor) => {
+            this.onServerSocketHandshakeRequest(localPeerDescriptor, connection, handshaker, sourceVersion, remotePeerDescriptor);
+        });
+    }
+    onServerSocketHandshakeRequest(sourcePeerDescriptor, websocketServerConnection, handshaker, remoteVersion, targetPeerDescriptor) {
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(sourcePeerDescriptor);
+        if (this.ongoingConnectRequests.has(nodeId)) {
+            const { pendingConnection, delFunc } = this.ongoingConnectRequests.get(nodeId);
+            if (!(0, version_1.isMaybeSupportedVersion)(remoteVersion)) {
+                (0, Handshaker_1.rejectHandshake)(pendingConnection, websocketServerConnection, handshaker, DhtRpc_1.HandshakeError.UNSUPPORTED_VERSION);
+                delFunc();
+            }
+            else if (targetPeerDescriptor && !(0, identifiers_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor)) {
+                (0, Handshaker_1.rejectHandshake)(pendingConnection, websocketServerConnection, handshaker, DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR);
+                delFunc();
+            }
+            else {
+                (0, Handshaker_1.acceptHandshake)(handshaker, pendingConnection, websocketServerConnection);
+            }
+        }
+        else {
+            const pendingConnection = new PendingConnection_1.PendingConnection(sourcePeerDescriptor);
+            if (!(0, version_1.isMaybeSupportedVersion)(remoteVersion)) {
+                (0, Handshaker_1.rejectHandshake)(pendingConnection, websocketServerConnection, handshaker, DhtRpc_1.HandshakeError.UNSUPPORTED_VERSION);
+            }
+            else if (targetPeerDescriptor && !(0, identifiers_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor)) {
+                (0, Handshaker_1.rejectHandshake)(pendingConnection, websocketServerConnection, handshaker, DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR);
+            }
+            else if (this.options.onNewConnection(pendingConnection)) {
+                (0, Handshaker_1.acceptHandshake)(handshaker, pendingConnection, websocketServerConnection);
+            }
+            else {
+                (0, Handshaker_1.rejectHandshake)(pendingConnection, websocketServerConnection, handshaker, DhtRpc_1.HandshakeError.DUPLICATE_CONNECTION);
+            }
+        }
+    }
     async checkConnectivity(allowSelfSignedCertificate) {
         // TODO: this could throw?
         if (this.abortController.signal.aborted) {
@@ -173,22 +160,22 @@ class WebsocketConnector {
                 version: version_1.LOCAL_PROTOCOL_VERSION
             };
         }
-        if (!this.config.entrypoints || this.config.entrypoints.length === 0) {
-            // return connectivity info given in config
+        if (!this.options.entrypoints || this.options.entrypoints.length === 0) {
+            // return connectivity info given in options
             return {
                 host: this.host,
                 natType: ConnectionManager_1.NatType.OPEN_INTERNET,
                 websocket: {
                     host: this.host,
                     port: this.selectedPort,
-                    tls: this.config.tlsCertificate !== undefined
+                    tls: this.options.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
             };
         }
-        const shuffledEntrypoints = (0, lodash_1.shuffle)(this.config.entrypoints);
+        const shuffledEntrypoints = (0, lodash_1.shuffle)(this.options.entrypoints);
         while (shuffledEntrypoints.length > 0 && !this.abortController.signal.aborted) {
             const entryPoint = shuffledEntrypoints[0];
             try {
@@ -196,7 +183,7 @@ class WebsocketConnector {
                 const connectivityRequest = {
                     port: this.selectedPort ?? connectivityRequestHandler_1.DISABLE_CONNECTIVITY_PROBE,
                     host: this.host,
-                    tls: this.websocketServer ? this.config.serverEnableTls : false,
+                    tls: this.websocketServer ? this.options.serverEnableTls : false,
                     allowSelfSignedCertificate
                 };
                 if (!this.abortController.signal.aborted) {
@@ -208,50 +195,41 @@ class WebsocketConnector {
             }
             catch (err) {
                 const error = `Failed to connect to entrypoint with id ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(entryPoint)} `
-                    + `and URL ${(0, exports.connectivityMethodToWebsocketUrl)(entryPoint.websocket)}`;
+                    + `and URL ${(0, WebsocketClientConnector_1.connectivityMethodToWebsocketUrl)(entryPoint.websocket)}`;
                 logger.error(error, { err });
                 shuffledEntrypoints.shift();
                 await (0, utils_1.wait)(2000, this.abortController.signal);
             }
         }
-        throw new errors_1.WebsocketServerStartError(`Failed to connect to the entrypoints after ${this.config.entrypoints.length} attempts\n`
-            + `Attempted hosts: ${this.config.entrypoints.map((entry) => `${entry.websocket.host}:${entry.websocket.port}`).join(', ')}`);
+        throw new errors_1.WebsocketServerStartError(`Failed to connect to the entrypoints after ${this.options.entrypoints.length} attempts\n`
+            + `Attempted hosts: ${this.options.entrypoints.map((entry) => `${entry.websocket.host}:${entry.websocket.port}`).join(', ')}`);
     }
-    isPossibleToFormConnection(targetPeerDescriptor) {
-        const connectionType = (0, Connectivity_1.expectedConnectionType)(this.localPeerDescriptor, targetPeerDescriptor);
-        return (connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT || connectionType === IConnection_1.ConnectionType.WEBSOCKET_SERVER);
+    async autoCertify() {
+        this.autoCertifierClient = new AutoCertifierClientFacade_1.AutoCertifierClientFacade({
+            configFile: this.options.autoCertifierConfigFile,
+            transport: this.options.autoCertifierTransport,
+            url: this.options.autoCertifierUrl,
+            wsServerPort: this.selectedPort,
+            setHost: (hostName) => this.setHost(hostName),
+            updateCertificate: (certificate, privateKey) => this.websocketServer.updateCertificate(certificate, privateKey)
+        });
+        logger.trace(`AutoCertifying subdomain...`);
+        await this.autoCertifierClient.start();
+    }
+    setHost(hostName) {
+        logger.trace(`Setting host name to ${hostName}`);
+        this.host = hostName;
     }
     connect(targetPeerDescriptor) {
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
-        const existingConnection = this.connectingConnections.get(nodeId);
-        if (existingConnection) {
-            return existingConnection;
-        }
-        if (this.localPeerDescriptor.websocket && !targetPeerDescriptor.websocket) {
-            return this.requestConnectionFromPeer(this.localPeerDescriptor, targetPeerDescriptor);
-        }
-        else {
-            const socket = new NodeWebsocketClientConnection_1.WebsocketClientConnection();
-            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(nodeId, managedConnection);
-            const delFunc = () => {
-                if (this.connectingConnections.has(nodeId)) {
-                    this.connectingConnections.delete(nodeId);
-                }
-                socket.off('disconnected', delFunc);
-                managedConnection.off('handshakeCompleted', delFunc);
-            };
-            socket.on('disconnected', delFunc);
-            managedConnection.on('handshakeCompleted', delFunc);
-            socket.connect(url, false);
-            return managedConnection;
+        if (this.ongoingConnectRequests.has(nodeId)) {
+            return this.ongoingConnectRequests.get(nodeId).pendingConnection;
         }
+        return this.requestConnectionFromPeer(this.localPeerDescriptor, targetPeerDescriptor);
     }
     requestConnectionFromPeer(localPeerDescriptor, targetPeerDescriptor) {
         setImmediate(() => {
-            const remoteConnector = new WebsocketConnectorRpcRemote_1.WebsocketConnectorRpcRemote(localPeerDescriptor, targetPeerDescriptor, this.rpcCommunicator, DhtRpc_client_1.WebsocketConnectorRpcClient);
+            const remoteConnector = new WebsocketClientConnectorRpcRemote_1.WebsocketClientConnectorRpcRemote(localPeerDescriptor, targetPeerDescriptor, this.options.rpcCommunicator, DhtRpc_client_1.WebsocketClientConnectorRpcClient);
             remoteConnector.requestConnection().then(() => {
                 logger.trace('Sent WebsocketConnectionRequest notification to peer', { targetPeerDescriptor });
             }, (err) => {
@@ -260,59 +238,33 @@ class WebsocketConnector {
                 });
             });
         });
-        const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, undefined, targetPeerDescriptor);
+        const pendingConnection = new PendingConnection_1.PendingConnection(targetPeerDescriptor);
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
-        managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete(nodeId));
-        managedConnection.setRemotePeerDescriptor(targetPeerDescriptor);
-        this.ongoingConnectRequests.set(nodeId, managedConnection);
-        return managedConnection;
-    }
-    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 if (targetPeerDescriptor && !(0, identifiers_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor)) {
-                ongoingConnectRequest.rejectHandshake(DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR);
-            }
-            else {
-                ongoingConnectRequest.attachImplementation(websocketServerConnection);
-                ongoingConnectRequest.acceptHandshake();
-            }
+        // TODO: can this leak?
+        const delFunc = () => {
+            pendingConnection.off('connected', delFunc);
+            pendingConnection.off('disconnected', delFunc);
             this.ongoingConnectRequests.delete(nodeId);
-        }
-        else {
-            const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, websocketServerConnection, targetPeerDescriptor);
-            managedConnection.setRemotePeerDescriptor(sourcePeerDescriptor);
-            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.config.onNewConnection(managedConnection)) {
-                managedConnection.acceptHandshake();
-            }
-            else {
-                managedConnection.rejectHandshake(DhtRpc_1.HandshakeError.DUPLICATE_CONNECTION);
-            }
-        }
+        };
+        pendingConnection.on('connected', delFunc);
+        pendingConnection.on('disconnected', delFunc);
+        this.ongoingConnectRequests.set(nodeId, { pendingConnection, delFunc });
+        return pendingConnection;
+    }
+    isPossibleToFormConnection(targetPeerDescriptor) {
+        const connectionType = (0, Connectivity_1.expectedConnectionType)(this.localPeerDescriptor, targetPeerDescriptor);
+        return (connectionType === IConnection_1.ConnectionType.WEBSOCKET_SERVER);
     }
     setLocalPeerDescriptor(localPeerDescriptor) {
         this.localPeerDescriptor = localPeerDescriptor;
     }
     async destroy() {
         this.abortController.abort();
-        this.rpcCommunicator.destroy();
         const requests = Array.from(this.ongoingConnectRequests.values());
-        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)));
+        await Promise.allSettled(requests.map((ongoingConnectRequest) => ongoingConnectRequest.pendingConnection.close(true)));
         await this.websocketServer?.stop();
         await this.geoIpLocator?.stop();
     }
 }
-exports.WebsocketConnector = WebsocketConnector;
-//# sourceMappingURL=WebsocketConnector.js.map
+exports.WebsocketServerConnector = WebsocketServerConnector;
+//# sourceMappingURL=WebsocketServerConnector.js.map

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

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

package/dist/src/dht/DhtNode.d.ts

@@ -22,7 +22,7 @@ export interface DhtNodeEvents {
 export interface DhtNodeOptions {
     serviceId?: ServiceID;
     joinParallelism?: number;
-    maxNeighborListSize?: number;
+    maxContactCount?: number;
     numberOfNodesPerKBucket?: number;
     joinNoProgressLimit?: number;
     peerDiscoveryQueryBatchSize?: number;
@@ -49,7 +49,6 @@ export interface DhtNodeOptions {
     webrtcAllowPrivateAddresses?: boolean;
     webrtcDatachannelBufferThresholdLow?: number;
     webrtcDatachannelBufferThresholdHigh?: number;
-    webrtcNewConnectionTimeout?: number;
     webrtcPortRange?: PortRange;
     maxMessageSize?: number;
     maxConnections?: number;
@@ -59,9 +58,10 @@ export interface DhtNodeOptions {
     autoCertifierConfigFile?: string;
     geoIpDatabaseFolder?: string;
 }
+export declare const CONTROL_LAYER_NODE_SERVICE_ID = "layer0";
 export type Events = TransportEvents & DhtNodeEvents;
 export declare class DhtNode extends EventEmitter<Events> implements ITransport {
-    private readonly config;
+    private readonly options;
     private rpcCommunicator?;
     private transport?;
     private localPeerDescriptor?;
@@ -76,7 +76,7 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private started;
     private abortController;
     constructor(conf: DhtNodeOptions);
-    private validateConfig;
+    private validateOptions;
     start(): Promise<void>;
     private initPeerManager;
     private bindRpcLocalMethods;