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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/dht",
-    "version": "100.2.5-beta.0",
+    "version": "101.0.0-beta.0",
     "description": "Streamr Network DHT",
     "repository": {
         "type": "git",
@@ -29,11 +29,11 @@
         "@js-sdsl/ordered-map": "^4.4.2",
         "@protobuf-ts/runtime": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/autocertifier-client": "100.2.5-beta.0",
-        "@streamr/cdn-location": "100.2.5-beta.0",
-        "@streamr/geoip-location": "100.2.5-beta.0",
-        "@streamr/proto-rpc": "100.2.5-beta.0",
-        "@streamr/utils": "100.2.5-beta.0",
+        "@streamr/autocertifier-client": "101.0.0-beta.0",
+        "@streamr/cdn-location": "101.0.0-beta.0",
+        "@streamr/geoip-location": "101.0.0-beta.0",
+        "@streamr/proto-rpc": "101.0.0-beta.0",
+        "@streamr/utils": "101.0.0-beta.0",
         "eventemitter3": "^5.0.0",
         "heap": "^0.2.6",
         "ipaddr.js": "^2.0.1",
@@ -48,7 +48,7 @@
     },
     "devDependencies": {
         "@streamr/browser-test-runner": "^0.0.1",
-        "@streamr/test-utils": "100.2.5-beta.0",
+        "@streamr/test-utils": "101.0.0-beta.0",
         "@types/heap": "^0.2.34",
         "@types/k-bucket": "^5.0.1",
         "@types/lodash": "^4.14.202",

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

@@ -4,15 +4,15 @@ import { DisconnectNotice, LockRequest, LockResponse, PeerDescriptor, UnlockRequ
 import { IConnectionLockRpc } from '../proto/packages/dht/protos/DhtRpc.server';
 import { LockID } from './ConnectionLockStates';
 import { DhtAddress } from '../identifiers';
-interface ConnectionLockRpcLocalConfig {
+interface ConnectionLockRpcLocalOptions {
     addRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
     removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
     closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void;
     getLocalPeerDescriptor: () => PeerDescriptor;
 }
 export declare class ConnectionLockRpcLocal implements IConnectionLockRpc {
-    private readonly config;
-    constructor(config: ConnectionLockRpcLocalConfig);
+    private readonly options;
+    constructor(options: ConnectionLockRpcLocalOptions);
     lockRequest(lockRequest: LockRequest, context: ServerCallContext): Promise<LockResponse>;
     unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty>;
     gracefulDisconnect(disconnectNotice: DisconnectNotice, context: ServerCallContext): Promise<Empty>;

package/dist/src/connection/ConnectionLockRpcLocal.js

@@ -7,20 +7,20 @@ const ConnectionManager_1 = require("./ConnectionManager");
 const identifiers_1 = require("../identifiers");
 const logger = new utils_1.Logger(module);
 class ConnectionLockRpcLocal {
-    config;
-    constructor(config) {
-        this.config = config;
+    options;
+    constructor(options) {
+        this.options = options;
     }
     async lockRequest(lockRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
-        if ((0, identifiers_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.config.getLocalPeerDescriptor())) {
+        if ((0, identifiers_1.areEqualPeerDescriptors)(senderPeerDescriptor, this.options.getLocalPeerDescriptor())) {
             const response = {
                 accepted: false
             };
             return response;
         }
         const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
-        this.config.addRemoteLocked(remoteNodeId, lockRequest.lockId);
+        this.options.addRemoteLocked(remoteNodeId, lockRequest.lockId);
         const response = {
             accepted: true
         };
@@ -29,17 +29,17 @@ class ConnectionLockRpcLocal {
     async unlockRequest(unlockRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
-        this.config.removeRemoteLocked(nodeId, unlockRequest.lockId);
+        this.options.removeRemoteLocked(nodeId, unlockRequest.lockId);
         return {};
     }
     async gracefulDisconnect(disconnectNotice, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
         logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(senderPeerDescriptor) + ' received gracefulDisconnect notice');
         if (disconnectNotice.disconnectMode === DhtRpc_1.DisconnectMode.LEAVING) {
-            this.config.closeConnection(senderPeerDescriptor, true, 'graceful leave notified');
+            this.options.closeConnection(senderPeerDescriptor, true, 'graceful leave notified');
         }
         else {
-            this.config.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified');
+            this.options.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified');
         }
         return {};
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ConnectionLockRpcLocal.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,gEAO4C;AAG5C,2DAA0E;AAE1E,gDAAiG;AASjG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAEd,MAAM,CAA8B;IAErD,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,OAA0B;QAClE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACtF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC7D,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,OAA0B;QACxE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,OAA0B;QACnF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,oBAAoB,CAAC,GAAG,qCAAqC,CAAC,CAAA;QAEhH,IAAI,gBAAgB,CAAC,cAAc,KAAK,uBAAc,CAAC,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;QACtF,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;QAC5F,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA1CD,wDA0CC"}
+{"version":3,"file":"ConnectionLockRpcLocal.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,gEAO4C;AAG5C,2DAA0E;AAE1E,gDAAiG;AASjG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAEd,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,OAA0B;QAClE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACvF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,OAA0B;QACxE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC7D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,OAA0B;QACnF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,oBAAoB,CAAC,GAAG,qCAAqC,CAAC,CAAA;QAEhH,IAAI,gBAAgB,CAAC,cAAc,KAAK,uBAAc,CAAC,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;QACvF,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;QAC7F,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA1CD,wDA0CC"}

package/dist/src/connection/ConnectionLockRpcRemote.js

@@ -41,7 +41,7 @@ class ConnectionLockRpcRemote extends RpcRemote_1.RpcRemote {
         const options = this.formDhtRpcOptions({
             connect: false,
             sendIfStopped: true,
-            timeout: 2000 // TODO use config option or named constant?
+            timeout: 2000 // TODO use options option or named constant?
         });
         await this.getClient().gracefulDisconnect(request, options);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,wDAAoD;AAIpD,gDAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,qBAAkC;IAEpE,KAAK,CAAC,WAAW,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxG,MAAM,OAAO,GAAgB;YACzB,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACjD,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,MAAc;QAC/B,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAAkB;YAC3B,MAAM;SACT,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,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC3G,MAAM,OAAO,GAAqB;YAC9B,cAAc;SACjB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI,CAAE,4CAA4C;SAC9D,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AA1CD,0DA0CC"}
+{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,wDAAoD;AAIpD,gDAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,qBAAkC;IAEpE,KAAK,CAAC,WAAW,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxG,MAAM,OAAO,GAAgB;YACzB,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACjD,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,MAAc;QAC/B,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAAkB;YAC3B,MAAM;SACT,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,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC3G,MAAM,OAAO,GAAqB;YAC9B,cAAc;SACjB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI,CAAE,6CAA6C;SAC/D,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AA1CD,0DA0CC"}

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

@@ -4,10 +4,9 @@ import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { ITransport, SendOptions, TransportEvents } from '../transport/ITransport';
 import { LockID } from './ConnectionLockStates';
 import { ConnectorFacade } from './ConnectorFacade';
-import { ManagedConnection } from './ManagedConnection';
 import { DhtAddress } from '../identifiers';
 import { ConnectionsView } from './ConnectionsView';
-export interface ConnectionManagerConfig {
+export interface ConnectionManagerOptions {
     maxConnections?: number;
     metricsContext: MetricsContext;
     createConnectorFacade: () => ConnectorFacade;
@@ -35,17 +34,17 @@ export interface TlsCertificate {
 }
 export declare const getNodeIdOrUnknownFromPeerDescriptor: (peerDescriptor: PeerDescriptor | undefined) => string;
 export declare class ConnectionManager extends EventEmitter<TransportEvents> implements ITransport, ConnectionsView, ConnectionLocker {
-    private config;
+    private options;
     private readonly metricsContext;
     private readonly duplicateMessageDetector;
     private readonly metrics;
     private locks;
-    private connections;
+    private endpoints;
     private readonly connectorFacade;
     private rpcCommunicator?;
     private disconnectorIntervalRef?;
     private state;
-    constructor(config: ConnectionManagerConfig);
+    constructor(options: ConnectionManagerOptions);
     garbageCollectConnections(maxConnections: number, maxIdleTime: number): void;
     start(): Promise<void>;
     stop(): Promise<void>;
@@ -55,7 +54,6 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
     send(message: Message, opts?: SendOptions): Promise<void>;
     private isConnectionToSelf;
     private isOwnWebsocketServer;
-    getConnection(nodeId: DhtAddress): ManagedConnection | undefined;
     getLocalPeerDescriptor(): PeerDescriptor;
     hasConnection(nodeId: DhtAddress): boolean;
     getConnectionCount(): number;

package/dist/src/connection/ConnectionManager.js

@@ -34,11 +34,12 @@ const DhtRpc_client_1 = require("../proto/packages/dht/protos/DhtRpc.client");
 const ITransport_1 = require("../transport/ITransport");
 const RoutingRpcCommunicator_1 = require("../transport/RoutingRpcCommunicator");
 const ConnectionLockStates_1 = require("./ConnectionLockStates");
+const ManagedConnection_1 = require("./ManagedConnection");
 const ConnectionLockRpcRemote_1 = require("./ConnectionLockRpcRemote");
-const NodeWebrtcConnection_1 = require("./webrtc/NodeWebrtcConnection");
 const ConnectionLockRpcLocal_1 = require("./ConnectionLockRpcLocal");
 const identifiers_1 = require("../identifiers");
 const offering_1 = require("../helpers/offering");
+const OutputBuffer_1 = require("./OutputBuffer");
 var NatType;
 (function (NatType) {
     NatType["OPEN_INTERNET"] = "open_internet";
@@ -72,24 +73,24 @@ const getNodeIdOrUnknownFromPeerDescriptor = (peerDescriptor) => {
 };
 exports.getNodeIdOrUnknownFromPeerDescriptor = getNodeIdOrUnknownFromPeerDescriptor;
 class ConnectionManager extends eventemitter3_1.EventEmitter {
-    config;
+    options;
     metricsContext;
-    // TODO use config option or named constant?
+    // TODO use options option or named constant?
     duplicateMessageDetector = new DuplicateDetector_1.DuplicateDetector(10000);
     metrics;
     locks = new ConnectionLockStates_1.ConnectionLockStates();
-    connections = new Map();
+    endpoints = new Map();
     connectorFacade;
     rpcCommunicator;
     disconnectorIntervalRef;
     state = ConnectionManagerState.IDLE;
-    constructor(config) {
+    constructor(options) {
         super();
-        this.config = config;
+        this.options = options;
         this.onData = this.onData.bind(this);
         this.send = this.send.bind(this);
         this.onNewConnection = this.onNewConnection.bind(this);
-        this.metricsContext = this.config.metricsContext ?? new utils_1.MetricsContext();
+        this.metricsContext = this.options.metricsContext ?? new utils_1.MetricsContext();
         this.metrics = {
             sendMessagesPerSecond: new utils_1.RateMetric(),
             sendBytesPerSecond: new utils_1.RateMetric(),
@@ -99,10 +100,10 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             connectionTotalFailureCount: new utils_1.CountMetric()
         };
         this.metricsContext.addMetrics('node', this.metrics);
-        this.connectorFacade = this.config.createConnectorFacade();
+        this.connectorFacade = this.options.createConnectorFacade();
         this.send = this.send.bind(this);
         this.rpcCommunicator = new RoutingRpcCommunicator_1.RoutingRpcCommunicator(INTERNAL_SERVICE_ID, this.send, {
-            rpcRequestTimeout: 10000 // TODO use config option or named constant?
+            rpcRequestTimeout: 10000 // TODO use options option or named constant?
         });
         const lockRpcLocal = new ConnectionLockRpcLocal_1.ConnectionLockRpcLocal({
             addRemoteLocked: (id, lockId) => this.locks.addRemoteLocked(id, lockId),
@@ -122,21 +123,24 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
      * which hasn't been used within maxIdleTime.
      */
     garbageCollectConnections(maxConnections, maxIdleTime) {
-        if (this.connections.size <= maxConnections) {
+        if (this.endpoints.size <= maxConnections) {
             return;
         }
         const disconnectionCandidates = new SortedContactList_1.SortedContactList({
             referenceId: (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()),
-            maxSize: 100000, // TODO use config option or named constant?
+            maxSize: 100000, // TODO use options option or named constant?
             allowToContainReferenceId: false
         });
-        this.connections.forEach((connection) => {
-            if (!this.locks.isLocked(connection.getNodeId()) && Date.now() - connection.getLastUsedTimestamp() > maxIdleTime) {
-                logger.trace('disconnecting in timeout interval: ' + (0, exports.getNodeIdOrUnknownFromPeerDescriptor)(connection.getPeerDescriptor()));
-                disconnectionCandidates.addContact(connection);
+        this.endpoints.forEach((endpoint) => {
+            if (endpoint.connected) {
+                const connection = endpoint.connection;
+                if (!this.locks.isLocked(connection.getNodeId()) && Date.now() - connection.getLastUsedTimestamp() > maxIdleTime) {
+                    logger.trace('disconnecting in timeout interval: ' + (0, exports.getNodeIdOrUnknownFromPeerDescriptor)(connection.getPeerDescriptor()));
+                    disconnectionCandidates.addContact(connection);
+                }
             }
         });
-        const disconnectables = disconnectionCandidates.getFurthestContacts(this.connections.size - maxConnections);
+        const disconnectables = disconnectionCandidates.getFurthestContacts(this.endpoints.size - maxConnections);
         for (const disconnectable of disconnectables) {
             const peerDescriptor = disconnectable.getPeerDescriptor();
             logger.trace('garbageCollecting ' + (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
@@ -154,8 +158,8 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         this.disconnectorIntervalRef = setInterval(() => {
             logger.trace('disconnectorInterval');
             const LAST_USED_LIMIT = 20000;
-            this.garbageCollectConnections(this.config.maxConnections ?? 80, LAST_USED_LIMIT);
-        }, 5000); // TODO use config option or named constant?
+            this.garbageCollectConnections(this.options.maxConnections ?? 80, LAST_USED_LIMIT);
+        }, 5000); // TODO use options option or named constant?
     }
     async stop() {
         if (this.state === ConnectionManagerState.STOPPED || this.state === ConnectionManagerState.STOPPING) {
@@ -167,26 +171,28 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             clearInterval(this.disconnectorIntervalRef);
         }
         await this.connectorFacade.stop();
-        await Promise.all(Array.from(this.connections.values()).map(async (peer) => {
-            if (peer.isHandshakeCompleted()) {
+        await Promise.all(Array.from(this.endpoints.values()).map(async (endpoint) => {
+            if (endpoint.connected) {
                 try {
-                    await this.gracefullyDisconnectAsync(peer.getPeerDescriptor(), DhtRpc_1.DisconnectMode.LEAVING);
+                    await this.gracefullyDisconnectAsync(endpoint.connection.getPeerDescriptor(), DhtRpc_1.DisconnectMode.LEAVING);
                 }
                 catch (e) {
                     logger.error(e);
                 }
             }
             else {
+                const connection = endpoint.connection;
                 logger.trace('handshake of connection not completed, force-closing');
-                // TODO use config option or named constant?
-                const eventReceived = (0, utils_1.waitForEvent3)(peer, 'disconnected', 2000);
+                // TODO use options option or named constant?
+                const eventReceived = (0, utils_1.waitForEvent3)(connection, 'disconnected', 2000);
                 // TODO should we have some handling for this floating promise?
-                peer.close(true);
+                connection.close(true);
                 try {
                     await eventReceived;
                     logger.trace('resolving after receiving disconnected event from non-handshaked connection');
                 }
                 catch (e) {
+                    endpoint.buffer.reject();
                     logger.trace('force-closing non-handshaked connection timed out ' + e);
                 }
             }
@@ -196,10 +202,6 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         this.duplicateMessageDetector.clear();
         this.locks.clear();
         this.removeAllListeners();
-        // TODO would it make sense to move this call to WebrtcConnector#stop()?
-        // - but note that we should call this only after connections have been closed
-        //   (i.e the this.gracefullyDisconnectAsync() calls above)
-        NodeWebrtcConnection_1.WEBRTC_CLEANUP.cleanUp();
     }
     getLocalLockedConnectionCount() {
         return this.locks.getLocalLockedConnectionCount();
@@ -224,7 +226,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             ...message,
             sourceDescriptor: this.getLocalPeerDescriptor()
         };
-        let connection = this.connections.get(nodeId);
+        let connection = this.endpoints.get(nodeId)?.connection;
         if (!connection && opts.connect) {
             connection = this.connectorFacade.createConnection(peerDescriptor);
             this.onNewConnection(connection);
@@ -235,7 +237,12 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         const binary = DhtRpc_1.Message.toBinary(message);
         this.metrics.sendBytesPerSecond.record(binary.byteLength);
         this.metrics.sendMessagesPerSecond.record(1);
-        return connection.send(binary, opts.connect);
+        if (this.endpoints.get(nodeId).connected) {
+            return connection.send(binary);
+        }
+        else {
+            return this.endpoints.get(nodeId).buffer.push(binary);
+        }
     }
     isConnectionToSelf(peerDescriptor) {
         return (0, identifiers_1.areEqualPeerDescriptors)(peerDescriptor, this.getLocalPeerDescriptor()) || this.isOwnWebsocketServer(peerDescriptor);
@@ -250,9 +257,6 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             return false;
         }
     }
-    getConnection(nodeId) {
-        return this.connections.get(nodeId);
-    }
     getLocalPeerDescriptor() {
         return this.connectorFacade.getLocalPeerDescriptor();
     }
@@ -314,29 +318,42 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
             logger.debug(`Handling incoming data failed: ${e}`);
         }
     }
-    onConnected(connection) {
-        const peerDescriptor = connection.getPeerDescriptor();
+    onConnected(peerDescriptor, connection) {
+        const managedConnection = new ManagedConnection_1.ManagedConnection(peerDescriptor, connection);
+        managedConnection.on('managedData', this.onData);
+        managedConnection.once('disconnected', (gracefulLeave) => this.onDisconnected(peerDescriptor, gracefulLeave));
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        const endpoint = this.endpoints.get(nodeId);
+        const outputBuffer = endpoint.buffer;
+        const pendingConnection = endpoint.connection;
+        const buffer = outputBuffer.getBuffer();
+        while (buffer.length > 0) {
+            logger.trace('emptying buffer');
+            managedConnection.send(buffer.shift());
+        }
+        outputBuffer.resolve();
+        pendingConnection.destroy();
+        this.endpoints.set(nodeId, {
+            connected: true,
+            connection: managedConnection
+        });
         this.emit('connected', peerDescriptor);
-        logger.trace((0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' onConnected() ' + connection.connectionType);
         this.onConnectionCountChange();
     }
-    onDisconnected(connection, gracefulLeave) {
-        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(connection.getPeerDescriptor());
+    onDisconnected(peerDescriptor, gracefulLeave) {
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
         logger.trace(nodeId + ' onDisconnected() gracefulLeave: ' + gracefulLeave);
-        const storedConnection = this.connections.get(nodeId);
-        if (storedConnection && (storedConnection.connectionId === connection.connectionId)) {
+        const endpoint = this.endpoints.get(nodeId);
+        if (endpoint) {
             this.locks.clearAllLocks(nodeId);
-            this.connections.delete(nodeId);
+            if (endpoint.connected === false) {
+                endpoint.buffer.reject();
+            }
+            this.endpoints.delete(nodeId);
             logger.trace(nodeId + ' deleted connection in onDisconnected() gracefulLeave: ' + gracefulLeave);
-            this.emit('disconnected', connection.getPeerDescriptor(), gracefulLeave);
+            this.emit('disconnected', peerDescriptor, gracefulLeave);
             this.onConnectionCountChange();
         }
-        else {
-            logger.trace(nodeId + ' onDisconnected() did nothing, no such connection in connectionManager');
-            if (storedConnection) {
-                logger.trace(nodeId + ' connectionIds do not match ' + storedConnection.connectionId + ' ' + connection.connectionId.toString());
-            }
-        }
     }
     onNewConnection(connection) {
         if (this.state === ConnectionManagerState.STOPPED) {
@@ -346,54 +363,55 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         if (!this.acceptNewConnection(connection)) {
             return false;
         }
-        connection.on('managedData', this.onData);
-        connection.on('disconnected', (gracefulLeave) => {
-            this.onDisconnected(connection, gracefulLeave);
-        });
-        if (connection.isHandshakeCompleted()) {
-            this.onConnected(connection);
-        }
-        else {
-            connection.once('handshakeCompleted', () => {
-                this.onConnected(connection);
-            });
-        }
+        connection.once('connected', (peerDescriptor, connection) => this.onConnected(peerDescriptor, connection));
+        connection.once('disconnected', (gracefulLeave) => this.onDisconnected(connection.getPeerDescriptor(), gracefulLeave));
         return true;
     }
     acceptNewConnection(newConnection) {
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(newConnection.getPeerDescriptor());
-        logger.trace(nodeId + ' acceptIncomingConnection()');
-        if (this.connections.has(nodeId)) {
+        logger.trace(nodeId + ' acceptNewConnection()');
+        if (this.endpoints.has(nodeId)) {
             if ((0, offering_1.getOfferer)((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor()), nodeId) === 'remote') {
-                logger.trace(nodeId + ' acceptIncomingConnection() replace current connection');
-                // replace the current connection
-                const oldConnection = this.connections.get(nodeId);
-                logger.trace('replaced: ' + nodeId);
-                const buffer = oldConnection.stealOutputBuffer();
-                for (const data of buffer) {
-                    newConnection.sendNoWait(data);
+                let buffer;
+                const endpoint = this.endpoints.get(nodeId);
+                // This is a rare occurance but it does happen from time to time.
+                // Could be related to WS client connections not realizing that they have been disconnected.
+                // Makes refactoring duplicate connection handling to the connectors very difficult. 
+                if (this.endpoints.get(nodeId).connected) {
+                    logger.debug('replacing connected connection', { nodeId });
+                    buffer = new OutputBuffer_1.OutputBuffer();
+                }
+                else {
+                    buffer = endpoint.buffer;
                 }
-                oldConnection.reportBufferSentByOtherConnection();
-                oldConnection.replacedByOtherConnection = true;
+                const oldConnection = endpoint.connection;
+                logger.trace('replaced: ' + nodeId);
+                oldConnection.replaceAsDuplicate();
+                this.endpoints.set(nodeId, { connected: false, connection: newConnection, buffer: buffer });
+                return true;
             }
             else {
                 return false;
             }
         }
-        logger.trace(nodeId + ' added to connections at acceptIncomingConnection');
-        this.connections.set(nodeId, newConnection);
+        logger.trace(nodeId + ' added to connections at acceptNewConnection');
+        this.endpoints.set(nodeId, {
+            connected: false,
+            buffer: new OutputBuffer_1.OutputBuffer(),
+            connection: newConnection
+        });
         return true;
     }
     async closeConnection(peerDescriptor, gracefulLeave, reason) {
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
         logger.trace(nodeId + ' ' + 'closeConnection() ' + reason);
         this.locks.clearAllLocks(nodeId);
-        if (this.connections.has(nodeId)) {
-            const connectionToClose = this.connections.get(nodeId);
+        if (this.endpoints.has(nodeId)) {
+            const connectionToClose = this.endpoints.get(nodeId).connection;
             await connectionToClose.close(gracefulLeave);
         }
         else {
-            logger.trace(nodeId + ' ' + 'closeConnection() this.connections did not have the id');
+            logger.trace(nodeId + ' ' + 'closeConnection() this.endpoints did not have the id');
             this.emit('disconnected', peerDescriptor, false);
         }
     }
@@ -415,7 +433,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
         this.locks.removeLocalLocked(nodeId, lockId);
         const rpcRemote = new ConnectionLockRpcRemote_1.ConnectionLockRpcRemote(this.getLocalPeerDescriptor(), targetDescriptor, this.rpcCommunicator, DhtRpc_client_1.ConnectionLockRpcClient);
-        if (this.connections.has(nodeId)) {
+        if (this.endpoints.has(nodeId)) {
             rpcRemote.unlockRequest(lockId);
         }
     }
@@ -432,31 +450,37 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         this.locks.removeWeakLocked(nodeId, lockId);
     }
     async gracefullyDisconnectAsync(targetDescriptor, disconnectMode) {
-        const connection = this.connections.get((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor));
-        if (!connection) {
+        const endpoint = this.endpoints.get((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor));
+        if (!endpoint) {
             logger.debug('gracefullyDisconnectedAsync() tried on a non-existing connection');
             return;
         }
-        const promise = new Promise((resolve, _reject) => {
-            // TODO use config option or named constant?
-            // eslint-disable-next-line promise/catch-or-return
-            (0, utils_1.waitForEvent3)(connection, 'disconnected', 2000).then(() => {
-                logger.trace('disconnected event received in gracefullyDisconnectAsync()');
-            })
-                .catch((e) => {
-                logger.trace('force-closing connection after timeout ' + e);
-                // TODO should we have some handling for this floating promise?
-                connection.close(true);
-            })
-                .finally(() => {
-                logger.trace('resolving after receiving disconnected event');
-                resolve();
+        if (endpoint.connected) {
+            const connection = endpoint.connection;
+            const promise = new Promise((resolve, _reject) => {
+                // TODO use options option or named constant?
+                // eslint-disable-next-line promise/catch-or-return
+                (0, utils_1.waitForEvent3)(connection, 'disconnected', 2000).then(() => {
+                    logger.trace('disconnected event received in gracefullyDisconnectAsync()');
+                })
+                    .catch((e) => {
+                    logger.trace('force-closing connection after timeout ' + e);
+                    // TODO should we have some handling for this floating promise?
+                    connection.close(true);
+                })
+                    .finally(() => {
+                    logger.trace('resolving after receiving disconnected event');
+                    resolve();
+                });
             });
-        });
-        await Promise.all([
-            promise,
-            this.doGracefullyDisconnectAsync(targetDescriptor, disconnectMode)
-        ]);
+            await Promise.all([
+                promise,
+                this.doGracefullyDisconnectAsync(targetDescriptor, disconnectMode)
+            ]);
+        }
+        else {
+            endpoint.connection.close(true);
+        }
     }
     async doGracefullyDisconnectAsync(targetDescriptor, disconnectMode) {
         const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(targetDescriptor);
@@ -470,14 +494,15 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         }
     }
     getConnections() {
-        return Array.from(this.connections.values())
+        return Array.from(this.endpoints.values())
+            .map((endpoint) => endpoint)
             // TODO is this filtering needed? (if it is, should we do the same filtering e.g.
-            // in getConnection() or in other methods which access this.connections directly?)
-            .filter((managedConnection) => managedConnection.isHandshakeCompleted())
-            .map((managedConnection) => managedConnection.getPeerDescriptor());
+            // in getConnection() or in other methods which access this.endpoints directly?)
+            .filter((endpoint) => endpoint.connected)
+            .map((endpoint) => endpoint.connection.getPeerDescriptor());
     }
     onConnectionCountChange() {
-        this.metrics.connectionAverageCount.record(this.connections.size);
+        this.metrics.connectionAverageCount.record(this.endpoints.size);
     }
 }
 exports.ConnectionManager = ConnectionManager;