@streamr/dht 0.0.1-tatum.0

package/dist/src/connection/WebSocket/WebSocketConnector.js

@@ -0,0 +1,202 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketConnector = void 0;
+const ClientWebSocket_1 = require("./ClientWebSocket");
+const IConnection_1 = require("../IConnection");
+const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
+const RemoteWebSocketConnector_1 = require("./RemoteWebSocketConnector");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
+const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
+const utils_1 = require("@streamr/utils");
+const ManagedConnection_1 = require("../ManagedConnection");
+const WebSocketServer_1 = require("./WebSocketServer");
+const ConnectivityChecker_1 = require("../ConnectivityChecker");
+const ConnectionManager_1 = require("../ConnectionManager");
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const Handshaker_1 = require("../Handshaker");
+const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const logger = new utils_1.Logger(module);
+class WebSocketConnector {
+    constructor(protocolVersion, rpcTransport, fnCanConnect, incomingConnectionCallback, webSocketPort, webSocketHost, entrypoints) {
+        this.ongoingConnectRequests = new Map();
+        this.connectingConnections = new Map();
+        this.stopped = false;
+        this.onServerSocketHandshakeRequest = (peerDescriptor, serverWebSocket) => {
+            const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(peerDescriptor);
+            if (this.ongoingConnectRequests.has(peerId.toKey())) {
+                const ongoingConnectReguest = this.ongoingConnectRequests.get(peerId.toKey());
+                ongoingConnectReguest.attachImplementation(serverWebSocket, peerDescriptor);
+                ongoingConnectReguest.acceptHandshake();
+                this.ongoingConnectRequests.delete(peerId.toKey());
+            }
+            else {
+                const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebSocket);
+                managedConnection.setPeerDescriptor(peerDescriptor);
+                if (this.incomingConnectionCallback(managedConnection)) {
+                    managedConnection.acceptHandshake();
+                }
+                else {
+                    managedConnection.rejectHandshake('Duplicate connection');
+                    managedConnection.destroy();
+                }
+            }
+        };
+        this.protocolVersion = protocolVersion;
+        this.webSocketServer = webSocketPort ? new WebSocketServer_1.WebSocketServer() : undefined;
+        this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(webSocketPort);
+        this.incomingConnectionCallback = incomingConnectionCallback;
+        this.webSocketPort = webSocketPort;
+        this.webSocketHost = webSocketHost;
+        this.entrypoints = entrypoints;
+        this.canConnectFunction = fnCanConnect.bind(this);
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID, rpcTransport, {
+            rpcRequestTimeout: 15000
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebSocketConnectionRequest, DhtRpc_1.WebSocketConnectionResponse, 'requestConnection', (req, context) => this.requestConnection(req, context));
+    }
+    attachHandshaker(connection) {
+        const handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.protocolVersion, connection);
+        handshaker.once('handshakeRequest', (peerDescriptor) => {
+            this.onServerSocketHandshakeRequest(peerDescriptor, connection);
+        });
+    }
+    async start() {
+        if (this.webSocketServer) {
+            this.webSocketServer.on('connected', (connection) => {
+                const serverSocket = connection;
+                if (serverSocket.resourceURL &&
+                    serverSocket.resourceURL.query) {
+                    const query = serverSocket.resourceURL.query;
+                    if (query.connectivityRequest) {
+                        logger.trace('Received connectivity request connection');
+                        this.connectivityChecker.listenToIncomingConnectivityRequests(serverSocket);
+                    }
+                    else if (query.connectivityProbe) {
+                        logger.trace('Received connectivity probe connection');
+                    }
+                    else {
+                        this.attachHandshaker(connection);
+                    }
+                }
+                else {
+                    this.attachHandshaker(connection);
+                }
+            });
+            await this.webSocketServer.start(this.webSocketPort, this.webSocketHost);
+        }
+    }
+    async checkConnectivity(reattempt = 0) {
+        try {
+            const noServerConnectivityResponse = {
+                openInternet: false,
+                ip: '127.0.0.1',
+                natType: ConnectionManager_1.NatType.UNKNOWN
+            };
+            if (!this.webSocketServer) {
+                // If no websocket server, return openInternet: false
+                return noServerConnectivityResponse;
+            }
+            else {
+                if (!this.entrypoints || this.entrypoints.length < 1) {
+                    // return connectivity info given in config
+                    const preconfiguredConnectivityResponse = {
+                        openInternet: true,
+                        ip: this.webSocketHost,
+                        natType: ConnectionManager_1.NatType.OPEN_INTERNET,
+                        websocket: { ip: this.webSocketHost, port: this.webSocketPort }
+                    };
+                    return preconfiguredConnectivityResponse;
+                }
+                else {
+                    // Do real connectivity checking
+                    let response = noServerConnectivityResponse;
+                    response = await this.connectivityChecker.sendConnectivityRequest(this.entrypoints[0]);
+                    return response;
+                }
+            }
+        }
+        catch (err) {
+            if (reattempt < 5) {
+                await (0, utils_1.wait)(2000);
+                return this.checkConnectivity(reattempt + 1);
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    connect(targetPeerDescriptor) {
+        if (this.stopped) {
+            logger.info('connect called on closed websocketconnector');
+        }
+        const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
+        const existingConnection = this.connectingConnections.get(peerKey);
+        if (existingConnection) {
+            return existingConnection;
+        }
+        if (this.ownPeerDescriptor.websocket && !targetPeerDescriptor.websocket) {
+            return this.requestConnectionFromPeer(this.ownPeerDescriptor, targetPeerDescriptor);
+        }
+        else {
+            const socket = new ClientWebSocket_1.ClientWebSocket();
+            const address = 'ws://' + targetPeerDescriptor.websocket.ip + ':' +
+                targetPeerDescriptor.websocket.port;
+            const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
+            managedConnection.setPeerDescriptor(targetPeerDescriptor);
+            this.connectingConnections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
+            const delFunc = () => {
+                if (this.connectingConnections.has(peerKey)) {
+                    this.connectingConnections.delete(peerKey);
+                }
+                socket.off('disconnected', delFunc);
+                managedConnection.off('handshakeCompleted', delFunc);
+            };
+            socket.on('disconnected', delFunc);
+            managedConnection.on('handshakeCompleted', delFunc);
+            socket.connect(address);
+            return managedConnection;
+        }
+    }
+    requestConnectionFromPeer(ownPeerDescriptor, targetPeerDescriptor) {
+        setImmediate(() => {
+            const remoteConnector = new RemoteWebSocketConnector_1.RemoteWebSocketConnector(targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebSocketConnectorServiceClient(this.rpcCommunicator.getRpcClientTransport())));
+            remoteConnector.requestConnection(ownPeerDescriptor, ownPeerDescriptor.websocket.ip, ownPeerDescriptor.websocket.port);
+        });
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_SERVER);
+        managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)));
+        managedConnection.setPeerDescriptor(targetPeerDescriptor);
+        this.ongoingConnectRequests.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
+        return managedConnection;
+    }
+    setOwnPeerDescriptor(ownPeerDescriptor) {
+        this.ownPeerDescriptor = ownPeerDescriptor;
+    }
+    async stop() {
+        this.stopped = true;
+        this.rpcCommunicator.stop();
+        const requests = Array.from(this.ongoingConnectRequests.values());
+        await Promise.allSettled(requests.map((conn) => conn.close('OTHER')));
+        const attempts = Array.from(this.connectingConnections.values());
+        await Promise.allSettled(attempts.map((conn) => conn.close('OTHER')));
+        await this.webSocketServer?.stop();
+    }
+    // IWebSocketConnectorService implementation
+    async requestConnection(request, _context) {
+        if (!this.stopped && this.canConnectFunction(request.requester, request.ip, request.port)) {
+            setImmediate(() => {
+                const connection = this.connect(request.requester);
+                this.incomingConnectionCallback(connection);
+            });
+            const res = {
+                accepted: true
+            };
+            return res;
+        }
+        return {
+            accepted: false
+        };
+    }
+}
+exports.WebSocketConnector = WebSocketConnector;
+WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocketconnector';
+//# sourceMappingURL=WebSocketConnector.js.map

package/dist/src/connection/WebSocket/WebSocketConnector.js.map

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

package/dist/src/connection/WebSocket/WebSocketServer.d.ts

@@ -0,0 +1,9 @@
+import EventEmitter from 'eventemitter3';
+import { ConnectionSourceEvents } from '../IConnectionSource';
+export declare class WebSocketServer extends EventEmitter<ConnectionSourceEvents> {
+    private httpServer?;
+    private wsServer?;
+    start(port: number, host?: string): Promise<void>;
+    stop(): Promise<void>;
+    private createWsServer;
+}

package/dist/src/connection/WebSocket/WebSocketServer.js

@@ -0,0 +1,101 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketServer = void 0;
+const http = __importStar(require("http"));
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const websocket_1 = require("websocket");
+const ServerWebSocket_1 = require("./ServerWebSocket");
+const utils_1 = require("@streamr/utils");
+const errors_1 = require("../../helpers/errors");
+const logger = new utils_1.Logger(module);
+class WebSocketServer extends eventemitter3_1.default {
+    start(port, host) {
+        return new Promise((resolve, reject) => {
+            this.httpServer = http.createServer((request, response) => {
+                logger.trace('Received request for ' + request.url);
+                response.writeHead(404);
+                response.end();
+            });
+            function originIsAllowed(_uorigin) {
+                return true;
+            }
+            this.wsServer = this.createWsServer(this.httpServer);
+            this.wsServer.on('request', (request) => {
+                if (!originIsAllowed(request.origin)) {
+                    // Make sure we only accept requests from an allowed origin
+                    request.reject();
+                    logger.trace('IConnection from origin ' + request.origin + ' rejected.');
+                    return;
+                }
+                const connection = request.accept(undefined, request.origin);
+                logger.trace('IConnection accepted.');
+                this.emit('connected', new ServerWebSocket_1.ServerWebSocket(connection, request.resourceURL));
+            });
+            this.httpServer.once('error', (err) => {
+                reject(new errors_1.StartingWebSocketServerFailed('Starting Websocket server failed', err));
+            });
+            this.httpServer.once('listening', () => {
+                logger.debug('Websocket server is listening on port ' + port);
+                resolve();
+            });
+            try {
+                this.httpServer.listen(port, host);
+            }
+            catch (e) {
+                reject(new errors_1.StartingWebSocketServerFailed('Websocket server threw an exception', e));
+            }
+        });
+    }
+    stop() {
+        this.removeAllListeners();
+        return new Promise((resolve, _reject) => {
+            this.wsServer?.shutDown();
+            this.httpServer?.close(() => {
+                resolve();
+            });
+        });
+    }
+    createWsServer(httpServer) {
+        // Use the real nodejs WebSocket server in Electron tests
+        if (typeof NodeJsWsServer !== 'undefined') {
+            return new NodeJsWsServer({
+                httpServer: httpServer,
+                autoAcceptConnections: false
+            });
+        }
+        else {
+            return this.wsServer = new websocket_1.server({
+                httpServer: httpServer,
+                autoAcceptConnections: false
+            });
+        }
+    }
+}
+exports.WebSocketServer = WebSocketServer;
+//# sourceMappingURL=WebSocketServer.js.map

package/dist/src/connection/WebSocket/WebSocketServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebSocketServer.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAC5B,kEAAwC;AACxC,yCAA8C;AAC9C,uDAAmD;AAKnD,0CAAuC;AACvC,iDAAoE;AAEpE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AASjC,MAAa,eAAgB,SAAQ,uBAAoC;IAK9D,KAAK,CAAC,IAAY,EAAE,IAAa;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBACtD,MAAM,CAAC,KAAK,CAAC,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;gBACnD,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvB,QAAQ,CAAC,GAAG,EAAE,CAAA;YAClB,CAAC,CAAC,CAAA;YAEF,SAAS,eAAe,CAAC,QAAgB;gBACrC,OAAO,IAAI,CAAA;YACf,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAEpD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;gBACpC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBAClC,2DAA2D;oBAC3D,OAAO,CAAC,MAAM,EAAE,CAAA;oBAChB,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,CAAA;oBACxE,OAAM;iBACT;gBAED,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;gBAE5D,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;gBAErC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,iCAAe,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA;YAChF,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBACzC,MAAM,CAAC,IAAI,sCAA6B,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC,CAAA;YACtF,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;gBACnC,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,IAAI,CAAC,CAAA;gBAC7D,OAAO,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;YAEF,IAAI;gBACA,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;aACrC;YAAC,OAAO,CAAC,EAAE;gBACR,MAAM,CAAC,IAAI,sCAA6B,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAC,CAAA;aACtF;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACpC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAA;YACzB,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE;gBACxB,OAAO,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,cAAc,CAAC,UAAuB;QAC1C,yDAAyD;QAEzD,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE;YACvC,OAAO,IAAI,cAAc,CAAC;gBACtB,UAAU,EAAE,UAAU;gBACtB,qBAAqB,EAAE,KAAK;aAC/B,CAAC,CAAA;SACL;aAAM;YACH,OAAO,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAQ,CAAC;gBAChC,UAAU,EAAE,UAAU;gBACtB,qBAAqB,EAAE,KAAK;aAC/B,CAAC,CAAA;SACL;IACL,CAAC;CACJ;AA5ED,0CA4EC"}

package/dist/src/dht/DhtNode.d.ts

@@ -0,0 +1,153 @@
+import { DhtPeer } from './DhtPeer';
+import { EventEmitter } from 'eventemitter3';
+import { SortedContactList } from './contact/SortedContactList';
+import { RoutingRpcCommunicator } from '../transport/RoutingRpcCommunicator';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { PeerID } from '../helpers/PeerID';
+import { LeaveNotice, ConnectivityResponse, Message, PeerDescriptor, FindMode, DataEntry } from '../proto/packages/dht/protos/DhtRpc';
+import { ITransport, TransportEvents } from '../transport/ITransport';
+import { ConnectionManager } from '../connection/ConnectionManager';
+import { MetricsContext } from '@streamr/utils';
+import { Empty } from '../proto/google/protobuf/empty';
+import { Any } from '../proto/google/protobuf/any';
+import { Router } from './routing/Router';
+import { RecursiveFindResult } from './find/RecursiveFinder';
+import { DataStore } from './store/DataStore';
+import { IceServer } from '../connection/WebRTC/WebRtcConnector';
+export interface DhtNodeEvents {
+    newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    joinCompleted: () => void;
+    newKbucketContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    kbucketContactRemoved: (peerDescriptor: PeerDescriptor) => void;
+    newOpenInternetContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    openInternetContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    newRandomContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    randomContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+}
+export interface DhtNodeOptions {
+    serviceId?: string;
+    joinParallelism?: number;
+    maxNeighborListSize?: number;
+    numberOfNodesPerKBucket?: number;
+    joinNoProgressLimit?: number;
+    dhtJoinTimeout?: number;
+    metricsContext?: MetricsContext;
+    storeHighestTtl?: number;
+    storeMaxTtl?: number;
+    transportLayer?: ITransport;
+    peerDescriptor?: PeerDescriptor;
+    entryPoints?: PeerDescriptor[];
+    webSocketHost?: string;
+    webSocketPort?: number;
+    peerIdString?: string;
+    nodeName?: string;
+    rpcRequestTimeout?: number;
+    iceServers?: IceServer[];
+    webrtcAllowPrivateAddresses?: boolean;
+    webrtcDatachannelBufferThresholdLow?: number;
+    webrtcDatachannelBufferThresholdHigh?: number;
+    webrtcNewConnectionTimeout?: number;
+    maxConnections?: number;
+}
+export declare class DhtNodeConfig {
+    serviceId: string;
+    joinParallelism: number;
+    maxNeighborListSize: number;
+    numberOfNodesPerKBucket: number;
+    joinNoProgressLimit: number;
+    dhtJoinTimeout: number;
+    getClosestContactsLimit: number;
+    maxConnections: number;
+    storeHighestTtl: number;
+    storeMaxTtl: number;
+    storeNumberOfCopies: number;
+    metricsContext: MetricsContext;
+    peerIdString: string;
+    transportLayer?: ITransport;
+    peerDescriptor?: PeerDescriptor;
+    entryPoints?: PeerDescriptor[];
+    webSocketHost?: string;
+    webSocketPort?: number;
+    nodeName?: string;
+    rpcRequestTimeout?: number;
+    iceServers?: IceServer[];
+    webrtcAllowPrivateAddresses?: boolean;
+    webrtcDatachannelBufferThresholdLow?: number;
+    webrtcDatachannelBufferThresholdHigh?: number;
+    webrtcNewConnectionTimeout?: number;
+    constructor(conf: Partial<DhtNodeOptions>);
+}
+export type Events = TransportEvents & DhtNodeEvents;
+export declare const createPeerDescriptor: (msg?: ConnectivityResponse, peerIdString?: string, nodeName?: string) => PeerDescriptor;
+export declare class DhtNode extends EventEmitter<Events> implements ITransport {
+    private readonly config;
+    private bucket?;
+    private connections;
+    private neighborList?;
+    private openInternetPeers?;
+    private randomPeers?;
+    private rpcCommunicator?;
+    private transportLayer?;
+    private ownPeerDescriptor?;
+    private ownPeerId?;
+    router?: Router;
+    dataStore?: DataStore;
+    private localDataStore;
+    private recursiveFinder?;
+    private peerDiscovery?;
+    private externalApi?;
+    connectionManager?: ConnectionManager;
+    private started;
+    private stopped;
+    private entryPointDisconnectTimeout?;
+    contactAddCounter: number;
+    contactOnAddedCounter: number;
+    constructor(conf: Partial<DhtNodeConfig>);
+    start(): Promise<void>;
+    private initKBuckets;
+    private onTransportConnected;
+    private onTransportDisconnected;
+    private bindDefaultServerMethods;
+    private isPeerCloserToIdThanSelf;
+    handleMessage(message: Message): void;
+    private generatePeerDescriptorCallBack;
+    private getClosestPeerDescriptors;
+    private onKBucketPing;
+    private onKBucketRemoved;
+    private onKBucketAdded;
+    private addClosestContactToBucket;
+    private getClosestActiveContactNotInBucket;
+    getNeighborList(): SortedContactList<DhtPeer>;
+    getNodeId(): PeerID;
+    getBucketSize(): number;
+    private addNewContact;
+    private connectToEntryPoint;
+    removeContact(contact: PeerDescriptor, removeFromOpenInternetPeers?: boolean): void;
+    send(msg: Message, _doNotConnect?: boolean): Promise<void>;
+    joinDht(entryPointDescriptors: PeerDescriptor[], doRandomJoin?: boolean): Promise<void>;
+    startRecursiveFind(idToFind: Uint8Array, findMode?: FindMode, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
+    storeDataToDht(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
+    getDataFromDht(idToFind: Uint8Array): Promise<RecursiveFindResult>;
+    deleteDataFromDht(idToDelete: Uint8Array): Promise<void>;
+    findDataViaPeer(idToFind: Uint8Array, peer: PeerDescriptor): Promise<DataEntry[]>;
+    getRpcCommunicator(): RoutingRpcCommunicator;
+    getTransport(): ITransport;
+    getPeerDescriptor(): PeerDescriptor;
+    getAllConnectionPeerDescriptors(): PeerDescriptor[];
+    getK(): number;
+    getKBucketPeers(): PeerDescriptor[];
+    getOpenInternetPeerDescriptors(): PeerDescriptor[];
+    getNumberOfConnections(): number;
+    getNumberOfLocalLockedConnections(): number;
+    getNumberOfRemoteLockedConnections(): number;
+    getNumberOfWeakLockedConnections(): number;
+    getNodeName(): string;
+    isJoinOngoing(): boolean;
+    hasJoined(): boolean;
+    getKnownEntryPoints(): PeerDescriptor[];
+    stop(): Promise<void>;
+    private getClosestPeers;
+    private ping;
+    leaveNotice(request: LeaveNotice, context: ServerCallContext): Promise<Empty>;
+}