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

@streamr/dht 0.0.1-tatum.7 → 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 (140) hide show

package/dist/src/connection/ConnectionLockRpcRemote.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+import { ProtoRpcClient } from '@streamr/proto-rpc';
+import { IConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
+import { PeerDescriptor, DisconnectMode } from '../proto/packages/dht/protos/DhtRpc';
+import { Remote } from '../dht/contact/Remote';
+export declare class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
+    constructor(ownPeerDescriptor: PeerDescriptor, targetPeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IConnectionLockRpcClient>);
+    lockRequest(serviceId: string): Promise<boolean>;
+    unlockRequest(serviceId: string): void;
+    gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void>;
+}

package/dist/src/connection/{RemoteConnectionLocker.js → ConnectionLockRpcRemote.js} RENAMED Viewed

@@ -23,31 +23,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteConnectionLocker = void 0;
+exports.ConnectionLockRpcRemote = void 0;
 const utils_1 = require("@streamr/utils");
 const Err = __importStar(require("../helpers/errors"));
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
+const Remote_1 = require("../dht/contact/Remote");
 const logger = new utils_1.Logger(module);
-class RemoteConnectionLocker {
-    constructor(ownPeerDescriptor, targetPeerDescriptor, protocolVersion, client) {
-        this.ownPeerDescriptor = ownPeerDescriptor;
-        this.targetPeerDescriptor = targetPeerDescriptor;
-        this.protocolVersion = protocolVersion;
-        this.client = client;
+class ConnectionLockRpcRemote extends Remote_1.Remote {
+    constructor(ownPeerDescriptor, targetPeerDescriptor, client) {
+        super(ownPeerDescriptor, targetPeerDescriptor, 'DUMMY', client);
     }
     async lockRequest(serviceId) {
-        logger.trace(`Requesting locked connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor)}`);
+        logger.trace(`Requesting locked connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
-            peerDescriptor: this.ownPeerDescriptor,
-            protocolVersion: this.protocolVersion,
             serviceId
         };
-        const options = {
-            sourceDescriptor: this.ownPeerDescriptor,
-            targetDescriptor: this.targetPeerDescriptor
-        };
+        const options = this.formDhtRpcOptions();
         try {
-            const res = await this.client.lockRequest(request, options);
+            const res = await this.getClient().lockRequest(request, options);
             return res.accepted;
         }
         catch (err) {
@@ -56,37 +49,29 @@ class RemoteConnectionLocker {
         }
     }
     unlockRequest(serviceId) {
-        logger.trace(`Requesting connection to be unlocked from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor)}`);
+        logger.trace(`Requesting connection to be unlocked from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
-            peerDescriptor: this.ownPeerDescriptor,
-            protocolVersion: this.protocolVersion,
             serviceId
         };
-        const options = {
-            sourceDescriptor: this.ownPeerDescriptor,
-            targetDescriptor: this.targetPeerDescriptor,
+        const options = this.formDhtRpcOptions({
             notification: true
-        };
-        this.client.unlockRequest(request, options).catch((_e) => {
+        });
+        this.getClient().unlockRequest(request, options).catch((_e) => {
             logger.trace('failed to send unlockRequest');
         });
     }
-    async gracefulDisconnect(disconnecMode) {
-        logger.trace(`Notifying a graceful disconnect to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor)}`);
+    async gracefulDisconnect(disconnectMode) {
+        logger.trace(`Notifying a graceful disconnect to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
-            peerDescriptor: this.ownPeerDescriptor,
-            protocolVersion: this.protocolVersion,
-            disconnecMode
+            disconnectMode
         };
-        const options = {
-            sourceDescriptor: this.ownPeerDescriptor,
-            targetDescriptor: this.targetPeerDescriptor,
+        const options = this.formDhtRpcOptions({
             doNotConnect: true,
             doNotMindStopped: true,
             timeout: 2000
-        };
-        await this.client.gracefulDisconnect(request, options);
+        });
+        await this.getClient().gracefulDisconnect(request, options);
     }
 }
-exports.RemoteConnectionLocker = RemoteConnectionLocker;
-//# sourceMappingURL=RemoteConnectionLocker.js.map
+exports.ConnectionLockRpcRemote = ConnectionLockRpcRemote;
+//# sourceMappingURL=ConnectionLockRpcRemote.js.map

package/dist/src/connection/ConnectionLockRpcRemote.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuC;AAKvC,uDAAwC;AACxC,kFAA2E;AAC3E,kDAA8C;AAE9C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,eAAgC;IAEzE,YACI,iBAAiC,EACjC,oBAAoC,EACpC,MAAgD;QAEhD,KAAK,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACnE,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAiB;QACtC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClG,MAAM,OAAO,GAAgB;YACzB,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC,KAAM,CAAC,CAAA;YAC9E,OAAO,KAAK,CAAA;SACf;IACL,CAAC;IAEM,aAAa,CAAC,SAAiB;QAClC,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC5G,MAAM,OAAO,GAAkB;YAC3B,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1D,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC1D,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACrG,MAAM,OAAO,GAAqB;YAC9B,cAAc;SACjB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AAlDD,0DAkDC"}

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

@@ -34,7 +34,6 @@ export interface TlsCertificate {
 export type Events = TransportEvents & ConnectionManagerEvents;
 export declare const keyOrUnknownFromPeerDescriptor: (peerDescriptor: PeerDescriptor | undefined) => string;
 export declare class ConnectionManager extends EventEmitter<Events> implements ITransport, ConnectionLocker {
-    static PROTOCOL_VERSION: string;
     private config;
     private readonly metricsContext;
     private readonly duplicateMessageDetector;

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

@@ -37,7 +37,7 @@ const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const DhtRpc_client_1 = require("../proto/packages/dht/protos/DhtRpc.client");
 const RoutingRpcCommunicator_1 = require("../transport/RoutingRpcCommunicator");
 const ConnectionLockHandler_1 = require("./ConnectionLockHandler");
-const RemoteConnectionLocker_1 = require("./RemoteConnectionLocker");
+const ConnectionLockRpcRemote_1 = require("./ConnectionLockRpcRemote");
 const NodeWebRtcConnection_1 = require("./WebRTC/NodeWebRtcConnection");
 var NatType;
 (function (NatType) {
@@ -123,9 +123,9 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         this.rpcCommunicator = new RoutingRpcCommunicator_1.RoutingRpcCommunicator(INTERNAL_SERVICE_ID, this.send, {
             rpcRequestTimeout: 10000
         });
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.LockRequest, DhtRpc_1.LockResponse, 'lockRequest', (req) => this.lockRequest(req));
-        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.UnlockRequest, 'unlockRequest', (req) => this.unlockRequest(req));
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.DisconnectNotice, DhtRpc_1.DisconnectNoticeResponse, 'gracefulDisconnect', (req) => this.gracefulDisconnect(req));
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.LockRequest, DhtRpc_1.LockResponse, 'lockRequest', (req, context) => this.lockRequest(req, context));
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.UnlockRequest, 'unlockRequest', (req, context) => this.unlockRequest(req, context));
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.DisconnectNotice, DhtRpc_1.DisconnectNoticeResponse, 'gracefulDisconnect', (req, context) => this.gracefulDisconnect(req, context));
     }
     garbageCollectConnections(maxConnections, lastUsedLimit) {
         if (this.connections.size <= maxConnections) {
@@ -390,9 +390,9 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             return;
         }
         const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetDescriptor);
-        const remoteConnectionLocker = new RemoteConnectionLocker_1.RemoteConnectionLocker(this.getOwnPeerDescriptor(), targetDescriptor, ConnectionManager.PROTOCOL_VERSION, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ConnectionLockerClient(this.rpcCommunicator.getRpcClientTransport())));
+        const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getOwnPeerDescriptor(), targetDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ConnectionLockRpcClient(this.rpcCommunicator.getRpcClientTransport())));
         this.locks.addLocalLocked(peerIdKey, serviceId);
-        remoteConnectionLocker.lockRequest(serviceId)
+        rpcRemote.lockRequest(serviceId)
             .then((_accepted) => logger.trace('LockRequest successful'))
             .catch((err) => { logger.debug(err); });
     }
@@ -402,9 +402,9 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         }
         const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetDescriptor);
         this.locks.removeLocalLocked(peerIdKey, serviceId);
-        const remoteConnectionLocker = new RemoteConnectionLocker_1.RemoteConnectionLocker(this.getOwnPeerDescriptor(), targetDescriptor, ConnectionManager.PROTOCOL_VERSION, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ConnectionLockerClient(this.rpcCommunicator.getRpcClientTransport())));
+        const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getOwnPeerDescriptor(), targetDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ConnectionLockRpcClient(this.rpcCommunicator.getRpcClientTransport())));
         if (this.connections.has(peerIdKey)) {
-            remoteConnectionLocker.unlockRequest(serviceId);
+            rpcRemote.unlockRequest(serviceId);
         }
     }
     weakLockConnection(targetDescriptor) {
@@ -451,12 +451,12 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
     }
     async doGracefullyDisconnectAsync(targetDescriptor, disconnectMode) {
         logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetDescriptor) + ' gracefullyDisconnectAsync()');
-        const remoteConnectionLocker = new RemoteConnectionLocker_1.RemoteConnectionLocker(this.getOwnPeerDescriptor(), targetDescriptor, ConnectionManager.PROTOCOL_VERSION, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ConnectionLockerClient(this.rpcCommunicator.getRpcClientTransport())));
+        const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getOwnPeerDescriptor(), targetDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ConnectionLockRpcClient(this.rpcCommunicator.getRpcClientTransport())));
         try {
-            await remoteConnectionLocker.gracefulDisconnect(disconnectMode);
+            await rpcRemote.gracefulDisconnect(disconnectMode);
         }
         catch (ex) {
-            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetDescriptor) + ' remoteConnectionLocker.gracefulDisconnect() failed' + ex);
+            logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetDescriptor) + ' remote.gracefulDisconnect() failed' + ex);
         }
     }
     getAllConnectionPeerDescriptors() {
@@ -464,10 +464,11 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             .filter((managedConnection) => managedConnection.isHandshakeCompleted())
             .map((managedConnection) => managedConnection.getPeerDescriptor());
     }
-    // IConnectionLocker server implementation
-    async lockRequest(lockRequest) {
-        const remotePeerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(lockRequest.peerDescriptor);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(lockRequest.peerDescriptor, this.getOwnPeerDescriptor())) {
+    // ConnectionLockRpc local RPC method
+    async lockRequest(lockRequest, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const remotePeerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(senderPeerDescriptor);
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.getOwnPeerDescriptor())) {
             const response = {
                 accepted: false
             };
@@ -479,20 +480,22 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         };
         return response;
     }
-    // IConnectionLocker server implementation
-    async unlockRequest(unlockRequest) {
-        const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(unlockRequest.peerDescriptor);
+    // ConnectionLockRpc local RPC method
+    async unlockRequest(unlockRequest, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(senderPeerDescriptor);
         this.locks.removeRemoteLocked(peerIdKey, unlockRequest.serviceId);
         return {};
     }
-    // IConnectionLocker server implementation
-    async gracefulDisconnect(disconnectNotice) {
-        logger.trace((0, exports.keyOrUnknownFromPeerDescriptor)(disconnectNotice.peerDescriptor) + ' received gracefulDisconnect notice');
-        if (disconnectNotice.disconnecMode === DhtRpc_1.DisconnectMode.LEAVING) {
-            this.closeConnection(disconnectNotice.peerDescriptor, 'INCOMING_GRACEFUL_LEAVE', 'graceful leave notified');
+    // ConnectionLockRpc local RPC method
+    async gracefulDisconnect(disconnectNotice, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        logger.trace((0, exports.keyOrUnknownFromPeerDescriptor)(senderPeerDescriptor) + ' received gracefulDisconnect notice');
+        if (disconnectNotice.disconnectMode === DhtRpc_1.DisconnectMode.LEAVING) {
+            this.closeConnection(senderPeerDescriptor, 'INCOMING_GRACEFUL_LEAVE', 'graceful leave notified');
         }
         else {
-            this.closeConnection(disconnectNotice.peerDescriptor, 'INCOMING_GRACEFUL_DISCONNECT', 'graceful disconnect notified');
+            this.closeConnection(senderPeerDescriptor, 'INCOMING_GRACEFUL_DISCONNECT', 'graceful disconnect notified');
         }
         return {};
     }
@@ -501,5 +504,4 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
     }
 }
 exports.ConnectionManager = ConnectionManager;
-ConnectionManager.PROTOCOL_VERSION = '1.0';
 //# sourceMappingURL=ConnectionManager.js.map

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

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

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

@@ -30,7 +30,7 @@ const Err = __importStar(require("../helpers/errors"));
 const ClientWebSocket_1 = require("./WebSocket/ClientWebSocket");
 const uuid_1 = require("uuid");
 const ConnectionManager_1 = require("./ConnectionManager");
-const WebSocketConnector_1 = require("./WebSocket/WebSocketConnector");
+const WebSocketConnectorRpcLocal_1 = require("./WebSocket/WebSocketConnectorRpcLocal");
 const logger = new utils_1.Logger(module);
 // Class for handling both client and server side of the connectivity
 // checks. This is attached to all ServerWebSockets to listen to
@@ -63,7 +63,7 @@ class ConnectivityChecker {
             });
         }
         catch (e) {
-            throw new Err.ConnectionFailed(`Failed to connect to the entrypoint ${(0, WebSocketConnector_1.connectivityMethodToWebSocketUrl)(entryPoint.websocket)}`, e);
+            throw new Err.ConnectionFailed(`Failed to connect to the entrypoint ${(0, WebSocketConnectorRpcLocal_1.connectivityMethodToWebSocketUrl)(entryPoint.websocket)}`, e);
         }
         // send connectivity request
         const connectivityRequestMessage = { port: this.webSocketPort, host: this.host, tls: this.tls };
@@ -147,7 +147,7 @@ class ConnectivityChecker {
                 port: connectivityRequest.port,
                 tls: connectivityRequest.tls
             };
-            logger.trace(`Attempting Connectivity Check to ${(0, WebSocketConnector_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}`);
+            logger.trace(`Attempting Connectivity Check to ${(0, WebSocketConnectorRpcLocal_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}`);
             outgoingConnection = await this.connectAsync({
                 wsServerInfo,
                 mode: ConnectionMode.PROBE
@@ -185,7 +185,7 @@ class ConnectivityChecker {
     // eslint-disable-next-line class-methods-use-this
     async connectAsync({ wsServerInfo, mode, timeoutMs = 1000, }) {
         const socket = new ClientWebSocket_1.ClientWebSocket();
-        const url = `${(0, WebSocketConnector_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}?${mode}=true`;
+        const url = `${(0, WebSocketConnectorRpcLocal_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}?${mode}=true`;
         let result;
         try {
             result = await (0, utils_1.runAndRaceEvents3)([

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ConnectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/ConnectivityChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAI4C;AAE5C,0CAAsF;AACtF,uDAAwC;AACxC,iEAA6D;AAC7D,+BAAyB;AACzB,2DAA6C;AAE7C,~~uEAAiF~~;~~AAEjF~~,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,qEAAqE;AACrE,gEAAgE;AAChE,iCAAiC;AAEjC,IAAY,cAA+E;AAA3F,WAAY,cAAc;IAAG,iDAA+B,CAAA;IAAE,6CAA2B,CAAA;AAAC,CAAC,EAA/E,cAAc,8BAAd,cAAc,QAAiE;AAC3F,MAAa,mBAAmB;IAS5B,YAAY,aAAqB,EAAE,GAAY,EAAE,IAAa;QALtD,cAAS,GAAG,KAAK,CAAA;QAMrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,UAA0B;QAC3D,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,MAAM,IAAI,GAAG,CAAC,gBAAgB,CAAC,kCAAkC,CAAC,CAAA;SACrE;QACD,IAAI,kBAA+B,CAAA;QACnC,IAAI;YACA,kBAAkB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;gBACzC,YAAY,EAAE;oBACV,IAAI,EAAE,UAAU,CAAC,SAAU,CAAC,IAAI;oBAChC,IAAI,EAAE,UAAU,CAAC,SAAU,CAAC,IAAI;oBAChC,GAAG,EAAE,UAAU,CAAC,SAAU,CAAC,GAAG;iBACjC;gBACD,IAAI,EAAE,cAAc,CAAC,OAAO;aAC/B,CAAC,CAAA;SACL;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,GAAG,CAAC,gBAAgB,CAAC,uCAAuC,IAAA,~~qDAAgC~~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~~qDAAgC~~,EAAC,YAAY,CAAC,EAAE,CAAC,CAAA;YAClG,kBAAkB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;gBACzC,YAAY;gBACZ,IAAI,EAAE,cAAc,CAAC,KAAK;aAC7B,CAAC,CAAA;SACL;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC9B,2BAA2B,GAAG;gBAC1B,YAAY,EAAE,KAAK;gBACnB,IAAI;gBACJ,OAAO,EAAE,2BAAO,CAAC,OAAO;aAC3B,CAAA;SACJ;QACD,IAAI,kBAAkB,EAAE;YACpB,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACjC,MAAM,CAAC,KAAK,CAAC,mFAAmF,GAAG,IAAI,GAAG,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;YACzI,2BAA2B,GAAG;gBAC1B,YAAY,EAAE,IAAI;gBAClB,IAAI;gBACJ,OAAO,EAAE,2BAAO,CAAC,aAAa;gBAC9B,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,mBAAmB,CAAC,GAAG,EAAE;aACpF,CAAA;SACJ;QACD,MAAM,GAAG,GAAY;YACjB,SAAS,EAAE,mBAAmB,CAAC,+BAA+B;YAC9D,WAAW,EAAE,oBAAW,CAAC,qBAAqB,EAAE,SAAS,EAAE,IAAA,SAAE,GAAE;YAC/D,IAAI,EAAE;gBACF,SAAS,EAAE,sBAAsB;gBACjC,oBAAoB,EAAE,2BAA4B;aACrD;SACJ,CAAA;QACD,UAAU,CAAC,IAAI,CAAC,gBAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACrF,CAAC;IAED,kDAAkD;IAC1C,KAAK,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,GACiB;QAE9E,MAAM,MAAM,GAAG,IAAI,iCAAe,EAAE,CAAA;QACpC,MAAM,GAAG,GAAG,GAAG,IAAA,~~qDAAgC~~,EAAC,YAAY,CAAC,IAAI,IAAI,OAAO,CAAA;QAC5E,IAAI,MAAoD,CAAA;QACxD,IAAI;YACA,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAmB;gBAC/C,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC;aAAC,EAClC,MAAM,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAC9B,SAAS,CAAC,CAAA;SACb;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,gCAAgC,CAAC,CAAC,CAAA;SACrE;QACD,IAAI,MAAM,CAAC,UAAU,KAAK,OAAO,EAAE;YAC/B,MAAM,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,qCAAqC,CAAC,CAAC,CAAA;SAC1E;QACD,OAAO,MAAM,CAAA;IACjB,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;IACzB,CAAC;;AA9KL,kDA+KC;AA7K2B,mDAA+B,GAAG,6BAA6B,AAAhC,CAAgC;AAC/D,gDAA4B,GAAG,IAAI,AAAP,CAAO"}
1	+ {"version":3,"file":"ConnectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/ConnectivityChecker.ts"],"names":[],"mappings":"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"}

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

@@ -3,7 +3,7 @@ import { ITransport } from '../transport/ITransport';
 import { PortRange, TlsCertificate } from './ConnectionManager';
 import { ManagedConnection } from './ManagedConnection';
 import { Simulator } from './Simulator/Simulator';
-import { IceServer } from './WebRTC/WebRtcConnector';
+import { IceServer } from './WebRTC/WebRtcConnectorRpcLocal';
 export interface ConnectorFacade {
     createConnection: (peerDescriptor: PeerDescriptor) => ManagedConnection;
     getOwnPeerDescriptor: () => PeerDescriptor | undefined;

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

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimulatorConnectorFacade = exports.DefaultConnectorFacade = void 0;
 const utils_1 = require("@streamr/utils");
-const ConnectionManager_1 = require("./ConnectionManager");
 const SimulatorConnector_1 = require("./Simulator/SimulatorConnector");
-const WebRtcConnector_1 = require("./WebRTC/WebRtcConnector");
-const WebSocketConnector_1 = require("./WebSocket/WebSocketConnector");
+const WebRtcConnectorRpcLocal_1 = require("./WebRTC/WebRtcConnectorRpcLocal");
+const WebSocketConnectorRpcLocal_1 = require("./WebSocket/WebSocketConnectorRpcLocal");
 const logger = new utils_1.Logger(module);
 class DefaultConnectorFacade {
     constructor(config) {
@@ -13,8 +12,7 @@ class DefaultConnectorFacade {
     }
     async start(onIncomingConnection, canConnect) {
         logger.trace(`Creating WebSocketConnector`);
-        this.webSocketConnector = new WebSocketConnector_1.WebSocketConnector({
-            protocolVersion: ConnectionManager_1.ConnectionManager.PROTOCOL_VERSION,
+        this.webSocketConnector = new WebSocketConnectorRpcLocal_1.WebSocketConnectorRpcLocal({
             transport: this.config.transport,
             // TODO should we use canConnect also for WebRtcConnector? (NET-1142)
             canConnect: (peerDescriptor) => canConnect(peerDescriptor),
@@ -26,9 +24,8 @@ class DefaultConnectorFacade {
             maxMessageSize: this.config.maxMessageSize
         });
         logger.trace(`Creating WebRTCConnector`);
-        this.webrtcConnector = new WebRtcConnector_1.WebRtcConnector({
+        this.webrtcConnector = new WebRtcConnectorRpcLocal_1.WebRtcConnectorRpcLocal({
             transport: this.config.transport,
-            protocolVersion: ConnectionManager_1.ConnectionManager.PROTOCOL_VERSION,
             iceServers: this.config.iceServers,
             allowPrivateAddresses: this.config.webrtcAllowPrivateAddresses,
             bufferThresholdLow: this.config.webrtcDatachannelBufferThresholdLow,
@@ -69,7 +66,7 @@ class SimulatorConnectorFacade {
     }
     async start(onIncomingConnection) {
         logger.trace(`Creating SimulatorConnector`);
-        this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(ConnectionManager_1.ConnectionManager.PROTOCOL_VERSION, this.ownPeerDescriptor, this.simulator, onIncomingConnection);
+        this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.ownPeerDescriptor, this.simulator, onIncomingConnection);
         this.simulator.addConnector(this.simulatorConnector);
     }
     createConnection(peerDescriptor) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ConnectorFacade.js","sourceRoot":"","sources":["../../../src/connection/ConnectorFacade.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;~~AAMvC~~,~~2DAAkF;AAGlF,~~uEAAmE;AACnE,~~8DAAqE~~;~~AACrE~~,~~uEAAmE~~;~~AAYnE~~,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAmBjC,MAAa,sBAAsB;IAO/B,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,KAAK,CACP,oBAAgE,EAChE,UAAuD;QAEvD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,~~uCAAkB~~,CAAC;~~YAC7C~~,~~eAAe,EAAE,qCAAiB,CAAC,gBAAgB;YACnD,~~SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAU;YACjC,qEAAqE;YACrE,UAAU,EAAE,CAAC,cAA8B,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;YAC1E,oBAAoB;YACpB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACzC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YAC/B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;YAC1C,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC7C,CAAC,CAAA;QACF,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;QACxC,IAAI,CAAC,eAAe,GAAG,IAAI,~~iCAAe~~,CAAC;~~YACvC~~,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAU;YACjC,~~eAAe,EAAE,qCAAiB,CAAC,gBAAgB;YACnD,~~UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B;YAC9D,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,mCAAmC;YACnE,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,oCAAoC;YACrE,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B;YACzD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACtC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC7C,EAAE,oBAAoB,CAAC,CAAA;QACxB,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QACrC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAA;QAC9E,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;QACnF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;QAC/D,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IAChE,CAAC;IAED,gBAAgB,CAAC,cAA8B;QAC3C,IAAI,IAAI,CAAC,kBAAmB,CAAC,0BAA0B,CAAC,cAAc,CAAC,EAAE;YACrE,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;SAC1D;aAAM;YACH,OAAO,IAAI,CAAC,eAAgB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;SACvD;IACL,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,kBAAmB,CAAC,OAAO,EAAE,CAAA;QACxC,MAAM,IAAI,CAAC,eAAgB,CAAC,IAAI,EAAE,CAAA;IACtC,CAAC;CACJ;~~AAjED~~,~~wDAiEC~~;AAED,MAAa,wBAAwB;IAMjC,YAAY,iBAAiC,EAAE,SAAoB;QAC/D,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,oBAAgE;QACxE,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC5C,~~qCAAiB,CAAC,gBAAgB,EAClC,~~IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,EACd,oBAAoB,CACvB,CAAA;QACD,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;IACxD,CAAC;IAED,gBAAgB,CAAC,cAA8B;QAC3C,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,kBAAmB,CAAC,IAAI,EAAE,CAAA;IACzC,CAAC;CACJ;~~AAjCD~~,~~4DAiCC~~"}
1	+ {"version":3,"file":"ConnectorFacade.js","sourceRoot":"","sources":["../../../src/connection/ConnectorFacade.ts"],"names":[],"mappings":"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"}

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

@@ -9,9 +9,8 @@ interface HandshakerEvents {
 export declare class Handshaker extends EventEmitter<HandshakerEvents> {
     private static readonly HANDSHAKER_SERVICE_ID;
     private ownPeerDescriptor;
-    private protocolVersion;
     private connection;
-    constructor(ownPeerDescriptor: PeerDescriptor, protocolVersion: string, connection: IConnection);
+    constructor(ownPeerDescriptor: PeerDescriptor, connection: IConnection);
     private onData;
     sendHandshakeRequest(): void;
     sendHandshakeResponse(error?: string): void;

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

@@ -7,7 +7,7 @@ const uuid_1 = require("uuid");
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const logger = new utils_1.Logger(module);
 class Handshaker extends eventemitter3_1.EventEmitter {
-    constructor(ownPeerDescriptor, protocolVersion, connection) {
+    constructor(ownPeerDescriptor, connection) {
         super();
         this.onData = (data) => {
             try {
@@ -33,14 +33,12 @@ class Handshaker extends eventemitter3_1.EventEmitter {
             }
         };
         this.ownPeerDescriptor = ownPeerDescriptor;
-        this.protocolVersion = protocolVersion;
         this.connection = connection;
         this.connection.on('data', this.onData);
     }
     sendHandshakeRequest() {
         const outgoingHandshake = {
             sourceId: this.ownPeerDescriptor.kademliaId,
-            protocolVersion: this.protocolVersion,
             peerDescriptor: this.ownPeerDescriptor
         };
         const msg = {
@@ -58,7 +56,6 @@ class Handshaker extends eventemitter3_1.EventEmitter {
     sendHandshakeResponse(error) {
         const outgoingHandshakeResponse = {
             sourceId: this.ownPeerDescriptor.kademliaId,
-            protocolVersion: this.protocolVersion,
             peerDescriptor: this.ownPeerDescriptor
         };
         if (error) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../src/connection/Handshaker.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,iDAA4C;AAC5C,+BAAyB;AACzB,gEAA+H;AAG/H,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAQjC,MAAa,UAAW,SAAQ,4BAA8B;~~IAO1D~~,YACI,iBAAiC,EACjC,~~eAAuB,EACvB,~~UAAuB;QAEvB,KAAK,EAAE,CAAA;~~QAOH~~,WAAM,GAAG,CAAC,IAAgB,EAAE,EAAE;YAClC,IAAI;gBACA,MAAM,OAAO,GAAG,gBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;gBACxC,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,kBAAkB,EAAE;oBAC/C,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;oBAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAA;oBAC/C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,cAAe,CAAC,CAAA;iBAC3D;gBACD,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,mBAAmB,EAAE;oBAChD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;oBAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAA;oBAChD,IAAI,SAAS,CAAC,aAAa,EAAE;wBACzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAA;qBACxD;yBAAM;wBACH,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,cAAe,CAAC,CAAA;qBAC7D;iBACJ;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAA;aAC7D;QAEL,CAAC,CAAA;~~QA3BG~~,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,~~eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,~~UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAyBM,oBAAoB;QACvB,MAAM,iBAAiB,GAAqB;YACxC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU;YAC3C,~~eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,~~cAAc,EAAE,IAAI,CAAC,iBAAiB;SACzC,CAAA;QACD,MAAM,GAAG,GAAY;YACjB,SAAS,EAAE,UAAU,CAAC,qBAAqB;YAC3C,WAAW,EAAE,oBAAW,CAAC,iBAAiB;YAC1C,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,IAAI,EAAE;gBACF,SAAS,EAAE,kBAAkB;gBAC7B,gBAAgB,EAAE,iBAAiB;aACtC;SACJ,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAC1C,CAAC;IAEM,qBAAqB,CAAC,KAAc;QACvC,MAAM,yBAAyB,GAAsB;YACjD,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU;YAC3C,~~eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,~~cAAc,EAAE,IAAI,CAAC,iBAAiB;SACzC,CAAA;QACD,IAAI,KAAK,EAAE;YACP,yBAAyB,CAAC,aAAa,GAAG,KAAK,CAAA;SAClD;QACD,MAAM,GAAG,GAAY;YACjB,SAAS,EAAE,UAAU,CAAC,qBAAqB;YAC3C,WAAW,EAAE,oBAAW,CAAC,kBAAkB;YAC3C,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,IAAI,EAAE;gBACF,SAAS,EAAE,mBAAmB;gBAC9B,iBAAiB,EAAE,yBAAyB;aAC/C;SACJ,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAC1C,CAAC;;~~AAjFL~~,~~gCAkFC~~;~~AAhF2B~~,gCAAqB,GAAG,mBAAmB,AAAtB,CAAsB"}
1	+ {"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../src/connection/Handshaker.ts"],"names":[],"mappings":"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"}

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

@@ -31,10 +31,9 @@ export declare class ManagedConnection extends EventEmitter<Events> {
     private closing;
     replacedByOtherConnection: boolean;
     private ownPeerDescriptor;
-    private protocolVersion;
     protected outgoingConnection?: IConnection;
     protected incomingConnection?: IConnection;
-    constructor(ownPeerDescriptor: PeerDescriptor, protocolVersion: string, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection);
+    constructor(ownPeerDescriptor: PeerDescriptor, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection);
     on(event: keyof Events, fn: (...args: any) => void, context?: any): this;
     once(event: keyof Events, fn: (...args: any) => void, context?: any): this;
     get peerIdKey(): PeerIDKey;

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

@@ -36,7 +36,7 @@ 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.outputBuffer = [];
         this.inputBuffer = [];
@@ -62,7 +62,6 @@ class ManagedConnection extends eventemitter3_1.default {
         };
         this.send = this.send.bind(this);
         this.ownPeerDescriptor = ownPeerDescriptor;
-        this.protocolVersion = protocolVersion;
         this.outgoingConnection = outgoingConnection;
         this.incomingConnection = incomingConnection;
         this.connectionType = connectionType;
@@ -73,7 +72,7 @@ class ManagedConnection extends eventemitter3_1.default {
             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((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed: ' + errorMessage);
                 this.emit('handshakeFailed');
@@ -93,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);
@@ -267,7 +266,7 @@ class ManagedConnection extends eventemitter3_1.default {
         // 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();
         }