@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-rc.1

package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketConnectorRpcLocal = void 0;
+const identifiers_1 = require("../../identifiers");
 class WebsocketConnectorRpcLocal {
+    config;
     constructor(config) {
         this.config = config;
     }
     async requestConnection(_request, context) {
-        const senderPeerDescriptor = context.incomingSourceDescriptor;
-        if (this.config.canConnect(senderPeerDescriptor)) {
-            setImmediate(() => {
-                if (this.config.abortSignal.aborted) {
-                    return;
-                }
-                const connection = this.config.connect(senderPeerDescriptor);
-                this.config.onNewConnection(connection);
-            });
-            return { accepted: true };
+        if (this.config.abortSignal.aborted) {
+            return {};
         }
-        else {
-            return { accepted: false };
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        if (!this.config.hasConnection((0, identifiers_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor))) {
+            const connection = this.config.connect(senderPeerDescriptor);
+            this.config.onNewConnection(connection);
         }
+        return {};
     }
 }
 exports.WebsocketConnectorRpcLocal = WebsocketConnectorRpcLocal;

package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketConnectorRpcLocal.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketConnectorRpcLocal.ts"],"names":[],"mappings":";;;AAiBA,MAAa,0BAA0B;IAInC,YAAY,MAAwC;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAoC,EAAE,OAA0B;QAC3F,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YAC9C,YAAY,CAAC,GAAG,EAAE;gBACd,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE;oBACjC,OAAM;iBACT;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;gBAC5D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;YAC3C,CAAC,CAAC,CAAA;YACF,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;SAC5B;aAAM;YACH,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;SAC7B;IACL,CAAC;CACJ;AAvBD,gEAuBC"}
+{"version":3,"file":"WebsocketConnectorRpcLocal.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketConnectorRpcLocal.ts"],"names":[],"mappings":";;;AASA,mDAA+D;AAU/D,MAAa,0BAA0B;IAElB,MAAM,CAAkC;IAEzD,YAAY,MAAwC;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAoC,EAAE,OAA0B;QAC3F,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO,EAAE,CAAA;QACb,CAAC;QACD,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;YAC5D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3C,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAnBD,gEAmBC"}

package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.d.ts

@@ -1,8 +1,5 @@
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { IWebsocketConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
-import { ProtoRpcClient } from '@streamr/proto-rpc';
-import { Remote } from '../../dht/contact/Remote';
-export declare class WebsocketConnectorRpcRemote extends Remote<IWebsocketConnectorRpcClient> {
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebsocketConnectorRpcClient>);
-    requestConnection(ip: string, port: number): Promise<boolean>;
+import { RpcRemote } from '../../dht/contact/RpcRemote';
+import { WebsocketConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+export declare class WebsocketConnectorRpcRemote extends RpcRemote<WebsocketConnectorRpcClient> {
+    requestConnection(): Promise<void>;
 }

package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js

@@ -1,53 +1,16 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketConnectorRpcRemote = 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 RpcRemote_1 = require("../../dht/contact/RpcRemote");
+const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
-class WebsocketConnectorRpcRemote extends Remote_1.Remote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, client) {
-        super(localPeerDescriptor, remotePeerDescriptor, 'DUMMY', client);
-    }
-    async requestConnection(ip, port) {
-        logger.trace(`Requesting WebSocket connection from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor())}`);
-        const request = {
-            ip,
-            port
-        };
+class WebsocketConnectorRpcRemote extends RpcRemote_1.RpcRemote {
+    async requestConnection() {
+        logger.trace(`Requesting WebSocket connection from ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor())}`);
+        const request = {};
         const options = this.formDhtRpcOptions();
-        try {
-            const res = await this.getClient().requestConnection(request, options);
-            return res.accepted;
-        }
-        catch (err) {
-            logger.debug(new Err.WebsocketConnectionRequestRejected('WebsocketConnectionRequest rejected', err).stack);
-            return false;
-        }
+        return this.getClient().requestConnection(request, options);
     }
 }
 exports.WebsocketConnectorRpcRemote = WebsocketConnectorRpcRemote;

package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketConnectorRpcRemote.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,0CAAuC;AACvC,0DAA2C;AAE3C,qFAAoF;AACpF,qDAAiD;AAEjD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,2BAA4B,SAAQ,eAAoC;IAEjF,YACI,mBAAmC,EACnC,oBAAoC,EACpC,MAAoD;QAEpD,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACrE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,EAAU,EAAE,IAAY;QAC5C,MAAM,CAAC,KAAK,CAAC,wCAAwC,IAAA,sDAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAA+B;YACxC,EAAE;YACF,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,GAAG,CAAC,QAAQ,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,kCAAkC,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC,KAAM,CAAC,CAAA;YAC3G,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CACJ;AAzBD,kEAyBC"}
+{"version":3,"file":"WebsocketConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/websocket/WebsocketConnectorRpcRemote.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AACvC,2DAAuD;AAEvD,mDAA+D;AAE/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,2BAA4B,SAAQ,qBAAsC;IAEnF,KAAK,CAAC,iBAAiB;QACnB,MAAM,CAAC,KAAK,CAAC,wCAAwC,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAA+B,EAAE,CAAA;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AARD,kEAQC"}

package/dist/src/connection/websocket/WebsocketServer.d.ts

@@ -11,10 +11,7 @@ export declare class WebsocketServer extends EventEmitter<ConnectionSourceEvents
     private httpServer?;
     private wsServer?;
     private readonly abortController;
-    private readonly portRange;
-    private readonly tlsCertificate?;
-    private readonly enableTls;
-    private readonly maxMessageSize;
+    private readonly config;
     constructor(config: WebsocketServerConfig);
     start(): Promise<number>;
     private startServer;

package/dist/src/connection/websocket/WebsocketServer.js

@@ -7,29 +7,30 @@ exports.WebsocketServer = void 0;
 const http_1 = require("http");
 const https_1 = require("https");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
-const websocket_1 = require("websocket");
-const ServerWebsocket_1 = require("./ServerWebsocket");
+const ws_1 = __importDefault(require("ws"));
+const WebsocketServerConnection_1 = require("./WebsocketServerConnection");
 const utils_1 = require("@streamr/utils");
 const autocertifier_client_1 = require("@streamr/autocertifier-client");
 const errors_1 = require("../../helpers/errors");
 const lodash_1 = require("lodash");
 const fs_1 = __importDefault(require("fs"));
-const UUID_1 = require("../../helpers/UUID");
+const uuid_1 = require("uuid");
+const url_1 = require("url");
 const logger = new utils_1.Logger(module);
 class WebsocketServer extends eventemitter3_1.default {
+    httpServer;
+    wsServer;
+    abortController = new AbortController();
+    config;
     constructor(config) {
         super();
-        this.abortController = new AbortController();
-        this.portRange = config.portRange;
-        this.enableTls = config.enableTls;
-        this.tlsCertificate = config.tlsCertificate;
-        this.maxMessageSize = config.maxMessageSize ?? 1048576;
+        this.config = config;
     }
     async start() {
-        const ports = (0, lodash_1.range)(this.portRange.min, this.portRange.max + 1);
+        const ports = (0, lodash_1.range)(this.config.portRange.min, this.config.portRange.max + 1);
         for (const port of ports) {
             try {
-                await (0, utils_1.asAbortable)(this.startServer(port, this.enableTls), this.abortController.signal);
+                await (0, utils_1.asAbortable)(this.startServer(port, this.config.enableTls), this.abortController.signal);
                 return port;
             }
             catch (err) {
@@ -41,7 +42,7 @@ class WebsocketServer extends eventemitter3_1.default {
                 }
             }
         }
-        throw new errors_1.WebsocketServerStartError(`Failed to start WebSocket server on any port in range: ${this.portRange.min}-${this.portRange.min}`);
+        throw new errors_1.WebsocketServerStartError(`Failed to start WebSocket server on any port in range: ${this.config.portRange.min}-${this.config.portRange.min}`);
     }
     // If tlsCertificate has been given the tls boolean is ignored
     // TODO: could be simplified?
@@ -52,17 +53,18 @@ class WebsocketServer extends eventemitter3_1.default {
             response.end();
         };
         return new Promise((resolve, reject) => {
-            if (this.tlsCertificate) {
+            if (this.config.tlsCertificate) {
                 this.httpServer = (0, https_1.createServer)({
-                    key: fs_1.default.readFileSync(this.tlsCertificate.privateKeyFileName),
-                    cert: fs_1.default.readFileSync(this.tlsCertificate.certFileName)
+                    key: fs_1.default.readFileSync(this.config.tlsCertificate.privateKeyFileName),
+                    cert: fs_1.default.readFileSync(this.config.tlsCertificate.certFileName)
                 }, requestListener);
             }
             else if (!tls) {
                 this.httpServer = (0, http_1.createServer)(requestListener);
             }
             else {
-                const certificate = (0, autocertifier_client_1.createSelfSignedCertificate)('streamr-self-signed-' + new UUID_1.UUID().toString(), 1000);
+                // TODO use config option or named constant?
+                const certificate = (0, autocertifier_client_1.createSelfSignedCertificate)('streamr-self-signed-' + (0, uuid_1.v4)(), 1000);
                 this.httpServer = (0, https_1.createServer)({
                     key: certificate.serverKey,
                     cert: certificate.serverCert
@@ -71,17 +73,22 @@ class WebsocketServer extends eventemitter3_1.default {
             function originIsAllowed() {
                 return true;
             }
-            this.wsServer = this.createWsServer(this.httpServer);
-            this.wsServer.on('request', (request) => {
+            this.wsServer = this.createWsServer();
+            this.wsServer.on('connection', (ws, request) => {
+                logger.trace(`New connection from ${request.socket.remoteAddress}`);
                 if (!originIsAllowed()) {
                     // Make sure we only accept requests from an allowed origin
-                    request.reject();
-                    logger.trace('IConnection from origin ' + request.origin + ' rejected.');
+                    ws.close();
+                    logger.trace('IConnection from origin ' + request.headers.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.emit('connected', new WebsocketServerConnection_1.WebsocketServerConnection(ws, (0, url_1.parse)(request.url), request.socket.remoteAddress));
+            });
+            this.httpServer.on('upgrade', (request, socket, head) => {
+                logger.trace('Received upgrade request for ' + request.url);
+                this.wsServer.handleUpgrade(request, socket, head, (ws) => {
+                    this.wsServer.emit('connection', ws, request);
+                });
             });
             this.httpServer.once('error', (err) => {
                 reject(new errors_1.WebsocketServerStartError('Starting Websocket server failed', err));
@@ -109,28 +116,30 @@ class WebsocketServer extends eventemitter3_1.default {
         this.abortController.abort();
         this.removeAllListeners();
         return new Promise((resolve, _reject) => {
-            this.wsServer?.shutDown();
-            this.httpServer?.close(() => {
+            this.wsServer.close();
+            for (const ws of this.wsServer.clients) {
+                ws.terminate();
+            }
+            this.httpServer?.once('close', () => {
+                // removeAllListeners is maybe not needed?
+                this.httpServer?.removeAllListeners();
                 resolve();
             });
+            this.httpServer?.close();
+            // the close method "Stops the server from accepting new connections and closes all 
+            // connections connected to this server which are not sending a request or waiting for a 
+            // response." (https://nodejs.org/api/http.html#serverclosecallback)
+            // i.e. we need to call closeAllConnections() to close the rest of the connections
+            // (in practice this closes the active websocket connections)
+            this.httpServer?.closeAllConnections();
         });
     }
-    createWsServer(httpServer) {
-        // Use the real nodejs WebSocket server in Electron tests
-        if (typeof NodeJsWsServer !== 'undefined') {
-            return new NodeJsWsServer({
-                httpServer,
-                autoAcceptConnections: false,
-                maxReceivedMessageSize: this.maxMessageSize
-            });
-        }
-        else {
-            return this.wsServer = new websocket_1.server({
-                httpServer,
-                autoAcceptConnections: false,
-                maxReceivedMessageSize: this.maxMessageSize
-            });
-        }
+    createWsServer() {
+        const maxPayload = this.config.maxMessageSize ?? 1048576;
+        return this.wsServer = new ws_1.default.Server({
+            noServer: true,
+            maxPayload
+        });
     }
 }
 exports.WebsocketServer = WebsocketServer;

package/dist/src/connection/websocket/WebsocketServer.js.map

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

package/dist/src/connection/websocket/{ServerWebsocket.d.ts → WebsocketServerConnection.d.ts}

@@ -1,18 +1,22 @@
 /// <reference types="node" />
 import EventEmitter from 'eventemitter3';
 import { IConnection, ConnectionID, ConnectionEvents, ConnectionType } from '../IConnection';
-import { connection as WsConnection } from 'websocket';
+import WebSocket from 'ws';
 import { Url } from 'url';
-export declare class ServerWebsocket extends EventEmitter<ConnectionEvents> implements IConnection {
+export declare class WebsocketServerConnection extends EventEmitter<ConnectionEvents> implements IConnection {
     readonly connectionId: ConnectionID;
     readonly connectionType = ConnectionType.WEBSOCKET_SERVER;
     readonly resourceURL: Url;
+    readonly remoteIpAddress: string;
     private socket?;
     private stopped;
-    constructor(socket: WsConnection, resourceURL: Url);
+    constructor(socket: WebSocket, resourceURL: Url, remoteAddress: string);
+    private onMessage;
+    private onClose;
+    private onError;
+    private stopListening;
     private doDisconnect;
     send(data: Uint8Array): void;
     close(gracefulLeave: boolean): Promise<void>;
     destroy(): void;
-    getRemoteAddress(): string;
 }

package/dist/src/connection/websocket/WebsocketServerConnection.js

@@ -0,0 +1,97 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketServerConnection = void 0;
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const IConnection_1 = require("../IConnection");
+const utils_1 = require("@streamr/utils");
+const ClientWebsocket_1 = require("./ClientWebsocket");
+const Connection_1 = require("../Connection");
+const logger = new utils_1.Logger(module);
+class WebsocketServerConnection extends eventemitter3_1.default {
+    connectionId;
+    connectionType = IConnection_1.ConnectionType.WEBSOCKET_SERVER;
+    resourceURL;
+    remoteIpAddress;
+    socket;
+    stopped = false;
+    constructor(socket, resourceURL, remoteAddress) {
+        super();
+        this.onMessage = this.onMessage.bind(this);
+        this.onClose = this.onClose.bind(this);
+        this.onError = this.onError.bind(this);
+        this.resourceURL = resourceURL;
+        this.connectionId = (0, Connection_1.createRandomConnectionId)();
+        this.remoteIpAddress = remoteAddress;
+        socket.on('message', this.onMessage);
+        socket.on('close', this.onClose);
+        socket.on('error', this.onError);
+        this.socket = socket;
+    }
+    onMessage(message, isBinary) {
+        if (!isBinary) {
+            logger.trace('Received string Message');
+        }
+        else {
+            logger.trace('Websocket server received Message');
+            this.emit('data', new Uint8Array(message));
+        }
+    }
+    onClose(reasonCode, description) {
+        logger.trace('Peer ' + this.remoteIpAddress + ' disconnected.');
+        this.doDisconnect(reasonCode, description);
+    }
+    onError(error) {
+        this.emit('error', error.name);
+    }
+    stopListening() {
+        this.socket?.off('message', this.onMessage);
+        this.socket?.off('close', this.onClose);
+        this.socket?.off('error', this.onError);
+    }
+    doDisconnect(reasonCode, description) {
+        this.stopped = true;
+        this.stopListening();
+        this.socket = undefined;
+        const gracefulLeave = (reasonCode === ClientWebsocket_1.GOING_AWAY) || (reasonCode === ClientWebsocket_1.CUSTOM_GOING_AWAY);
+        this.emit('disconnected', gracefulLeave, reasonCode, description);
+    }
+    send(data) {
+        // TODO: no need to check this.socket as it is always defined when stopped is false?
+        if (!this.stopped && this.socket) {
+            this.socket.send(data, { binary: true });
+        }
+        else {
+            logger.debug('Tried to call send() on a stopped socket');
+        }
+    }
+    async close(gracefulLeave) {
+        this.emit('disconnected', gracefulLeave, undefined, 'close() called');
+        this.removeAllListeners();
+        if (!this.stopped) {
+            this.socket?.close(gracefulLeave ? ClientWebsocket_1.GOING_AWAY : undefined);
+        }
+        else {
+            logger.debug('Tried to close a stopped connection');
+        }
+    }
+    // TODO could rename to "closeSilently?"
+    destroy() {
+        if (!this.stopped) {
+            this.removeAllListeners();
+            if (this.socket) {
+                this.stopListening();
+                this.socket.close();
+                this.socket = undefined;
+            }
+            this.stopped = true;
+        }
+        else {
+            logger.debug('Tried to destroy() a stopped connection');
+        }
+    }
+}
+exports.WebsocketServerConnection = WebsocketServerConnection;
+//# sourceMappingURL=WebsocketServerConnection.js.map

package/dist/src/connection/websocket/WebsocketServerConnection.js.map

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

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

@@ -1,22 +1,25 @@
+import { MetricsContext } from '@streamr/utils';
 import { EventEmitter } from 'eventemitter3';
-import { PeerID } from '../helpers/PeerID';
-import { ConnectivityResponse, Message, PeerDescriptor, DataEntry } from '../proto/packages/dht/protos/DhtRpc';
-import { ITransport, TransportEvents } from '../transport/ITransport';
 import { ConnectionManager, PortRange, TlsCertificate } from '../connection/ConnectionManager';
-import { MetricsContext } from '@streamr/utils';
+import { IceServer } from '../connection/webrtc/WebrtcConnector';
+import { DhtAddress } from '../identifiers';
 import { Any } from '../proto/google/protobuf/any';
+import { DataEntry, Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { ITransport, TransportEvents } from '../transport/ITransport';
+import { ServiceID } from '../types/ServiceID';
 import { Router } from './routing/Router';
-import { FindResult } from './find/Finder';
-import { IceServer } from '../connection/webrtc/WebrtcConnector';
+import { RingIdRaw } from './contact/ringIdentifiers';
+import { RingContacts } from './contact/RingContactList';
 export interface DhtNodeEvents {
-    newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    contactAdded: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
     contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
-    joinCompleted: () => void;
-    newRandomContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    randomContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
     randomContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    ringContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
+    ringContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
 }
 export interface DhtNodeOptions {
-    serviceId?: string;
+    serviceId?: ServiceID;
     joinParallelism?: number;
     maxNeighborListSize?: number;
     numberOfNodesPerKBucket?: number;
@@ -28,13 +31,14 @@ export interface DhtNodeOptions {
     storeMaxTtl?: number;
     networkConnectivityTimeout?: number;
     storageRedundancyFactor?: number;
+    region?: number;
     transport?: ITransport;
     peerDescriptor?: PeerDescriptor;
     entryPoints?: PeerDescriptor[];
     websocketHost?: string;
     websocketPortRange?: PortRange;
     websocketServerEnableTls?: boolean;
-    peerId?: string;
+    nodeId?: DhtAddress;
     rpcRequestTimeout?: number;
     iceServers?: IceServer[];
     webrtcAllowPrivateAddresses?: boolean;
@@ -50,62 +54,54 @@ export interface DhtNodeOptions {
     autoCertifierConfigFile?: string;
 }
 export type Events = TransportEvents & DhtNodeEvents;
-export declare const createPeerDescriptor: (msg?: ConnectivityResponse, peerId?: string) => PeerDescriptor;
 export declare class DhtNode extends EventEmitter<Events> implements ITransport {
     private readonly config;
-    private bucket?;
-    private connections;
-    private neighborList?;
-    private randomPeers?;
     private rpcCommunicator?;
     private transport?;
     private localPeerDescriptor?;
     router?: Router;
-    private storeRpcLocal?;
+    private storeManager?;
     private localDataStore;
-    private finder?;
+    private recursiveOperationManager?;
     private peerDiscovery?;
+    private peerManager?;
     connectionManager?: ConnectionManager;
+    private region?;
     private started;
-    private stopped;
-    private entryPointDisconnectTimeout?;
+    private abortController;
     constructor(conf: DhtNodeOptions);
+    private validateConfig;
     start(): Promise<void>;
-    private initKBuckets;
-    private onTransportConnected;
-    private onTransportDisconnected;
+    private initPeerManager;
     private bindRpcLocalMethods;
-    private isPeerCloserToIdThanSelf;
-    private handleMessage;
+    private handleMessageFromTransport;
+    private handleMessageFromRouter;
     private generatePeerDescriptorCallBack;
-    private onKBucketPing;
-    private onKBucketRemoved;
-    private onKBucketAdded;
-    private addClosestContactToBucket;
-    private getClosestActiveContactNotInBucket;
-    getClosestContacts(maxCount?: number): PeerDescriptor[];
-    getNodeId(): PeerID;
-    getBucketSize(): number;
-    private addNewContact;
-    private connectToEntryPoint;
-    removeContact(contact: PeerDescriptor): void;
+    getClosestContacts(limit?: number): PeerDescriptor[];
+    getClosestRingContactsTo(ringIdRaw: RingIdRaw, limit?: number): RingContacts;
+    getNodeId(): DhtAddress;
+    getNeighborCount(): number;
+    removeContact(nodeId: DhtAddress): void;
     send(msg: Message): Promise<void>;
-    joinDht(entryPointDescriptors: PeerDescriptor[], doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
-    startFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<FindResult>;
-    storeDataToDht(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
-    storeDataViaPeer(key: Uint8Array, data: Any, peer: PeerDescriptor): Promise<PeerDescriptor[]>;
-    getDataFromDht(idToFind: Uint8Array): Promise<DataEntry[]>;
-    deleteDataFromDht(idToDelete: Uint8Array): Promise<void>;
-    findDataViaPeer(idToFind: Uint8Array, peer: PeerDescriptor): Promise<DataEntry[]>;
+    private getConnectedEntryPoints;
+    joinDht(entryPointDescriptors: PeerDescriptor[], doAdditionalDistantPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
+    joinRing(): Promise<void>;
+    storeDataToDht(key: DhtAddress, data: Any, creator?: DhtAddress): Promise<PeerDescriptor[]>;
+    storeDataToDhtViaPeer(key: DhtAddress, data: Any, peer: PeerDescriptor): Promise<PeerDescriptor[]>;
+    fetchDataFromDht(key: DhtAddress): Promise<DataEntry[]>;
+    fetchDataFromDhtViaPeer(key: DhtAddress, peer: PeerDescriptor): Promise<DataEntry[]>;
+    deleteDataFromDht(key: DhtAddress, waitForCompletion: boolean): Promise<void>;
+    findClosestNodesFromDht(key: DhtAddress): Promise<PeerDescriptor[]>;
     getTransport(): ITransport;
     getLocalPeerDescriptor(): PeerDescriptor;
-    getAllConnectionPeerDescriptors(): PeerDescriptor[];
-    getKBucketPeers(): PeerDescriptor[];
-    getNumberOfConnections(): number;
-    getNumberOfLocalLockedConnections(): number;
-    getNumberOfRemoteLockedConnections(): number;
-    getNumberOfWeakLockedConnections(): number;
+    getConnections(): PeerDescriptor[];
+    getNeighbors(): PeerDescriptor[];
+    getConnectionCount(): number;
+    getLocalLockedConnectionCount(): number;
+    getRemoteLockedConnectionCount(): number;
+    getWeakLockedConnectionCount(): number;
     waitForNetworkConnectivity(): Promise<void>;
     hasJoined(): boolean;
     stop(): Promise<void>;
+    private createDhtNodeRpcRemote;
 }