@streamr/dht 100.2.5-beta.0 → 101.0.0-beta.0

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

@@ -1,50 +1,25 @@
-import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from './IConnection';
-import { HandshakeError, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { ConnectionID, IConnection } from './IConnection';
+import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import EventEmitter from 'eventemitter3';
 import { DhtAddress } from '../identifiers';
 export interface ManagedConnectionEvents {
     managedData: (bytes: Uint8Array, remotePeerDescriptor: PeerDescriptor) => void;
-    handshakeRequest: (source: PeerDescriptor, version: string, target?: PeerDescriptor) => void;
-    handshakeCompleted: (peerDescriptor: PeerDescriptor) => void;
-    handshakeFailed: () => void;
+    disconnected: (gracefulLeave: boolean) => void;
 }
-export type Events = ManagedConnectionEvents & ConnectionEvents;
-export declare class ManagedConnection extends EventEmitter<Events> {
-    private implementation?;
-    private outputBufferEmitter;
-    private outputBuffer;
-    private inputBuffer;
+export type Events = ManagedConnectionEvents;
+export declare class ManagedConnection extends EventEmitter<ManagedConnectionEvents> {
+    private connection;
     connectionId: ConnectionID;
-    private remotePeerDescriptor?;
-    connectionType: ConnectionType;
-    private handshaker?;
-    private handshakeCompleted;
+    private remotePeerDescriptor;
     private lastUsedTimestamp;
+    private replacedAsDuplicate;
     private stopped;
-    private bufferSentbyOtherConnection;
-    private closing;
-    replacedByOtherConnection: boolean;
-    private localPeerDescriptor;
-    protected outgoingConnection?: IConnection;
-    protected incomingConnection?: IConnection;
-    private created;
-    constructor(localPeerDescriptor: PeerDescriptor, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection, targetPeerDescriptor?: PeerDescriptor);
-    on(event: keyof Events, fn: (...args: any) => void, context?: any): this;
-    once(event: keyof Events, fn: (...args: any) => void, context?: any): this;
+    constructor(peerDescriptor: PeerDescriptor, connection: IConnection);
+    private onDisconnected;
+    replaceAsDuplicate(): void;
+    send(data: Uint8Array): void;
+    close(gracefulLeave: boolean): Promise<void>;
     getNodeId(): DhtAddress;
     getLastUsedTimestamp(): number;
-    setRemotePeerDescriptor(peerDescriptor: PeerDescriptor): void;
     getPeerDescriptor(): PeerDescriptor | undefined;
-    private onHandshakeCompleted;
-    attachImplementation(impl: IConnection): void;
-    private onDisconnected;
-    send(data: Uint8Array, connect: boolean): Promise<void>;
-    sendNoWait(data: Uint8Array): void;
-    reportBufferSentByOtherConnection(): void;
-    acceptHandshake(): void;
-    rejectHandshake(error: HandshakeError): void;
-    close(gracefulLeave: boolean): Promise<void>;
-    destroy(): void;
-    isHandshakeCompleted(): boolean;
-    stealOutputBuffer(): Uint8Array[];
 }

package/dist/src/connection/ManagedConnection.js

@@ -28,289 +28,68 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManagedConnection = void 0;
 const Err = __importStar(require("../helpers/errors"));
-const Handshaker_1 = require("./Handshaker");
-const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const ConnectionManager_1 = require("./ConnectionManager");
 const identifiers_1 = require("../identifiers");
 const Connection_1 = require("./Connection");
 const logger = new utils_1.Logger(module);
+// ManagedConnection is a component used as a wrapper for IConnection after they have been successfully handshaked.
+// Should only be used in the ConnectionManager.
 class ManagedConnection extends eventemitter3_1.default {
-    implementation;
-    outputBufferEmitter = new eventemitter3_1.default();
-    outputBuffer = [];
-    inputBuffer = [];
+    connection;
     connectionId;
     remotePeerDescriptor;
-    connectionType;
-    handshaker;
-    handshakeCompleted = false;
     lastUsedTimestamp = Date.now();
+    replacedAsDuplicate = false;
     stopped = false;
-    bufferSentbyOtherConnection = false;
-    closing = false;
-    replacedByOtherConnection = false;
-    localPeerDescriptor;
-    outgoingConnection;
-    incomingConnection;
-    // TODO: Temporary debug variable, should be removed in the future.
-    created = Date.now();
-    constructor(localPeerDescriptor, connectionType, outgoingConnection, incomingConnection, targetPeerDescriptor) {
+    constructor(peerDescriptor, connection) {
         super();
-        this.localPeerDescriptor = localPeerDescriptor;
-        this.outgoingConnection = outgoingConnection;
-        this.incomingConnection = incomingConnection;
-        this.connectionType = connectionType;
         this.connectionId = (0, Connection_1.createRandomConnectionId)();
-        this.send = this.send.bind(this);
-        this.onDisconnected = this.onDisconnected.bind(this);
-        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.localPeerDescriptor, outgoingConnection);
-            this.handshaker.once('handshakeFailed', (error) => {
-                if (error === DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR || error === DhtRpc_1.HandshakeError.UNSUPPORTED_VERSION) {
-                    // TODO should we have some handling for this floating promise?
-                    this.close(false);
-                }
-                else {
-                    logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' handshakeFailed: ' + error);
-                    this.emit('handshakeFailed');
-                }
-            });
-            this.handshaker.on('handshakeCompleted', (peerDescriptor) => {
-                logger.trace('handshake completed for outgoing connection '
-                    + ', ' + (0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor)
-                    + ' outputBuffer.length: ' + this.outputBuffer.length);
-                this.attachImplementation(outgoingConnection);
-                this.onHandshakeCompleted(peerDescriptor);
-            });
-            outgoingConnection.once('connected', () => {
-                this.handshaker.sendHandshakeRequest(targetPeerDescriptor);
-                this.emit('connected');
-            });
-            outgoingConnection.once('disconnected', this.onDisconnected);
-        }
-        else if (incomingConnection) {
-            this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, incomingConnection);
-            this.handshaker.on('handshakeRequest', (sourcePeerDescriptor, version, targetPeerDescriptor) => {
-                this.setRemotePeerDescriptor(sourcePeerDescriptor);
-                this.emit('handshakeRequest', sourcePeerDescriptor, version, targetPeerDescriptor);
-            });
-            incomingConnection.on('disconnected', this.onDisconnected);
-        }
-    }
-    // eventemitter3 does not implement the standard 'newListener' event, so we need to override
-    on(event, fn, 
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    context) {
-        if (event === 'managedData' && this.listenerCount('managedData') === 0) {
-            while (this.inputBuffer.length > 0) {
-                logger.trace('emptying inputBuffer');
-                const data = this.inputBuffer.shift();
-                fn(data, this.getPeerDescriptor());
-            }
-        }
-        super.on(event, fn, context);
-        return this;
-    }
-    once(event, fn, 
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    context) {
-        if (event === 'managedData' && this.listenerCount('managedData') === 0) {
-            if (this.inputBuffer.length > 0) {
-                while (this.inputBuffer.length > 0) {
-                    logger.trace('emptying inputBuffer');
-                    const data = this.inputBuffer.shift();
-                    fn(data, this.getPeerDescriptor());
-                }
-            }
-            else {
-                super.once(event, fn, context);
-            }
-        }
-        else {
-            super.once(event, fn, context);
-        }
-        return this;
-    }
-    getNodeId() {
-        return (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
-    }
-    getLastUsedTimestamp() {
-        return this.lastUsedTimestamp;
-    }
-    setRemotePeerDescriptor(peerDescriptor) {
-        this.remotePeerDescriptor = peerDescriptor;
-    }
-    getPeerDescriptor() {
-        return this.remotePeerDescriptor;
-    }
-    onHandshakeCompleted(peerDescriptor) {
-        this.lastUsedTimestamp = Date.now();
-        this.setRemotePeerDescriptor(peerDescriptor);
-        this.handshakeCompleted = true;
-        this.handshaker.stop();
-        while (this.outputBuffer.length > 0) {
-            logger.trace('emptying outputBuffer');
-            this.implementation.send(this.outputBuffer.shift());
-        }
-        this.outputBufferEmitter.emit('bufferSent');
-        logger.trace('emitting handshake_completed');
-        this.emit('handshakeCompleted', peerDescriptor);
-    }
-    attachImplementation(impl) {
-        logger.trace('attachImplementation()');
-        this.implementation = impl;
-        impl.on('data', (bytes) => {
+        this.connection = connection;
+        connection.on('data', (bytes) => {
             this.lastUsedTimestamp = Date.now();
-            if (this.listenerCount('managedData') === 0) {
-                this.inputBuffer.push(bytes);
-            }
-            else {
-                this.emit('managedData', bytes, this.getPeerDescriptor());
-            }
+            this.emit('managedData', bytes, this.getPeerDescriptor());
         });
-        impl.on('error', (name) => {
-            this.emit('error', name);
-        });
-        impl.on('connected', () => {
-            this.lastUsedTimestamp = Date.now();
-            logger.trace('connected emitted');
-            this.emit('connected');
-        });
-        //ensure that we have subscribed to the event only once
-        impl.off('disconnected', this.onDisconnected);
-        impl.on('disconnected', this.onDisconnected);
+        connection.on('disconnected', (gracefulLeave) => this.onDisconnected(gracefulLeave));
+        this.lastUsedTimestamp = Date.now();
+        this.remotePeerDescriptor = peerDescriptor;
     }
     onDisconnected(gracefulLeave) {
         logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' onDisconnected() ' + gracefulLeave);
-        if (this.bufferSentbyOtherConnection) {
-            return;
+        if (!this.replacedAsDuplicate) {
+            this.emit('disconnected', gracefulLeave);
         }
-        this.outputBufferEmitter.emit('bufferSendingFailed');
-        this.emit('disconnected', gracefulLeave);
+        this.removeAllListeners();
     }
-    async send(data, connect) {
+    // TODO: Can this be removed if ManagedConnections can never be duplicates?
+    // Handle duplicates in the ConncetorFacade and no longer have PendingConnections in ConnectionManager
+    replaceAsDuplicate() {
+        logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' replaceAsDuplicate');
+        this.replacedAsDuplicate = true;
+    }
+    send(data) {
         if (this.stopped) {
             throw new Err.SendFailed('ManagedConnection is stopped');
         }
-        if (this.closing) {
-            throw new Err.SendFailed('ManagedConnection is closing');
-        }
-        this.lastUsedTimestamp = Date.now();
-        if (!connect && !this.implementation) {
-            throw new Err.ConnectionNotOpen('Connection not open when calling send() with connect flag as false');
-        }
-        else if (this.implementation) {
-            this.implementation.send(data);
-        }
-        else {
-            logger.trace('adding data to outputBuffer');
-            let result;
-            try {
-                result = await (0, utils_1.runAndRaceEvents3)([() => { this.outputBuffer.push(data); }], this.outputBufferEmitter, ['bufferSent', 'bufferSendingFailed'], 15000); // TODO use config option or named constant?
-            }
-            catch (e) {
-                logger.debug(`Connection to ${(0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor)} timed out`, {
-                    peerDescriptor: this.remotePeerDescriptor,
-                    type: this.connectionType,
-                    lifetime: Date.now() - this.created
-                });
-                await this.close(false);
-                throw new Err.SendFailed('Sending buffer timed out');
-            }
-            if (result.winnerName === 'bufferSendingFailed') {
-                throw new Err.SendFailed('Sending buffer failed');
-            }
-            // buffer was sent successfully, return normally
-        }
-    }
-    sendNoWait(data) {
         this.lastUsedTimestamp = Date.now();
-        if (this.implementation) {
-            this.implementation.send(data);
-        }
-        else {
-            logger.trace('adding data to outputBuffer');
-            this.outputBuffer.push(data);
-        }
-    }
-    reportBufferSentByOtherConnection() {
-        logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' reportBufferSentByOtherConnection');
-        if (this.handshaker) {
-            this.handshaker.removeAllListeners();
-        }
-        logger.trace('bufferSentByOtherConnection reported');
-        this.bufferSentbyOtherConnection = true;
-        this.outputBufferEmitter.emit('bufferSent');
-    }
-    acceptHandshake() {
-        // This happens when connectionRequest has been made and answered
-        if (this.implementation) {
-            if (!this.handshaker) {
-                this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, this.implementation);
-            }
-            this.handshaker.sendHandshakeResponse();
-        }
-        else { // This happens to when there is a regular incoming connection
-            this.handshaker.sendHandshakeResponse();
-            this.attachImplementation(this.incomingConnection);
-        }
-        this.onHandshakeCompleted(this.remotePeerDescriptor);
-    }
-    rejectHandshake(error) {
-        this.handshaker.sendHandshakeResponse(error);
-        this.destroy();
+        this.connection.send(data);
     }
     async close(gracefulLeave) {
-        if (this.closing) {
+        if (this.stopped) {
             return;
         }
-        if (this.replacedByOtherConnection) {
-            logger.trace('close() called on replaced connection');
-        }
-        this.closing = true;
-        this.outputBufferEmitter.emit('bufferSendingFailed');
-        if (this.implementation) {
-            await this.implementation?.close(gracefulLeave);
-        }
-        else if (this.outgoingConnection) {
-            await this.outgoingConnection?.close(gracefulLeave);
-        }
-        else if (this.incomingConnection) {
-            await this.incomingConnection?.close(gracefulLeave);
-        }
-        else {
-            this.emit('disconnected', gracefulLeave);
-        }
+        await this.connection.close(gracefulLeave);
+        this.removeAllListeners();
     }
-    destroy() {
-        this.closing = true;
-        if (!this.stopped) {
-            this.stopped = true;
-            this.removeAllListeners();
-            if (this.implementation) {
-                this.implementation?.destroy();
-            }
-            else if (this.outgoingConnection) {
-                this.outgoingConnection?.destroy();
-            }
-            else if (this.incomingConnection) {
-                this.incomingConnection?.destroy();
-            }
-        }
+    getNodeId() {
+        return (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
     }
-    isHandshakeCompleted() {
-        return this.handshakeCompleted;
+    getLastUsedTimestamp() {
+        return this.lastUsedTimestamp;
     }
-    stealOutputBuffer() {
-        const ret = this.outputBuffer;
-        this.outputBuffer = [];
-        return ret;
+    getPeerDescriptor() {
+        return this.remotePeerDescriptor;
     }
 }
 exports.ManagedConnection = ManagedConnection;

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

@@ -1 +1 @@
-{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAwC;AAExC,0CAAuC;AACvC,kEAAwC;AACxC,2DAA0E;AAC1E,gDAAwE;AACxE,6CAAuD;AAOvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAIjC,mHAAmH;AACnH,gDAAgD;AAChD,MAAa,iBAAkB,SAAQ,uBAAqC;IAEhE,UAAU,CAAa;IACxB,YAAY,CAAc;IACzB,oBAAoB,CAAgB;IACpC,iBAAiB,GAAW,IAAI,CAAC,GAAG,EAAE,CAAA;IACtC,mBAAmB,GAAG,KAAK,CAAA;IAC3B,OAAO,GAAG,KAAK,CAAA;IAEvB,YAAY,cAA8B,EAAE,UAAuB;QAC/D,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,YAAY,GAAG,IAAA,qCAAwB,GAAE,CAAA;QAC9C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAE5B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAiB,EAAE,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACnC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAG,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;QACF,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAA;QAEpF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACnC,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAA;IAC9C,CAAC;IAEO,cAAc,CAAC,aAAsB;QACzC,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,oBAAoB,GAAG,aAAa,CAAC,CAAA;QACpH,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;QAC5C,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;IAED,2EAA2E;IAC3E,sGAAsG;IACtG,kBAAkB;QACd,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,qBAAqB,CAAC,CAAA;QACrG,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAA;IACnC,CAAC;IAED,IAAI,CAAC,IAAgB;QACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAA;QAC5D,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,aAAsB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC1C,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;IAED,SAAS;QACL,OAAO,IAAA,yCAA2B,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IACjE,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;CAEJ;AAnED,8CAmEC"}

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

@@ -0,0 +1,9 @@
+import { Defer } from '@streamr/utils';
+export declare class OutputBuffer {
+    private readonly buffer;
+    private readonly deferredPromise;
+    push(message: Uint8Array): Defer<void>;
+    getBuffer(): Uint8Array[];
+    resolve(): void;
+    reject(): void;
+}

package/dist/src/connection/OutputBuffer.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OutputBuffer = void 0;
+const utils_1 = require("@streamr/utils");
+const errors_1 = require("../helpers/errors");
+class OutputBuffer {
+    buffer = [];
+    deferredPromise = new utils_1.Defer();
+    push(message) {
+        this.buffer.push(message);
+        return this.deferredPromise;
+    }
+    getBuffer() {
+        return this.buffer;
+    }
+    resolve() {
+        this.buffer.length = 0;
+        this.deferredPromise.resolve();
+    }
+    reject() {
+        this.buffer.length = 0;
+        this.deferredPromise.reject(new errors_1.SendFailed('Could not send buffered messages'));
+    }
+}
+exports.OutputBuffer = OutputBuffer;
+//# sourceMappingURL=OutputBuffer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OutputBuffer.js","sourceRoot":"","sources":["../../../src/connection/OutputBuffer.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AACtC,8CAA8C;AAE9C,MAAa,YAAY;IAEJ,MAAM,GAAiB,EAAE,CAAA;IACzB,eAAe,GAAgB,IAAI,aAAK,EAAQ,CAAA;IAEjE,IAAI,CAAC,OAAmB;QACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC/B,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,mBAAU,CAAC,kCAAkC,CAAC,CAAC,CAAA;IACnF,CAAC;CAEJ;AAxBD,oCAwBC"}

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

@@ -0,0 +1,19 @@
+import EventEmitter from 'eventemitter3';
+import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { IConnection } from './IConnection';
+export interface PendingConnectionEvents {
+    connected: (peerDescriptor: PeerDescriptor, connection: IConnection) => void;
+    disconnected: (gracefulLeave: boolean) => void;
+}
+export declare class PendingConnection extends EventEmitter<PendingConnectionEvents> {
+    private readonly connectingAbortController;
+    private remotePeerDescriptor;
+    private replacedAsDuplicate;
+    private stopped;
+    constructor(remotePeerDescriptor: PeerDescriptor, timeout?: number);
+    replaceAsDuplicate(): void;
+    onHandshakeCompleted(connection: IConnection): void;
+    close(graceful: boolean): void;
+    destroy(): void;
+    getPeerDescriptor(): PeerDescriptor;
+}

package/dist/src/connection/PendingConnection.js

@@ -0,0 +1,59 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PendingConnection = void 0;
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const utils_1 = require("@streamr/utils");
+const ConnectionManager_1 = require("./ConnectionManager");
+const logger = new utils_1.Logger(module);
+// PendingConnection is used as a reference to a connection that should be opened and handshaked to a given PeerDescriptor
+// It does not hold a connection internally. The public method onHandshakedCompleted should be called once a connection for the 
+// remotePeerDescriptor is opened and handshaked successfully.
+// PendingConnections are created by the Connectors.
+class PendingConnection extends eventemitter3_1.default {
+    connectingAbortController = new AbortController();
+    remotePeerDescriptor;
+    replacedAsDuplicate = false;
+    stopped = false;
+    constructor(remotePeerDescriptor, timeout = 15 * 1000) {
+        super();
+        this.remotePeerDescriptor = remotePeerDescriptor;
+        (0, utils_1.setAbortableTimeout)(() => {
+            this.close(false);
+        }, timeout, this.connectingAbortController.signal);
+    }
+    replaceAsDuplicate() {
+        logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' replaceAsDuplicate');
+        this.replacedAsDuplicate = true;
+    }
+    onHandshakeCompleted(connection) {
+        if (!this.replacedAsDuplicate) {
+            this.emit('connected', this.remotePeerDescriptor, connection);
+        }
+    }
+    close(graceful) {
+        if (this.stopped) {
+            return;
+        }
+        this.stopped = true;
+        this.connectingAbortController.abort();
+        if (!this.replacedAsDuplicate) {
+            this.emit('disconnected', graceful);
+        }
+    }
+    destroy() {
+        if (this.stopped) {
+            return;
+        }
+        this.stopped = true;
+        this.connectingAbortController.abort();
+        this.removeAllListeners();
+    }
+    getPeerDescriptor() {
+        return this.remotePeerDescriptor;
+    }
+}
+exports.PendingConnection = PendingConnection;
+//# sourceMappingURL=PendingConnection.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PendingConnection.js","sourceRoot":"","sources":["../../../src/connection/PendingConnection.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AAExC,0CAA4D;AAC5D,2DAA0E;AAQ1E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,0HAA0H;AAC1H,gIAAgI;AAChI,8DAA8D;AAC9D,oDAAoD;AACpD,MAAa,iBAAkB,SAAQ,uBAAqC;IAEvD,yBAAyB,GAAoB,IAAI,eAAe,EAAE,CAAA;IAC3E,oBAAoB,CAAgB;IACpC,mBAAmB,GAAY,KAAK,CAAA;IACpC,OAAO,GAAY,KAAK,CAAA;IAEhC,YAAY,oBAAoC,EAAE,OAAO,GAAG,EAAE,GAAG,IAAI;QACjE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAA,2BAAmB,EAAC,GAAG,EAAE;YACrB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACrB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACtD,CAAC;IAED,kBAAkB;QACd,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,qBAAqB,CAAC,CAAA;QACrG,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAA;IACnC,CAAC;IAED,oBAAoB,CAAC,UAAuB;QACxC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAA;QACjE,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAiB;QACnB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,CAAA;QACtC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QACvC,CAAC;IACL,CAAC;IAED,OAAO;QACH,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,CAAA;QACtC,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;CAEJ;AAlDD,8CAkDC"}

package/dist/src/connection/connectivityChecker.js

@@ -29,10 +29,10 @@ const uuid_1 = require("uuid");
 const Err = __importStar(require("../helpers/errors"));
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const NodeWebsocketClientConnection_1 = require("./websocket/NodeWebsocketClientConnection");
-const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
+const WebsocketClientConnector_1 = require("./websocket/WebsocketClientConnector");
 const version_1 = require("../helpers/version");
 const logger = new utils_1.Logger(module);
-// TODO use config option or named constant?
+// TODO use options option or named constant?
 const connectAsync = async ({ url, allowSelfSignedCertificate, timeoutMs = 1000 }) => {
     const socket = new NodeWebsocketClientConnection_1.WebsocketClientConnection();
     let result;
@@ -59,7 +59,7 @@ const sendConnectivityRequest = async (request, entryPoint) => {
         port: entryPoint.websocket.port,
         tls: entryPoint.websocket.tls,
     };
-    const url = (0, WebsocketConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityRequest');
+    const url = (0, WebsocketClientConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityRequest');
     logger.debug(`Attempting connectivity check with entrypoint ${url}`);
     try {
         outgoingConnection = await (0, exports.connectAsync)({

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

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

package/dist/src/connection/connectivityRequestHandler.js

@@ -6,7 +6,7 @@ const uuid_1 = require("uuid");
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const ConnectionManager_1 = require("./ConnectionManager");
 const connectivityChecker_1 = require("./connectivityChecker");
-const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
+const WebsocketClientConnector_1 = require("./websocket/WebsocketClientConnector");
 const version_1 = require("../helpers/version");
 exports.DISABLE_CONNECTIVITY_PROBE = 0;
 const logger = new utils_1.Logger(module);
@@ -75,7 +75,7 @@ const connectivityProbe = async (connectivityRequest, ipAddress, host) => {
             port: connectivityRequest.port,
             tls: connectivityRequest.tls
         };
-        const url = (0, WebsocketConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityProbe');
+        const url = (0, WebsocketClientConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityProbe');
         logger.trace(`Attempting Connectivity Check to ${url}`);
         outgoingConnection = await (0, connectivityChecker_1.connectAsync)({
             url,

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

@@ -1 +1 @@
-{"version":3,"file":"connectivityRequestHandler.js","sourceRoot":"","sources":["../../../src/connection/connectivityRequestHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connectivityRequestHandler.js","sourceRoot":"","sources":["../../../src/connection/connectivityRequestHandler.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,+BAAyB;AACzB,gEAI4C;AAC5C,2DAA6C;AAC7C,+DAAqF;AAGrF,mFAAuF;AACvF,gDAA2D;AAG9C,QAAA,0BAA0B,GAAG,CAAC,CAAA;AAE3C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,gCAAgC,GAAG,CAAC,oBAA+C,EAAE,YAA2B,EAAQ,EAAE;IACnI,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAgB,EAAE,EAAE;QACvD,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACpC,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,gBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACxC,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,qBAAqB,EAAE,CAAC;gBACnD,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBACxF,IAAI,CAAC;oBACD,MAAM,iCAAiC,CAAC,oBAAoB,EACxD,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAA;oBACnD,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;gBACxD,CAAC;gBAAC,OAAO,IAAI,EAAE,CAAC;oBACZ,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;gBACpE,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1D,CAAC;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAnBY,QAAA,gCAAgC,oCAmB5C;AAED,MAAM,iCAAiC,GAAG,KAAK,EAC3C,UAAqC,EACrC,mBAAwC,EACxC,YAA2B,EACd,EAAE;IACf,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,IAAI,UAAU,CAAC,kBAAkB,EAAE,CAAA;IACxE,MAAM,SAAS,GAAG,UAAU,CAAC,kBAAkB,EAAE,CAAA;IACjD,IAAI,oBAA0C,CAAA;IAC9C,IAAI,mBAAmB,CAAC,IAAI,KAAK,kCAA0B,EAAE,CAAC;QAC1D,oBAAoB,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IACxF,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAA;QACjF,oBAAoB,GAAG;YACnB,IAAI;YACJ,OAAO,EAAE,2BAAO,CAAC,OAAO;YACxB,SAAS,EAAE,IAAA,oBAAY,EAAC,SAAS,CAAC;YAClC,OAAO,EAAE,gCAAsB;SAClC,CAAA;IACL,CAAC;IACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC/C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,oBAAoB,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;YACjD,oBAAoB,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAA;QACvD,CAAC;IACL,CAAC;IACD,MAAM,GAAG,GAAY;QACjB,SAAS,EAAE,qDAA+B;QAC1C,SAAS,EAAE,IAAA,SAAE,GAAE;QACf,IAAI,EAAE;YACF,SAAS,EAAE,sBAAsB;YACjC,oBAAoB;SACvB;KACJ,CAAA;IACD,UAAU,CAAC,IAAI,CAAC,gBAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IACtC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AACrF,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,KAAK,EAAE,mBAAwC,EAAE,SAAiB,EAAE,IAAY,EAAiC,EAAE;IACzI,IAAI,kBAA2C,CAAA;IAC/C,IAAI,2BAAiD,CAAA;IACrD,IAAI,CAAC;QACD,MAAM,YAAY,GAAG;YACjB,IAAI;YACJ,IAAI,EAAE,mBAAmB,CAAC,IAAI;YAC9B,GAAG,EAAE,mBAAmB,CAAC,GAAG;SAC/B,CAAA;QACD,MAAM,GAAG,GAAG,IAAA,2DAAgC,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;QAC/E,MAAM,CAAC,KAAK,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAA;QACvD,kBAAkB,GAAG,MAAM,IAAA,kCAAY,EAAC;YACpC,GAAG;YACH,0BAA0B,EAAE,mBAAmB,CAAC,0BAA0B;SAC7E,CAAC,CAAA;QACF,MAAM,CAAC,KAAK,CAAC,mFAAmF,GAAG,IAAI,GAAG,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;QACzI,2BAA2B,GAAG;YAC1B,IAAI;YACJ,OAAO,EAAE,2BAAO,CAAC,aAAa;YAC9B,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,mBAAmB,CAAC,GAAG,EAAE;YACjF,SAAS,EAAE,IAAA,oBAAY,EAAC,SAAS,CAAC;YAClC,OAAO,EAAE,gCAAsB;SAClC,CAAA;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QAC9B,2BAA2B,GAAG;YAC1B,IAAI;YACJ,OAAO,EAAE,2BAAO,CAAC,OAAO;YACxB,SAAS,EAAE,IAAA,oBAAY,EAAC,SAAS,CAAC;YAClC,OAAO,EAAE,gCAAsB;SAClC,CAAA;IACL,CAAC;IACD,IAAI,kBAAkB,EAAE,CAAC;QACrB,+DAA+D;QAC/D,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;IACD,OAAO,2BAA2B,CAAA;AACtC,CAAC,CAAA"}

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

@@ -1,6 +1,4 @@
-import EventEmitter from 'eventemitter3';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { ConnectionSourceEvents } from '../IConnectionSource';
 import { SimulatorConnector } from './SimulatorConnector';
 import { SimulatorConnection } from './SimulatorConnection';
 export declare enum LatencyType {
@@ -9,7 +7,7 @@ export declare enum LatencyType {
     REAL = "REAL",
     FIXED = "FIXED"
 }
-export declare class Simulator extends EventEmitter<ConnectionSourceEvents> {
+export declare class Simulator {
     private stopped;
     private connectors;
     private latencyTable?;