@streamr/dht 0.0.1-tatum.6 → 0.0.1-tatum.8

package/dist/src/connection/WebRTC/NodeWebRtcConnection.d.ts

@@ -3,7 +3,7 @@ import { ConnectionType, IConnection, ConnectionID, ConnectionEvents } from '../
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import EventEmitter from 'eventemitter3';
 import { DisconnectionType } from '../../transport/ITransport';
-import { IceServer } from './WebRtcConnector';
+import { IceServer } from './WebRtcConnectorRpcLocal';
 import { PortRange } from '../ConnectionManager';
 export declare const WEB_RTC_CLEANUP: {
     cleanUp(): void;
@@ -13,6 +13,7 @@ export interface Params {
     bufferThresholdHigh?: number;
     bufferThresholdLow?: number;
     connectingTimeout?: number;
+    maxMessageSize?: number;
     iceServers?: IceServer[];
     portRange?: PortRange;
 }
@@ -31,6 +32,7 @@ export declare class NodeWebRtcConnection extends EventEmitter<Events> implement
     private readonly connectingTimeout;
     private readonly remotePeerDescriptor;
     private readonly portRange?;
+    private readonly maxMessageSize?;
     private closed;
     constructor(params: Params);
     start(isOffering: boolean): void;

package/dist/src/connection/WebRTC/NodeWebRtcConnection.js

@@ -35,7 +35,6 @@ const errors_1 = require("../../helpers/errors");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const iceServerAsString_1 = require("./iceServerAsString");
 const logger = new utils_1.Logger(module);
-const MAX_MESSAGE_SIZE = 1048576;
 exports.WEB_RTC_CLEANUP = new class {
     // eslint-disable-next-line class-methods-use-this
     cleanUp() {
@@ -62,21 +61,22 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
         this.connectionType = IConnection_1.ConnectionType.WEBRTC;
         this.closed = false;
         this.connectionId = new IConnection_1.ConnectionID();
-        this.iceServers = params.iceServers || [];
+        this.iceServers = params.iceServers ?? [];
         // eslint-disable-next-line no-underscore-dangle
-        this._bufferThresholdHigh = params.bufferThresholdHigh || 2 ** 17;
-        this.bufferThresholdLow = params.bufferThresholdLow || 2 ** 15;
-        this.connectingTimeout = params.connectingTimeout || 20000;
+        this._bufferThresholdHigh = params.bufferThresholdHigh ?? 2 ** 17;
+        this.bufferThresholdLow = params.bufferThresholdLow ?? 2 ** 15;
+        this.connectingTimeout = params.connectingTimeout ?? 20000;
         this.remotePeerDescriptor = params.remotePeerDescriptor;
+        this.maxMessageSize = params.maxMessageSize ?? 1048576;
         this.portRange = params.portRange;
     }
     start(isOffering) {
-        logger.trace(`Staring new connection for peer: ${this.remotePeerDescriptor.kademliaId.toString()}`);
-        const hexId = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor);
-        logger.trace(`Staring new connection for peer: ${hexId} offering: ${isOffering}`);
-        this.connection = new node_datachannel_1.PeerConnection(hexId, {
+        logger.trace(`Staring new connection for peer: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+        const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor);
+        logger.trace(`Staring new connection for peer: ${peerIdKey} offering: ${isOffering}`);
+        this.connection = new node_datachannel_1.PeerConnection(peerIdKey, {
             iceServers: this.iceServers.map(iceServerAsString_1.iceServerAsString),
-            maxMessageSize: MAX_MESSAGE_SIZE,
+            maxMessageSize: this.maxMessageSize,
             portRangeBegin: this.portRange?.min,
             portRangeEnd: this.portRange?.max,
         });
@@ -85,7 +85,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
             this.doClose('OTHER');
         }, this.connectingTimeout);
         this.connection.onStateChange((state) => this.onStateChange(state));
-        this.connection.onGatheringStateChange((_state) => { });
+        this.connection.onGatheringStateChange(() => { });
         this.connection.onLocalDescription((description, type) => {
             this.emit('localDescription', description, type.toString());
         });
@@ -209,7 +209,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
             clearTimeout(this.connectingTimeoutRef);
         }
         this.dataChannel = dataChannel;
-        logger.trace(`DataChannel opened for peer ${this.remotePeerDescriptor.kademliaId.toString()}`);
+        logger.trace(`DataChannel opened for peer ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
         this.emit('connected');
     }
     onStateChange(state) {

package/dist/src/connection/WebRTC/NodeWebRtcConnection.js.map

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

@@ -1,18 +1,18 @@
 import { IceCandidate, PeerDescriptor, RtcAnswer, RtcOffer, WebRtcConnectionRequest } from '../../proto/packages/dht/protos/DhtRpc';
 import { Empty } from '../../proto/google/protobuf/empty';
 import { ITransport } from '../../transport/ITransport';
-import { IWebRtcConnectorService } from '../../proto/packages/dht/protos/DhtRpc.server';
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { IWebRtcConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import { ManagedConnection } from '../ManagedConnection';
 import { PortRange } from '../ConnectionManager';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 export declare const replaceInternalIpWithExternalIp: (candidate: string, ip: string) => string;
-export interface WebRtcConnectorConfig {
-    rpcTransport: ITransport;
-    protocolVersion: string;
+export interface WebRtcConnectorRpcLocalConfig {
+    transport: ITransport;
     iceServers?: IceServer[];
     allowPrivateAddresses?: boolean;
     bufferThresholdLow?: number;
     bufferThresholdHigh?: number;
+    maxMessageSize?: number;
     connectionTimeout?: number;
     externalIp?: string;
     portRange?: PortRange;
@@ -24,7 +24,7 @@ export interface IceServer {
     password?: string;
     tcp?: boolean;
 }
-export declare class WebRtcConnector implements IWebRtcConnectorService {
+export declare class WebRtcConnectorRpcLocal implements IWebRtcConnectorRpc {
     private static readonly WEBRTC_CONNECTOR_SERVICE_ID;
     private readonly rpcCommunicator;
     private readonly ongoingConnectAttempts;
@@ -33,19 +33,19 @@ export declare class WebRtcConnector implements IWebRtcConnectorService {
     private iceServers;
     private allowPrivateAddresses;
     private config;
-    private incomingConnectionCallback;
-    constructor(config: WebRtcConnectorConfig, incomingConnectionCallback: (connection: ManagedConnection) => boolean);
+    private onIncomingConnection;
+    constructor(config: WebRtcConnectorRpcLocalConfig, onIncomingConnection: (connection: ManagedConnection) => boolean);
     connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
     setOwnPeerDescriptor(peerDescriptor: PeerDescriptor): void;
-    isIceCandidateAllowed(candidate: string): boolean;
+    private isIceCandidateAllowed;
     private onRtcOffer;
     private onRtcAnswer;
     private onConnectionRequest;
     private onRemoteCandidate;
     stop(): Promise<void>;
     isOffering(targetPeerDescriptor: PeerDescriptor): boolean;
-    requestConnection(request: WebRtcConnectionRequest, _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>;
+    requestConnection(_request: WebRtcConnectionRequest, 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>;
 }

package/dist/src/connection/WebRTC/{WebRtcConnector.js → WebRtcConnectorRpcLocal.js}

@@ -23,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebRtcConnector = exports.replaceInternalIpWithExternalIp = void 0;
+exports.WebRtcConnectorRpcLocal = 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 RemoteWebrtcConnector_1 = require("./RemoteWebrtcConnector");
+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");
@@ -45,15 +45,15 @@ const replaceInternalIpWithExternalIp = (candidate, ip) => {
     return parsed.join(' ');
 };
 exports.replaceInternalIpWithExternalIp = replaceInternalIpWithExternalIp;
-class WebRtcConnector {
-    constructor(config, incomingConnectionCallback) {
+class WebRtcConnectorRpcLocal {
+    constructor(config, onIncomingConnection) {
         this.ongoingConnectAttempts = new Map();
         this.stopped = false;
         this.config = config;
         this.iceServers = config.iceServers || [];
         this.allowPrivateAddresses = config.allowPrivateAddresses || true;
-        this.incomingConnectionCallback = incomingConnectionCallback;
-        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebRtcConnector.WEBRTC_CONNECTOR_SERVICE_ID, config.rpcTransport, {
+        this.onIncomingConnection = onIncomingConnection;
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebRtcConnectorRpcLocal.WEBRTC_CONNECTOR_SERVICE_ID, config.transport, {
             rpcRequestTimeout: 15000
         });
         this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcOffer, 'rtcOffer', (req, context) => this.rtcOffer(req, context));
@@ -62,10 +62,10 @@ class WebRtcConnector {
         this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebRtcConnectionRequest, 'requestConnection', (req, context) => this.requestConnection(req, context));
     }
     connect(targetPeerDescriptor) {
-        if ((0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(targetPeerDescriptor, this.ownPeerDescriptor)) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
             throw new Err.CannotConnectToSelf('Cannot open WebRTC Connection to self');
         }
-        logger.trace(`Opening WebRTC connection to ${targetPeerDescriptor.kademliaId.toString()}`);
+        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) {
@@ -82,10 +82,10 @@ class WebRtcConnector {
         const offering = this.isOffering(targetPeerDescriptor);
         let managedConnection;
         if (offering) {
-            managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, this.config.protocolVersion, connection);
+            managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, connection);
         }
         else {
-            managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, this.config.protocolVersion, undefined, connection);
+            managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, undefined, connection);
         }
         managedConnection.setPeerDescriptor(targetPeerDescriptor);
         this.ongoingConnectAttempts.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
@@ -98,27 +98,27 @@ class WebRtcConnector {
         };
         connection.on('disconnected', delFunc);
         managedConnection.on('handshakeCompleted', delFunc);
-        const remoteConnector = new RemoteWebrtcConnector_1.RemoteWebrtcConnector(targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorServiceClient(this.rpcCommunicator.getRpcClientTransport())));
+        const remoteConnector = new WebRtcConnectorRpcRemote_1.WebRtcConnectorRpcRemote(this.ownPeerDescriptor, 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(this.ownPeerDescriptor, candidate, mid, connection.connectionId.toString());
+            remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
         });
         if (offering) {
-            connection.once('localDescription', (description, _type) => {
-                remoteConnector.sendRtcOffer(this.ownPeerDescriptor, description, connection.connectionId.toString());
+            connection.once('localDescription', (description) => {
+                remoteConnector.sendRtcOffer(description, connection.connectionId.toString());
             });
         }
         else {
-            connection.once('localDescription', (description, _type) => {
-                remoteConnector.sendRtcAnswer(this.ownPeerDescriptor, description, connection.connectionId.toString());
+            connection.once('localDescription', (description) => {
+                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
             });
         }
         connection.start(offering);
         if (!offering) {
-            remoteConnector.requestConnection(this.ownPeerDescriptor, connection.connectionId.toString());
+            remoteConnector.requestConnection(connection.connectionId.toString());
         }
         return managedConnection;
     }
@@ -135,7 +135,7 @@ class WebRtcConnector {
         return true;
     }
     onRtcOffer(remotePeer, targetPeer, description, connectionId) {
-        if (this.stopped || !(0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(targetPeer, this.ownPeerDescriptor)) {
+        if (this.stopped || !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeer, this.ownPeerDescriptor)) {
             return;
         }
         const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeer);
@@ -143,16 +143,16 @@ class WebRtcConnector {
         let connection = managedConnection?.getWebRtcConnection();
         if (!managedConnection) {
             connection = new NodeWebRtcConnection_1.NodeWebRtcConnection({ remotePeerDescriptor: remotePeer });
-            managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, this.config.protocolVersion, undefined, connection);
+            managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, undefined, connection);
             managedConnection.setPeerDescriptor(remotePeer);
             this.ongoingConnectAttempts.set(peerKey, managedConnection);
-            this.incomingConnectionCallback(managedConnection);
-            const remoteConnector = new RemoteWebrtcConnector_1.RemoteWebrtcConnector(remotePeer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorServiceClient(this.rpcCommunicator.getRpcClientTransport())));
+            this.onIncomingConnection(managedConnection);
+            const remoteConnector = new WebRtcConnectorRpcRemote_1.WebRtcConnectorRpcRemote(this.ownPeerDescriptor, remotePeer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
             connection.on('localCandidate', (candidate, mid) => {
-                remoteConnector.sendIceCandidate(this.ownPeerDescriptor, candidate, mid, connection.connectionId.toString());
+                remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
             });
-            connection.once('localDescription', (description, _type) => {
-                remoteConnector.sendRtcAnswer(this.ownPeerDescriptor, description, connection.connectionId.toString());
+            connection.once('localDescription', (description) => {
+                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
             });
             connection.start(false);
         }
@@ -167,7 +167,7 @@ class WebRtcConnector {
         });
     }
     onRtcAnswer(remotePeerDescriptor, targetPeerDescriptor, description, connectionId) {
-        if (this.stopped || !(0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(targetPeerDescriptor, this.ownPeerDescriptor)) {
+        if (this.stopped || !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
             return;
         }
         const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
@@ -187,10 +187,10 @@ class WebRtcConnector {
         }
         const managedConnection = this.connect(targetPeerDescriptor);
         managedConnection.setPeerDescriptor(targetPeerDescriptor);
-        this.incomingConnectionCallback(managedConnection);
+        this.onIncomingConnection(managedConnection);
     }
     onRemoteCandidate(remotePeerDescriptor, targetPeerDescriptor, candidate, mid, connectionId) {
-        if (this.stopped || !(0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(targetPeerDescriptor, this.ownPeerDescriptor)) {
+        if (this.stopped || !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
             return;
         }
         const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
@@ -219,23 +219,31 @@ class WebRtcConnector {
         return myId.hasSmallerHashThan(theirId);
     }
     // IWebRTCConnector implementation
-    async requestConnection(request, _context) {
-        this.onConnectionRequest(request.requester);
+    // TODO should we read connectionId from WebRtcConnectionRequest (or remove the field)?
+    async requestConnection(_request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        this.onConnectionRequest(senderPeerDescriptor);
         return {};
     }
-    async rtcOffer(request, _context) {
-        this.onRtcOffer(request.requester, request.target, request.description, request.connectionId);
+    async rtcOffer(request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const receiverPeerDescriptor = context.incomingTargetDescriptor;
+        this.onRtcOffer(senderPeerDescriptor, receiverPeerDescriptor, request.description, request.connectionId);
         return {};
     }
-    async rtcAnswer(request, _context) {
-        this.onRtcAnswer(request.requester, request.target, request.description, request.connectionId);
+    async rtcAnswer(request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const receiverPeerDescriptor = context.incomingTargetDescriptor;
+        this.onRtcAnswer(senderPeerDescriptor, receiverPeerDescriptor, request.description, request.connectionId);
         return {};
     }
-    async iceCandidate(request, _context) {
-        this.onRemoteCandidate(request.requester, request.target, request.candidate, request.mid, request.connectionId);
+    async iceCandidate(request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const receiverPeerDescriptor = context.incomingTargetDescriptor;
+        this.onRemoteCandidate(senderPeerDescriptor, receiverPeerDescriptor, request.candidate, request.mid, request.connectionId);
         return {};
     }
 }
-exports.WebRtcConnector = WebRtcConnector;
-WebRtcConnector.WEBRTC_CONNECTOR_SERVICE_ID = 'system/webrtc_connector';
-//# sourceMappingURL=WebRtcConnector.js.map
+exports.WebRtcConnectorRpcLocal = WebRtcConnectorRpcLocal;
+WebRtcConnectorRpcLocal.WEBRTC_CONNECTOR_SERVICE_ID = 'system/webrtc-connector';
+//# 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

@@ -0,0 +1,11 @@
+import { Remote } from '../../dht/contact/Remote';
+import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+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;
+    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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 {
+    constructor(localPeerDescriptor, remotePeerDescriptor, client) {
+        super(localPeerDescriptor, remotePeerDescriptor, 'DUMMY', client);
+    }
+    requestConnection(connectionId) {
+        const request = {
+            connectionId
+        };
+        const options = this.formDhtRpcOptions({
+            notification: true
+        });
+        this.getClient().requestConnection(request, options).catch((_e) => {
+            logger.trace('Failed to send requestConnection');
+        });
+    }
+    sendRtcOffer(description, connectionId) {
+        const request = {
+            connectionId,
+            description
+        };
+        const options = this.formDhtRpcOptions();
+        this.getClient().rtcOffer(request, options).catch((_e) => {
+            logger.trace('Failed to send rtcOffer');
+        });
+    }
+    sendRtcAnswer(description, connectionId) {
+        const request = {
+            connectionId,
+            description
+        };
+        const options = this.formDhtRpcOptions();
+        this.getClient().rtcAnswer(request, options).catch((_e) => {
+            logger.trace('Failed to send rtcAnswer');
+        });
+    }
+    sendIceCandidate(candidate, mid, connectionId) {
+        const request = {
+            connectionId,
+            mid,
+            candidate
+        };
+        const options = this.formDhtRpcOptions();
+        this.getClient().iceCandidate(request, options).catch((_e) => {
+            logger.trace('Failed to send iceCandidate');
+        });
+    }
+}
+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,CAAC,YAAoB;QAClC,MAAM,OAAO,GAA4B;YACrC,YAAY;SACf,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;AAvDD,4DAuDC"}

package/dist/src/connection/WebRTC/iceServerAsString.d.ts

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

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

@@ -1,35 +1,45 @@
 import { ITransport } from '../../transport/ITransport';
 import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor, WebSocketConnectionRequest, WebSocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
-import { IWebSocketConnectorService } from '../../proto/packages/dht/protos/DhtRpc.server';
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { IWebSocketConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import { ManagedConnection } from '../ManagedConnection';
 import { PortRange, TlsCertificate } from '../ConnectionManager';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 export declare const connectivityMethodToWebSocketUrl: (ws: ConnectivityMethod) => string;
-export declare class WebSocketConnector implements IWebSocketConnectorService {
+interface WebSocketConnectorRpcLocalConfig {
+    transport: ITransport;
+    canConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean;
+    onIncomingConnection: (connection: ManagedConnection) => boolean;
+    portRange?: PortRange;
+    maxMessageSize?: number;
+    host?: string;
+    entrypoints?: PeerDescriptor[];
+    tlsCertificate?: TlsCertificate;
+}
+export declare class WebSocketConnectorRpcLocal implements IWebSocketConnectorRpc {
     private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
     private readonly rpcCommunicator;
     private readonly canConnectFunction;
     private readonly webSocketServer?;
     private connectivityChecker?;
     private readonly ongoingConnectRequests;
-    private incomingConnectionCallback;
-    private portRange?;
+    private onIncomingConnection;
     private host?;
-    private entrypoints?;
+    private readonly entrypoints?;
     private readonly tlsCertificate?;
     private selectedPort?;
-    private readonly protocolVersion;
     private ownPeerDescriptor?;
     private connectingConnections;
     private destroyed;
-    constructor(protocolVersion: string, rpcTransport: ITransport, fnCanConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean, incomingConnectionCallback: (connection: ManagedConnection) => boolean, portRange?: PortRange, host?: string, entrypoints?: PeerDescriptor[], tlsCertificate?: TlsCertificate);
+    constructor(config: WebSocketConnectorRpcLocalConfig);
     private attachHandshaker;
     start(): Promise<void>;
-    checkConnectivity(reattempt?: number): Promise<ConnectivityResponse>;
+    checkConnectivity(): Promise<ConnectivityResponse>;
+    isPossibleToFormConnection(targetPeerDescriptor: PeerDescriptor): boolean;
     connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
-    requestConnectionFromPeer(ownPeerDescriptor: PeerDescriptor, targetPeerDescriptor: PeerDescriptor): ManagedConnection;
+    private requestConnectionFromPeer;
     private onServerSocketHandshakeRequest;
     setOwnPeerDescriptor(ownPeerDescriptor: PeerDescriptor): void;
     destroy(): Promise<void>;
-    requestConnection(request: WebSocketConnectionRequest, _context: ServerCallContext): Promise<WebSocketConnectionResponse>;
+    requestConnection(request: WebSocketConnectionRequest, context: ServerCallContext): Promise<WebSocketConnectionResponse>;
 }
+export {};