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

package/dist/src/connection/{Simulator → simulator}/SimulatorConnection.js

@@ -8,10 +8,10 @@ const protoToString_1 = require("../../helpers/protoToString");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
 class SimulatorConnection extends Connection_1.Connection {
-    constructor(ownPeerDescriptor, targetPeerDescriptor, connectionType, simulator) {
+    constructor(localPeerDescriptor, targetPeerDescriptor, connectionType, simulator) {
         super(connectionType);
         this.stopped = false;
-        this.ownPeerDescriptor = ownPeerDescriptor;
+        this.localPeerDescriptor = localPeerDescriptor;
         this.setPeerDescriptor(targetPeerDescriptor);
         this.targetPeerDescriptor = targetPeerDescriptor;
         this.connectionType = connectionType;
@@ -30,35 +30,36 @@ class SimulatorConnection extends Connection_1.Connection {
             this.simulator.send(this, data);
         }
         else {
-            logger.error((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
+            logger.error((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
                 'tried to send() on a stopped connection');
         }
     }
-    async close(disconnectionType) {
-        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' close()');
+    async close(gracefulLeave) {
+        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor)
+            + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) + ' close()');
         if (!this.stopped) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', '
-                + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' close() not stopped');
+            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', '
+                + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) + ' close() not stopped');
             this.stopped = true;
             try {
-                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
                     ' close() calling simulator.disconnect()');
                 this.simulator.close(this);
-                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
                     ' close() simulator.disconnect returned');
             }
             catch (e) {
-                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
                     'close aborted' + e);
             }
             finally {
-                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
                     ' calling this.doDisconnect');
-                this.doDisconnect(disconnectionType);
+                this.doDisconnect(gracefulLeave);
             }
         }
         else {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
+            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
                 ' close() tried to close a stopped connection');
         }
     }
@@ -68,7 +69,7 @@ class SimulatorConnection extends Connection_1.Connection {
             this.simulator.connect(this, this.targetPeerDescriptor, (error) => {
                 if (error) {
                     logger.trace(error);
-                    this.doDisconnect('OTHER');
+                    this.doDisconnect(false);
                 }
                 else {
                     this.emit('connected');
@@ -91,9 +92,9 @@ class SimulatorConnection extends Connection_1.Connection {
     }
     handleIncomingDisconnection() {
         if (!this.stopped) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' handleIncomingDisconnection()');
+            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' handleIncomingDisconnection()');
             this.stopped = true;
-            this.doDisconnect('OTHER');
+            this.doDisconnect(false);
         }
         else {
             logger.trace('tried to call handleIncomingDisconnection() a stopped connection');
@@ -101,20 +102,20 @@ class SimulatorConnection extends Connection_1.Connection {
     }
     destroy() {
         if (!this.stopped) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' destroy()');
+            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' destroy()');
             this.removeAllListeners();
-            this.close('OTHER').catch((_e) => { });
+            this.close(false).catch((_e) => { });
         }
         else {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' tried to call destroy() a stopped connection');
+            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' tried to call destroy() a stopped connection');
         }
     }
-    doDisconnect(disconnectionType) {
-        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' doDisconnect()');
+    doDisconnect(gracefulLeave) {
+        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' doDisconnect()');
         this.stopped = true;
-        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', '
-            + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' doDisconnect emitting');
-        this.emit('disconnected', disconnectionType);
+        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', '
+            + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) + ' doDisconnect emitting');
+        this.emit('disconnected', gracefulLeave);
     }
 }
 exports.SimulatorConnection = SimulatorConnection;

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

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

package/dist/src/connection/{Simulator → simulator}/SimulatorConnector.d.ts

@@ -5,10 +5,10 @@ import { SimulatorConnection } from './SimulatorConnection';
 export declare class SimulatorConnector {
     private connectingConnections;
     private stopped;
-    private ownPeerDescriptor;
+    private localPeerDescriptor;
     private simulator;
-    private onIncomingConnection;
-    constructor(ownPeerDescriptor: PeerDescriptor, simulator: Simulator, onIncomingConnection: (connection: ManagedConnection) => boolean);
+    private onNewConnection;
+    constructor(localPeerDescriptor: PeerDescriptor, simulator: Simulator, onNewConnection: (connection: ManagedConnection) => boolean);
     connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
     getPeerDescriptor(): PeerDescriptor;
     handleIncomingConnection(sourceConnection: SimulatorConnection): void;

package/dist/src/connection/{Simulator → simulator}/SimulatorConnector.js

@@ -2,29 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimulatorConnector = void 0;
 const IConnection_1 = require("../IConnection");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const utils_1 = require("@streamr/utils");
 const ManagedConnection_1 = require("../ManagedConnection");
 const SimulatorConnection_1 = require("./SimulatorConnection");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
 class SimulatorConnector {
-    constructor(ownPeerDescriptor, simulator, onIncomingConnection) {
+    constructor(localPeerDescriptor, simulator, onNewConnection) {
         this.connectingConnections = new Map();
         this.stopped = false;
-        this.ownPeerDescriptor = ownPeerDescriptor;
+        this.localPeerDescriptor = localPeerDescriptor;
         this.simulator = simulator;
-        this.onIncomingConnection = onIncomingConnection;
+        this.onNewConnection = onNewConnection;
     }
     connect(targetPeerDescriptor) {
-        logger.trace('connect() ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor));
+        logger.trace('connect() ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor));
         const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
         const existingConnection = this.connectingConnections.get(peerKey);
         if (existingConnection) {
             return existingConnection;
         }
-        const connection = new SimulatorConnection_1.SimulatorConnection(this.ownPeerDescriptor, targetPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, this.simulator);
-        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, connection, undefined);
-        managedConnection.setPeerDescriptor(targetPeerDescriptor);
+        const connection = new SimulatorConnection_1.SimulatorConnection(this.localPeerDescriptor, targetPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, this.simulator);
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, connection, undefined);
+        managedConnection.setRemotePeerDescriptor(targetPeerDescriptor);
         this.connectingConnections.set(peerKey, managedConnection);
         connection.once('disconnected', () => {
             this.connectingConnections.delete(peerKey);
@@ -36,26 +37,24 @@ class SimulatorConnector {
         return managedConnection;
     }
     getPeerDescriptor() {
-        return this.ownPeerDescriptor;
+        return this.localPeerDescriptor;
     }
     handleIncomingConnection(sourceConnection) {
-        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' incoming connection, stopped: ' + this.stopped);
+        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor) + ' incoming connection, stopped: ' + this.stopped);
         if (this.stopped) {
             return;
         }
-        const connection = new SimulatorConnection_1.SimulatorConnection(this.ownPeerDescriptor, sourceConnection.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, this.simulator);
-        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, undefined, connection);
+        const connection = new SimulatorConnection_1.SimulatorConnection(this.localPeerDescriptor, sourceConnection.localPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, this.simulator);
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.localPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, undefined, connection);
         logger.trace('connected');
         managedConnection.once('handshakeRequest', () => {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' incoming handshake request');
-            logger.trace('incoming handshake request');
-            if (this.onIncomingConnection(managedConnection)) {
-                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' calling acceptHandshake');
+            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor) + ' incoming handshake request');
+            if (this.onNewConnection(managedConnection)) {
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor) + ' calling acceptHandshake');
                 managedConnection.acceptHandshake();
             }
             else {
-                managedConnection.rejectHandshake('Duplicate connection');
-                managedConnection.destroy();
+                managedConnection.rejectHandshake(DhtRpc_1.HandshakeError.DUPLICATE_CONNECTION);
             }
         });
         this.simulator.accept(sourceConnection, connection);
@@ -63,7 +62,7 @@ class SimulatorConnector {
     async stop() {
         this.stopped = true;
         const conns = Array.from(this.connectingConnections.values());
-        await Promise.allSettled(conns.map((conn) => conn.close('OTHER')));
+        await Promise.allSettled(conns.map((conn) => conn.close(false)));
     }
 }
 exports.SimulatorConnector = SimulatorConnector;

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

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

package/dist/src/connection/{Simulator → simulator}/SimulatorTransport.d.ts

@@ -2,5 +2,5 @@ import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ConnectionManager } from '../ConnectionManager';
 import { Simulator } from './Simulator';
 export declare class SimulatorTransport extends ConnectionManager {
-    constructor(ownPeerDescriptor: PeerDescriptor, simulator: Simulator);
+    constructor(localPeerDescriptor: PeerDescriptor, simulator: Simulator);
 }

package/dist/src/connection/{Simulator → simulator}/SimulatorTransport.js

@@ -5,9 +5,9 @@ const utils_1 = require("@streamr/utils");
 const ConnectionManager_1 = require("../ConnectionManager");
 const ConnectorFacade_1 = require("../ConnectorFacade");
 class SimulatorTransport extends ConnectionManager_1.ConnectionManager {
-    constructor(ownPeerDescriptor, simulator) {
+    constructor(localPeerDescriptor, simulator) {
         super({
-            createConnectorFacade: () => new ConnectorFacade_1.SimulatorConnectorFacade(ownPeerDescriptor, simulator),
+            createConnectorFacade: () => new ConnectorFacade_1.SimulatorConnectorFacade(localPeerDescriptor, simulator),
             metricsContext: new utils_1.MetricsContext()
         });
     }

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

@@ -0,0 +1 @@
+{"version":3,"file":"SimulatorTransport.js","sourceRoot":"","sources":["../../../../src/connection/simulator/SimulatorTransport.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAE/C,4DAAwD;AAExD,wDAA6D;AAE7D,MAAa,kBAAmB,SAAQ,qCAAiB;IACrD,YAAY,mBAAmC,EAAE,SAAoB;QACjE,KAAK,CAAC;YACF,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,0CAAwB,CAAC,mBAAmB,EAAE,SAAS,CAAC;YACzF,cAAc,EAAE,IAAI,sBAAc,EAAE;SACvC,CAAC,CAAA;IACN,CAAC;CACJ;AAPD,gDAOC"}

package/dist/src/connection/{Simulator → 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;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"}

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

@@ -1,4 +1,4 @@
-export interface WebRtcConnectionEvents {
+export interface WebrtcConnectionEvents {
     localDescription: (description: string, type: string) => void;
     localCandidate: (candidate: string, mid: string) => void;
 }
@@ -6,7 +6,7 @@ export declare enum RtcDescription {
     OFFER = "offer",
     ANSWER = "answer"
 }
-export interface IWebRtcConnection {
+export interface IWebrtcConnection {
     start(isOffering: boolean): void;
     on(event: 'localDescription', listener: (description: string, type: string) => void): this;
     on(event: 'localCandidate', listener: (candidate: string, mid: string) => void): this;

package/dist/src/connection/{WebRTC/IWebRtcConnection.js → webrtc/IWebrtcConnection.js}

@@ -6,4 +6,4 @@ var RtcDescription;
     RtcDescription["OFFER"] = "offer";
     RtcDescription["ANSWER"] = "answer";
 })(RtcDescription || (exports.RtcDescription = RtcDescription = {}));
-//# sourceMappingURL=IWebRtcConnection.js.map
+//# sourceMappingURL=IWebrtcConnection.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"IWebrtcConnection.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/IWebrtcConnection.ts"],"names":[],"mappings":";;;AAKA,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACrB,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB"}

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

@@ -1,11 +1,10 @@
-import { IWebRtcConnection, WebRtcConnectionEvents } from './IWebRtcConnection';
+import { IWebrtcConnection, WebrtcConnectionEvents } from './IWebrtcConnection';
 import { ConnectionType, IConnection, ConnectionID, ConnectionEvents } from '../IConnection';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import EventEmitter from 'eventemitter3';
-import { DisconnectionType } from '../../transport/ITransport';
-import { IceServer } from './WebRtcConnectorRpcLocal';
+import { IceServer } from './WebrtcConnector';
 import { PortRange } from '../ConnectionManager';
-export declare const WEB_RTC_CLEANUP: {
+export declare const WEBRTC_CLEANUP: {
     cleanUp(): void;
 };
 export interface Params {
@@ -17,8 +16,8 @@ export interface Params {
     iceServers?: IceServer[];
     portRange?: PortRange;
 }
-type Events = WebRtcConnectionEvents & ConnectionEvents;
-export declare class NodeWebRtcConnection extends EventEmitter<Events> implements IConnection, IWebRtcConnection {
+type Events = WebrtcConnectionEvents & ConnectionEvents;
+export declare class NodeWebrtcConnection extends EventEmitter<Events> implements IConnection, IWebrtcConnection {
     connectionId: ConnectionID;
     private connection?;
     private dataChannel?;
@@ -39,7 +38,7 @@ export declare class NodeWebRtcConnection extends EventEmitter<Events> implement
     setRemoteDescription(description: string, type: string): Promise<void>;
     addRemoteCandidate(candidate: string, mid: string): void;
     send(data: Uint8Array): void;
-    close(disconnectionType: DisconnectionType, reason?: string): Promise<void>;
+    close(gracefulLeave: boolean, reason?: string): Promise<void>;
     private doClose;
     destroy(): void;
     private onDataChannel;

package/dist/src/connection/{WebRTC/NodeWebRtcConnection.js → webrtc/NodeWebrtcConnection.js}

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeWebRtcConnection = exports.WEB_RTC_CLEANUP = void 0;
+exports.NodeWebrtcConnection = exports.WEBRTC_CLEANUP = void 0;
 const IConnection_1 = require("../IConnection");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const node_datachannel_1 = __importStar(require("node-datachannel"));
@@ -35,7 +35,7 @@ const errors_1 = require("../../helpers/errors");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const iceServerAsString_1 = require("./iceServerAsString");
 const logger = new utils_1.Logger(module);
-exports.WEB_RTC_CLEANUP = new class {
+exports.WEBRTC_CLEANUP = new class {
     // eslint-disable-next-line class-methods-use-this
     cleanUp() {
         node_datachannel_1.default.cleanup();
@@ -43,17 +43,17 @@ exports.WEB_RTC_CLEANUP = new class {
 };
 // Re-defined accoring to https://github.com/microsoft/TypeScript/blob/main/src/lib/dom.generated.d.ts
 // because importing single dom definitions in not possible
-var RTCPeerConnectionStateEnum;
-(function (RTCPeerConnectionStateEnum) {
-    RTCPeerConnectionStateEnum["closed"] = "closed";
-    RTCPeerConnectionStateEnum["connected"] = "connected";
-    RTCPeerConnectionStateEnum["connecting"] = "connecting";
-    RTCPeerConnectionStateEnum["disconnected"] = "disconnected";
-    RTCPeerConnectionStateEnum["failed"] = "failed";
-    RTCPeerConnectionStateEnum["new"] = "new";
-})(RTCPeerConnectionStateEnum || (RTCPeerConnectionStateEnum = {}));
+var RtcPeerConnectionStateEnum;
+(function (RtcPeerConnectionStateEnum) {
+    RtcPeerConnectionStateEnum["closed"] = "closed";
+    RtcPeerConnectionStateEnum["connected"] = "connected";
+    RtcPeerConnectionStateEnum["connecting"] = "connecting";
+    RtcPeerConnectionStateEnum["disconnected"] = "disconnected";
+    RtcPeerConnectionStateEnum["failed"] = "failed";
+    RtcPeerConnectionStateEnum["new"] = "new";
+})(RtcPeerConnectionStateEnum || (RtcPeerConnectionStateEnum = {}));
 node_datachannel_1.default.initLogger('Fatal');
-class NodeWebRtcConnection extends eventemitter3_1.default {
+class NodeWebrtcConnection extends eventemitter3_1.default {
     constructor(params) {
         super();
         this.lastState = 'connecting';
@@ -71,9 +71,8 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
         this.portRange = params.portRange;
     }
     start(isOffering) {
-        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}`);
+        logger.trace(`Starting new connection for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`, { isOffering });
         this.connection = new node_datachannel_1.PeerConnection(peerIdKey, {
             iceServers: this.iceServers.map(iceServerAsString_1.iceServerAsString),
             maxMessageSize: this.maxMessageSize,
@@ -82,7 +81,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
         });
         this.connectingTimeoutRef = setTimeout(() => {
             logger.trace('connectingTimeout, this.closed === ' + this.closed);
-            this.doClose('OTHER');
+            this.doClose(false);
         }, this.connectingTimeout);
         this.connection.onStateChange((state) => this.onStateChange(state));
         this.connection.onGatheringStateChange(() => { });
@@ -103,36 +102,36 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
     async setRemoteDescription(description, type) {
         if (this.connection) {
             try {
-                logger.trace(`Setting remote descriptor for peer: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                logger.trace(`Setting remote descriptor for peer: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
                 this.connection.setRemoteDescription(description, type);
                 this.remoteDescriptionSet = true;
             }
             catch (err) {
-                logger.warn(`Failed to set remote descriptor for peer ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                logger.debug(`Failed to set remote descriptor for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
             }
         }
         else {
-            this.doClose('OTHER', `Tried to set description for non-existent connection`);
+            this.doClose(false, `Tried to set description for non-existent connection`);
         }
     }
     addRemoteCandidate(candidate, mid) {
         if (this.connection) {
             if (this.remoteDescriptionSet) {
                 try {
-                    logger.trace(`Setting remote candidate for peer: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+                    logger.trace(`Setting remote candidate for peer: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
                     this.connection.addRemoteCandidate(candidate, mid);
                 }
                 catch (err) {
-                    logger.warn(`Failed to set remote candidate for peer ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
-                    this.doClose('OTHER');
+                    logger.debug(`Failed to set remote candidate for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
                 }
             }
             else {
-                this.doClose('OTHER', `Tried to set candidate before description`);
+                // TODO: should queue candidates until remote description is set?
+                this.doClose(false, `Tried to set candidate before description`);
             }
         }
         else {
-            this.doClose('OTHER', `Tried to set candidate for non-existent connection`);
+            this.doClose(false, `Tried to set candidate for non-existent connection`);
         }
     }
     send(data) {
@@ -141,19 +140,19 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
                 this.dataChannel.sendMessageBinary(data);
             }
             catch (err) {
-                logger.warn('Failed to send binary message to ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor) + err);
+                logger.debug('Failed to send binary message to ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor) + err);
             }
         }
     }
-    async close(disconnectionType, reason) {
-        this.doClose(disconnectionType, reason);
+    async close(gracefulLeave, reason) {
+        this.doClose(gracefulLeave, reason);
     }
-    doClose(disconnectionType, reason) {
+    doClose(gracefulLeave, reason) {
         if (!this.closed) {
-            logger.trace(`Closing Node WebRTC Connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`
+            logger.trace(`Closing Node WebRTC Connection to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`
                 + `${reason ? `, reason: ${reason}` : ''}`);
             this.closed = true;
-            this.emit('disconnected', disconnectionType, undefined, reason);
+            this.emit('disconnected', gracefulLeave, undefined, reason);
             this.removeAllListeners();
             if (this.connectingTimeoutRef) {
                 clearTimeout(this.connectingTimeoutRef);
@@ -164,7 +163,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
                     this.dataChannel.close();
                 }
                 catch (e) {
-                    logger.warn('dc.close() errored: %s', e);
+                    logger.trace('dc.close() errored: %s', e);
                 }
             }
             if (this.connection) {
@@ -172,14 +171,14 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
                     this.connection.close();
                 }
                 catch (e) {
-                    logger.warn('conn.close() errored: %s', e);
+                    logger.trace('conn.close() errored: %s', e);
                 }
             }
         }
     }
     destroy() {
         this.removeAllListeners();
-        this.doClose('OTHER');
+        this.doClose(false);
     }
     onDataChannel(dataChannel) {
         this.openDataChannel(dataChannel);
@@ -193,7 +192,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
         });
         dataChannel.onClosed(() => {
             logger.trace(`dc.closed`);
-            this.doClose('OTHER', 'DataChannel closed');
+            this.doClose(false, 'DataChannel closed');
         });
         dataChannel.onError((err) => logger.error('error', { err }));
         dataChannel.onBufferedAmountLow(() => {
@@ -209,21 +208,21 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
             clearTimeout(this.connectingTimeoutRef);
         }
         this.dataChannel = dataChannel;
-        logger.trace(`DataChannel opened for peer ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
+        logger.trace(`DataChannel opened for peer ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor)}`);
         this.emit('connected');
     }
     onStateChange(state) {
         logger.trace('onStateChange ' + state);
-        if (!Object.keys(RTCPeerConnectionStateEnum).filter((s) => isNaN(+s)).includes(state)) {
-            throw new errors_1.IllegalRTCPeerConnectionState('NodeWebRtcConnection used an unknown state: ' + state);
+        if (!Object.keys(RtcPeerConnectionStateEnum).filter((s) => isNaN(+s)).includes(state)) {
+            throw new errors_1.IllegalRtcPeerConnectionState('NodeWebrtcConnection used an unknown state: ' + state);
         }
         else {
             this.lastState = state;
         }
-        if (state === RTCPeerConnectionStateEnum.closed
-            || state === RTCPeerConnectionStateEnum.disconnected
-            || state === RTCPeerConnectionStateEnum.failed) {
-            this.doClose('OTHER');
+        if (state === RtcPeerConnectionStateEnum.closed
+            || state === RtcPeerConnectionStateEnum.disconnected
+            || state === RtcPeerConnectionStateEnum.failed) {
+            this.doClose(false);
         }
     }
     isOpen() {
@@ -233,5 +232,5 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
         this.connectionId = new IConnection_1.ConnectionID(connectionID);
     }
 }
-exports.NodeWebRtcConnection = NodeWebRtcConnection;
-//# sourceMappingURL=NodeWebRtcConnection.js.map
+exports.NodeWebrtcConnection = NodeWebrtcConnection;
+//# sourceMappingURL=NodeWebrtcConnection.js.map

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, onNewConnection: (connection: ManagedConnection) => boolean);
+    private registerLocalRpcMethods;
+    connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
+    setLocalPeerDescriptor(peerDescriptor: PeerDescriptor): void;
+    stop(): Promise<void>;
+    isOffering(targetPeerDescriptor: PeerDescriptor): boolean;
+}