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

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

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

package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts

@@ -3,22 +3,20 @@ import { Empty } from '../../proto/google/protobuf/empty';
 import { IceCandidate, PeerDescriptor, RtcAnswer, RtcOffer } from '../../proto/packages/dht/protos/DhtRpc';
 import { IWebrtcConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator';
-import { ManagedConnection } from '../ManagedConnection';
-import { ManagedWebrtcConnection } from './ManagedWebrtcConnection';
-import { NodeWebrtcConnection } from './NodeWebrtcConnection';
 import { DhtAddress } from '../../identifiers';
-interface WebrtcConnectorRpcLocalConfig {
-    createConnection: (targetPeerDescriptor: PeerDescriptor) => NodeWebrtcConnection;
-    connect: (targetPeerDescriptor: PeerDescriptor) => ManagedConnection;
-    onNewConnection: (connection: ManagedConnection) => boolean;
-    ongoingConnectAttempts: Map<DhtAddress, ManagedWebrtcConnection>;
+import { ConnectingConnection } from './WebrtcConnector';
+import { PendingConnection } from '../PendingConnection';
+interface WebrtcConnectorRpcLocalOptions {
+    connect: (targetPeerDescriptor: PeerDescriptor, doNotRequestConnection: boolean) => PendingConnection;
+    onNewConnection: (connection: PendingConnection) => boolean;
+    ongoingConnectAttempts: Map<DhtAddress, ConnectingConnection>;
     rpcCommunicator: ListeningRpcCommunicator;
     getLocalPeerDescriptor: () => PeerDescriptor;
     allowPrivateAddresses: boolean;
 }
 export declare class WebrtcConnectorRpcLocal implements IWebrtcConnectorRpc {
-    private readonly config;
-    constructor(config: WebrtcConnectorRpcLocalConfig);
+    private readonly options;
+    constructor(options: WebrtcConnectorRpcLocalOptions);
     requestConnection(context: ServerCallContext): Promise<Empty>;
     rtcOffer(request: RtcOffer, context: ServerCallContext): Promise<Empty>;
     rtcAnswer(request: RtcAnswer, context: ServerCallContext): Promise<Empty>;

package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js

@@ -3,68 +3,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebrtcConnectorRpcLocal = void 0;
 const utils_1 = require("@streamr/utils");
 const AddressTools_1 = require("../../helpers/AddressTools");
-const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
-const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
-const ManagedWebrtcConnection_1 = require("./ManagedWebrtcConnection");
-const WebrtcConnectorRpcRemote_1 = require("./WebrtcConnectorRpcRemote");
 const identifiers_1 = require("../../identifiers");
-const version_1 = require("../../helpers/version");
 const logger = new utils_1.Logger(module);
 class WebrtcConnectorRpcLocal {
-    config;
-    constructor(config) {
-        this.config = config;
+    options;
+    constructor(options) {
+        this.options = options;
     }
     async requestConnection(context) {
         const targetPeerDescriptor = context.incomingSourceDescriptor;
-        if (this.config.ongoingConnectAttempts.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor))) {
+        if (this.options.ongoingConnectAttempts.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor))) {
             return {};
         }
-        const managedConnection = this.config.connect(targetPeerDescriptor);
-        managedConnection.setRemotePeerDescriptor(targetPeerDescriptor);
-        this.config.onNewConnection(managedConnection);
+        const pendingConnection = this.options.connect(targetPeerDescriptor, false);
+        this.options.onNewConnection(pendingConnection);
         return {};
     }
     async rtcOffer(request, context) {
-        const remotePeer = context.incomingSourceDescriptor;
-        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeer);
-        let managedConnection = this.config.ongoingConnectAttempts.get(nodeId);
-        let connection = managedConnection?.getWebrtcConnection();
-        if (!managedConnection) {
-            connection = this.config.createConnection(remotePeer);
-            managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.config.getLocalPeerDescriptor(), undefined, connection);
-            managedConnection.setRemotePeerDescriptor(remotePeer);
-            this.config.ongoingConnectAttempts.set(nodeId, managedConnection);
-            this.config.onNewConnection(managedConnection);
-            const remoteConnector = new WebrtcConnectorRpcRemote_1.WebrtcConnectorRpcRemote(this.config.getLocalPeerDescriptor(), remotePeer, this.config.rpcCommunicator, DhtRpc_client_1.WebrtcConnectorRpcClient);
-            connection.on('localCandidate', (candidate, mid) => {
-                remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId);
-            });
-            connection.once('localDescription', (description) => {
-                remoteConnector.sendRtcAnswer(description, connection.connectionId);
-            });
-            connection.start(false);
+        const remotePeerDescriptor = context.incomingSourceDescriptor;
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeerDescriptor);
+        let connection;
+        let pendingConnection;
+        if (!this.options.ongoingConnectAttempts.has(nodeId)) {
+            pendingConnection = this.options.connect(remotePeerDescriptor, true);
+            connection = this.options.ongoingConnectAttempts.get(nodeId).connection;
+            this.options.onNewConnection(pendingConnection);
+        }
+        else {
+            pendingConnection = this.options.ongoingConnectAttempts.get(nodeId).managedConnection;
+            connection = this.options.ongoingConnectAttempts.get(nodeId).connection;
         }
         // Always use offerers connectionId
         connection.setConnectionId(request.connectionId);
         connection.setRemoteDescription(request.description, 'offer');
-        managedConnection.on('handshakeRequest', (_sourceDescriptor, remoteVersion) => {
-            if (this.config.ongoingConnectAttempts.has(nodeId)) {
-                this.config.ongoingConnectAttempts.delete(nodeId);
-            }
-            if (!(0, version_1.isMaybeSupportedVersion)(remoteVersion)) {
-                managedConnection.rejectHandshake(DhtRpc_1.HandshakeError.UNSUPPORTED_VERSION);
-            }
-            else {
-                managedConnection.acceptHandshake();
-            }
-        });
         return {};
     }
     async rtcAnswer(request, context) {
         const remotePeerDescriptor = context.incomingSourceDescriptor;
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeerDescriptor);
-        const connection = this.config.ongoingConnectAttempts.get(nodeId)?.getWebrtcConnection();
+        const connection = this.options.ongoingConnectAttempts.get(nodeId)?.connection;
         if (!connection) {
             return {};
         }
@@ -78,7 +55,7 @@ class WebrtcConnectorRpcLocal {
     async iceCandidate(request, context) {
         const remotePeerDescriptor = context.incomingSourceDescriptor;
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeerDescriptor);
-        const connection = this.config.ongoingConnectAttempts.get(nodeId)?.getWebrtcConnection();
+        const connection = this.options.ongoingConnectAttempts.get(nodeId)?.connection;
         if (!connection) {
             return {};
         }
@@ -92,7 +69,7 @@ class WebrtcConnectorRpcLocal {
         return {};
     }
     isIceCandidateAllowed(candidate) {
-        if (!this.config.allowPrivateAddresses) {
+        if (!this.options.allowPrivateAddresses) {
             const address = (0, AddressTools_1.getAddressFromIceCandidate)(candidate);
             if ((address !== undefined) && (0, AddressTools_1.isPrivateIPv4)(address)) {
                 return false;

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

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

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

@@ -32,7 +32,13 @@ class AbstractWebsocketClientConnection extends eventemitter3_1.default {
                 this.socket?.send(data);
             }
             else {
-                logger.debug('Tried to send data on a non-open connection');
+                // Could this throw for faster feedback on RPC calls?
+                // Currently this log line is seen if a connection is closing but the disconnected event has not been emitted yet.
+                logger.debug('Tried to send data on a non-open connection', {
+                    id: this.connectionId,
+                    readyState: this.socket.readyState,
+                    destroyed: this.destroyed
+                });
             }
         }
         else {
@@ -47,7 +53,7 @@ class AbstractWebsocketClientConnection extends eventemitter3_1.default {
             this.socket?.close(gracefulLeave ? exports.CUSTOM_GOING_AWAY : undefined);
         }
         else {
-            logger.debug('Tried to close() a stopped connection');
+            logger.debug('Tried to close() a stopped connection', { id: this.connectionId });
         }
     }
     destroy() {

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWebsocketClientConnection.js","sourceRoot":"","sources":["../../../../src/connection/websocket/AbstractWebsocketClientConnection.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,8CAAwD;AACxD,gDAA4F;AAC5F,0CAAuC;AASvC,mGAAmG;AACnG,sDAAsD;AACzC,QAAA,UAAU,GAAG,IAAI,CAAA;AAC9B,+FAA+F;AAC/F,+BAA+B;AAClB,QAAA,iBAAiB,GAAG,IAAI,CAAA;AACrC,+EAA+E;AAC/E,MAAM,IAAI,GAAG,CAAC,CAAA;AAEd,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAsB,iCAAkC,SAAQ,uBAA8B;IAE1E,YAAY,CAAc;IAEnC,cAAc,GAAG,4BAAc,CAAC,gBAAgB,CAAA;IAC7C,SAAS,GAAG,KAAK,CAAA;IAE3B;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,YAAY,GAAG,IAAA,qCAAwB,GAAE,CAAA;IAClD,CAAC;IAOM,IAAI,CAAC,IAAgB;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBACjD,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;gBACzD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3B,CAAC;iBAAM,CAAC;gBACJ,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAC/D,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;QACzD,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,aAAsB;QACrC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAA;QACrE,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;YAClE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,yBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrE,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;QACzD,CAAC;IACL,CAAC;IAEM,OAAO;QACV,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACzB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,CAAC,aAAa,EAAE,CAAA;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;gBACnB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;YAC3B,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACzB,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC3D,CAAC;IACL,CAAC;IAES,MAAM;QACZ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAC1C,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBACjD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC;QACL,CAAC;IACL,CAAC;IAES,SAAS,CAAC,OAAmB;QACnC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC;IAES,OAAO,CAAC,IAAY,EAAE,MAAc;QAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACnC,CAAC;IACL,CAAC;IAES,OAAO,CAAC,KAAY;QAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;YACpE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;IACL,CAAC;IAES,YAAY,CAAC,IAAa,EAAE,MAAe;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,aAAa,GAAG,CAAC,IAAI,KAAK,kBAAU,CAAC,IAAI,CAAC,IAAI,KAAK,yBAAiB,CAAC,CAAA;QAC3E,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QACtD,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;CAEJ;AA5FD,8EA4FC"}
+{"version":3,"file":"AbstractWebsocketClientConnection.js","sourceRoot":"","sources":["../../../../src/connection/websocket/AbstractWebsocketClientConnection.ts"],"names":[],"mappings":"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"}

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

@@ -5,7 +5,7 @@ export interface IAutoCertifierClient {
     stop(): void;
     on(eventName: string, cb: (subdomain: CertifiedSubdomain) => void): void;
 }
-interface AutoCertifierClientFacadeConfig {
+interface AutoCertifierClientFacadeOptions {
     url: string;
     configFile: string;
     transport: ITransport;
@@ -17,8 +17,8 @@ interface AutoCertifierClientFacadeConfig {
 export declare class AutoCertifierClientFacade {
     private autoCertifierClient;
     private readonly rpcCommunicator;
-    private readonly config;
-    constructor(config: AutoCertifierClientFacadeConfig);
+    private readonly options;
+    constructor(options: AutoCertifierClientFacadeOptions);
     start(): Promise<void>;
     stop(): void;
 }

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

@@ -12,17 +12,17 @@ const logger = new utils_1.Logger(module);
 class AutoCertifierClientFacade {
     autoCertifierClient;
     rpcCommunicator;
-    config;
-    constructor(config) {
-        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);
+    options;
+    constructor(options) {
+        this.options = options;
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(autocertifier_client_1.SERVICE_ID, options.transport);
+        this.autoCertifierClient = options.createClientFactory ? options.createClientFactory()
+            : defaultAutoCertifierClientFactory(options.configFile, options.url, this.rpcCommunicator, options.wsServerPort);
     }
     async start() {
         this.autoCertifierClient.on('updatedCertificate', (subdomain) => {
-            this.config.setHost(subdomain.fqdn);
-            this.config.updateCertificate(subdomain.certificate, subdomain.privateKey);
+            this.options.setHost(subdomain.fqdn);
+            this.options.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;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"}
+{"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,OAAO,CAAkC;IAE1D,YAAY,OAAyC;QACjD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,iCAAyB,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;QACjG,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAClF,CAAC,CAAC,iCAAiC,CAC/B,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,GAAG,EACX,IAAI,CAAC,eAAe,EACpB,OAAO,CAAC,YAAY,CACvB,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,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACpC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;YAC3E,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/NodeWebsocketClientConnection.js

@@ -28,7 +28,7 @@ class WebsocketClientConnection extends AbstractWebsocketClientConnection_1.Abst
             });
         }
         else {
-            logger.debug('Tried to connect() a stopped connection');
+            logger.debug('Tried to connect() a stopped connection', { id: this.connectionId });
         }
     }
     stopListening() {

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

@@ -1 +1 @@
-{"version":3,"file":"NodeWebsocketClientConnection.js","sourceRoot":"","sources":["../../../../src/connection/websocket/NodeWebsocketClientConnection.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,2BAA8B;AAC9B,2FAAuF;AAEvF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,WAAW,GAAG,YAAY,CAAA;AAEhC,MAAa,yBAA0B,SAAQ,qEAAiC;IAElE,MAAM,CAAY;IAE5B,mEAAmE;IAC5D,OAAO,CAAC,OAAe,EAAE,UAAoB;QAChD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,cAAS,CAAC,OAAO,EAAE,EAAE,kBAAkB,EAAE,CAAC,UAAU,EAAE,CAAC,CAAA;YACzE,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,CAAA;YACpC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;YAC9D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;YAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACnG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,QAAiB,EAAE,EAAE;gBAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBAClB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;wBACrB,MAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAA;oBACvE,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;oBAC3C,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC3D,CAAC;IACL,CAAC;IAES,aAAa;QACnB,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAA;IACrC,CAAC;CAEJ;AA9BD,8DA8BC"}
+{"version":3,"file":"NodeWebsocketClientConnection.js","sourceRoot":"","sources":["../../../../src/connection/websocket/NodeWebsocketClientConnection.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,2BAA8B;AAC9B,2FAAuF;AAEvF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,WAAW,GAAG,YAAY,CAAA;AAEhC,MAAa,yBAA0B,SAAQ,qEAAiC;IAElE,MAAM,CAAY;IAE5B,mEAAmE;IAC5D,OAAO,CAAC,OAAe,EAAE,UAAoB;QAChD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,cAAS,CAAC,OAAO,EAAE,EAAE,kBAAkB,EAAE,CAAC,UAAU,EAAE,CAAC,CAAA;YACzE,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,CAAA;YACpC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;YAC9D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;YAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACnG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,QAAiB,EAAE,EAAE;gBAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBAClB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;wBACrB,MAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAA;oBACvE,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;oBAC3C,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;QACtF,CAAC;IACL,CAAC;IAES,aAAa;QACnB,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAA;IACrC,CAAC;CAEJ;AA9BD,8DA8BC"}

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

@@ -0,0 +1,26 @@
+import { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator';
+import { ConnectivityMethod, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { DhtAddress } from '../../identifiers';
+import { PendingConnection } from '../PendingConnection';
+export type Action = 'connectivityRequest' | 'connectivityProbe';
+export declare const connectivityMethodToWebsocketUrl: (ws: ConnectivityMethod, action?: Action) => string;
+export interface WebsocketClientConnectorOptions {
+    onNewConnection: (connection: PendingConnection) => boolean;
+    hasConnection: (nodeId: DhtAddress) => boolean;
+    rpcCommunicator: ListeningRpcCommunicator;
+}
+export declare class WebsocketClientConnector {
+    static readonly WEBSOCKET_CONNECTOR_SERVICE_ID = "system/websocket-connector";
+    private readonly websocketServer?;
+    private geoIpLocator?;
+    private localPeerDescriptor?;
+    private connectingConnections;
+    private abortController;
+    private readonly options;
+    constructor(options: WebsocketClientConnectorOptions);
+    private registerLocalRpcMethods;
+    isPossibleToFormConnection(targetPeerDescriptor: PeerDescriptor): boolean;
+    connect(targetPeerDescriptor: PeerDescriptor): PendingConnection;
+    setLocalPeerDescriptor(peerDescriptor: PeerDescriptor): void;
+    destroy(): Promise<void>;
+}

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

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketClientConnector = exports.connectivityMethodToWebsocketUrl = void 0;
+const NodeWebsocketClientConnection_1 = require("./NodeWebsocketClientConnection");
+const IConnection_1 = require("../IConnection");
+const WebsocketClientConnectorRpcLocal_1 = require("./WebsocketClientConnectorRpcLocal");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
+const Handshaker_1 = require("../Handshaker");
+const Connectivity_1 = require("../../helpers/Connectivity");
+const identifiers_1 = require("../../identifiers");
+const PendingConnection_1 = require("../PendingConnection");
+const connectivityMethodToWebsocketUrl = (ws, action) => {
+    return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port + ((action !== undefined) ? '?action=' + action : '');
+};
+exports.connectivityMethodToWebsocketUrl = connectivityMethodToWebsocketUrl;
+class WebsocketClientConnector {
+    static WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
+    websocketServer;
+    geoIpLocator;
+    localPeerDescriptor;
+    connectingConnections = new Map();
+    abortController = new AbortController();
+    options;
+    constructor(options) {
+        this.options = options;
+        this.registerLocalRpcMethods();
+    }
+    registerLocalRpcMethods() {
+        const rpcLocal = new WebsocketClientConnectorRpcLocal_1.WebsocketClientConnectorRpcLocal({
+            connect: (targetPeerDescriptor) => this.connect(targetPeerDescriptor),
+            hasConnection: (nodeId) => (this.connectingConnections.has(nodeId)
+                || this.options.hasConnection(nodeId)),
+            onNewConnection: (connection) => this.options.onNewConnection(connection),
+            abortSignal: this.abortController.signal
+        });
+        this.options.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebsocketConnectionRequest, 'requestConnection', async (req, context) => {
+            if (!this.abortController.signal.aborted) {
+                return rpcLocal.requestConnection(req, context);
+            }
+            else {
+                return {};
+            }
+        });
+    }
+    isPossibleToFormConnection(targetPeerDescriptor) {
+        const connectionType = (0, Connectivity_1.expectedConnectionType)(this.localPeerDescriptor, targetPeerDescriptor);
+        return connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT;
+    }
+    connect(targetPeerDescriptor) {
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
+        const existingConnection = this.connectingConnections.get(nodeId);
+        if (existingConnection) {
+            return existingConnection;
+        }
+        const socket = new NodeWebsocketClientConnection_1.WebsocketClientConnection();
+        const url = (0, exports.connectivityMethodToWebsocketUrl)(targetPeerDescriptor.websocket);
+        const pendingConnection = new PendingConnection_1.PendingConnection(targetPeerDescriptor);
+        (0, Handshaker_1.createOutgoingHandshaker)(this.localPeerDescriptor, pendingConnection, socket, targetPeerDescriptor);
+        this.connectingConnections.set(nodeId, pendingConnection);
+        const delFunc = () => {
+            if (this.connectingConnections.has(nodeId)) {
+                this.connectingConnections.delete(nodeId);
+            }
+            socket.off('disconnected', delFunc);
+            pendingConnection.off('disconnected', delFunc);
+            pendingConnection.off('connected', delFunc);
+        };
+        socket.on('disconnected', delFunc);
+        pendingConnection.on('disconnected', delFunc);
+        pendingConnection.on('connected', delFunc);
+        socket.connect(url, false);
+        return pendingConnection;
+    }
+    setLocalPeerDescriptor(peerDescriptor) {
+        this.localPeerDescriptor = peerDescriptor;
+    }
+    async destroy() {
+        this.abortController.abort();
+        const requests = Array.from(this.connectingConnections.values());
+        await Promise.allSettled(requests.map((conn) => conn.close(true)));
+        await this.websocketServer?.stop();
+        await this.geoIpLocator?.stop();
+    }
+}
+exports.WebsocketClientConnector = WebsocketClientConnector;
+//# sourceMappingURL=WebsocketClientConnector.js.map

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

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

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

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

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketClientConnectorRpcLocal = void 0;
+const identifiers_1 = require("../../identifiers");
+class WebsocketClientConnectorRpcLocal {
+    options;
+    constructor(options) {
+        this.options = options;
+    }
+    async requestConnection(_request, context) {
+        if (this.options.abortSignal.aborted) {
+            return {};
+        }
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        if (!this.options.hasConnection((0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor))) {
+            const connection = this.options.connect(senderPeerDescriptor);
+            this.options.onNewConnection(connection);
+        }
+        return {};
+    }
+}
+exports.WebsocketClientConnectorRpcLocal = WebsocketClientConnectorRpcLocal;
+//# sourceMappingURL=WebsocketClientConnectorRpcLocal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketClientConnectorRpcLocal.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketClientConnectorRpcLocal.ts"],"names":[],"mappings":";;;AAQA,mDAA+D;AAW/D,MAAa,gCAAgC;IAExB,OAAO,CAAyC;IAEjE,YAAY,OAAgD;QACxD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAoC,EAAE,OAA0B;QAC3F,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACnC,OAAO,EAAE,CAAA;QACb,CAAC;QACD,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC;YACjF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;YAC7D,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QAC5C,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAnBD,4EAmBC"}

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

@@ -0,0 +1,5 @@
+import { RpcRemote } from '../../dht/contact/RpcRemote';
+import { WebsocketClientConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+export declare class WebsocketClientConnectorRpcRemote extends RpcRemote<WebsocketClientConnectorRpcClient> {
+    requestConnection(): Promise<void>;
+}

package/dist/src/connection/websocket/{WebsocketConnectorRpcRemote.js → WebsocketClientConnectorRpcRemote.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsocketConnectorRpcRemote = void 0;
+exports.WebsocketClientConnectorRpcRemote = void 0;
 const utils_1 = require("@streamr/utils");
 const RpcRemote_1 = require("../../dht/contact/RpcRemote");
 const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
-class WebsocketConnectorRpcRemote extends RpcRemote_1.RpcRemote {
+class WebsocketClientConnectorRpcRemote extends RpcRemote_1.RpcRemote {
     async requestConnection() {
         logger.trace(`Requesting WebSocket connection from ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor())}`);
         const request = {};
@@ -13,5 +13,5 @@ class WebsocketConnectorRpcRemote extends RpcRemote_1.RpcRemote {
         return this.getClient().requestConnection(request, options);
     }
 }
-exports.WebsocketConnectorRpcRemote = WebsocketConnectorRpcRemote;
-//# sourceMappingURL=WebsocketConnectorRpcRemote.js.map
+exports.WebsocketClientConnectorRpcRemote = WebsocketClientConnectorRpcRemote;
+//# sourceMappingURL=WebsocketClientConnectorRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketClientConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketClientConnectorRpcRemote.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AACvC,2DAAuD;AAEvD,mDAA+D;AAE/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,iCAAkC,SAAQ,qBAA4C;IAE/F,KAAK,CAAC,iBAAiB;QACnB,MAAM,CAAC,KAAK,CAAC,wCAAwC,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAA+B,EAAE,CAAA;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AARD,8EAQC"}

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

@@ -1,18 +1,21 @@
 import EventEmitter from 'eventemitter3';
-import { ConnectionSourceEvents } from '../IConnectionSource';
 import { PortRange, TlsCertificate } from '../ConnectionManager';
-interface WebsocketServerConfig {
+import { IConnection } from '../IConnection';
+interface WebsocketServerOptions {
     portRange: PortRange;
     enableTls: boolean;
     tlsCertificate?: TlsCertificate;
     maxMessageSize?: number;
 }
-export declare class WebsocketServer extends EventEmitter<ConnectionSourceEvents> {
+interface Events {
+    connected: ((connection: IConnection) => void);
+}
+export declare class WebsocketServer extends EventEmitter<Events> {
     private httpServer?;
     private wsServer?;
     private readonly abortController;
-    private readonly config;
-    constructor(config: WebsocketServerConfig);
+    private readonly options;
+    constructor(options: WebsocketServerOptions);
     start(): Promise<number>;
     private startServer;
     updateCertificate(cert: string, key: string): void;