npm - @streamr/dht - Versions diffs - 0.0.1-tatum.6 → 0.0.1-tatum.8 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (255) hide show

package/dist/src/connection/ManagedConnection.js CHANGED Viewed

@@ -33,11 +33,11 @@ const Handshaker_1 = require("./Handshaker");
 const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
+const ConnectionManager_1 = require("./ConnectionManager");
 const logger = new utils_1.Logger(module);
 class ManagedConnection extends eventemitter3_1.default {
-    constructor(ownPeerDescriptor, protocolVersion, connectionType, outgoingConnection, incomingConnection) {
+    constructor(ownPeerDescriptor, connectionType, outgoingConnection, incomingConnection) {
         super();
-        this.objectId = 0;
         this.outputBuffer = [];
         this.inputBuffer = [];
         this.handshakeCompleted = false;
@@ -54,35 +54,32 @@ class ManagedConnection extends eventemitter3_1.default {
             this.setPeerDescriptor(peerDescriptor);
             this.handshakeCompleted = true;
             while (this.outputBuffer.length > 0) {
-                logger.trace('emptying outputBuffer objectId: ' + this.objectId);
+                logger.trace('emptying outputBuffer');
                 this.implementation.send(this.outputBuffer.shift());
             }
-            logger.trace('emitting handshake_completed, objectId: ' + this.objectId);
+            logger.trace('emitting handshake_completed');
             this.emit('handshakeCompleted', peerDescriptor);
         };
-        this.objectId = ManagedConnection.objectCounter;
-        ManagedConnection.objectCounter++;
         this.send = this.send.bind(this);
         this.ownPeerDescriptor = ownPeerDescriptor;
-        this.protocolVersion = protocolVersion;
         this.outgoingConnection = outgoingConnection;
         this.incomingConnection = incomingConnection;
         this.connectionType = connectionType;
         this.connectionId = new IConnection_1.ConnectionID();
         this.onDisconnected = this.onDisconnected.bind(this);
-        logger.trace('creating ManagedConnection of type: ' + connectionType + ' objectId: ' + this.objectId);
+        logger.trace('creating ManagedConnection of type: ' + connectionType);
         if (incomingConnection && outgoingConnection) {
             throw new Err.IllegalArguments('Managed connection constructor only accepts either an incoming connection OR a outgoing connection');
         }
         if (outgoingConnection) {
-            this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.protocolVersion, outgoingConnection);
+            this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, outgoingConnection);
             this.handshaker.once('handshakeFailed', (errorMessage) => {
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' handshakeFailed: ' + errorMessage);
+                logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed: ' + errorMessage);
                 this.emit('handshakeFailed');
             });
             this.handshaker.on('handshakeCompleted', (peerDescriptor) => {
-                logger.trace('handshake completed for outgoing connection ' + this.ownPeerDescriptor.nodeName +
-                    ', ' + this.peerDescriptor?.nodeName + ' objectid: ' + this.objectId
+                logger.trace('handshake completed for outgoing connection '
+                    + ', ' + (0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor)
                     + ' outputBuffer.length: ' + this.outputBuffer.length);
                 this.attachImplementation(outgoingConnection);
                 this.onHandshakeCompleted(peerDescriptor);
@@ -95,7 +92,7 @@ class ManagedConnection extends eventemitter3_1.default {
         }
         else {
             if (incomingConnection) {
-                this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.protocolVersion, incomingConnection);
+                this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, incomingConnection);
                 this.handshaker.on('handshakeRequest', (peerDescriptor) => {
                     this.setPeerDescriptor(peerDescriptor);
                     this.emit('handshakeRequest', peerDescriptor);
@@ -110,7 +107,7 @@ class ManagedConnection extends eventemitter3_1.default {
     context) {
         if (event === 'managedData' && this.listenerCount('managedData') === 0) {
             while (this.inputBuffer.length > 0) {
-                logger.trace('emptying inputBuffer objectId: ' + this.objectId);
+                logger.trace('emptying inputBuffer');
                 const data = this.inputBuffer.shift();
                 fn(data, this.getPeerDescriptor());
             }
@@ -124,7 +121,7 @@ class ManagedConnection extends eventemitter3_1.default {
         if (event === 'managedData' && this.listenerCount('managedData') === 0) {
             if (this.inputBuffer.length > 0) {
                 while (this.inputBuffer.length > 0) {
-                    logger.trace('emptying inputBuffer objectId: ' + this.objectId);
+                    logger.trace('emptying inputBuffer');
                     const data = this.inputBuffer.shift();
                     fn(data, this.getPeerDescriptor());
                 }
@@ -150,8 +147,8 @@ class ManagedConnection extends eventemitter3_1.default {
     getPeerDescriptor() {
         return this.peerDescriptor;
     }
-    attachImplementation(impl, _peerDescriptor) {
-        logger.trace('attachImplementation() objectId: ' + this.objectId);
+    attachImplementation(impl) {
+        logger.trace('attachImplementation()');
         this.implementation = impl;
         impl.on('data', (bytes) => {
             this.lastUsed = Date.now();
@@ -173,8 +170,8 @@ class ManagedConnection extends eventemitter3_1.default {
         impl.off('disconnected', this.onDisconnected);
         impl.on('disconnected', this.onDisconnected);
     }
-    onDisconnected(disconnectionType, _code, _reason) {
-        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' onDisconnected() ' + disconnectionType);
+    onDisconnected(disconnectionType) {
+        logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' onDisconnected() ' + disconnectionType);
         if (this.bufferSentbyOtherConnection) {
             return;
         }
@@ -196,7 +193,7 @@ class ManagedConnection extends eventemitter3_1.default {
             this.implementation.send(data);
         }
         else {
-            logger.trace('adding data to outputBuffer objectId: ' + this.objectId);
+            logger.trace('adding data to outputBuffer');
             let result;
             this.doNotEmitDisconnected = true;
             try {
@@ -204,7 +201,7 @@ class ManagedConnection extends eventemitter3_1.default {
                     'bufferSentByOtherConnection', 'closing', 'internal_disconnected'], 15000);
             }
             catch (e) {
-                logger.debug(`Connection from ${this.ownPeerDescriptor.nodeName} to ${this.peerDescriptor?.nodeName} timed out`);
+                logger.debug(`Connection to ${(0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor)} timed out`);
                 throw e;
             }
             if (result.winnerName === 'internal_disconnected') {
@@ -212,7 +209,7 @@ class ManagedConnection extends eventemitter3_1.default {
                 this.doDisconnect('OTHER');
             }
             else if (result.winnerName === 'handshakeFailed') {
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' handshakeFailed received');
+                logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed received');
                 if (this.bufferSentbyOtherConnection) {
                     logger.trace('bufferSentByOtherConnection already true');
                     this.doNotEmitDisconnected = false;
@@ -224,8 +221,8 @@ class ManagedConnection extends eventemitter3_1.default {
                         result2 = await (0, utils_1.raceEvents3)(this, ['bufferSentByOtherConnection', 'closing', 'disconnected'], 15000);
                     }
                     catch (ex) {
-                        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName +
-                            ' Exception from raceEvents3 while waiting bufferSentByOtherConnection or closing ' + ex);
+                        logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor)
+                            + ' Exception from raceEvents3 while waiting bufferSentByOtherConnection or closing ' + ex);
                         throw ex;
                     }
                     if (result2.winnerName === 'bufferSentByOtherConnection') {
@@ -252,12 +249,12 @@ class ManagedConnection extends eventemitter3_1.default {
             this.implementation.send(data);
         }
         else {
-            logger.trace('adding data to outputBuffer objectId: ' + this.objectId);
+            logger.trace('adding data to outputBuffer');
             this.outputBuffer.push(data);
         }
     }
     reportBufferSentByOtherConnection() {
-        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' reportBufferSentByOtherConnection');
+        logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' reportBufferSentByOtherConnection');
         if (this.handshaker) {
             this.handshaker.removeAllListeners();
         }
@@ -265,15 +262,11 @@ class ManagedConnection extends eventemitter3_1.default {
         this.bufferSentbyOtherConnection = true;
         this.emit('bufferSentByOtherConnection');
     }
-    reportBufferSendingByOtherConnectionFailed() {
-        logger.trace('reportBufferSendingByOtherConnectionFailed');
-        this.doDisconnect('OTHER');
-    }
     acceptHandshake() {
         // This happens when connectionRequest has been made and answered
         if (this.implementation) {
             if (!this.handshaker) {
-                this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.protocolVersion, this.implementation);
+                this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.implementation);
             }
             this.handshaker.sendHandshakeResponse();
         }
@@ -287,14 +280,13 @@ class ManagedConnection extends eventemitter3_1.default {
         this.handshaker.sendHandshakeResponse(errorMessage);
     }
     doDisconnect(disconnectionType) {
-        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' doDisconnect() emitting');
+        logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' doDisconnect() emitting');
         if (!this.doNotEmitDisconnected) {
-            logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' emitting disconnected');
+            logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' emitting disconnected');
             this.emit('disconnected', disconnectionType);
         }
         else {
-            logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName +
-                ' not emitting disconnected because doNotEmitDisconnected flag is set');
+            logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' not emitting disconnected because doNotEmitDisconnected flag is set');
         }
     }
     async close(disconnectionType) {
@@ -344,5 +336,4 @@ class ManagedConnection extends eventemitter3_1.default {
     }
 }
 exports.ManagedConnection = ManagedConnection;
-ManagedConnection.objectCounter = 0;
 //# sourceMappingURL=ManagedConnection.js.map

package/dist/src/connection/ManagedConnection.js.map CHANGED Viewed

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

package/dist/src/connection/ManagedWebRtcConnection.d.ts CHANGED Viewed

@@ -2,6 +2,6 @@ import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { ManagedConnection } from './ManagedConnection';
 import { NodeWebRtcConnection } from './WebRTC/NodeWebRtcConnection';
 export declare class ManagedWebRtcConnection extends ManagedConnection {
-    constructor(ownPeerDescriptor: PeerDescriptor, protocolVersion: string, connectingConnection?: NodeWebRtcConnection, connectedConnection?: NodeWebRtcConnection);
+    constructor(ownPeerDescriptor: PeerDescriptor, connectingConnection?: NodeWebRtcConnection, connectedConnection?: NodeWebRtcConnection);
     getWebRtcConnection(): NodeWebRtcConnection;
 }

package/dist/src/connection/ManagedWebRtcConnection.js CHANGED Viewed

@@ -4,8 +4,8 @@ exports.ManagedWebRtcConnection = void 0;
 const IConnection_1 = require("./IConnection");
 const ManagedConnection_1 = require("./ManagedConnection");
 class ManagedWebRtcConnection extends ManagedConnection_1.ManagedConnection {
-    constructor(ownPeerDescriptor, protocolVersion, connectingConnection, connectedConnection) {
-        super(ownPeerDescriptor, protocolVersion, IConnection_1.ConnectionType.WEBRTC, connectingConnection, connectedConnection);
+    constructor(ownPeerDescriptor, connectingConnection, connectedConnection) {
+        super(ownPeerDescriptor, IConnection_1.ConnectionType.WEBRTC, connectingConnection, connectedConnection);
     }
     getWebRtcConnection() {
         if (this.outgoingConnection) {

package/dist/src/connection/ManagedWebRtcConnection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ManagedWebRtcConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedWebRtcConnection.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAC9C,2DAAuD;AAGvD,MAAa,uBAAwB,SAAQ,qCAAiB;IAE1D,YAAY,iBAAiC,EACzC,~~eAAuB,EACvB,~~oBAA2C,EAC3C,mBAA0C;QAC1C,KAAK,CACD,iBAAiB,EACjB,~~eAAe,EACf,~~4BAAc,CAAC,MAAM,EACrB,oBAAoB,EACpB,mBAAmB,CAAC,CAAA;IAC5B,CAAC;IAEM,mBAAmB;QACtB,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;aAAM;YACH,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;IACL,CAAC;CACJ;~~AArBD~~,~~0DAqBC~~"}
1	+ {"version":3,"file":"ManagedWebRtcConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedWebRtcConnection.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAC9C,2DAAuD;AAGvD,MAAa,uBAAwB,SAAQ,qCAAiB;IAE1D,YAAY,iBAAiC,EACzC,oBAA2C,EAC3C,mBAA0C;QAC1C,KAAK,CACD,iBAAiB,EACjB,4BAAc,CAAC,MAAM,EACrB,oBAAoB,EACpB,mBAAmB,CAAC,CAAA;IAC5B,CAAC;IAEM,mBAAmB;QACtB,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;aAAM;YACH,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;IACL,CAAC;CACJ;AAnBD,0DAmBC"}

package/dist/src/connection/Simulator/Simulator.d.ts CHANGED Viewed

@@ -18,7 +18,6 @@ export declare class Simulator extends EventEmitter<ConnectionSourceEvents> {
     private latencyType;
     private fixedLatency?;
     private loopCounter;
-    private operationCounter;
     private MAX_LOOPS;
     private operationQueue;
     private simulatorTimeout?;
@@ -33,7 +32,6 @@ export declare class Simulator extends EventEmitter<ConnectionSourceEvents> {
     private executeCloseOperation;
     private executeSendOperation;
     private executeQueuedOperations;
-    getOperationCounter(): number;
     private scheduleNextTimeout;
     private scheduleOperation;
     connect(sourceConnection: SimulatorConnection, targetDescriptor: PeerDescriptor, connectedCallback: (error?: string) => void): void;

package/dist/src/connection/Simulator/Simulator.js CHANGED Viewed

@@ -120,7 +120,6 @@ class Simulator extends eventemitter3_1.default {
         this.connectors = new Map();
         this.associations = new Map();
         this.loopCounter = 0;
-        this.operationCounter = 0;
         this.MAX_LOOPS = 1000;
         this.operationQueue = new heap_1.default((a, b) => {
             if ((a.executionTime - b.executionTime) === 0) {
@@ -230,7 +229,6 @@ class Simulator extends eventemitter3_1.default {
         while (this.operationQueue.size() > 0
             && this.operationQueue.peek().executionTime <= currentTime) {
             const operation = this.operationQueue.pop();
-            this.operationCounter++;
             if (operation instanceof ConnectOperation) {
                 this.executeConnectOperation(operation);
             }
@@ -252,9 +250,6 @@ class Simulator extends eventemitter3_1.default {
         }
         this.scheduleNextTimeout();
     }
-    getOperationCounter() {
-        return this.operationCounter;
-    }
     scheduleNextTimeout() {
         if (this.simulatorTimeout) {
             clearTimeout(this.simulatorTimeout);

package/dist/src/connection/Simulator/Simulator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Simulator.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/Simulator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA4D;AAC5D,kEAAwC;AAOxC,0CAAuC;AACvC,mCAA8C;AAC9C,qFAA8E;AAC9E,gDAAuB;AACvB,6DAAsD;AACtD,6CAA8B;AAM9B,SAAgB,mBAAmB;IAC/B,gDAAgD;IAChD,OAAO,OAAO,sBAAsB,KAAK,WAAW,CAAA;AACxD,CAAC;AAHD,kDAGC;AAED,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,IAAY,WAAgF;AAA5F,WAAY,WAAW;IAAG,4BAAa,CAAA;IAAE,gCAAiB,CAAA;IAAE,4BAAa,CAAA;IAAE,8BAAe,CAAA;AAAC,CAAC,EAAhF,WAAW,2BAAX,WAAW,QAAqE;AAE5F,6BAA6B;AAE7B,MAAM,WAAW;IAMb,YAAY,gBAAqC,EAC7C,qBAA2C,EACpC,iBAA4C;QAA5C,sBAAiB,GAAjB,iBAAiB,CAA2B;QAL/C,oBAAe,GAAW,CAAC,CAAA;QAC3B,YAAO,GAAG,KAAK,CAAA;QAMnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;IACtD,CAAC;IAEM,wBAAwB,CAAC,UAA+B;QAC3D,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAA;IAC3C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC/B,CAAC;IAEM,kBAAkB,CAAC,aAAqB;QAC3C,IAAI,CAAC,eAAe,GAAG,aAAa,CAAA;IACxC,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;IACvB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ;AAED,MAAM,kBAAkB;IAIpB,YACW,aAAqB,EACrB,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAQ;QACrB,gBAAW,GAAX,WAAW,CAAa;QAJ5B,aAAQ,GAAG,CAAC,CAAA;QAMf,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAA;QAChD,kBAAkB,CAAC,aAAa,EAAE,CAAA;IACtC,CAAC;;AATc,gCAAa,GAAG,CAAC,AAAJ,CAAI;AAYpC,MAAM,gBAAiB,SAAQ,kBAAkB;IAC7C,YACI,aAAqB,EACrB,WAAwB,EACjB,gBAAqC,EACrC,gBAAgC;QAEvC,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAH1B,qBAAgB,GAAhB,gBAAgB,CAAqB;QACrC,qBAAgB,GAAhB,gBAAgB,CAAgB;IAG3C,CAAC;CACJ;AAED,MAAM,aAAc,SAAQ,kBAAkB;IAC1C,YACI,aAAqB,EACrB,WAAwB,EACjB,IAAgB;QAEvB,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAF1B,SAAI,GAAJ,IAAI,CAAY;IAG3B,CAAC;CACJ;AAED,MAAM,cAAe,SAAQ,kBAAkB;CAC9C;AAED,MAAa,SAAU,SAAQ,uBAAoC;~~IAwB~~/D,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,IAAI;QAC1B,IAAI,CAAC,mBAAmB,EAAE,EAAE,EAAG,+CAA+C;YAC1E,IAAI,EAAE,EAAE;gBACJ,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;oBAClB,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,CAAA;iBAC1C;aACJ;iBAAM;gBACH,IAAI,SAAS,CAAC,KAAK,EAAE;oBACjB,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;oBACzB,SAAS,CAAC,KAAK,GAAG,SAAS,CAAA;iBAC9B;aACJ;SACJ;IACL,CAAC;IAED,YAAY,cAA2B,WAAW,CAAC,IAAI,EAAE,YAAqB;QAC1E,KAAK,EAAE,CAAA;~~QAvCH~~,YAAO,GAAG,KAAK,CAAA;QACf,eAAU,GAAuC,IAAI,GAAG,EAAE,CAAA;QAE1D,iBAAY,GAAmC,IAAI,GAAG,EAAE,CAAA;QAKxD,gBAAW,GAAG,CAAC,CAAA;QACf,~~qBAAgB,GAAG,CAAC,CAAA;QACpB,~~cAAS,GAAG,IAAI,CAAA;QAEhB,mBAAc,GAA6B,IAAI,cAAI,CAAqB,CAAC,CAAqB,EAAE,CAAqB,EAAE,EAAE;YAC7H,IAAI,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;gBAC3C,OAAO,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAA;aACnC;iBAAM;gBACH,OAAO,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC,CAAA;aAC7C;QACL,CAAC,CAAC,CAAA;QAuBE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAEhC,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,EAAE;YACvC,IAAI,CAAC,YAAY,GAAG,IAAA,4BAAoB,GAAE,CAAA;SAC7C;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YAC9D,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAA;SACpG;QAED,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClE,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChE,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9D,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9D,CAAC;IAEO,qBAAqB,CAAC,WAAwB,EAAE,YAAgC,EAAE,YAAgC;QACtH,IAAI,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC5E,IAAI,WAAW,CAAC,kBAAkB,EAAE,GAAG,aAAa,EAAE;YAClD,aAAa,GAAG,WAAW,CAAC,kBAAkB,EAAE,CAAA;SACnD;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAEO,UAAU,CAAC,YAAgC,EAAE,YAAgC;QACjF,IAAI,OAAO,GAAW,CAAC,CAAA;QAEvB,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,KAAK,EAAE;YACxC,OAAO,GAAG,IAAI,CAAC,YAAa,CAAA;SAC/B;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,EAAE;YAEvC,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,GAAG,EAAE,IAAI,YAAY,GAAG,EAAE,EAAE;gBACpG,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;gBACvD,MAAM,CAAC,yCAAyC,CAAC,CAAA;aACpD;YAED,OAAO,GAAG,IAAI,CAAC,YAAa,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,CAAA;SAC3D;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,MAAM,EAAE;YACzC,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;SAC1C;QAED,OAAO,OAAO,CAAA;IAClB,CAAC;IAEM,MAAM,CAAC,gBAAqC,EAAE,gBAAqC;QAEtF,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QAE9E,IAAI,CAAC,iBAAiB,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;YACxD,OAAM;SACT;QACD,iBAAiB,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAA;QAE5D,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;QAC7E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;QAEvE,iBAAiB,CAAC,iBAAkB,EAAE,CAAA;IAC1C,CAAC;IAEM,YAAY,CAAC,SAA6B;QAC7C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;IACxF,CAAC;IAEO,uBAAuB,CAAC,SAA2B;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAA;QAErF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAA;YAC3E,OAAO,SAAS,CAAC,WAAW,CAAC,iBAAkB,CAAC,4BAA4B,CAAC,CAAA;SAChF;QAED,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAEO,qBAAqB,CAAC,SAAyB;QAEnD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,qBAAqB,CAAA;QAE1D,IAAI,kBAA2C,CAAA;QAE/C,IAAI,MAAM,EAAE;YACR,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SAClE;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;SAEhF;aAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE;YACxC,MAAM,CAAC,2BAA2B,EAAE,CAAA;YACpC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SACrB;aAAM;YACH,iEAAiE;YACjE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YAC7C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;SAChF;IACL,CAAC;IAEO,oBAAoB,CAAC,SAAwB;QAEjD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,qBAAqB,CAAA;QAC1D,MAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE9C,CAAC;IAEO,uBAAuB;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC9B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC;eAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,EAAG,CAAC,aAAa,IAAI,WAAW,EAAE;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAA;YAE3C,IAAI,~~CAAC,gBAAgB,EAAE,CAAA;YAEvB,IAAI,~~SAAS,YAAY,gBAAgB,EAAE;gBACvC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAA;aAC1C;iBAAM,IAAI,SAAS,YAAY,cAAc,EAAE;gBAC5C,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;aACxC;iBAAM,IAAI,SAAS,YAAY,aAAa,EAAE;gBAC3C,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;aACvC;iBAAM;gBACH,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;aAC7C;YAED,IAAI,CAAC,WAAW,EAAE,CAAA;YAClB,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,EAAE;gBACpC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAA;gBACpB,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAA;gBACnD,OAAM;aACT;SACJ;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAC9B,CAAC;~~IAEM,mBAAmB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAChC,CAAC;~~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~~AAnTD~~,~~8BAmTC~~"}
1	+ {"version":3,"file":"Simulator.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/Simulator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA4D;AAC5D,kEAAwC;AAOxC,0CAAuC;AACvC,mCAA8C;AAC9C,qFAA8E;AAC9E,gDAAuB;AACvB,6DAAsD;AACtD,6CAA8B;AAM9B,SAAgB,mBAAmB;IAC/B,gDAAgD;IAChD,OAAO,OAAO,sBAAsB,KAAK,WAAW,CAAA;AACxD,CAAC;AAHD,kDAGC;AAED,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,IAAY,WAAgF;AAA5F,WAAY,WAAW;IAAG,4BAAa,CAAA;IAAE,gCAAiB,CAAA;IAAE,4BAAa,CAAA;IAAE,8BAAe,CAAA;AAAC,CAAC,EAAhF,WAAW,2BAAX,WAAW,QAAqE;AAE5F,6BAA6B;AAE7B,MAAM,WAAW;IAMb,YAAY,gBAAqC,EAC7C,qBAA2C,EACpC,iBAA4C;QAA5C,sBAAiB,GAAjB,iBAAiB,CAA2B;QAL/C,oBAAe,GAAW,CAAC,CAAA;QAC3B,YAAO,GAAG,KAAK,CAAA;QAMnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;IACtD,CAAC;IAEM,wBAAwB,CAAC,UAA+B;QAC3D,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAA;IAC3C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC/B,CAAC;IAEM,kBAAkB,CAAC,aAAqB;QAC3C,IAAI,CAAC,eAAe,GAAG,aAAa,CAAA;IACxC,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;IACvB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ;AAED,MAAM,kBAAkB;IAIpB,YACW,aAAqB,EACrB,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAQ;QACrB,gBAAW,GAAX,WAAW,CAAa;QAJ5B,aAAQ,GAAG,CAAC,CAAA;QAMf,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAA;QAChD,kBAAkB,CAAC,aAAa,EAAE,CAAA;IACtC,CAAC;;AATc,gCAAa,GAAG,CAAC,AAAJ,CAAI;AAYpC,MAAM,gBAAiB,SAAQ,kBAAkB;IAC7C,YACI,aAAqB,EACrB,WAAwB,EACjB,gBAAqC,EACrC,gBAAgC;QAEvC,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAH1B,qBAAgB,GAAhB,gBAAgB,CAAqB;QACrC,qBAAgB,GAAhB,gBAAgB,CAAgB;IAG3C,CAAC;CACJ;AAED,MAAM,aAAc,SAAQ,kBAAkB;IAC1C,YACI,aAAqB,EACrB,WAAwB,EACjB,IAAgB;QAEvB,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAF1B,SAAI,GAAJ,IAAI,CAAY;IAG3B,CAAC;CACJ;AAED,MAAM,cAAe,SAAQ,kBAAkB;CAC9C;AAED,MAAa,SAAU,SAAQ,uBAAoC;IAuB/D,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,IAAI;QAC1B,IAAI,CAAC,mBAAmB,EAAE,EAAE,EAAG,+CAA+C;YAC1E,IAAI,EAAE,EAAE;gBACJ,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;oBAClB,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,CAAA;iBAC1C;aACJ;iBAAM;gBACH,IAAI,SAAS,CAAC,KAAK,EAAE;oBACjB,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;oBACzB,SAAS,CAAC,KAAK,GAAG,SAAS,CAAA;iBAC9B;aACJ;SACJ;IACL,CAAC;IAED,YAAY,cAA2B,WAAW,CAAC,IAAI,EAAE,YAAqB;QAC1E,KAAK,EAAE,CAAA;QAtCH,YAAO,GAAG,KAAK,CAAA;QACf,eAAU,GAAuC,IAAI,GAAG,EAAE,CAAA;QAE1D,iBAAY,GAAmC,IAAI,GAAG,EAAE,CAAA;QAKxD,gBAAW,GAAG,CAAC,CAAA;QACf,cAAS,GAAG,IAAI,CAAA;QAEhB,mBAAc,GAA6B,IAAI,cAAI,CAAqB,CAAC,CAAqB,EAAE,CAAqB,EAAE,EAAE;YAC7H,IAAI,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;gBAC3C,OAAO,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAA;aACnC;iBAAM;gBACH,OAAO,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC,CAAA;aAC7C;QACL,CAAC,CAAC,CAAA;QAuBE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAEhC,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,EAAE;YACvC,IAAI,CAAC,YAAY,GAAG,IAAA,4BAAoB,GAAE,CAAA;SAC7C;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YAC9D,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAA;SACpG;QAED,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClE,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChE,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9D,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9D,CAAC;IAEO,qBAAqB,CAAC,WAAwB,EAAE,YAAgC,EAAE,YAAgC;QACtH,IAAI,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC5E,IAAI,WAAW,CAAC,kBAAkB,EAAE,GAAG,aAAa,EAAE;YAClD,aAAa,GAAG,WAAW,CAAC,kBAAkB,EAAE,CAAA;SACnD;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAEO,UAAU,CAAC,YAAgC,EAAE,YAAgC;QACjF,IAAI,OAAO,GAAW,CAAC,CAAA;QAEvB,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,KAAK,EAAE;YACxC,OAAO,GAAG,IAAI,CAAC,YAAa,CAAA;SAC/B;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,EAAE;YAEvC,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,GAAG,EAAE,IAAI,YAAY,GAAG,EAAE,EAAE;gBACpG,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;gBACvD,MAAM,CAAC,yCAAyC,CAAC,CAAA;aACpD;YAED,OAAO,GAAG,IAAI,CAAC,YAAa,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,CAAA;SAC3D;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,MAAM,EAAE;YACzC,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;SAC1C;QAED,OAAO,OAAO,CAAA;IAClB,CAAC;IAEM,MAAM,CAAC,gBAAqC,EAAE,gBAAqC;QAEtF,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QAE9E,IAAI,CAAC,iBAAiB,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;YACxD,OAAM;SACT;QACD,iBAAiB,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAA;QAE5D,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;QAC7E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;QAEvE,iBAAiB,CAAC,iBAAkB,EAAE,CAAA;IAC1C,CAAC;IAEM,YAAY,CAAC,SAA6B;QAC7C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;IACxF,CAAC;IAEO,uBAAuB,CAAC,SAA2B;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAA;QAErF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAA;YAC3E,OAAO,SAAS,CAAC,WAAW,CAAC,iBAAkB,CAAC,4BAA4B,CAAC,CAAA;SAChF;QAED,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAEO,qBAAqB,CAAC,SAAyB;QAEnD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,qBAAqB,CAAA;QAE1D,IAAI,kBAA2C,CAAA;QAE/C,IAAI,MAAM,EAAE;YACR,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SAClE;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;SAEhF;aAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE;YACxC,MAAM,CAAC,2BAA2B,EAAE,CAAA;YACpC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SACrB;aAAM;YACH,iEAAiE;YACjE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YAC7C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;SAChF;IACL,CAAC;IAEO,oBAAoB,CAAC,SAAwB;QAEjD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,qBAAqB,CAAA;QAC1D,MAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE9C,CAAC;IAEO,uBAAuB;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC9B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC;eAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,EAAG,CAAC,aAAa,IAAI,WAAW,EAAE;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAA;YAE3C,IAAI,SAAS,YAAY,gBAAgB,EAAE;gBACvC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAA;aAC1C;iBAAM,IAAI,SAAS,YAAY,cAAc,EAAE;gBAC5C,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;aACxC;iBAAM,IAAI,SAAS,YAAY,aAAa,EAAE;gBAC3C,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;aACvC;iBAAM;gBACH,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;aAC7C;YAED,IAAI,CAAC,WAAW,EAAE,CAAA;YAClB,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,EAAE;gBACpC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAA;gBACpB,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAA;gBACnD,OAAM;aACT;SACJ;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAC9B,CAAC;IAEO,mBAAmB;QACvB,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAA;SACpC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAE9B,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAA;QAEjD,IAAI,CAAC,cAAc,EAAE;YACjB,OAAM;SACT;QAED,MAAM,kBAAkB,GAAG,cAAc,CAAC,aAAa,CAAA;QACvD,MAAM,cAAc,GAAG,kBAAkB,GAAG,WAAW,CAAA;QAEvD,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,uBAAuB,EAAE,cAAc,CAAC,CAAA;QAEhF,IAAI,SAAS,CAAC,KAAK,EAAE;YACjB,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,CAAA;SAChC;IACL,CAAC;IAEO,iBAAiB,CAAC,SAA6B;QACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACnC,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAC9B,CAAC;IAEM,OAAO,CAAC,gBAAqC,EAAE,gBAAgC,EAAE,iBAA2C;QAE/H,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,0CAA0C,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;YAC9E,OAAM;SACT;QACD,wBAAS,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAA;QAE3D,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,gBAAgB,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAA;QACnF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEjE,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACjI,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAE7C,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,aAAa,EAAE,WAAW,EAC7D,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;QAEvC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,gBAAqC;QAE9C,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACxE,IAAI,CAAC,WAAW,EAAE;YACd,OAAM;SACT;QAED,WAAW,CAAC,UAAU,EAAE,CAAA;QAExB,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,EACxD,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,EACzC,gBAAgB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAA;QACjD,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAE7C,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAEhE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,CAAC;IAEM,IAAI,CAAC,gBAAqC,EAAE,IAAgB;QAE/D,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACxE,IAAI,CAAC,WAAW,EAAE;YACd,OAAM;SACT;QAED,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;YACzB,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAA;YAC7D,OAAM;SACT;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,EACxD,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,EACzC,WAAW,CAAC,qBAAsB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAEhE,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAE7C,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;QAErE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,0CAA0C,CAAC,CAAA;QAEhF,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;SACtC;IACL,CAAC;CACJ;AA5SD,8BA4SC"}

package/dist/src/connection/Simulator/SimulatorConnection.js CHANGED Viewed

@@ -5,6 +5,7 @@ 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 logger = new utils_1.Logger(module);
 class SimulatorConnection extends Connection_1.Connection {
     constructor(ownPeerDescriptor, targetPeerDescriptor, connectionType, simulator) {
@@ -29,34 +30,35 @@ class SimulatorConnection extends Connection_1.Connection {
             this.simulator.send(this, data);
         }
         else {
-            logger.error(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) +
+            logger.error((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
                 'tried to send() on a stopped connection');
         }
     }
     async close(disconnectionType) {
-        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) + ' close()');
+        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' close()');
         if (!this.stopped) {
-            logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) + ' close() not stopped');
+            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', '
+                + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' close() not stopped');
             this.stopped = true;
             try {
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
                     ' close() calling simulator.disconnect()');
                 this.simulator.close(this);
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
                     ' close() simulator.disconnect returned');
             }
             catch (e) {
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
                     'close aborted' + e);
             }
             finally {
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) +
+                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
                     ' calling this.doDisconnect');
                 this.doDisconnect(disconnectionType);
             }
         }
         else {
-            logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) +
+            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
                 ' close() tried to close a stopped connection');
         }
     }
@@ -89,7 +91,7 @@ class SimulatorConnection extends Connection_1.Connection {
     }
     handleIncomingDisconnection() {
         if (!this.stopped) {
-            logger.trace(this.ownPeerDescriptor.nodeName + ' handleIncomingDisconnection()');
+            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' handleIncomingDisconnection()');
             this.stopped = true;
             this.doDisconnect('OTHER');
         }
@@ -99,18 +101,19 @@ class SimulatorConnection extends Connection_1.Connection {
     }
     destroy() {
         if (!this.stopped) {
-            logger.trace(this.ownPeerDescriptor.nodeName + ' destroy()');
+            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' destroy()');
             this.removeAllListeners();
             this.close('OTHER').catch((_e) => { });
         }
         else {
-            logger.trace(this.ownPeerDescriptor.nodeName + ' tried to call destroy() a stopped connection');
+            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' tried to call destroy() a stopped connection');
         }
     }
     doDisconnect(disconnectionType) {
-        logger.trace(this.ownPeerDescriptor.nodeName + ' doDisconnect()');
+        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' doDisconnect()');
         this.stopped = true;
-        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + (this.targetPeerDescriptor.nodeName) + ' doDisconnect emitting');
+        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', '
+            + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' doDisconnect emitting');
         this.emit('disconnected', disconnectionType);
     }
 }

package/dist/src/connection/Simulator/SimulatorConnection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SimulatorConnection.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnection.ts"],"names":[],"mappings":";;;AAEA,mEAAgF;AAChF,8CAA0C;AAC1C,0CAAuC;AACvC,+DAA2D;~~AAG3D~~,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,mBAAoB,SAAQ,uBAAU;IAO/C,YACI,iBAAiC,EACjC,oBAAoC,EACpC,cAA8B,EAC9B,SAAoB;QAEpB,KAAK,CAAC,cAAc,CAAC,CAAA;QAXjB,YAAO,GAAG,KAAK,CAAA;QAanB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;QAC5C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5D,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAEM,IAAI,CAAC,IAAgB;QACxB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAEf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;SAElC;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC~~,QAAS,CAAC~~;~~gBAC7F~~,yCAAyC,CAAC,CAAA;SACjD;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,iBAAoC;QACnD,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC,~~QAAS,CAAC,~~GAAG,UAAU,CAAC,CAAA;~~QAE/G~~,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,~~GAAG~~,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC,~~QAAS,CAAC,~~GAAG,sBAAsB,CAAC,CAAA;~~YAC3H~~,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YAEnB,IAAI;gBACA,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC~~,QAAS,CAAC~~;~~oBAC7F~~,yCAAyC,CAAC,CAAA;gBAC9C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC1B,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC~~,QAAS,CAAC~~;~~oBAC7F~~,wCAAwC,CAAC,CAAA;aAChD;YAAC,OAAO,CAAC,EAAE;gBACR,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC~~,QAAS,CAAC~~;~~oBAC7F~~,eAAe,GAAG,CAAC,CAAC,CAAA;aAC3B;oBAAS;gBACN,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC~~,QAAS,CAAC~~;~~oBAC7F~~,4BAA4B,CAAC,CAAA;gBACjC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;aACvC;SAEJ;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,GAAG,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC~~,QAAS,CAAC~~;~~gBAC7F~~,8CAA8C,CAAC,CAAA;SACtD;IACL,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;YAEhC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,KAAc,EAAE,EAAE;gBACvE,IAAI,KAAK,EAAE;oBACP,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;oBACnB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;iBAC7B;qBAAM;oBACH,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;iBACzB;YACL,CAAC,CAAC,CAAA;SACL;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;SAC1D;IACL,CAAC;IAEM,kBAAkB,CAAC,IAAgB;QACtC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;YACpC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAa,EAAC,gBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,gBAAO,CAAC,CAAC,CAAA;YAC9D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;SAC1B;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAA;SAC1E;IACL,CAAC;IAEM,2BAA2B;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,gCAAgC,CAAC,CAAA;~~YAChF~~,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YACnB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;SAC7B;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAA;SACnF;IACL,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,YAAY,CAAC,CAAA;~~YAC5D~~,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;SACzC;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,+CAA+C,CAAC,CAAA;~~SAClG~~;IACL,CAAC;IAEO,YAAY,CAAC,iBAAoC;QACrD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,iBAAiB,CAAC,CAAA;~~QACjE~~,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,IAAI,~~GAAG~~,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC,~~QAAS,CAAC,~~GAAG,wBAAwB,CAAC,CAAA;~~QAE7H~~,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAA;IAEhD,CAAC;CACJ;~~AA9HD~~,~~kDA8HC~~"}
1	+ {"version":3,"file":"SimulatorConnection.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnection.ts"],"names":[],"mappings":"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"}

package/dist/src/connection/Simulator/SimulatorConnector.d.ts CHANGED Viewed

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

package/dist/src/connection/Simulator/SimulatorConnector.js CHANGED Viewed

@@ -8,23 +8,22 @@ const SimulatorConnection_1 = require("./SimulatorConnection");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
 class SimulatorConnector {
-    constructor(protocolVersion, ownPeerDescriptor, simulator, incomingConnectionCallback) {
+    constructor(ownPeerDescriptor, simulator, onIncomingConnection) {
         this.connectingConnections = new Map();
         this.stopped = false;
-        this.protocolVersion = protocolVersion;
         this.ownPeerDescriptor = ownPeerDescriptor;
         this.simulator = simulator;
-        this.incomingConnectionCallback = incomingConnectionCallback;
+        this.onIncomingConnection = onIncomingConnection;
     }
     connect(targetPeerDescriptor) {
-        logger.trace('connect() ' + this.ownPeerDescriptor.nodeName + ',' + targetPeerDescriptor.nodeName);
+        logger.trace('connect() ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(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, this.protocolVersion, IConnection_1.ConnectionType.SIMULATOR_CLIENT, connection, undefined);
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, connection, undefined);
         managedConnection.setPeerDescriptor(targetPeerDescriptor);
         this.connectingConnections.set(peerKey, managedConnection);
         connection.once('disconnected', () => {
@@ -40,19 +39,18 @@ class SimulatorConnector {
         return this.ownPeerDescriptor;
     }
     handleIncomingConnection(sourceConnection) {
-        logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + sourceConnection.ownPeerDescriptor.nodeName +
-            ' incoming connection, stopped: ' + this.stopped);
+        logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' 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, this.protocolVersion, IConnection_1.ConnectionType.SIMULATOR_SERVER, undefined, connection);
-        logger.trace('connected, objectId: ' + managedConnection.objectId);
-        managedConnection.once('handshakeRequest', (_peerDescriptor) => {
-            logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + sourceConnection.ownPeerDescriptor.nodeName + ' incoming handshake request');
-            logger.trace('incoming handshake request objectId: ' + managedConnection.objectId);
-            if (this.incomingConnectionCallback(managedConnection)) {
-                logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + sourceConnection.ownPeerDescriptor.nodeName + ' calling acceptHandshake');
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, 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');
                 managedConnection.acceptHandshake();
             }
             else {

package/dist/src/connection/Simulator/SimulatorConnector.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SimulatorConnector.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnector.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAK/C,0CAAuC;AACvC,4DAAwD;AAGxD,+DAA2D;AAC3D,qFAA8E;AAE9E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,kBAAkB;~~IAS3B~~,YACI,~~eAAuB,EACvB,~~iBAAiC,EACjC,SAAoB,EACpB,~~0BAAsE~~;~~QAXlE~~,0BAAqB,GAAsC,IAAI,GAAG,EAAE,CAAA;QACpE,YAAO,GAAG,KAAK,CAAA;~~QAYnB~~,IAAI,CAAC,~~eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,~~iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,~~0BAA0B~~,GAAG,~~0BAA0B~~,CAAA;~~IAChE~~,CAAC;IAEM,OAAO,CAAC,oBAAoC;QAC/C,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,~~IAAI~~,~~CAAC~~,~~iBAAiB~~,~~CAAC,QAAQ,GAAG,GAAG,GAAG,~~oBAAoB,CAAC,~~QAAQ,~~CAAC,CAAA;~~QAClG~~,MAAM,OAAO,GAAG,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAA;QAC3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAClE,IAAI,kBAAkB,EAAE;YACpB,OAAO,kBAAkB,CAAA;SAC5B;QAED,MAAM,UAAU,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,4BAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAEzI,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,iBAAiB,EAAE,~~IAAI,CAAC,eAAe,EACxF,~~4BAAc,CAAC,gBAAgB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;~~QAC3D~~,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;QAEzD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;QAC1D,UAAU,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;YACjC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC9C,CAAC,CAAC,CAAA;QACF,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC9B,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC9C,CAAC,CAAC,CAAA;QAEF,UAAU,CAAC,OAAO,EAAE,CAAA;QAEpB,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAEM,wBAAwB,CAAC,gBAAqC;QACjE,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,~~IAAI~~,~~CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,~~gBAAgB,CAAC,iBAAiB,CAAC,~~QAAQ;YACnG~~,iCAAiC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;~~QACrD~~,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,MAAM,UAAU,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,iBAAiB,EAC7D,gBAAgB,CAAC,iBAAiB,EAAE,4BAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAExF,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,iBAAiB,EAAE,~~IAAI,CAAC,eAAe,EACxF,~~4BAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;~~QAE3D~~,MAAM,CAAC,KAAK,CAAC,~~uBAAuB~~,~~GAAG,iBAAiB,~~CAAC,~~QAAQ,CAAC,~~CAAA;~~QAElE~~,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,EAAE,~~CAAC~~,~~eAA+B,~~EAAE~~,EAAE~~;~~YAC3E~~,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,~~IAAI~~,~~CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,~~gBAAgB,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,6BAA6B,CAAC,CAAA;~~YACxI~~,MAAM,CAAC,KAAK,CAAC,~~uCAAuC~~,~~GAAG,iBAAiB,~~CAAC,~~QAAQ,CAAC,~~CAAA;~~YAElF~~,IAAI,IAAI,CAAC,~~0BAA0B~~,CAAC,iBAAiB,CAAC,EAAE;~~gBACpD~~,MAAM,CAAC,KAAK,CAAC,~~GAAG~~,~~GAAG~~,~~IAAI~~,~~CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,~~gBAAgB,CAAC,iBAAiB,CAAC,~~QAAQ,~~GAAG,0BAA0B,CAAC,CAAA;~~gBACrI~~,iBAAiB,CAAC,eAAe,EAAE,CAAA;aACtC;iBAAM;gBACH,iBAAiB,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAA;gBACzD,iBAAiB,CAAC,OAAO,EAAE,CAAA;aAC9B;QACL,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAA;IACvD,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAA;QAC7D,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CACtB,CAAC,CAAA;IACN,CAAC;CACJ;~~AAzFD~~,~~gDAyFC~~"}
1	+ {"version":3,"file":"SimulatorConnector.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnector.ts"],"names":[],"mappings":"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"}

package/dist/src/connection/Simulator/SimulatorTransport.js CHANGED Viewed

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimulatorTransport = void 0;
+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) {
-        super({ ownPeerDescriptor: ownPeerDescriptor, simulator, serviceIdPrefix: 'simulator/' });
+        super({
+            createConnectorFacade: () => new ConnectorFacade_1.SimulatorConnectorFacade(ownPeerDescriptor, simulator),
+            metricsContext: new utils_1.MetricsContext()
+        });
     }
 }
 exports.SimulatorTransport = SimulatorTransport;

package/dist/src/connection/Simulator/SimulatorTransport.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SimulatorTransport.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorTransport.ts"],"names":[],"mappings":";;;~~AACA~~,4DAAwD;~~AAGxD~~,MAAa,kBAAmB,SAAQ,qCAAiB;IACrD,YAAY,iBAAiC,EAAE,SAAoB;QAC/D,KAAK,CAAC,EAAE,~~iBAAiB~~,EAAE,iBAAiB,EAAE,SAAS,~~EAAE~~,~~eAAe~~,EAAE,~~YAAY~~,EAAE,CAAC,CAAA;~~IAC7F~~,CAAC;CACJ;~~AAJD~~,~~gDAIC~~"}
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,iBAAiC,EAAE,SAAoB;QAC/D,KAAK,CAAC;YACF,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,0CAAwB,CAAC,iBAAiB,EAAE,SAAS,CAAC;YACvF,cAAc,EAAE,IAAI,sBAAc,EAAE;SACvC,CAAC,CAAA;IACN,CAAC;CACJ;AAPD,gDAOC"}