@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-rc.0

package/dist/src/connection/simulator/pings.js.map

@@ -1 +1 @@
-{"version":3,"file":"pings.js","sourceRoot":"","sources":["../../../../src/connection/simulator/pings.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,mEAAmE;AACnE,kEAAkE;AAClE,gDAAgD;AAEhD,IAAY,WAA0N;AAAtO,WAAY,WAAW;IAAG,6DAAY,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,yDAAU,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,6DAAY,CAAA;IAAE,0DAAU,CAAA;IAAE,kEAAc,CAAA;IAAE,kEAAc,CAAA;IAAE,kEAAc,CAAA;IAAE,kEAAc,CAAA;IAAE,wDAAS,CAAA;AAAC,CAAC,EAA1N,WAAW,2BAAX,WAAW,QAA+M;AAEzN,QAAA,gBAAgB,GAAG;IAC5B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACnI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACvI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACnI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACpI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACtI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACrI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACrI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACvI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACzI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACtI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC;IACzI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;IAC3I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;IAC1I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC;IAC5I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;IAC1I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC;CAChJ,CAAA;AAED,SAAgB,oBAAoB;IAChC,MAAM,GAAG,GAAG,EAAE,CAAA;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,EAAE,CAAA;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,GAAG,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;SACvC;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KAChB;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAVD,oDAUC;AAED,SAAgB,eAAe;IAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;AACzC,CAAC;AAFD,0CAEC"}
+{"version":3,"file":"pings.js","sourceRoot":"","sources":["../../../../src/connection/simulator/pings.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,mEAAmE;AACnE,kEAAkE;AAClE,gDAAgD;AAEhD,IAAY,WAA0N;AAAtO,WAAY,WAAW;IAAG,6DAAY,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,yDAAU,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,uDAAS,CAAA;IAAE,6DAAY,CAAA;IAAE,0DAAU,CAAA;IAAE,kEAAc,CAAA;IAAE,kEAAc,CAAA;IAAE,kEAAc,CAAA;IAAE,kEAAc,CAAA;IAAE,wDAAS,CAAA;AAAC,CAAC,EAA1N,WAAW,2BAAX,WAAW,QAA+M;AAEzN,QAAA,gBAAgB,GAAG;IAC5B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACnI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACvI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACnI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACpI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACtI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACrI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACrI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACvI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACzI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACtI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC;IACzI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;IAC3I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;IAC1I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC;IAC5I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;IAC1I,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC;CAChJ,CAAA;AAED,SAAgB,oBAAoB;IAChC,MAAM,GAAG,GAAG,EAAE,CAAA;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,MAAM,GAAG,GAAG,EAAE,CAAA;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,GAAG,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QACxC,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACjB,CAAC;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAVD,oDAUC;AAED,SAAgB,eAAe;IAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;AACzC,CAAC;AAFD,0CAEC"}

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

@@ -41,11 +41,10 @@ export declare class NodeWebrtcConnection extends EventEmitter<Events> implement
     close(gracefulLeave: boolean, reason?: string): Promise<void>;
     private doClose;
     destroy(): void;
-    private onDataChannel;
     private setupDataChannel;
-    private openDataChannel;
+    private onDataChannelOpen;
     private onStateChange;
     isOpen(): boolean;
-    setConnectionId(connectionID: string): void;
+    setConnectionId(connectionId: ConnectionID): void;
 }
 export {};

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

@@ -32,8 +32,9 @@ const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const node_datachannel_1 = __importStar(require("node-datachannel"));
 const utils_1 = require("@streamr/utils");
 const errors_1 = require("../../helpers/errors");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const iceServerAsString_1 = require("./iceServerAsString");
+const identifiers_1 = require("../../identifiers");
+const Connection_1 = require("../Connection");
 const logger = new utils_1.Logger(module);
 exports.WEBRTC_CLEANUP = new class {
     // eslint-disable-next-line class-methods-use-this
@@ -54,13 +55,24 @@ var RtcPeerConnectionStateEnum;
 })(RtcPeerConnectionStateEnum || (RtcPeerConnectionStateEnum = {}));
 node_datachannel_1.default.initLogger('Fatal');
 class NodeWebrtcConnection extends eventemitter3_1.default {
+    connectionId;
+    connection;
+    dataChannel;
+    lastState = 'connecting';
+    remoteDescriptionSet = false;
+    connectingTimeoutRef;
+    connectionType = IConnection_1.ConnectionType.WEBRTC;
+    iceServers;
+    _bufferThresholdHigh; // TODO: buffer handling must be implemented before production use (NET-938)
+    bufferThresholdLow;
+    connectingTimeout;
+    remotePeerDescriptor;
+    portRange;
+    maxMessageSize;
+    closed = false;
     constructor(params) {
         super();
-        this.lastState = 'connecting';
-        this.remoteDescriptionSet = false;
-        this.connectionType = IConnection_1.ConnectionType.WEBRTC;
-        this.closed = false;
-        this.connectionId = new IConnection_1.ConnectionID();
+        this.connectionId = (0, Connection_1.createRandomConnectionId)();
         this.iceServers = params.iceServers ?? [];
         // eslint-disable-next-line no-underscore-dangle
         this._bufferThresholdHigh = params.bufferThresholdHigh ?? 2 ** 17;
@@ -71,9 +83,9 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
         this.portRange = params.portRange;
     }
     start(isOffering) {
-        const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor);
-        logger.trace(`Starting new connection for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`, { isOffering });
-        this.connection = new node_datachannel_1.PeerConnection(peerIdKey, {
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
+        logger.trace(`Starting new connection for peer ${nodeId}`, { isOffering });
+        this.connection = new node_datachannel_1.PeerConnection(nodeId, {
             iceServers: this.iceServers.map(iceServerAsString_1.iceServerAsString),
             maxMessageSize: this.maxMessageSize,
             portRangeBegin: this.portRange?.min,
@@ -96,18 +108,19 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
             this.setupDataChannel(dataChannel);
         }
         else {
-            this.connection.onDataChannel((dataChannel) => this.onDataChannel(dataChannel));
+            this.connection.onDataChannel((dataChannel) => this.setupDataChannel(dataChannel));
         }
     }
     async setRemoteDescription(description, type) {
         if (this.connection) {
+            const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
             try {
-                logger.trace(`Setting remote descriptor for peer: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                logger.trace(`Setting remote descriptor for peer: ${remoteNodeId}`);
                 this.connection.setRemoteDescription(description, type);
                 this.remoteDescriptionSet = true;
             }
             catch (err) {
-                logger.debug(`Failed to set remote descriptor for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                logger.debug(`Failed to set remote descriptor for peer ${remoteNodeId}`);
             }
         }
         else {
@@ -117,12 +130,13 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
     addRemoteCandidate(candidate, mid) {
         if (this.connection) {
             if (this.remoteDescriptionSet) {
+                const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
                 try {
-                    logger.trace(`Setting remote candidate for peer: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                    logger.trace(`Setting remote candidate for peer: ${remoteNodeId}`);
                     this.connection.addRemoteCandidate(candidate, mid);
                 }
                 catch (err) {
-                    logger.debug(`Failed to set remote candidate for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                    logger.debug(`Failed to set remote candidate for peer ${remoteNodeId}`);
                 }
             }
             else {
@@ -140,7 +154,8 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
                 this.dataChannel.sendMessageBinary(data);
             }
             catch (err) {
-                logger.debug('Failed to send binary message to ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor) + err);
+                const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
+                logger.debug('Failed to send binary message to ' + remoteNodeId + err);
             }
         }
     }
@@ -149,8 +164,8 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
     }
     doClose(gracefulLeave, reason) {
         if (!this.closed) {
-            logger.trace(`Closing Node WebRTC Connection to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`
-                + `${reason ? `, reason: ${reason}` : ''}`);
+            const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
+            logger.trace(`Closing Node WebRTC Connection to ${remoteNodeId}` + `${(reason !== undefined) ? `, reason: ${reason}` : ''}`);
             this.closed = true;
             this.emit('disconnected', gracefulLeave, undefined, reason);
             this.removeAllListeners();
@@ -174,21 +189,20 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
                     logger.trace('conn.close() errored: %s', e);
                 }
             }
+            this.connection = undefined;
+            this.dataChannel = undefined;
         }
     }
     destroy() {
         this.removeAllListeners();
         this.doClose(false);
     }
-    onDataChannel(dataChannel) {
-        this.openDataChannel(dataChannel);
-        this.setupDataChannel(dataChannel);
-    }
     setupDataChannel(dataChannel) {
+        this.dataChannel = dataChannel;
         dataChannel.setBufferedAmountLowThreshold(this.bufferThresholdLow);
         dataChannel.onOpen(() => {
             logger.trace(`dc.onOpened`);
-            this.openDataChannel(dataChannel);
+            this.onDataChannelOpen();
         });
         dataChannel.onClosed(() => {
             logger.trace(`dc.closed`);
@@ -203,12 +217,11 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
             this.emit('data', msg);
         });
     }
-    openDataChannel(dataChannel) {
+    onDataChannelOpen() {
         if (this.connectingTimeoutRef) {
             clearTimeout(this.connectingTimeoutRef);
         }
-        this.dataChannel = dataChannel;
-        logger.trace(`DataChannel opened for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+        logger.trace(`DataChannel opened for peer ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
         this.emit('connected');
     }
     onStateChange(state) {
@@ -228,8 +241,8 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
     isOpen() {
         return !this.closed && this.lastState === 'connected' && !!this.dataChannel;
     }
-    setConnectionId(connectionID) {
-        this.connectionId = new IConnection_1.ConnectionID(connectionID);
+    setConnectionId(connectionId) {
+        this.connectionId = connectionId;
     }
 }
 exports.NodeWebrtcConnection = NodeWebrtcConnection;

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4F;AAE5F,kEAAwC;AACxC,qEAAgG;AAChG,0CAAuC;AACvC,iDAAoE;AACpE,2DAAuD;AAGvD,mDAA+D;AAC/D,8CAAwD;AAExD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEpB,QAAA,cAAc,GAAG,IAAI;IAC9B,kDAAkD;IAClD,OAAO;QACH,0BAAe,CAAC,OAAO,EAAE,CAAA;IAC7B,CAAC;CACJ,CAAA;AAYD,sGAAsG;AACtG,2DAA2D;AAE3D,IAAK,0BAOJ;AAPD,WAAK,0BAA0B;IAC3B,+CAAiB,CAAA;IACjB,qDAAuB,CAAA;IACvB,uDAAyB,CAAA;IACzB,2DAA6B,CAAA;IAC7B,+CAAiB,CAAA;IACjB,yCAAW,CAAA;AACf,CAAC,EAPI,0BAA0B,KAA1B,0BAA0B,QAO9B;AAED,0BAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;AAMnC,MAAa,oBAAqB,SAAQ,uBAAoB;IAEnD,YAAY,CAAc;IACzB,UAAU,CAAiB;IAC3B,WAAW,CAAc;IACzB,SAAS,GAA2B,YAAY,CAAA;IAChD,oBAAoB,GAAG,KAAK,CAAA;IAC5B,oBAAoB,CAAiB;IAC7B,cAAc,GAAmB,4BAAc,CAAC,MAAM,CAAA;IACrD,UAAU,CAAa;IACvB,oBAAoB,CAAQ,CAAC,4EAA4E;IACzG,kBAAkB,CAAQ;IAC1B,iBAAiB,CAAQ;IACzB,oBAAoB,CAAgB;IACpC,SAAS,CAAY;IACrB,cAAc,CAAS;IAChC,MAAM,GAAG,KAAK,CAAA;IAEtB,YAAY,MAAc;QACtB,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,YAAY,GAAG,IAAA,qCAAwB,GAAE,CAAA;QAC9C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAA;QACzC,gDAAgD;QAChD,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,mBAAmB,IAAI,CAAC,IAAI,EAAE,CAAA;QACjE,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAA;QAC9D,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,IAAI,KAAK,CAAA;QAC1D,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAA;QACvD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,OAAO,CAAA;QACtD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,UAAmB;QAC5B,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACrE,MAAM,CAAC,KAAK,CAAC,oCAAoC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;QAC1E,IAAI,CAAC,UAAU,GAAG,IAAI,iCAAc,CAAC,MAAM,EAAE;YACzC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,qCAAiB,CAAC;YAClD,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,cAAc,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG;YACnC,YAAY,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG;SACpC,CAAC,CAAA;QAEF,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;YACjE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAE1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3E,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAEhD,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,WAAmB,EAAE,IAAqB,EAAE,EAAE;YAC9E,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;QACF,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;YAC3E,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QACtC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAA;QACtF,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,WAAmB,EAAE,IAAY;QAC/D,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;YAC3E,IAAI,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,uCAAuC,YAAY,EAAE,CAAC,CAAA;gBACnE,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,WAAW,EAAE,IAAuB,CAAC,CAAA;gBAC1E,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAA;YACpC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,4CAA4C,YAAY,EAAE,CAAC,CAAA;YAC5E,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,sDAAsD,CAAC,CAAA;QAC/E,CAAC;IACL,CAAC;IAEM,kBAAkB,CAAC,SAAiB,EAAE,GAAW;QACpD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;gBAC3E,IAAI,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAA;oBAClE,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;gBACtD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CAAC,2CAA2C,YAAY,EAAE,CAAC,CAAA;gBAC3E,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,iEAAiE;gBACjE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,2CAA2C,CAAC,CAAA;YACpE,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,oDAAoD,CAAC,CAAA;QAC7E,CAAC;IACL,CAAC;IAEM,IAAI,CAAC,IAAgB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YAChB,IAAI,CAAC;gBACD,IAAI,CAAC,WAAY,CAAC,iBAAiB,CAAC,IAAc,CAAC,CAAA;YACvD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;gBAC3E,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,YAAY,GAAG,GAAG,CAAC,CAAA;YAC1E,CAAC;QACL,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,aAAsB,EAAE,MAAe;QACtD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;IAEO,OAAO,CAAC,aAAsB,EAAE,MAAe;QACnD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;YAC3E,MAAM,CAAC,KAAK,CAAC,qCAAqC,YAAY,EAAE,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YAE5H,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;YAElB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;YAC3D,IAAI,CAAC,kBAAkB,EAAE,CAAA;YAEzB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;YAC3C,CAAC;YAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,IAAI,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;oBACnC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;gBAC5B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAA;gBAC7C,CAAC;YACL,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,IAAI,CAAC;oBACD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;gBAC3B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAA;gBAC/C,CAAC;YACL,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;YAC3B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAChC,CAAC;IACL,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAEO,gBAAgB,CAAC,WAAwB;QAC7C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,WAAW,CAAC,6BAA6B,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAClE,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAC3B,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC5B,CAAC,CAAC,CAAA;QAEF,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE;YACtB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YACzB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;QAEF,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QAE5D,WAAW,CAAC,mBAAmB,CAAC,GAAG,EAAE;YACjC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;QAEF,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;YAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAa,CAAC,CAAA;QACpC,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,iBAAiB;QACrB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QAC3C,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,+BAA+B,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;QACrG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC1B,CAAC;IAEO,aAAa,CAAC,KAAa;QAC/B,MAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,CAAA;QACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACpF,MAAM,IAAI,sCAA6B,CAAC,8CAA8C,GAAG,KAAK,CAAC,CAAA;QACnG,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,SAAS,GAAG,KAA+B,CAAA;QACpD,CAAC;QAED,IAAI,KAAK,KAAK,0BAA0B,CAAC,MAAM;eACxC,KAAK,KAAK,0BAA0B,CAAC,YAAY;eACjD,KAAK,KAAK,0BAA0B,CAAC,MAAM,EAChD,CAAC;YACC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;IAEL,CAAC;IAED,MAAM;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAA;IAC/E,CAAC;IAEM,eAAe,CAAC,YAA0B;QAC7C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;CACJ;AAjND,oDAiNC"}

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

@@ -27,12 +27,10 @@ export declare class WebrtcConnector {
     private readonly ongoingConnectAttempts;
     private localPeerDescriptor?;
     private stopped;
-    private iceServers;
     private config;
     constructor(config: WebrtcConnectorConfig, onNewConnection: (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

@@ -32,9 +32,9 @@ 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 identifiers_1 = require("../../identifiers");
+const offering_1 = require("../../helpers/offering");
 const logger = new utils_1.Logger(module);
 const replaceInternalIpWithExternalIp = (candidate, ip) => {
     const parsed = candidate.split(' ');
@@ -46,13 +46,16 @@ const replaceInternalIpWithExternalIp = (candidate, ip) => {
 };
 exports.replaceInternalIpWithExternalIp = replaceInternalIpWithExternalIp;
 class WebrtcConnector {
+    static WEBRTC_CONNECTOR_SERVICE_ID = 'system/webrtc-connector';
+    rpcCommunicator;
+    ongoingConnectAttempts = new Map();
+    localPeerDescriptor;
+    stopped = false;
+    config;
     constructor(config, onNewConnection) {
-        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
+            rpcRequestTimeout: 15000 // TODO use config option or named constant?
         });
         this.registerLocalRpcMethods(config, onNewConnection);
     }
@@ -99,24 +102,26 @@ class WebrtcConnector {
         });
     }
     connect(targetPeerDescriptor) {
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.localPeerDescriptor)) {
+        if ((0, identifiers_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.localPeerDescriptor)) {
             throw new Err.CannotConnectToSelf('Cannot open WebRTC Connection to self');
         }
-        logger.trace(`Opening WebRTC connection to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor)}`);
-        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
-        const existingConnection = this.ongoingConnectAttempts.get(peerKey);
+        logger.trace(`Opening WebRTC connection to ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor)}`);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
+        const existingConnection = this.ongoingConnectAttempts.get(nodeId);
         if (existingConnection) {
             return existingConnection;
         }
         const connection = new NodeWebrtcConnection_1.NodeWebrtcConnection({
             remotePeerDescriptor: targetPeerDescriptor,
-            iceServers: this.iceServers,
+            iceServers: this.config.iceServers,
             bufferThresholdLow: this.config.bufferThresholdLow,
             bufferThresholdHigh: this.config.bufferThresholdHigh,
             connectingTimeout: this.config.connectionTimeout,
             portRange: this.config.portRange
         });
-        const offering = this.isOffering(targetPeerDescriptor);
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor);
+        const targetNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
+        const offering = ((0, offering_1.getOfferer)(localNodeId, targetNodeId) === 'local');
         let managedConnection;
         if (offering) {
             managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.localPeerDescriptor, connection);
@@ -125,30 +130,30 @@ class WebrtcConnector {
             managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.localPeerDescriptor, undefined, connection);
         }
         managedConnection.setRemotePeerDescriptor(targetPeerDescriptor);
-        this.ongoingConnectAttempts.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
+        this.ongoingConnectAttempts.set(targetNodeId, managedConnection);
         const delFunc = () => {
-            this.ongoingConnectAttempts.delete(peerKey);
+            this.ongoingConnectAttempts.delete(nodeId);
             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())));
+        const remoteConnector = new WebrtcConnectorRpcRemote_1.WebrtcConnectorRpcRemote(this.localPeerDescriptor, targetPeerDescriptor, this.rpcCommunicator, DhtRpc_client_1.WebrtcConnectorRpcClient);
         connection.on('localCandidate', (candidate, mid) => {
-            if (this.config.externalIp) {
+            if (this.config.externalIp !== undefined) {
                 candidate = (0, exports.replaceInternalIpWithExternalIp)(candidate, this.config.externalIp);
                 logger.debug(`onLocalCandidate injected external ip ${candidate} ${mid}`);
             }
-            remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
+            remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId);
         });
         if (offering) {
             connection.once('localDescription', (description) => {
-                remoteConnector.sendRtcOffer(description, connection.connectionId.toString());
+                remoteConnector.sendRtcOffer(description, connection.connectionId);
             });
         }
         else {
             connection.once('localDescription', (description) => {
-                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
+                remoteConnector.sendRtcAnswer(description, connection.connectionId);
             });
         }
         connection.start(offering);
@@ -167,12 +172,6 @@ class WebrtcConnector {
         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

@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAK+C;AAE/C,uFAAmF;AACnF,iEAA6D;AAC7D,yEAAqE;AACrE,iFAAwF;AACxF,wEAAoE;AACpE,0CAAuC;AACvC,0DAA2C;AAI3C,uEAAmE;AACnE,mDAAoG;AACpG,qDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,+BAA+B,GAAG,CAAC,SAAiB,EAAE,EAAU,EAAU,EAAE;IACrF,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IACtB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAClB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;IAClB,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC,CAAA;AAPY,QAAA,+BAA+B,mCAO3C;AAsBD,MAAa,eAAe;IAEhB,MAAM,CAAU,2BAA2B,GAAG,yBAAyB,CAAA;IAC9D,eAAe,CAA0B;IACzC,sBAAsB,GAA6C,IAAI,GAAG,EAAE,CAAA;IACrF,mBAAmB,CAAiB;IACpC,OAAO,GAAG,KAAK,CAAA;IACf,MAAM,CAAuB;IAErC,YACI,MAA6B,EAC7B,eAA2D;QAE3D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,eAAe,CAAC,2BAA2B,EAAE,MAAM,CAAC,SAAS,EAAE;YAC/G,iBAAiB,EAAE,KAAK,CAAE,4CAA4C;SACzE,CAAC,CAAA;QACF,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACzD,CAAC;IAEO,uBAAuB,CAC3B,MAA6B,EAC7B,eAA2D;QAE3D,MAAM,QAAQ,GAAG,IAAI,iDAAuB,CAAC;YACzC,OAAO,EAAE,CAAC,oBAAoC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrF,eAAe;YACf,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;YACnD,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,sBAAsB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAoB;YACvD,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,IAAI,IAAI;SAC9D,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,gCAAuB,EAAE,mBAAmB,EACrF,KAAK,EAAE,IAA6B,EAAE,OAA0B,EAAE,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,OAAO,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,CAAC;iBAAM,CAAC;gBACJ,OAAO,EAAE,CAAA;YACb,CAAC;QACL,CAAC,CACJ,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,iBAAQ,EAAE,UAAU,EAC7D,KAAK,EAAE,GAAa,EAAE,OAA0B,EAAE,EAAE;YAChD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC1C,CAAC;iBAAM,CAAC;gBACJ,OAAO,EAAE,CAAA;YACb,CAAC;QACL,CAAC,CACJ,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,kBAAS,EAAE,WAAW,EAC/D,KAAK,EAAE,GAAc,EAAE,OAA0B,EAAE,EAAE;YACjD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC3C,CAAC;iBAAM,CAAC;gBACJ,OAAO,EAAE,CAAA;YACb,CAAC;QACL,CAAC,CACJ,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,qBAAY,EAAE,cAAc,EACrE,KAAK,EAAE,GAAiB,EAAE,OAA0B,EAAE,EAAE;YACpD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,OAAO,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC9C,CAAC;iBAAM,CAAC;gBACJ,OAAO,EAAE,CAAA;YACb,CAAC;QACL,CAAC,CACJ,CAAA;IACL,CAAC;IAED,OAAO,CAAC,oBAAoC;QACxC,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,mBAAoB,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,GAAG,CAAC,mBAAmB,CAAC,uCAAuC,CAAC,CAAA;QAC9E,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;QAEjG,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAClE,IAAI,kBAAkB,EAAE,CAAC;YACrB,OAAO,kBAAkB,CAAA;QAC7B,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,2CAAoB,CAAC;YACxC,oBAAoB,EAAE,oBAAoB;YAC1C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YAClD,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YACpD,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;SACnC,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,mBAAoB,CAAC,CAAA;QAC1E,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,MAAM,QAAQ,GAAG,CAAC,IAAA,qBAAU,EAAC,WAAW,EAAE,YAAY,CAAC,KAAK,OAAO,CAAC,CAAA;QACpE,IAAI,iBAA0C,CAAA;QAE9C,IAAI,QAAQ,EAAE,CAAC;YACX,iBAAiB,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,mBAAoB,EAAE,UAAU,CAAC,CAAA;QAC1F,CAAC;aAAM,CAAC;YACJ,iBAAiB,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,mBAAoB,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;QACrG,CAAC;QAED,iBAAiB,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;QAE/D,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;QAEhE,MAAM,OAAO,GAAG,GAAG,EAAE;YACjB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC1C,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;YACvC,iBAAiB,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;QACxD,CAAC,CAAA;QACD,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QACtC,iBAAiB,CAAC,EAAE,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;QAEnD,MAAM,eAAe,GAAG,IAAI,mDAAwB,CAChD,IAAI,CAAC,mBAAoB,EACzB,oBAAoB,EACpB,IAAI,CAAC,eAAe,EACpB,wCAAwB,CAC3B,CAAA;QAED,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;YAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBACvC,SAAS,GAAG,IAAA,uCAA+B,EAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;gBAC9E,MAAM,CAAC,KAAK,CAAC,yCAAyC,SAAS,IAAI,GAAG,EAAE,CAAC,CAAA;YAC7E,CAAC;YACD,eAAe,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;QAEF,IAAI,QAAQ,EAAE,CAAC;YACX,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACxD,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;YACtE,CAAC,CAAC,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACxD,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;YACvE,CAAC,CAAC,CAAA;QACN,CAAC;QAED,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAE1B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,eAAe,CAAC,iBAAiB,EAAE,CAAA;QACvC,CAAC;QAED,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IAED,sBAAsB,CAAC,cAA8B;QACjD,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAA;QACjE,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEnE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;;AAjKL,0CAkKC"}

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

@@ -1,15 +1,15 @@
 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';
+import { DhtAddress } from '../../identifiers';
 interface WebrtcConnectorRpcLocalConfig {
     connect: (targetPeerDescriptor: PeerDescriptor) => ManagedConnection;
     onNewConnection: (connection: ManagedConnection) => boolean;
-    ongoingConnectAttempts: Map<PeerIDKey, ManagedWebrtcConnection>;
+    ongoingConnectAttempts: Map<DhtAddress, ManagedWebrtcConnection>;
     rpcCommunicator: ListeningRpcCommunicator;
     getLocalPeerDescriptor: () => PeerDescriptor;
     allowPrivateAddresses: boolean;

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

@@ -1,22 +1,24 @@
 "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_1 = require("../../proto/packages/dht/protos/DhtRpc");
 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 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;
     }
     async requestConnection(context) {
         const targetPeerDescriptor = context.incomingSourceDescriptor;
-        if (this.config.ongoingConnectAttempts.has((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor))) {
+        if (this.config.ongoingConnectAttempts.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor))) {
             return {};
         }
         const managedConnection = this.config.connect(targetPeerDescriptor);
@@ -26,43 +28,48 @@ class WebrtcConnectorRpcLocal {
     }
     async rtcOffer(request, context) {
         const remotePeer = context.incomingSourceDescriptor;
-        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeer);
-        let managedConnection = this.config.ongoingConnectAttempts.get(peerKey);
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeer);
+        let managedConnection = this.config.ongoingConnectAttempts.get(nodeId);
         let connection = managedConnection?.getWebrtcConnection();
         if (!managedConnection) {
             connection = new NodeWebrtcConnection_1.NodeWebrtcConnection({ remotePeerDescriptor: remotePeer });
             managedConnection = new ManagedWebrtcConnection_1.ManagedWebrtcConnection(this.config.getLocalPeerDescriptor(), undefined, connection);
             managedConnection.setRemotePeerDescriptor(remotePeer);
-            this.config.ongoingConnectAttempts.set(peerKey, managedConnection);
+            this.config.ongoingConnectAttempts.set(nodeId, managedConnection);
             this.config.onNewConnection(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())));
+            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.toString());
+                remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId);
             });
             connection.once('localDescription', (description) => {
-                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
+                remoteConnector.sendRtcAnswer(description, connection.connectionId);
             });
             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.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();
             }
-            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();
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeerDescriptor);
+        const connection = this.config.ongoingConnectAttempts.get(nodeId)?.getWebrtcConnection();
         if (!connection) {
             return {};
         }
-        else if (connection.connectionId.toString() !== request.connectionId) {
+        else if (connection.connectionId !== request.connectionId) {
             logger.trace(`Ignoring RTC answer due to connectionId mismatch`);
             return {};
         }
@@ -71,12 +78,12 @@ class WebrtcConnectorRpcLocal {
     }
     async iceCandidate(request, context) {
         const remotePeerDescriptor = context.incomingSourceDescriptor;
-        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
-        const connection = this.config.ongoingConnectAttempts.get(peerKey)?.getWebrtcConnection();
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remotePeerDescriptor);
+        const connection = this.config.ongoingConnectAttempts.get(nodeId)?.getWebrtcConnection();
         if (!connection) {
             return {};
         }
-        else if (connection.connectionId.toString() !== request.connectionId) {
+        else if (connection.connectionId !== request.connectionId) {
             logger.trace(`Ignoring remote candidate due to connectionId mismatch`);
             return {};
         }
@@ -88,7 +95,7 @@ class WebrtcConnectorRpcLocal {
     isIceCandidateAllowed(candidate) {
         if (!this.config.allowPrivateAddresses) {
             const address = (0, AddressTools_1.getAddressFromIceCandidate)(candidate);
-            if (address && (0, AddressTools_1.isPrivateIPv4)(address)) {
+            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":";;;AACA,0CAAuC;AACvC,6DAAsF;AAEtF,mEAM+C;AAC/C,iFAAwF;AAKxF,wEAAoE;AACpE,iEAA6D;AAC7D,yEAAqE;AACrE,mDAA2E;AAC3E,mDAA+D;AAG/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAYjC,MAAa,uBAAuB;IAEf,MAAM,CAA+B;IAEtD,YAAY,MAAqC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA0B;QAC9C,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC;YAC5F,OAAO,EAAE,CAAA;QACb,CAAC;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;QACnE,iBAAiB,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAA;QAC9C,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAiB,EAAE,OAA0B;QACxD,MAAM,UAAU,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QACxE,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,UAAU,CAAC,CAAA;QACtD,IAAI,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACtE,IAAI,UAAU,GAAG,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;QAEzD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,UAAU,GAAG,IAAI,2CAAoB,CAAC,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC,CAAA;YAC3E,iBAAiB,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;YAC5G,iBAAiB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAA;YACrD,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;YACjE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAA;YAC9C,MAAM,eAAe,GAAG,IAAI,mDAAwB,CAChD,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,EACpC,UAAU,EACV,IAAI,CAAC,MAAM,CAAC,eAAe,EAC3B,wCAAwB,CAC3B,CAAA;YACD,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;gBAC/D,eAAe,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,EAAE,UAAW,CAAC,YAAY,CAAC,CAAA;YAC9E,CAAC,CAAC,CAAA;YACF,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACxD,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,UAAW,CAAC,YAAY,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;YACF,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,mCAAmC;QACnC,UAAW,CAAC,eAAe,CAAC,OAAO,CAAC,YAA4B,CAAC,CAAA;QACjE,UAAW,CAAC,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAE9D,iBAAiB,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,iBAAiC,EAAE,aAAqB,EAAE,EAAE;YAClG,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjD,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACrD,CAAC;YACD,IAAI,CAAC,IAAA,iCAAuB,EAAC,aAAa,CAAC,EAAE,CAAC;gBAC1C,iBAAkB,CAAC,eAAe,CAAC,uBAAc,CAAC,mBAAmB,CAAC,CAAA;YAC1E,CAAC;iBAAM,CAAC;gBACJ,iBAAkB,CAAC,eAAe,EAAE,CAAA;YACxC,CAAC;QACL,CAAC,CAAC,CAAA;QACF,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAkB,EAAE,OAA0B;QAC1D,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;QACxF,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,EAAE,CAAA;QACb,CAAC;aAAM,IAAI,UAAU,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAA;YAChE,OAAO,EAAE,CAAA;QACb,CAAC;QACD,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAC9D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAqB,EAAE,OAA0B;QAChE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;QACxF,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,EAAE,CAAA;QACb,CAAC;aAAM,IAAI,UAAU,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAA;YACtE,OAAO,EAAE,CAAA;QACb,CAAC;aAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACvD,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QACjE,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IAEO,qBAAqB,CAAC,SAAiB;QAC3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,IAAA,yCAA0B,EAAC,SAAS,CAAC,CAAA;YACrD,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AArGD,0DAqGC"}

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

@@ -1,9 +1,6 @@
-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>);
+import { RpcRemote } from '../../dht/contact/RpcRemote';
+import { WebrtcConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+export declare class WebrtcConnectorRpcRemote extends RpcRemote<WebrtcConnectorRpcClient> {
     requestConnection(): void;
     sendRtcOffer(description: string, connectionId: string): void;
     sendRtcAnswer(description: string, connectionId: string): void;

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

@@ -1,13 +1,10 @@
 "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 RpcRemote_1 = require("../../dht/contact/RpcRemote");
 const logger = new utils_1.Logger(module);
-class WebrtcConnectorRpcRemote extends Remote_1.Remote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, client) {
-        super(localPeerDescriptor, remotePeerDescriptor, 'DUMMY', client);
-    }
+class WebrtcConnectorRpcRemote extends RpcRemote_1.RpcRemote {
     requestConnection() {
         const request = {};
         const options = this.formDhtRpcOptions({

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

@@ -1 +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"}
+{"version":3,"file":"WebrtcConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/WebrtcConnectorRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,2DAAuD;AASvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,wBAAyB,SAAQ,qBAAmC;IAE7E,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;AA9CD,4DA8CC"}

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

@@ -10,7 +10,7 @@ function iceServerAsString({ url, port, username, password, tcp }) {
         return `${protocol}:${hostname}:${port}`;
     }
     if (username !== undefined && password !== undefined) {
-        return `${protocol}:${username}:${password}@${hostname}:${port}${tcp ? '?transport=tcp' : ''}`;
+        return `${protocol}:${username}:${password}@${hostname}:${port}${(tcp !== undefined) ? '?transport=tcp' : ''}`;
     }
     throw new Error(`username (${username}) and password (${password}) must be supplied together`);
 }