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

package/dist/src/connection/connectivityChecker.js.map

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

package/dist/src/connection/connectivityRequestHandler.d.ts

@@ -0,0 +1,3 @@
+import { WebsocketServerConnection } from './websocket/WebsocketServerConnection';
+export declare const DISABLE_CONNECTIVITY_PROBE = 0;
+export declare const attachConnectivityRequestHandler: (connectionToListenTo: WebsocketServerConnection) => void;

package/dist/src/connection/connectivityRequestHandler.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.attachConnectivityRequestHandler = exports.DISABLE_CONNECTIVITY_PROBE = void 0;
+const utils_1 = require("@streamr/utils");
+const uuid_1 = require("uuid");
+const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
+const ConnectionManager_1 = require("./ConnectionManager");
+const connectivityChecker_1 = require("./connectivityChecker");
+const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
+const version_1 = require("../helpers/version");
+exports.DISABLE_CONNECTIVITY_PROBE = 0;
+const logger = new utils_1.Logger(module);
+const attachConnectivityRequestHandler = (connectionToListenTo) => {
+    connectionToListenTo.on('data', async (data) => {
+        logger.trace('server received data');
+        try {
+            const message = DhtRpc_1.Message.fromBinary(data);
+            if (message.body.oneofKind === 'connectivityRequest') {
+                logger.trace('ConnectivityRequest received: ' + JSON.stringify(DhtRpc_1.Message.toJson(message)));
+                try {
+                    await handleIncomingConnectivityRequest(connectionToListenTo, message.body.connectivityRequest);
+                    logger.trace('handleIncomingConnectivityRequest ok');
+                }
+                catch (e) {
+                    logger.error('handleIncomingConnectivityRequest', { error: e });
+                }
+            }
+        }
+        catch (err) {
+            logger.trace(`Could not parse message: ${err}`);
+        }
+    });
+};
+exports.attachConnectivityRequestHandler = attachConnectivityRequestHandler;
+const handleIncomingConnectivityRequest = async (connection, connectivityRequest) => {
+    const host = connectivityRequest.host ?? connection.remoteIpAddress;
+    const ipAddress = connection.remoteIpAddress;
+    let connectivityResponse;
+    if (connectivityRequest.port !== exports.DISABLE_CONNECTIVITY_PROBE) {
+        connectivityResponse = await connectivityProbe(connectivityRequest, ipAddress, host);
+    }
+    else {
+        logger.trace('ConnectivityRequest port is 0, replying without connectivityProbe');
+        connectivityResponse = {
+            host,
+            natType: ConnectionManager_1.NatType.UNKNOWN,
+            ipAddress: (0, utils_1.ipv4ToNumber)(ipAddress),
+            version: version_1.LOCAL_PROTOCOL_VERSION
+        };
+    }
+    const msg = {
+        serviceId: connectivityChecker_1.CONNECTIVITY_CHECKER_SERVICE_ID,
+        messageId: (0, uuid_1.v4)(),
+        body: {
+            oneofKind: 'connectivityResponse',
+            connectivityResponse
+        }
+    };
+    connection.send(DhtRpc_1.Message.toBinary(msg));
+    logger.trace('ConnectivityResponse sent: ' + JSON.stringify(DhtRpc_1.Message.toJson(msg)));
+};
+const connectivityProbe = async (connectivityRequest, ipAddress, host) => {
+    let outgoingConnection;
+    let connectivityResponseMessage;
+    try {
+        const wsServerInfo = {
+            host,
+            port: connectivityRequest.port,
+            tls: connectivityRequest.tls
+        };
+        const url = (0, WebsocketConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityProbe');
+        logger.trace(`Attempting Connectivity Check to ${url}`);
+        outgoingConnection = await (0, connectivityChecker_1.connectAsync)({
+            url,
+            selfSigned: connectivityRequest.selfSigned
+        });
+        logger.trace('Connectivity test produced positive result, communicating reply to the requester ' + host + ':' + connectivityRequest.port);
+        connectivityResponseMessage = {
+            host,
+            natType: ConnectionManager_1.NatType.OPEN_INTERNET,
+            websocket: { host, port: connectivityRequest.port, tls: connectivityRequest.tls },
+            ipAddress: (0, utils_1.ipv4ToNumber)(ipAddress),
+            version: version_1.LOCAL_PROTOCOL_VERSION
+        };
+    }
+    catch (err) {
+        logger.debug('error', { err });
+        connectivityResponseMessage = {
+            host,
+            natType: ConnectionManager_1.NatType.UNKNOWN,
+            ipAddress: (0, utils_1.ipv4ToNumber)(ipAddress),
+            version: version_1.LOCAL_PROTOCOL_VERSION
+        };
+    }
+    if (outgoingConnection) {
+        // TODO should we have some handling for this floating promise?
+        outgoingConnection.close(false);
+    }
+    return connectivityResponseMessage;
+};
+//# sourceMappingURL=connectivityRequestHandler.js.map

package/dist/src/connection/connectivityRequestHandler.js.map

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

package/dist/src/connection/simulator/Simulator.d.ts

@@ -3,7 +3,6 @@ import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ConnectionSourceEvents } from '../IConnectionSource';
 import { SimulatorConnector } from './SimulatorConnector';
 import { SimulatorConnection } from './SimulatorConnection';
-export declare function isRunningInElectron(): boolean;
 export declare enum LatencyType {
     NONE = "NONE",
     RANDOM = "RANDOM",
@@ -21,8 +20,6 @@ export declare class Simulator extends EventEmitter<ConnectionSourceEvents> {
     private MAX_LOOPS;
     private operationQueue;
     private simulatorTimeout?;
-    private static clock;
-    static useFakeTimers(on?: boolean): void;
     constructor(latencyType?: LatencyType, fixedLatency?: number);
     private generateExecutionTime;
     private getLatency;

package/dist/src/connection/simulator/Simulator.js

@@ -1,45 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Simulator = exports.LatencyType = exports.isRunningInElectron = void 0;
+exports.Simulator = exports.LatencyType = void 0;
 /* eslint-disable @typescript-eslint/parameter-properties */
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const utils_1 = require("@streamr/utils");
 const pings_1 = require("./pings");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const heap_1 = __importDefault(require("heap"));
 const debugHelpers_1 = require("../../helpers/debugHelpers");
-const sinon = __importStar(require("sinon"));
-function isRunningInElectron() {
-    // eslint-disable-next-line no-underscore-dangle
-    return typeof _streamr_electron_test !== 'undefined';
-}
-exports.isRunningInElectron = isRunningInElectron;
+const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 var LatencyType;
 (function (LatencyType) {
@@ -50,10 +21,13 @@ var LatencyType;
 })(LatencyType || (exports.LatencyType = LatencyType = {}));
 // One-way 'pipe' of messages
 class Association {
+    connectedCallback;
+    sourceConnection;
+    destinationConnection;
+    lastOperationAt = 0;
+    closing = false;
     constructor(sourceConnection, destinationConnection, connectedCallback) {
         this.connectedCallback = connectedCallback;
-        this.lastOperationAt = 0;
-        this.closing = false;
         this.sourceConnection = sourceConnection;
         this.destinationConnection = destinationConnection;
     }
@@ -74,16 +48,20 @@ class Association {
     }
 }
 class SimulatorOperation {
+    executionTime;
+    association;
+    static objectCounter = 0;
+    objectId = 0;
     constructor(executionTime, association) {
         this.executionTime = executionTime;
         this.association = association;
-        this.objectId = 0;
         this.objectId = SimulatorOperation.objectCounter;
         SimulatorOperation.objectCounter++;
     }
 }
-SimulatorOperation.objectCounter = 0;
 class ConnectOperation extends SimulatorOperation {
+    sourceConnection;
+    targetDescriptor;
     constructor(executionTime, association, sourceConnection, targetDescriptor) {
         super(executionTime, association);
         this.sourceConnection = sourceConnection;
@@ -91,6 +69,7 @@ class ConnectOperation extends SimulatorOperation {
     }
 }
 class SendOperation extends SimulatorOperation {
+    data;
     constructor(executionTime, association, data) {
         super(executionTime, association);
         this.data = data;
@@ -99,42 +78,31 @@ class SendOperation extends SimulatorOperation {
 class CloseOperation extends SimulatorOperation {
 }
 class Simulator extends eventemitter3_1.default {
-    static useFakeTimers(on = true) {
-        if (!isRunningInElectron()) { // never use fake timers in browser environment
-            if (on) {
-                if (!Simulator.clock) {
-                    Simulator.clock = sinon.useFakeTimers();
-                }
-            }
-            else {
-                if (Simulator.clock) {
-                    Simulator.clock.restore();
-                    Simulator.clock = undefined;
-                }
-            }
+    stopped = false;
+    connectors = new Map();
+    latencyTable;
+    associations = new Map();
+    latencyType;
+    fixedLatency;
+    loopCounter = 0;
+    MAX_LOOPS = 1000;
+    operationQueue = new heap_1.default((a, b) => {
+        if ((a.executionTime - b.executionTime) === 0) {
+            return (a.objectId - b.objectId);
         }
-    }
+        else {
+            return (a.executionTime - b.executionTime);
+        }
+    });
+    simulatorTimeout;
     constructor(latencyType = LatencyType.NONE, fixedLatency) {
         super();
-        this.stopped = false;
-        this.connectors = new Map();
-        this.associations = new Map();
-        this.loopCounter = 0;
-        this.MAX_LOOPS = 1000;
-        this.operationQueue = new heap_1.default((a, b) => {
-            if ((a.executionTime - b.executionTime) === 0) {
-                return (a.objectId - b.objectId);
-            }
-            else {
-                return (a.executionTime - b.executionTime);
-            }
-        });
         this.latencyType = latencyType;
         this.fixedLatency = fixedLatency;
         if (this.latencyType === LatencyType.REAL) {
             this.latencyTable = (0, pings_1.getRegionDelayMatrix)();
         }
-        if (this.latencyType === LatencyType.FIXED && !this.fixedLatency) {
+        if ((this.latencyType === LatencyType.FIXED) && (this.fixedLatency === undefined)) {
             throw new Error('LatencyType.FIXED requires the desired latency to be given as second parameter');
         }
         this.generateExecutionTime = this.generateExecutionTime.bind(this);
@@ -164,7 +132,7 @@ class Simulator extends eventemitter3_1.default {
         if (this.latencyType === LatencyType.REAL) {
             if (sourceRegion === undefined || targetRegion === undefined || sourceRegion > 15 || targetRegion > 15) {
                 logger.error('invalid region index given to Simulator');
-                throw ('invalid region index given to Simulator');
+                throw new Error('invalid region index given to Simulator');
             }
             latency = this.latencyTable[sourceRegion][targetRegion];
         }
@@ -185,10 +153,10 @@ class Simulator extends eventemitter3_1.default {
         sourceAssociation.connectedCallback();
     }
     addConnector(connector) {
-        this.connectors.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(connector.getPeerDescriptor()), connector);
+        this.connectors.set((0, identifiers_1.getNodeIdFromPeerDescriptor)(connector.getPeerDescriptor()), connector);
     }
     executeConnectOperation(operation) {
-        const target = this.connectors.get((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(operation.targetDescriptor));
+        const target = this.connectors.get((0, identifiers_1.getNodeIdFromPeerDescriptor)(operation.targetDescriptor));
         if (!target) {
             logger.error('Target connector not found when executing connect operation');
             return operation.association.connectedCallback('Target connector not found');
@@ -263,9 +231,6 @@ class Simulator extends eventemitter3_1.default {
         const firstOperationTime = firstOperation.executionTime;
         const timeDifference = firstOperationTime - currentTime;
         this.simulatorTimeout = setTimeout(this.executeQueuedOperations, timeDifference);
-        if (Simulator.clock) {
-            Simulator.clock.runAllAsync();
-        }
     }
     scheduleOperation(operation) {
         this.operationQueue.push(operation);

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

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

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

@@ -5,12 +5,15 @@ const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const Connection_1 = require("../Connection");
 const utils_1 = require("@streamr/utils");
 const protoToString_1 = require("../../helpers/protoToString");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 class SimulatorConnection extends Connection_1.Connection {
+    stopped = false;
+    localPeerDescriptor;
+    targetPeerDescriptor;
+    simulator;
     constructor(localPeerDescriptor, targetPeerDescriptor, connectionType, simulator) {
         super(connectionType);
-        this.stopped = false;
         this.localPeerDescriptor = localPeerDescriptor;
         this.setPeerDescriptor(targetPeerDescriptor);
         this.targetPeerDescriptor = targetPeerDescriptor;
@@ -30,44 +33,40 @@ class SimulatorConnection extends Connection_1.Connection {
             this.simulator.send(this, data);
         }
         else {
-            logger.error((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
-                'tried to send() on a stopped connection');
+            const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor);
+            const targetNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor);
+            logger.error(localNodeId + ', ' + targetNodeId + 'tried to send() on a stopped connection');
         }
     }
     async close(gracefulLeave) {
-        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor)
-            + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) + ' close()');
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor);
+        const targetNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor);
+        logger.trace(localNodeId + ', ' + targetNodeId + ' close()');
         if (!this.stopped) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', '
-                + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) + ' close() not stopped');
+            logger.trace(localNodeId + ', ' + targetNodeId + ' close() not stopped');
             this.stopped = true;
             try {
-                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
-                    ' close() calling simulator.disconnect()');
+                logger.trace(localNodeId + ', ' + targetNodeId + ' close() calling simulator.disconnect()');
                 this.simulator.close(this);
-                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
-                    ' close() simulator.disconnect returned');
+                logger.trace(localNodeId + ', ' + targetNodeId + ' close() simulator.disconnect returned');
             }
             catch (e) {
-                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
-                    'close aborted' + e);
+                logger.trace(localNodeId + ', ' + targetNodeId + 'close aborted' + e);
             }
             finally {
-                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
-                    ' calling this.doDisconnect');
+                logger.trace(localNodeId + ', ' + targetNodeId + ' calling this.doDisconnect');
                 this.doDisconnect(gracefulLeave);
             }
         }
         else {
-            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) +
-                ' close() tried to close a stopped connection');
+            logger.trace(localNodeId + ', ' + targetNodeId + ' close() tried to close a stopped connection');
         }
     }
     connect() {
         if (!this.stopped) {
             logger.trace('connect() called');
             this.simulator.connect(this, this.targetPeerDescriptor, (error) => {
-                if (error) {
+                if (error !== undefined) {
                     logger.trace(error);
                     this.doDisconnect(false);
                 }
@@ -92,7 +91,8 @@ class SimulatorConnection extends Connection_1.Connection {
     }
     handleIncomingDisconnection() {
         if (!this.stopped) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' handleIncomingDisconnection()');
+            const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor);
+            logger.trace(localNodeId + ' handleIncomingDisconnection()');
             this.stopped = true;
             this.doDisconnect(false);
         }
@@ -101,20 +101,22 @@ class SimulatorConnection extends Connection_1.Connection {
         }
     }
     destroy() {
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor);
         if (!this.stopped) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' destroy()');
+            logger.trace(localNodeId + ' destroy()');
             this.removeAllListeners();
             this.close(false).catch((_e) => { });
         }
         else {
-            logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' tried to call destroy() a stopped connection');
+            logger.trace(localNodeId + ' tried to call destroy() a stopped connection');
         }
     }
     doDisconnect(gracefulLeave) {
-        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ' doDisconnect()');
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor);
+        const targetNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor);
+        logger.trace(localNodeId + ' doDisconnect()');
         this.stopped = true;
-        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.localPeerDescriptor) + ', '
-            + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.targetPeerDescriptor) + ' doDisconnect emitting');
+        logger.trace(localNodeId + ', ' + targetNodeId + ' doDisconnect emitting');
         this.emit('disconnected', gracefulLeave);
     }
 }

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

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

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

@@ -6,32 +6,35 @@ 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 identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 class SimulatorConnector {
+    connectingConnections = new Map();
+    stopped = false;
+    localPeerDescriptor;
+    simulator;
+    onNewConnection;
     constructor(localPeerDescriptor, simulator, onNewConnection) {
-        this.connectingConnections = new Map();
-        this.stopped = false;
         this.localPeerDescriptor = localPeerDescriptor;
         this.simulator = simulator;
         this.onNewConnection = onNewConnection;
     }
     connect(targetPeerDescriptor) {
-        logger.trace('connect() ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor));
-        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
-        const existingConnection = this.connectingConnections.get(peerKey);
+        logger.trace('connect() ' + (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor));
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor);
+        const existingConnection = this.connectingConnections.get(nodeId);
         if (existingConnection) {
             return existingConnection;
         }
         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);
+        this.connectingConnections.set(nodeId, managedConnection);
         connection.once('disconnected', () => {
-            this.connectingConnections.delete(peerKey);
+            this.connectingConnections.delete(nodeId);
         });
         connection.once('connected', () => {
-            this.connectingConnections.delete(peerKey);
+            this.connectingConnections.delete(nodeId);
         });
         connection.connect();
         return managedConnection;
@@ -40,7 +43,8 @@ class SimulatorConnector {
         return this.localPeerDescriptor;
     }
     handleIncomingConnection(sourceConnection) {
-        logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor) + ' incoming connection, stopped: ' + this.stopped);
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor);
+        logger.trace(localNodeId + ' incoming connection, stopped: ' + this.stopped);
         if (this.stopped) {
             return;
         }
@@ -48,9 +52,9 @@ class SimulatorConnector {
         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.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor) + ' incoming handshake request');
+            logger.trace(localNodeId + ' incoming handshake request');
             if (this.onNewConnection(managedConnection)) {
-                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(sourceConnection.localPeerDescriptor) + ' calling acceptHandshake');
+                logger.trace(localNodeId + ' calling acceptHandshake');
                 managedConnection.acceptHandshake();
             }
             else {

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

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