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

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

@@ -9,7 +9,7 @@ export declare class ConnectionLockHandler {
     getNumberOfWeakLockedConnections(): number;
     isLocalLocked(id: PeerIDKey, serviceName?: ServiceName): boolean;
     isRemoteLocked(id: PeerIDKey, serviceName?: ServiceName): boolean;
-    isWeakLocked(id: PeerIDKey): boolean;
+    private isWeakLocked;
     isLocked(id: PeerIDKey): boolean;
     addLocalLocked(id: PeerIDKey, serviceName: ServiceName): void;
     addRemoteLocked(id: PeerIDKey, serviceName: ServiceName): void;

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

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

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

@@ -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}

@@ -23,30 +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 ${this.targetPeerDescriptor.kademliaId.toString()}`);
+        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) {
@@ -55,37 +49,29 @@ class RemoteConnectionLocker {
         }
     }
     unlockRequest(serviceId) {
-        logger.trace(`Requesting connection to be unlocked from ${this.targetPeerDescriptor.kademliaId.toString()}`);
+        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 ${this.targetPeerDescriptor.nodeName} from ${this.ownPeerDescriptor.nodeName}`);
+    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

@@ -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

@@ -1,37 +1,19 @@
+import { MetricsContext } from '@streamr/utils';
 import { EventEmitter } from 'eventemitter3';
-import { ConnectivityResponse, Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
-import { PeerIDKey } from '../helpers/PeerID';
+import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { ITransport, TransportEvents } from '../transport/ITransport';
-import { IceServer } from './WebRTC/WebRtcConnector';
-import { MetricsContext } from '@streamr/utils';
+import { ConnectorFacade } from './ConnectorFacade';
 import { ManagedConnection } from './ManagedConnection';
-import { Simulator } from './Simulator/Simulator';
-export declare class ConnectionManagerConfig {
-    transportLayer?: ITransport;
-    websocketHost?: string;
-    websocketPortRange?: PortRange;
-    entryPoints?: PeerDescriptor[];
-    maxConnections: number;
-    iceServers?: IceServer[];
-    metricsContext?: MetricsContext;
-    webrtcAllowPrivateAddresses?: boolean;
-    webrtcDatachannelBufferThresholdLow?: number;
-    webrtcDatachannelBufferThresholdHigh?: number;
-    webrtcNewConnectionTimeout?: number;
-    externalIp?: string;
-    webrtcPortRange?: PortRange;
-    tlsCertificate?: TlsCertificate;
-    simulator?: Simulator;
-    ownPeerDescriptor?: PeerDescriptor;
-    serviceIdPrefix?: string;
-    constructor(conf: Partial<ConnectionManagerConfig>);
+export interface ConnectionManagerConfig {
+    maxConnections?: number;
+    metricsContext: MetricsContext;
+    createConnectorFacade: () => ConnectorFacade;
 }
 export declare enum NatType {
     OPEN_INTERNET = "open_internet",
     UNKNOWN = "unknown"
 }
 type ServiceId = string;
-export type PeerDescriptorGeneratorCallback = (connectivityResponse: ConnectivityResponse) => PeerDescriptor;
 interface ConnectionManagerEvents {
     newConnection: (connection: ManagedConnection) => void;
 }
@@ -50,46 +32,40 @@ export interface TlsCertificate {
     certFileName: string;
 }
 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 ownPeerDescriptor?;
-    private readonly messageDuplicateDetector;
+    private readonly duplicateMessageDetector;
     private readonly metrics;
     private locks;
     private connections;
-    private webSocketConnector?;
-    private webrtcConnector?;
-    private simulatorConnector?;
+    private readonly connectorFacade;
     private rpcCommunicator?;
     private disconnectorIntervalRef?;
-    private serviceId;
     private state;
-    constructor(conf: Partial<ConnectionManagerConfig>);
+    constructor(config: ConnectionManagerConfig);
     garbageCollectConnections(maxConnections: number, lastUsedLimit: number): void;
-    start(peerDescriptorGeneratorCallback?: PeerDescriptorGeneratorCallback): Promise<void>;
+    start(): Promise<void>;
     stop(): Promise<void>;
-    getConnectionTo(id: PeerIDKey): ManagedConnection;
     getNumberOfLocalLockedConnections(): number;
     getNumberOfRemoteLockedConnections(): number;
     getNumberOfWeakLockedConnections(): number;
     send(message: Message, doNotConnect?: boolean, doNotMindStopped?: boolean): Promise<void>;
     private isConnectionToSelf;
     private isOwnWebSocketServer;
-    private createConnection;
-    private canOpenWsConnection;
     getConnection(peerDescriptor: PeerDescriptor): ManagedConnection | undefined;
     getPeerDescriptor(): PeerDescriptor;
+    private getOwnPeerDescriptor;
     hasConnection(peerDescriptor: PeerDescriptor): boolean;
-    hasLocalLockedConnection(peerDescriptor: PeerDescriptor, _serviceId?: ServiceId): boolean;
-    hasRemoteLockedConnection(peerDescriptor: PeerDescriptor, _serviceId?: ServiceId): boolean;
-    canConnect(peerDescriptor: PeerDescriptor, _ip: string, _port: number): boolean;
+    hasLocalLockedConnection(peerDescriptor: PeerDescriptor): boolean;
+    hasRemoteLockedConnection(peerDescriptor: PeerDescriptor): boolean;
+    private canConnect;
     handleMessage(message: Message): void;
     private onData;
     private onConnected;
     private onDisconnected;
-    private incomingConnectionCallback;
+    private onIncomingConnection;
     private acceptIncomingConnection;
     private closeConnection;
     lockConnection(targetDescriptor: PeerDescriptor, serviceId: ServiceId): void;