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

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

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

package/dist/src/connection/{WebSocket/ServerWebSocket.d.ts → websocket/ServerWebsocket.d.ts}

@@ -3,7 +3,7 @@ import EventEmitter from 'eventemitter3';
 import { IConnection, ConnectionID, ConnectionEvents, ConnectionType } from '../IConnection';
 import { connection as WsConnection } from 'websocket';
 import { Url } from 'url';
-export declare class ServerWebSocket extends EventEmitter<ConnectionEvents> implements IConnection {
+export declare class ServerWebsocket extends EventEmitter<ConnectionEvents> implements IConnection {
     readonly connectionId: ConnectionID;
     readonly connectionType = ConnectionType.WEBSOCKET_SERVER;
     readonly resourceURL: Url;
@@ -12,7 +12,7 @@ export declare class ServerWebSocket extends EventEmitter<ConnectionEvents> impl
     constructor(socket: WsConnection, resourceURL: Url);
     private doDisconnect;
     send(data: Uint8Array): void;
-    close(): Promise<void>;
+    close(gracefulLeave: boolean): Promise<void>;
     destroy(): void;
     getRemoteAddress(): string;
 }

package/dist/src/connection/{WebSocket/ServerWebSocket.js → websocket/ServerWebsocket.js}

@@ -3,17 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerWebSocket = void 0;
+exports.ServerWebsocket = void 0;
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const IConnection_1 = require("../IConnection");
 const utils_1 = require("@streamr/utils");
+const ClientWebsocket_1 = require("./ClientWebsocket");
 const logger = new utils_1.Logger(module);
 var MessageType;
 (function (MessageType) {
     MessageType["UTF8"] = "utf8";
     MessageType["BINARY"] = "binary";
 })(MessageType || (MessageType = {}));
-class ServerWebSocket extends eventemitter3_1.default {
+class ServerWebsocket extends eventemitter3_1.default {
     constructor(socket, resourceURL) {
         super();
         this.connectionType = IConnection_1.ConnectionType.WEBSOCKET_SERVER;
@@ -21,35 +22,30 @@ class ServerWebSocket extends eventemitter3_1.default {
         this.resourceURL = resourceURL;
         this.connectionId = new IConnection_1.ConnectionID();
         socket.on('message', (message) => {
-            if (!this.stopped) {
-                logger.trace('ServerWebSocket::onMessage');
-                if (message.type === MessageType.UTF8) {
-                    logger.debug('Received string Message: ' + message.utf8Data);
-                }
-                else if (message.type === MessageType.BINARY) {
-                    logger.trace('Received Binary Message of ' + message.binaryData.length + ' bytes');
-                    this.emit('data', new Uint8Array(message.binaryData.buffer, message.binaryData.byteOffset, message.binaryData.byteLength / Uint8Array.BYTES_PER_ELEMENT));
-                }
+            logger.trace('ServerWebsocket::onMessage');
+            if (message.type === MessageType.UTF8) {
+                logger.debug('Received string Message: ' + message.utf8Data);
+            }
+            else if (message.type === MessageType.BINARY) {
+                logger.trace('Received Binary Message of ' + message.binaryData.length + ' bytes');
+                this.emit('data', new Uint8Array(message.binaryData.buffer, message.binaryData.byteOffset, message.binaryData.byteLength / Uint8Array.BYTES_PER_ELEMENT));
             }
         });
         socket.on('close', (reasonCode, description) => {
-            if (!this.stopped) {
-                logger.trace(' Peer ' + socket.remoteAddress + ' disconnected.');
-                this.doDisconnect('OTHER', reasonCode, description);
-            }
+            logger.trace('Peer ' + socket.remoteAddress + ' disconnected.');
+            this.doDisconnect(reasonCode, description);
         });
         socket.on('error', (error) => {
-            if (!this.stopped) {
-                this.emit('error', error.name);
-            }
+            this.emit('error', error.name);
         });
         this.socket = socket;
     }
-    doDisconnect(disconnectionType, reasonCode, description) {
+    doDisconnect(reasonCode, description) {
         this.stopped = true;
         this.socket?.removeAllListeners();
         this.socket = undefined;
-        this.emit('disconnected', disconnectionType, reasonCode, description);
+        const gracefulLeave = reasonCode === ClientWebsocket_1.GOING_AWAY;
+        this.emit('disconnected', gracefulLeave, reasonCode, description);
     }
     send(data) {
         // If in an Karma / Electron test, use the NodeJS implementation
@@ -63,15 +59,15 @@ class ServerWebSocket extends eventemitter3_1.default {
             }
         }
         else {
-            logger.error('Tried to call send() on a stopped socket');
+            logger.debug('Tried to call send() on a stopped socket');
         }
     }
-    async close() {
+    async close(gracefulLeave) {
         if (!this.stopped) {
-            this.socket?.close();
+            this.socket?.close(gracefulLeave === true ? ClientWebsocket_1.GOING_AWAY : undefined);
         }
         else {
-            logger.error('Tried to close a stopped connection');
+            logger.debug('Tried to close a stopped connection');
         }
     }
     destroy() {
@@ -85,7 +81,7 @@ class ServerWebSocket extends eventemitter3_1.default {
             this.stopped = true;
         }
         else {
-            logger.error('Tried to destroy() a stopped connection');
+            logger.debug('Tried to destroy() a stopped connection');
         }
     }
     getRemoteAddress() {
@@ -98,5 +94,5 @@ class ServerWebSocket extends eventemitter3_1.default {
         }
     }
 }
-exports.ServerWebSocket = ServerWebSocket;
-//# sourceMappingURL=ServerWebSocket.js.map
+exports.ServerWebsocket = ServerWebsocket;
+//# sourceMappingURL=ServerWebsocket.js.map

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

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

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

@@ -1,45 +1,53 @@
 import { ITransport } from '../../transport/ITransport';
-import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor, WebSocketConnectionRequest, WebSocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
-import { IWebSocketConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
+import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ManagedConnection } from '../ManagedConnection';
 import { PortRange, TlsCertificate } from '../ConnectionManager';
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
-export declare const connectivityMethodToWebSocketUrl: (ws: ConnectivityMethod) => string;
-interface WebSocketConnectorRpcLocalConfig {
+export declare const connectivityMethodToWebsocketUrl: (ws: ConnectivityMethod) => string;
+interface WebsocketConnectorConfig {
     transport: ITransport;
-    canConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean;
+    canConnect: (peerDescriptor: PeerDescriptor) => boolean;
     onIncomingConnection: (connection: ManagedConnection) => boolean;
     portRange?: PortRange;
     maxMessageSize?: number;
     host?: string;
     entrypoints?: PeerDescriptor[];
     tlsCertificate?: TlsCertificate;
+    autoCertifierTransport: ITransport;
+    autoCertifierUrl: string;
+    autoCertifierConfigFile: string;
+    serverEnableTls: boolean;
 }
-export declare class WebSocketConnectorRpcLocal implements IWebSocketConnectorRpc {
+export declare class WebsocketConnector {
     private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
     private readonly rpcCommunicator;
-    private readonly canConnectFunction;
-    private readonly webSocketServer?;
+    private readonly websocketServer?;
     private connectivityChecker?;
     private readonly ongoingConnectRequests;
     private onIncomingConnection;
     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 ownPeerDescriptor?;
+    private localPeerDescriptor?;
     private connectingConnections;
-    private destroyed;
-    constructor(config: WebSocketConnectorRpcLocalConfig);
+    private abortController;
+    constructor(config: WebsocketConnectorConfig);
+    private registerLocalRpcMethods;
     private attachHandshaker;
+    autoCertify(): Promise<void>;
+    private setHost;
     start(): Promise<void>;
-    checkConnectivity(): Promise<ConnectivityResponse>;
+    checkConnectivity(selfSigned: boolean): Promise<ConnectivityResponse>;
     isPossibleToFormConnection(targetPeerDescriptor: PeerDescriptor): boolean;
     connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
     private requestConnectionFromPeer;
     private onServerSocketHandshakeRequest;
-    setOwnPeerDescriptor(ownPeerDescriptor: PeerDescriptor): void;
+    setLocalPeerDescriptor(localPeerDescriptor: PeerDescriptor): void;
     destroy(): Promise<void>;
-    requestConnection(request: WebSocketConnectionRequest, context: ServerCallContext): Promise<WebSocketConnectionResponse>;
 }
 export {};

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

@@ -1,81 +1,97 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketConnectorRpcLocal = exports.connectivityMethodToWebSocketUrl = void 0;
-const ClientWebSocket_1 = require("./ClientWebSocket");
+exports.WebsocketConnector = exports.connectivityMethodToWebsocketUrl = void 0;
+const ClientWebsocket_1 = require("./ClientWebsocket");
 const IConnection_1 = require("../IConnection");
 const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
-const WebSocketConnectorRpcRemote_1 = require("./WebSocketConnectorRpcRemote");
+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");
-const WebSocketServer_1 = require("./WebSocketServer");
+const WebsocketServer_1 = require("./WebsocketServer");
 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 lodash_1 = require("lodash");
-const AddressTools_1 = require("../../helpers/AddressTools");
+const Connectivity_1 = require("../../helpers/Connectivity");
+const errors_1 = require("../../helpers/errors");
+const AutoCertifierClientFacade_1 = require("./AutoCertifierClientFacade");
 const logger = new utils_1.Logger(module);
-const connectivityMethodToWebSocketUrl = (ws) => {
+const connectivityMethodToWebsocketUrl = (ws) => {
     return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port;
 };
-exports.connectivityMethodToWebSocketUrl = connectivityMethodToWebSocketUrl;
-const canOpenConnectionFromBrowser = (websocketServer) => {
-    const hasPrivateAddress = ((websocketServer.host === 'localhost') || (0, AddressTools_1.isPrivateIPv4)(websocketServer.host));
-    return websocketServer.tls || hasPrivateAddress;
-};
+exports.connectivityMethodToWebsocketUrl = connectivityMethodToWebsocketUrl;
 const ENTRY_POINT_CONNECTION_ATTEMPTS = 5;
-class WebSocketConnectorRpcLocal {
+class WebsocketConnector {
     constructor(config) {
         this.ongoingConnectRequests = new Map();
         this.connectingConnections = new Map();
-        this.destroyed = false;
-        this.onServerSocketHandshakeRequest = (peerDescriptor, serverWebSocket) => {
-            const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(peerDescriptor);
-            if (this.ongoingConnectRequests.has(peerId.toKey())) {
-                const ongoingConnectReguest = this.ongoingConnectRequests.get(peerId.toKey());
-                ongoingConnectReguest.attachImplementation(serverWebSocket);
-                ongoingConnectReguest.acceptHandshake();
-                this.ongoingConnectRequests.delete(peerId.toKey());
-            }
-            else {
-                const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebSocket);
-                managedConnection.setPeerDescriptor(peerDescriptor);
-                if (this.onIncomingConnection(managedConnection)) {
-                    managedConnection.acceptHandshake();
-                }
-                else {
-                    managedConnection.rejectHandshake('Duplicate connection');
-                    managedConnection.destroy();
-                }
-            }
-        };
-        this.webSocketServer = config.portRange ? new WebSocketServer_1.WebSocketServer({
+        this.abortController = new AbortController();
+        this.websocketServer = config.portRange ? new WebsocketServer_1.WebsocketServer({
             portRange: config.portRange,
             tlsCertificate: config.tlsCertificate,
-            maxMessageSize: config.maxMessageSize
+            maxMessageSize: config.maxMessageSize,
+            enableTls: config.serverEnableTls
         }) : undefined;
         this.onIncomingConnection = config.onIncomingConnection;
         this.host = config.host;
         this.entrypoints = config.entrypoints;
         this.tlsCertificate = config.tlsCertificate;
-        this.canConnectFunction = config.canConnect.bind(this);
-        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnectorRpcLocal.WEBSOCKET_CONNECTOR_SERVICE_ID, config.transport, {
+        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
         });
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebSocketConnectionRequest, DhtRpc_1.WebSocketConnectionResponse, 'requestConnection', (req, context) => this.requestConnection(req, context));
+        this.registerLocalRpcMethods(config);
+    }
+    registerLocalRpcMethods(config) {
+        const rpcLocal = new WebsocketConnectorRpcLocal_1.WebsocketConnectorRpcLocal({
+            canConnect: (peerDescriptor) => config.canConnect(peerDescriptor),
+            connect: (targetPeerDescriptor) => this.connect(targetPeerDescriptor),
+            onIncomingConnection: (connection) => config.onIncomingConnection(connection),
+            abortSignal: this.abortController.signal
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebsocketConnectionRequest, DhtRpc_1.WebsocketConnectionResponse, 'requestConnection', async (req, context) => {
+            if (!this.abortController.signal.aborted) {
+                return rpcLocal.requestConnection(req, context);
+            }
+            else {
+                return { accepted: false };
+            }
+        });
     }
     attachHandshaker(connection) {
-        const handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, connection);
+        const handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, connection);
         handshaker.once('handshakeRequest', (peerDescriptor) => {
             this.onServerSocketHandshakeRequest(peerDescriptor, connection);
         });
     }
+    async autoCertify() {
+        this.autoCertifierClient = new AutoCertifierClientFacade_1.AutoCertifierClientFacade({
+            configFile: this.autoCertifierConfigFile,
+            transport: this.autoCertifierTransport,
+            url: this.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.connectivityChecker.setHost(hostName);
+    }
     async start() {
-        if (!this.destroyed && this.webSocketServer) {
-            this.webSocketServer.on('connected', (connection) => {
+        if (!this.abortController.signal.aborted && this.websocketServer) {
+            this.websocketServer.on('connected', (connection) => {
                 const serverSocket = connection;
                 if (serverSocket.resourceURL &&
                     serverSocket.resourceURL.query) {
@@ -95,33 +111,30 @@ class WebSocketConnectorRpcLocal {
                     this.attachHandshaker(connection);
                 }
             });
-            const port = await this.webSocketServer.start();
+            const port = await this.websocketServer.start();
             this.selectedPort = port;
-            this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.tlsCertificate !== undefined, this.host);
+            this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.serverEnableTls, this.host);
         }
     }
-    async checkConnectivity() {
+    async checkConnectivity(selfSigned) {
         // TODO: this could throw if the server is not running
         const noServerConnectivityResponse = {
-            openInternet: false,
             host: '127.0.0.1',
             natType: ConnectionManager_1.NatType.UNKNOWN
         };
-        if (this.destroyed) {
+        if (this.abortController.signal.aborted) {
             return noServerConnectivityResponse;
         }
         for (const reattempt of (0, lodash_1.range)(ENTRY_POINT_CONNECTION_ATTEMPTS)) {
             const entryPoint = (0, lodash_1.sample)(this.entrypoints);
             try {
-                if (!this.webSocketServer) {
-                    // If no websocket server, return openInternet: false
+                if (!this.websocketServer) {
                     return noServerConnectivityResponse;
                 }
                 else {
-                    if (!this.entrypoints || this.entrypoints.length < 1) {
+                    if (!this.entrypoints || this.entrypoints.length === 0) {
                         // return connectivity info given in config
                         const preconfiguredConnectivityResponse = {
-                            openInternet: true,
                             host: this.host,
                             natType: ConnectionManager_1.NatType.OPEN_INTERNET,
                             websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
@@ -129,32 +142,25 @@ class WebSocketConnectorRpcLocal {
                         return preconfiguredConnectivityResponse;
                     }
                     else {
-                        // Do real connectivity checking
-                        return await this.connectivityChecker.sendConnectivityRequest(entryPoint);
+                        // Do real connectivity checking     
+                        return await this.connectivityChecker.sendConnectivityRequest(entryPoint, selfSigned);
                     }
                 }
             }
             catch (err) {
                 if (reattempt < ENTRY_POINT_CONNECTION_ATTEMPTS) {
                     const error = `Failed to connect to entrypoint with id ${(0, utils_1.binaryToHex)(entryPoint.kademliaId)} `
-                        + `and URL ${(0, exports.connectivityMethodToWebSocketUrl)(entryPoint.websocket)}`;
+                        + `and URL ${(0, exports.connectivityMethodToWebsocketUrl)(entryPoint.websocket)}`;
                     logger.error(error, { error: err });
                     await (0, utils_1.wait)(2000);
                 }
             }
         }
-        throw Error(`Failed to connect to the entrypoints after ${ENTRY_POINT_CONNECTION_ATTEMPTS} attempts`);
+        throw new errors_1.WebsocketServerStartError(`Failed to connect to the entrypoints after ${ENTRY_POINT_CONNECTION_ATTEMPTS} attempts`);
     }
     isPossibleToFormConnection(targetPeerDescriptor) {
-        if (this.ownPeerDescriptor.websocket !== undefined) {
-            return (targetPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER) || canOpenConnectionFromBrowser(this.ownPeerDescriptor.websocket);
-        }
-        else if (targetPeerDescriptor.websocket !== undefined) {
-            return (this.ownPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER) || canOpenConnectionFromBrowser(targetPeerDescriptor.websocket);
-        }
-        else {
-            return false;
-        }
+        const connectionType = (0, Connectivity_1.expectedConnectionType)(this.localPeerDescriptor, targetPeerDescriptor);
+        return (connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT || connectionType === IConnection_1.ConnectionType.WEBSOCKET_SERVER);
     }
     connect(targetPeerDescriptor) {
         const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
@@ -162,13 +168,13 @@ class WebSocketConnectorRpcLocal {
         if (existingConnection) {
             return existingConnection;
         }
-        if (this.ownPeerDescriptor.websocket && !targetPeerDescriptor.websocket) {
-            return this.requestConnectionFromPeer(this.ownPeerDescriptor, targetPeerDescriptor);
+        if (this.localPeerDescriptor.websocket && !targetPeerDescriptor.websocket) {
+            return this.requestConnectionFromPeer(this.localPeerDescriptor, targetPeerDescriptor);
         }
         else {
-            const socket = new ClientWebSocket_1.ClientWebSocket();
-            const url = (0, exports.connectivityMethodToWebSocketUrl)(targetPeerDescriptor.websocket);
-            const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
+            const socket = new ClientWebsocket_1.ClientWebsocket();
+            const url = (0, exports.connectivityMethodToWebsocketUrl)(targetPeerDescriptor.websocket);
+            const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
             managedConnection.setPeerDescriptor(targetPeerDescriptor);
             this.connectingConnections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
             const delFunc = () => {
@@ -184,51 +190,51 @@ class WebSocketConnectorRpcLocal {
             return managedConnection;
         }
     }
-    requestConnectionFromPeer(ownPeerDescriptor, targetPeerDescriptor) {
+    requestConnectionFromPeer(localPeerDescriptor, targetPeerDescriptor) {
         setImmediate(() => {
-            const remoteConnector = new WebSocketConnectorRpcRemote_1.WebSocketConnectorRpcRemote(ownPeerDescriptor, targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebSocketConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
-            remoteConnector.requestConnection(ownPeerDescriptor.websocket.host, ownPeerDescriptor.websocket.port);
+            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 managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER);
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER);
         managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)));
         managedConnection.setPeerDescriptor(targetPeerDescriptor);
         this.ongoingConnectRequests.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
         return managedConnection;
     }
-    setOwnPeerDescriptor(ownPeerDescriptor) {
-        this.ownPeerDescriptor = ownPeerDescriptor;
+    onServerSocketHandshakeRequest(peerDescriptor, serverWebsocket) {
+        const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(peerDescriptor);
+        if (this.ongoingConnectRequests.has(peerId.toKey())) {
+            const ongoingConnectReguest = this.ongoingConnectRequests.get(peerId.toKey());
+            ongoingConnectReguest.attachImplementation(serverWebsocket);
+            ongoingConnectReguest.acceptHandshake();
+            this.ongoingConnectRequests.delete(peerId.toKey());
+        }
+        else {
+            const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebsocket);
+            managedConnection.setPeerDescriptor(peerDescriptor);
+            if (this.onIncomingConnection(managedConnection)) {
+                managedConnection.acceptHandshake();
+            }
+            else {
+                managedConnection.rejectHandshake('Duplicate connection');
+                managedConnection.destroy();
+            }
+        }
+    }
+    setLocalPeerDescriptor(localPeerDescriptor) {
+        this.localPeerDescriptor = localPeerDescriptor;
     }
     async destroy() {
-        this.destroyed = true;
+        this.abortController.abort();
         this.rpcCommunicator.destroy();
         const requests = Array.from(this.ongoingConnectRequests.values());
-        await Promise.allSettled(requests.map((conn) => conn.close('OTHER')));
+        await Promise.allSettled(requests.map((conn) => conn.close(false)));
         const attempts = Array.from(this.connectingConnections.values());
-        await Promise.allSettled(attempts.map((conn) => conn.close('OTHER')));
+        await Promise.allSettled(attempts.map((conn) => conn.close(false)));
         this.connectivityChecker?.destroy();
-        await this.webSocketServer?.stop();
-    }
-    // IWebSocketConnectorRpc implementation
-    async requestConnection(request, context) {
-        const senderPeerDescriptor = context.incomingSourceDescriptor;
-        if (!this.destroyed && this.canConnectFunction(senderPeerDescriptor, request.ip, request.port)) {
-            setImmediate(() => {
-                if (this.destroyed) {
-                    return;
-                }
-                const connection = this.connect(senderPeerDescriptor);
-                this.onIncomingConnection(connection);
-            });
-            const res = {
-                accepted: true
-            };
-            return res;
-        }
-        return {
-            accepted: false
-        };
+        await this.websocketServer?.stop();
     }
 }
-exports.WebSocketConnectorRpcLocal = WebSocketConnectorRpcLocal;
-WebSocketConnectorRpcLocal.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
-//# sourceMappingURL=WebSocketConnectorRpcLocal.js.map
+exports.WebsocketConnector = WebsocketConnector;
+WebsocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
+//# sourceMappingURL=WebsocketConnector.js.map

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

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

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

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketConnectorRpcLocal = void 0;
+class WebsocketConnectorRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async requestConnection(_request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        if (this.config.canConnect(senderPeerDescriptor)) {
+            setImmediate(() => {
+                if (this.config.abortSignal.aborted) {
+                    return;
+                }
+                const connection = this.config.connect(senderPeerDescriptor);
+                this.config.onIncomingConnection(connection);
+            });
+            return { accepted: true };
+        }
+        else {
+            return { accepted: false };
+        }
+    }
+}
+exports.WebsocketConnectorRpcLocal = WebsocketConnectorRpcLocal;
+//# sourceMappingURL=WebsocketConnectorRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketConnectorRpcLocal.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketConnectorRpcLocal.ts"],"names":[],"mappings":";;;AAiBA,MAAa,0BAA0B;IAInC,YAAY,MAAwC;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAoC,EAAE,OAA0B;QAC3F,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YAC9C,YAAY,CAAC,GAAG,EAAE;gBACd,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE;oBACjC,OAAM;iBACT;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;gBAC5D,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;YACF,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;SAC5B;aAAM;YACH,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;SAC7B;IACL,CAAC;CACJ;AAvBD,gEAuBC"}

package/dist/src/connection/{WebSocket/WebSocketConnectorRpcRemote.d.ts → websocket/WebsocketConnectorRpcRemote.d.ts}

@@ -1,8 +1,8 @@
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { IWebSocketConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+import { IWebsocketConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
 import { ProtoRpcClient } from '@streamr/proto-rpc';
 import { Remote } from '../../dht/contact/Remote';
-export declare class WebSocketConnectorRpcRemote extends Remote<IWebSocketConnectorRpcClient> {
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebSocketConnectorRpcClient>);
+export declare class WebsocketConnectorRpcRemote extends Remote<IWebsocketConnectorRpcClient> {
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebsocketConnectorRpcClient>);
     requestConnection(ip: string, port: number): Promise<boolean>;
 }