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

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

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

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

@@ -0,0 +1,38 @@
+import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { ITransport } from '../../transport/ITransport';
+import { ManagedConnection } from '../ManagedConnection';
+import { PortRange } from '../ConnectionManager';
+export declare const replaceInternalIpWithExternalIp: (candidate: string, ip: string) => string;
+export interface WebrtcConnectorConfig {
+    transport: ITransport;
+    iceServers?: IceServer[];
+    allowPrivateAddresses?: boolean;
+    bufferThresholdLow?: number;
+    bufferThresholdHigh?: number;
+    maxMessageSize?: number;
+    connectionTimeout?: number;
+    externalIp?: string;
+    portRange?: PortRange;
+}
+export interface IceServer {
+    url: string;
+    port: number;
+    username?: string;
+    password?: string;
+    tcp?: boolean;
+}
+export declare class WebrtcConnector {
+    private static readonly WEBRTC_CONNECTOR_SERVICE_ID;
+    private readonly rpcCommunicator;
+    private readonly ongoingConnectAttempts;
+    private localPeerDescriptor?;
+    private stopped;
+    private iceServers;
+    private config;
+    constructor(config: WebrtcConnectorConfig, onIncomingConnection: (connection: ManagedConnection) => boolean);
+    private registerLocalRpcMethods;
+    connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
+    setLocalPeerDescriptor(peerDescriptor: PeerDescriptor): void;
+    stop(): Promise<void>;
+    isOffering(targetPeerDescriptor: PeerDescriptor): boolean;
+}

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

@@ -0,0 +1,178 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebrtcConnector = exports.replaceInternalIpWithExternalIp = void 0;
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
+const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
+const NodeWebrtcConnection_1 = require("./NodeWebrtcConnection");
+const WebrtcConnectorRpcRemote_1 = require("./WebrtcConnectorRpcRemote");
+const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
+const ManagedWebrtcConnection_1 = require("../ManagedWebrtcConnection");
+const utils_1 = require("@streamr/utils");
+const Err = __importStar(require("../../helpers/errors"));
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const WebrtcConnectorRpcLocal_1 = require("./WebrtcConnectorRpcLocal");
+const logger = new utils_1.Logger(module);
+const replaceInternalIpWithExternalIp = (candidate, ip) => {
+    const parsed = candidate.split(' ');
+    const type = parsed[7];
+    if (type === 'host') {
+        parsed[4] = ip;
+    }
+    return parsed.join(' ');
+};
+exports.replaceInternalIpWithExternalIp = replaceInternalIpWithExternalIp;
+class WebrtcConnector {
+    constructor(config, onIncomingConnection) {
+        this.ongoingConnectAttempts = new Map();
+        this.stopped = false;
+        this.config = config;
+        this.iceServers = config.iceServers ?? [];
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebrtcConnector.WEBRTC_CONNECTOR_SERVICE_ID, config.transport, {
+            rpcRequestTimeout: 15000
+        });
+        this.registerLocalRpcMethods(config, onIncomingConnection);
+    }
+    registerLocalRpcMethods(config, onIncomingConnection) {
+        const localRpc = new WebrtcConnectorRpcLocal_1.WebrtcConnectorRpcLocal({
+            connect: (targetPeerDescriptor) => this.connect(targetPeerDescriptor),
+            onIncomingConnection,
+            ongoingConnectAttempts: this.ongoingConnectAttempts,
+            rpcCommunicator: this.rpcCommunicator,
+            getLocalPeerDescriptor: () => this.localPeerDescriptor,
+            allowPrivateAddresses: config.allowPrivateAddresses ?? true
+        });
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebrtcConnectionRequest, 'requestConnection', async (_req, context) => {
+            if (!this.stopped) {
+                return localRpc.requestConnection(context);
+            }
+            else {
+                return {};
+            }
+        });
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcOffer, 'rtcOffer', async (req, context) => {
+            if (!this.stopped) {
+                return localRpc.rtcOffer(req, context);
+            }
+            else {
+                return {};
+            }
+        });
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcAnswer, 'rtcAnswer', async (req, context) => {
+            if (!this.stopped) {
+                return localRpc.rtcAnswer(req, context);
+            }
+            else {
+                return {};
+            }
+        });
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.IceCandidate, 'iceCandidate', async (req, context) => {
+            if (!this.stopped) {
+                return localRpc.iceCandidate(req, context);
+            }
+            else {
+                return {};
+            }
+        });
+    }
+    connect(targetPeerDescriptor) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.localPeerDescriptor)) {
+            throw new Err.CannotConnectToSelf('Cannot open WebRTC Connection to self');
+        }
+        logger.trace(`Opening WebRTC connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)}`);
+        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
+        const existingConnection = this.ongoingConnectAttempts.get(peerKey);
+        if (existingConnection) {
+            return existingConnection;
+        }
+        const connection = new NodeWebrtcConnection_1.NodeWebrtcConnection({
+            remotePeerDescriptor: targetPeerDescriptor,
+            iceServers: this.iceServers,
+            bufferThresholdLow: this.config.bufferThresholdLow,
+            bufferThresholdHigh: this.config.bufferThresholdHigh,
+            connectingTimeout: this.config.connectionTimeout,
+            portRange: this.config.portRange
+        });
+        const offering = this.isOffering(targetPeerDescriptor);
+        let managedConnection;
+        if (offering) {
+            managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.localPeerDescriptor, connection);
+        }
+        else {
+            managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.localPeerDescriptor, undefined, connection);
+        }
+        managedConnection.setPeerDescriptor(targetPeerDescriptor);
+        this.ongoingConnectAttempts.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
+        const delFunc = () => {
+            this.ongoingConnectAttempts.delete(peerKey);
+            connection.off('disconnected', delFunc);
+            managedConnection.off('handshakeCompleted', delFunc);
+        };
+        connection.on('disconnected', delFunc);
+        managedConnection.on('handshakeCompleted', delFunc);
+        const remoteConnector = new WebrtcConnectorRpcRemote_1.WebrtcConnectorRpcRemote(this.localPeerDescriptor, targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebrtcConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+        connection.on('localCandidate', (candidate, mid) => {
+            if (this.config.externalIp) {
+                candidate = (0, exports.replaceInternalIpWithExternalIp)(candidate, this.config.externalIp);
+                logger.debug(`onLocalCandidate injected external ip ${candidate} ${mid}`);
+            }
+            remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
+        });
+        if (offering) {
+            connection.once('localDescription', (description) => {
+                remoteConnector.sendRtcOffer(description, connection.connectionId.toString());
+            });
+        }
+        else {
+            connection.once('localDescription', (description) => {
+                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
+            });
+        }
+        connection.start(offering);
+        if (!offering) {
+            remoteConnector.requestConnection();
+        }
+        return managedConnection;
+    }
+    setLocalPeerDescriptor(peerDescriptor) {
+        this.localPeerDescriptor = peerDescriptor;
+    }
+    async stop() {
+        logger.trace('stop()');
+        this.stopped = true;
+        const attempts = Array.from(this.ongoingConnectAttempts.values());
+        await Promise.allSettled(attempts.map((conn) => conn.close(false)));
+        this.rpcCommunicator.destroy();
+    }
+    isOffering(targetPeerDescriptor) {
+        const myId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor);
+        const theirId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(targetPeerDescriptor);
+        return myId.hasSmallerHashThan(theirId);
+    }
+}
+exports.WebrtcConnector = WebrtcConnector;
+WebrtcConnector.WEBRTC_CONNECTOR_SERVICE_ID = 'system/webrtc-connector';
+//# sourceMappingURL=WebrtcConnector.js.map

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

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

@@ -0,0 +1,26 @@
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { PeerIDKey } from '../../helpers/PeerID';
+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';
+interface WebrtcConnectorRpcLocalConfig {
+    connect: (targetPeerDescriptor: PeerDescriptor) => ManagedConnection;
+    onIncomingConnection: (connection: ManagedConnection) => boolean;
+    ongoingConnectAttempts: Map<PeerIDKey, ManagedWebrtcConnection>;
+    rpcCommunicator: ListeningRpcCommunicator;
+    getLocalPeerDescriptor: () => PeerDescriptor;
+    allowPrivateAddresses: boolean;
+}
+export declare class WebrtcConnectorRpcLocal implements IWebrtcConnectorRpc {
+    private readonly config;
+    constructor(config: WebrtcConnectorRpcLocalConfig);
+    requestConnection(context: ServerCallContext): Promise<Empty>;
+    rtcOffer(request: RtcOffer, context: ServerCallContext): Promise<Empty>;
+    rtcAnswer(request: RtcAnswer, context: ServerCallContext): Promise<Empty>;
+    iceCandidate(request: IceCandidate, context: ServerCallContext): Promise<Empty>;
+    private isIceCandidateAllowed;
+}
+export {};

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

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebrtcConnectorRpcLocal = void 0;
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const utils_1 = require("@streamr/utils");
+const AddressTools_1 = require("../../helpers/AddressTools");
+const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
+const ManagedWebrtcConnection_1 = require("../ManagedWebrtcConnection");
+const NodeWebrtcConnection_1 = require("./NodeWebrtcConnection");
+const WebrtcConnectorRpcRemote_1 = require("./WebrtcConnectorRpcRemote");
+const logger = new utils_1.Logger(module);
+class WebrtcConnectorRpcLocal {
+    constructor(config) {
+        this.config = config;
+    }
+    async requestConnection(context) {
+        const targetPeerDescriptor = context.incomingSourceDescriptor;
+        if (this.config.ongoingConnectAttempts.has((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor))) {
+            return {};
+        }
+        const managedConnection = this.config.connect(targetPeerDescriptor);
+        managedConnection.setPeerDescriptor(targetPeerDescriptor);
+        this.config.onIncomingConnection(managedConnection);
+        return {};
+    }
+    async rtcOffer(request, context) {
+        const remotePeer = context.incomingSourceDescriptor;
+        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeer);
+        let managedConnection = this.config.ongoingConnectAttempts.get(peerKey);
+        let connection = managedConnection?.getWebrtcConnection();
+        if (!managedConnection) {
+            connection = new NodeWebrtcConnection_1.NodeWebrtcConnection({ remotePeerDescriptor: remotePeer });
+            managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.config.getLocalPeerDescriptor(), undefined, connection);
+            managedConnection.setPeerDescriptor(remotePeer);
+            this.config.ongoingConnectAttempts.set(peerKey, managedConnection);
+            this.config.onIncomingConnection(managedConnection);
+            const remoteConnector = new WebrtcConnectorRpcRemote_1.WebrtcConnectorRpcRemote(this.config.getLocalPeerDescriptor(), remotePeer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebrtcConnectorRpcClient(this.config.rpcCommunicator.getRpcClientTransport())));
+            connection.on('localCandidate', (candidate, mid) => {
+                remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
+            });
+            connection.once('localDescription', (description) => {
+                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
+            });
+            connection.start(false);
+        }
+        // Always use offerers connectionId
+        connection.setConnectionId(request.connectionId);
+        connection.setRemoteDescription(request.description, 'offer');
+        managedConnection.on('handshakeRequest', () => {
+            if (this.config.ongoingConnectAttempts.has(peerKey)) {
+                this.config.ongoingConnectAttempts.delete(peerKey);
+            }
+            managedConnection.acceptHandshake();
+        });
+        return {};
+    }
+    async rtcAnswer(request, context) {
+        const remotePeerDescriptor = context.incomingSourceDescriptor;
+        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
+        const connection = this.config.ongoingConnectAttempts.get(peerKey)?.getWebrtcConnection();
+        if (!connection) {
+            return {};
+        }
+        else if (connection.connectionId.toString() !== request.connectionId) {
+            logger.trace(`Ignoring RTC answer due to connectionId mismatch`);
+            return {};
+        }
+        connection.setRemoteDescription(request.description, 'answer');
+        return {};
+    }
+    async iceCandidate(request, context) {
+        const remotePeerDescriptor = context.incomingSourceDescriptor;
+        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
+        const connection = this.config.ongoingConnectAttempts.get(peerKey)?.getWebrtcConnection();
+        if (!connection) {
+            return {};
+        }
+        else if (connection.connectionId.toString() !== request.connectionId) {
+            logger.trace(`Ignoring remote candidate due to connectionId mismatch`);
+            return {};
+        }
+        else if (this.isIceCandidateAllowed(request.candidate)) {
+            connection.addRemoteCandidate(request.candidate, request.mid);
+        }
+        return {};
+    }
+    isIceCandidateAllowed(candidate) {
+        if (!this.config.allowPrivateAddresses) {
+            const address = (0, AddressTools_1.getAddressFromIceCandidate)(candidate);
+            if (address && (0, AddressTools_1.isPrivateIPv4)(address)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+exports.WebrtcConnectorRpcLocal = WebrtcConnectorRpcLocal;
+//# sourceMappingURL=WebrtcConnectorRpcLocal.js.map

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

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

package/dist/src/connection/{WebRTC/WebRtcConnectorRpcRemote.d.ts → webrtc/WebrtcConnectorRpcRemote.d.ts}

@@ -1,10 +1,10 @@
 import { Remote } from '../../dht/contact/Remote';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { IWebRtcConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+import { IWebrtcConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
 import { ProtoRpcClient } from '@streamr/proto-rpc';
-export declare class WebRtcConnectorRpcRemote extends Remote<IWebRtcConnectorRpcClient> {
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebRtcConnectorRpcClient>);
-    requestConnection(connectionId: string): void;
+export declare class WebrtcConnectorRpcRemote extends Remote<IWebrtcConnectorRpcClient> {
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebrtcConnectorRpcClient>);
+    requestConnection(): void;
     sendRtcOffer(description: string, connectionId: string): void;
     sendRtcAnswer(description: string, connectionId: string): void;
     sendIceCandidate(candidate: string, mid: string, connectionId: string): void;

package/dist/src/connection/{WebRTC/WebRtcConnectorRpcRemote.js → webrtc/WebrtcConnectorRpcRemote.js}

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebRtcConnectorRpcRemote = void 0;
+exports.WebrtcConnectorRpcRemote = void 0;
 const Remote_1 = require("../../dht/contact/Remote");
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-class WebRtcConnectorRpcRemote extends Remote_1.Remote {
+class WebrtcConnectorRpcRemote extends Remote_1.Remote {
     constructor(localPeerDescriptor, remotePeerDescriptor, client) {
         super(localPeerDescriptor, remotePeerDescriptor, 'DUMMY', client);
     }
-    requestConnection(connectionId) {
-        const request = {
-            connectionId
-        };
+    requestConnection() {
+        const request = {};
         const options = this.formDhtRpcOptions({
             notification: true
         });
@@ -51,5 +49,5 @@ class WebRtcConnectorRpcRemote extends Remote_1.Remote {
         });
     }
 }
-exports.WebRtcConnectorRpcRemote = WebRtcConnectorRpcRemote;
-//# sourceMappingURL=WebRtcConnectorRpcRemote.js.map
+exports.WebrtcConnectorRpcRemote = WebrtcConnectorRpcRemote;
+//# sourceMappingURL=WebrtcConnectorRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebrtcConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/WebrtcConnectorRpcRemote.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AAUjD,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,wBAAyB,SAAQ,eAAiC;IAE3E,YACI,mBAAmC,EACnC,oBAAoC,EACpC,MAAiD;QAEjD,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACrE,CAAC;IAED,iBAAiB;QACb,MAAM,OAAO,GAA4B,EACxC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC9D,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACN,CAAC;IAED,YAAY,CAAC,WAAmB,EAAE,YAAoB;QAClD,MAAM,OAAO,GAAa;YACtB,YAAY;YACZ,WAAW;SACd,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACrD,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,aAAa,CAAC,WAAmB,EAAE,YAAoB;QACnD,MAAM,OAAO,GAAc;YACvB,YAAY;YACZ,WAAW;SACd,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACtD,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,gBAAgB,CAAC,SAAiB,EAAE,GAAW,EAAE,YAAoB;QACjE,MAAM,OAAO,GAAiB;YAC1B,YAAY;YACZ,GAAG;YACH,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACzD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAtDD,4DAsDC"}

package/dist/src/connection/{WebRTC → webrtc}/iceServerAsString.d.ts

@@ -1,2 +1,2 @@
-import { IceServer } from './WebRtcConnectorRpcLocal';
+import { IceServer } from './WebrtcConnector';
 export declare function iceServerAsString({ url, port, username, password, tcp }: IceServer): string;

package/dist/src/connection/{WebRTC → webrtc}/iceServerAsString.js.map

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

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

@@ -0,0 +1,26 @@
+import { CertifiedSubdomain } from '@streamr/autocertifier-client';
+import { ITransport } from '../../transport/ITransport';
+export interface IAutoCertifierClient {
+    start(): Promise<void>;
+    stop(): void;
+    on(eventName: string, cb: (subdomain: CertifiedSubdomain) => void): void;
+}
+interface AutoCertifierClientFacadeConfig {
+    url: string;
+    configFile: string;
+    transport: ITransport;
+    wsServerPort: number;
+    setHost: (host: string) => void;
+    updateCertificate: (certificate: string, privateKey: string) => void;
+    createClientFactory?: () => IAutoCertifierClient;
+}
+export declare class AutoCertifierClientFacade {
+    private autoCertifierClient;
+    private readonly rpcCommunicator;
+    private readonly setHost;
+    private readonly updateCertificate;
+    constructor(config: AutoCertifierClientFacadeConfig);
+    start(): Promise<void>;
+    stop(): void;
+}
+export {};

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AutoCertifierClientFacade = void 0;
+const autocertifier_client_1 = require("@streamr/autocertifier-client");
+const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
+const utils_1 = require("@streamr/utils");
+const START_TIMEOUT = 60 * 1000;
+const defaultAutoCertifierClientFactory = (configFile, autoCertifierUrl, autoCertifierRpcCommunicator, wsServerPort) => new autocertifier_client_1.AutoCertifierClient(configFile, wsServerPort, autoCertifierUrl, (_serviceId, rpcMethodName, method) => {
+    autoCertifierRpcCommunicator.registerRpcMethod(autocertifier_client_1.HasSessionRequest, autocertifier_client_1.HasSessionResponse, rpcMethodName, method);
+});
+const logger = new utils_1.Logger(module);
+class AutoCertifierClientFacade {
+    constructor(config) {
+        this.setHost = config.setHost;
+        this.updateCertificate = config.updateCertificate;
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(autocertifier_client_1.SERVICE_ID, config.transport);
+        this.autoCertifierClient = config.createClientFactory ? config.createClientFactory()
+            : defaultAutoCertifierClientFactory(config.configFile, config.url, this.rpcCommunicator, config.wsServerPort);
+    }
+    async start() {
+        this.autoCertifierClient.on('updatedCertificate', (subdomain) => {
+            this.setHost(subdomain.fqdn);
+            this.updateCertificate(subdomain.certificate, subdomain.privateKey);
+            logger.trace(`Updated certificate`);
+        });
+        await Promise.all([
+            (0, utils_1.waitForEvent3)(this.autoCertifierClient, 'updatedCertificate', START_TIMEOUT),
+            this.autoCertifierClient.start()
+        ]);
+    }
+    stop() {
+        this.autoCertifierClient.stop();
+        this.rpcCommunicator.destroy();
+    }
+}
+exports.AutoCertifierClientFacade = AutoCertifierClientFacade;
+//# sourceMappingURL=AutoCertifierClientFacade.js.map

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

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

package/dist/src/connection/{WebSocket/ClientWebSocket.d.ts → websocket/ClientWebsocket.d.ts}

@@ -1,15 +1,16 @@
-import { IConnection, ConnectionID, ConnectionType, ConnectionEvents } from '../IConnection';
 import EventEmitter from 'eventemitter3';
-export declare class ClientWebSocket extends EventEmitter<ConnectionEvents> implements IConnection {
+import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from '../IConnection';
+export declare const GOING_AWAY = 1001;
+export declare class ClientWebsocket extends EventEmitter<ConnectionEvents> implements IConnection {
     readonly connectionId: ConnectionID;
     private socket?;
     connectionType: ConnectionType;
     private destroyed;
     constructor();
-    connect(address: string): void;
+    connect(address: string, selfSigned?: boolean): void;
     private doDisconnect;
     send(data: Uint8Array): void;
-    close(): Promise<void>;
+    close(gracefulLeave: boolean): Promise<void>;
     private stopListening;
     destroy(): void;
 }

package/dist/src/connection/{WebSocket/ClientWebSocket.js → websocket/ClientWebsocket.js}

@@ -3,27 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientWebSocket = void 0;
-const IConnection_1 = require("../IConnection");
-const websocket_1 = require("websocket");
-const eventemitter3_1 = __importDefault(require("eventemitter3"));
+exports.ClientWebsocket = exports.GOING_AWAY = void 0;
 const utils_1 = require("@streamr/utils");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const websocket_1 = require("websocket");
+const IConnection_1 = require("../IConnection");
 const logger = new utils_1.Logger(module);
+// https://kapeli.com/cheat_sheets/WebSocket_Status_Codes.docset/Contents/Resources/Documents/index
+// Browsers send this automatically when closing a tab
+exports.GOING_AWAY = 1001;
 const BINARY_TYPE = 'arraybuffer';
-class ClientWebSocket extends eventemitter3_1.default {
+class ClientWebsocket extends eventemitter3_1.default {
     constructor() {
         super();
         this.connectionType = IConnection_1.ConnectionType.WEBSOCKET_CLIENT;
         this.destroyed = false;
         this.connectionId = new IConnection_1.ConnectionID();
     }
-    connect(address) {
+    connect(address, selfSigned) {
         if (!this.destroyed) {
-            this.socket = new websocket_1.w3cwebsocket(address);
+            this.socket = new websocket_1.w3cwebsocket(address, undefined, undefined, undefined, { rejectUnauthorized: !selfSigned });
             this.socket.binaryType = BINARY_TYPE;
             this.socket.onerror = (error) => {
                 if (!this.destroyed) {
-                    logger.trace('WebSocket Client error: ' + error);
+                    logger.trace('WebSocket Client error: ' + error?.message, { error });
                     this.emit('error', error.name);
                 }
             };
@@ -38,7 +41,7 @@ class ClientWebSocket extends eventemitter3_1.default {
             this.socket.onclose = (event) => {
                 if (!this.destroyed) {
                     logger.trace('Websocket Closed');
-                    this.doDisconnect('OTHER', event.code, event.reason);
+                    this.doDisconnect(event.code, event.reason);
                 }
             };
             this.socket.onmessage = (message) => {
@@ -56,11 +59,12 @@ class ClientWebSocket extends eventemitter3_1.default {
             logger.debug('Tried to connect() a stopped connection');
         }
     }
-    doDisconnect(disconnectionType, code, reason) {
+    doDisconnect(code, reason) {
         this.destroyed = true;
         this.stopListening();
         this.socket = undefined;
-        this.emit('disconnected', disconnectionType, code, reason);
+        const gracefulLeave = code === exports.GOING_AWAY;
+        this.emit('disconnected', gracefulLeave, code, reason);
         this.removeAllListeners();
     }
     send(data) {
@@ -70,17 +74,17 @@ class ClientWebSocket extends eventemitter3_1.default {
                 this.socket?.send(data.buffer);
             }
             else {
-                logger.warn('Tried to send data on a non-open connection');
+                logger.debug('Tried to send data on a non-open connection');
             }
         }
         else {
             logger.debug('Tried to send() on stopped connection');
         }
     }
-    async close() {
+    async close(gracefulLeave) {
         if (!this.destroyed) {
             logger.trace(`Closing socket for connection ${this.connectionId.toString()}`);
-            this.socket?.close();
+            this.socket?.close(gracefulLeave === true ? exports.GOING_AWAY : undefined);
         }
         else {
             logger.debug('Tried to close() a stopped connection');
@@ -109,5 +113,5 @@ class ClientWebSocket extends eventemitter3_1.default {
         }
     }
 }
-exports.ClientWebSocket = ClientWebSocket;
-//# sourceMappingURL=ClientWebSocket.js.map
+exports.ClientWebsocket = ClientWebsocket;
+//# sourceMappingURL=ClientWebsocket.js.map