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

package/dist/src/connection/WebSocket/{WebSocketConnector.js → WebSocketConnectorRpcLocal.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketConnector = exports.connectivityMethodToWebSocketUrl = void 0;
+exports.WebSocketConnectorRpcLocal = exports.connectivityMethodToWebSocketUrl = void 0;
 const ClientWebSocket_1 = require("./ClientWebSocket");
 const IConnection_1 = require("../IConnection");
 const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
-const RemoteWebSocketConnector_1 = require("./RemoteWebSocketConnector");
+const WebSocketConnectorRpcRemote_1 = require("./WebSocketConnectorRpcRemote");
 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");
@@ -16,14 +16,19 @@ const proto_rpc_1 = require("@streamr/proto-rpc");
 const Handshaker_1 = require("../Handshaker");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const lodash_1 = require("lodash");
+const AddressTools_1 = require("../../helpers/AddressTools");
 const logger = new utils_1.Logger(module);
 const connectivityMethodToWebSocketUrl = (ws) => {
     return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port;
 };
 exports.connectivityMethodToWebSocketUrl = connectivityMethodToWebSocketUrl;
+const canOpenConnectionFromBrowser = (websocketServer) => {
+    const hasPrivateAddress = ((websocketServer.host === 'localhost') || (0, AddressTools_1.isPrivateIPv4)(websocketServer.host));
+    return websocketServer.tls || hasPrivateAddress;
+};
 const ENTRY_POINT_CONNECTION_ATTEMPTS = 5;
-class WebSocketConnector {
-    constructor(protocolVersion, rpcTransport, fnCanConnect, incomingConnectionCallback, portRange, host, entrypoints, tlsCertificate) {
+class WebSocketConnectorRpcLocal {
+    constructor(config) {
         this.ongoingConnectRequests = new Map();
         this.connectingConnections = new Map();
         this.destroyed = false;
@@ -31,14 +36,14 @@ class WebSocketConnector {
             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.attachImplementation(serverWebSocket);
                 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);
+                const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebSocket);
                 managedConnection.setPeerDescriptor(peerDescriptor);
-                if (this.incomingConnectionCallback(managedConnection)) {
+                if (this.onIncomingConnection(managedConnection)) {
                     managedConnection.acceptHandshake();
                 }
                 else {
@@ -47,21 +52,23 @@ class WebSocketConnector {
                 }
             }
         };
-        this.protocolVersion = protocolVersion;
-        this.webSocketServer = portRange ? new WebSocketServer_1.WebSocketServer() : undefined;
-        this.incomingConnectionCallback = incomingConnectionCallback;
-        this.portRange = portRange;
-        this.host = host;
-        this.entrypoints = entrypoints;
-        this.tlsCertificate = tlsCertificate;
-        this.canConnectFunction = fnCanConnect.bind(this);
-        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID, rpcTransport, {
+        this.webSocketServer = config.portRange ? new WebSocketServer_1.WebSocketServer({
+            portRange: config.portRange,
+            tlsCertificate: config.tlsCertificate,
+            maxMessageSize: config.maxMessageSize
+        }) : undefined;
+        this.onIncomingConnection = config.onIncomingConnection;
+        this.host = config.host;
+        this.entrypoints = config.entrypoints;
+        this.tlsCertificate = config.tlsCertificate;
+        this.canConnectFunction = config.canConnect.bind(this);
+        this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnectorRpcLocal.WEBSOCKET_CONNECTOR_SERVICE_ID, config.transport, {
             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);
+        const handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, connection);
         handshaker.once('handshakeRequest', (peerDescriptor) => {
             this.onServerSocketHandshakeRequest(peerDescriptor, connection);
         });
@@ -74,11 +81,11 @@ class WebSocketConnector {
                     serverSocket.resourceURL.query) {
                     const query = serverSocket.resourceURL.query;
                     if (query.connectivityRequest) {
-                        logger.trace('Received connectivity request connection');
+                        logger.trace('Received connectivity request connection from ' + serverSocket.getRemoteAddress());
                         this.connectivityChecker.listenToIncomingConnectivityRequests(serverSocket);
                     }
                     else if (query.connectivityProbe) {
-                        logger.trace('Received connectivity probe connection');
+                        logger.trace('Received connectivity probe connection from ' + serverSocket.getRemoteAddress());
                     }
                     else {
                         this.attachHandshaker(connection);
@@ -88,12 +95,12 @@ class WebSocketConnector {
                     this.attachHandshaker(connection);
                 }
             });
-            const port = await this.webSocketServer.start(this.portRange, this.tlsCertificate);
+            const port = await this.webSocketServer.start();
             this.selectedPort = port;
             this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.tlsCertificate !== undefined, this.host);
         }
     }
-    async checkConnectivity(reattempt = 0) {
+    async checkConnectivity() {
         // TODO: this could throw if the server is not running
         const noServerConnectivityResponse = {
             openInternet: false,
@@ -103,38 +110,51 @@ class WebSocketConnector {
         if (this.destroyed) {
             return noServerConnectivityResponse;
         }
-        try {
-            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,
-                        host: this.host,
-                        natType: ConnectionManager_1.NatType.OPEN_INTERNET,
-                        websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
-                    };
-                    return preconfiguredConnectivityResponse;
+        for (const reattempt of (0, lodash_1.range)(ENTRY_POINT_CONNECTION_ATTEMPTS)) {
+            const entryPoint = (0, lodash_1.sample)(this.entrypoints);
+            try {
+                if (!this.webSocketServer) {
+                    // If no websocket server, return openInternet: false
+                    return noServerConnectivityResponse;
                 }
                 else {
-                    // Do real connectivity checking     
-                    return await this.connectivityChecker.sendConnectivityRequest((0, lodash_1.sample)(this.entrypoints));
+                    if (!this.entrypoints || this.entrypoints.length < 1) {
+                        // return connectivity info given in config
+                        const preconfiguredConnectivityResponse = {
+                            openInternet: true,
+                            host: this.host,
+                            natType: ConnectionManager_1.NatType.OPEN_INTERNET,
+                            websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
+                        };
+                        return preconfiguredConnectivityResponse;
+                    }
+                    else {
+                        // Do real connectivity checking
+                        return await this.connectivityChecker.sendConnectivityRequest(entryPoint);
+                    }
                 }
             }
-        }
-        catch (err) {
-            if (reattempt < ENTRY_POINT_CONNECTION_ATTEMPTS) {
-                logger.error('Failed to connect to the entrypoint', { error: err });
-                await (0, utils_1.wait)(2000);
-                return this.checkConnectivity(reattempt + 1);
-            }
-            else {
-                throw err;
+            catch (err) {
+                if (reattempt < ENTRY_POINT_CONNECTION_ATTEMPTS) {
+                    const error = `Failed to connect to entrypoint with id ${(0, utils_1.binaryToHex)(entryPoint.kademliaId)} `
+                        + `and URL ${(0, exports.connectivityMethodToWebSocketUrl)(entryPoint.websocket)}`;
+                    logger.error(error, { error: err });
+                    await (0, utils_1.wait)(2000);
+                }
             }
         }
+        throw Error(`Failed to connect to the entrypoints after ${ENTRY_POINT_CONNECTION_ATTEMPTS} attempts`);
+    }
+    isPossibleToFormConnection(targetPeerDescriptor) {
+        if (this.ownPeerDescriptor.websocket !== undefined) {
+            return (targetPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER) || canOpenConnectionFromBrowser(this.ownPeerDescriptor.websocket);
+        }
+        else if (targetPeerDescriptor.websocket !== undefined) {
+            return (this.ownPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER) || canOpenConnectionFromBrowser(targetPeerDescriptor.websocket);
+        }
+        else {
+            return false;
+        }
     }
     connect(targetPeerDescriptor) {
         const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
@@ -148,7 +168,7 @@ class WebSocketConnector {
         else {
             const socket = new ClientWebSocket_1.ClientWebSocket();
             const url = (0, exports.connectivityMethodToWebSocketUrl)(targetPeerDescriptor.websocket);
-            const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
+            const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
             managedConnection.setPeerDescriptor(targetPeerDescriptor);
             this.connectingConnections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
             const delFunc = () => {
@@ -166,10 +186,10 @@ class WebSocketConnector {
     }
     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.host, ownPeerDescriptor.websocket.port);
+            const remoteConnector = new WebSocketConnectorRpcRemote_1.WebSocketConnectorRpcRemote(ownPeerDescriptor, targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebSocketConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            remoteConnector.requestConnection(ownPeerDescriptor.websocket.host, ownPeerDescriptor.websocket.port);
         });
-        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_SERVER);
+        const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, 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);
@@ -188,15 +208,16 @@ class WebSocketConnector {
         this.connectivityChecker?.destroy();
         await this.webSocketServer?.stop();
     }
-    // IWebSocketConnectorService implementation
-    async requestConnection(request, _context) {
-        if (!this.destroyed && this.canConnectFunction(request.requester, request.ip, request.port)) {
+    // IWebSocketConnectorRpc implementation
+    async requestConnection(request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        if (!this.destroyed && this.canConnectFunction(senderPeerDescriptor, request.ip, request.port)) {
             setImmediate(() => {
                 if (this.destroyed) {
                     return;
                 }
-                const connection = this.connect(request.requester);
-                this.incomingConnectionCallback(connection);
+                const connection = this.connect(senderPeerDescriptor);
+                this.onIncomingConnection(connection);
             });
             const res = {
                 accepted: true
@@ -208,6 +229,6 @@ class WebSocketConnector {
         };
     }
 }
-exports.WebSocketConnector = WebSocketConnector;
-WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocketconnector';
-//# sourceMappingURL=WebSocketConnector.js.map
+exports.WebSocketConnectorRpcLocal = WebSocketConnectorRpcLocal;
+WebSocketConnectorRpcLocal.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
+//# sourceMappingURL=WebSocketConnectorRpcLocal.js.map

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

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

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

@@ -0,0 +1,8 @@
+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>;
+}

package/dist/src/connection/WebSocket/{RemoteWebSocketConnector.js → WebSocketConnectorRpcRemote.js}

@@ -23,29 +23,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteWebSocketConnector = void 0;
+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 logger = new utils_1.Logger(module);
-class RemoteWebSocketConnector {
-    constructor(peerDescriptor, client) {
-        this.peerDescriptor = peerDescriptor;
-        this.client = client;
+class WebSocketConnectorRpcRemote extends Remote_1.Remote {
+    constructor(localPeerDescriptor, remotePeerDescriptor, client) {
+        super(localPeerDescriptor, remotePeerDescriptor, 'DUMMY', client);
     }
-    async requestConnection(sourceDescriptor, ip, port) {
-        logger.trace(`Requesting WebSocket connection from ${this.peerDescriptor.kademliaId.toString()}`);
+    async requestConnection(ip, port) {
+        logger.trace(`Requesting WebSocket connection from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getLocalPeerDescriptor())}`);
         const request = {
-            target: this.peerDescriptor,
-            requester: sourceDescriptor,
             ip,
             port
         };
-        const options = {
-            sourceDescriptor: sourceDescriptor,
-            targetDescriptor: this.peerDescriptor
-        };
+        const options = this.formDhtRpcOptions();
         try {
-            const res = await this.client.requestConnection(request, options);
+            const res = await this.getClient().requestConnection(request, options);
             if (res.reason) {
                 logger.debug('WebSocketConnectionRequest Rejected', {
                     stack: new Err.WebSocketConnectionRequestRejected(res.reason).stack
@@ -59,5 +55,5 @@ class RemoteWebSocketConnector {
         }
     }
 }
-exports.RemoteWebSocketConnector = RemoteWebSocketConnector;
-//# sourceMappingURL=RemoteWebSocketConnector.js.map
+exports.WebSocketConnectorRpcRemote = WebSocketConnectorRpcRemote;
+//# sourceMappingURL=WebSocketConnectorRpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebSocketConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketConnectorRpcRemote.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,0CAAuC;AACvC,0DAA2C;AAE3C,qFAA8E;AAC9E,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,gDAAqB,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC5G,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;YAEtE,IAAI,GAAG,CAAC,MAAM,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE;oBAChD,KAAK,EAAE,IAAI,GAAG,CAAC,kCAAkC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK;iBACtE,CAAC,CAAA;aACL;YACD,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;AA/BD,kEA+BC"}

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

@@ -1,12 +1,22 @@
 import EventEmitter from 'eventemitter3';
 import { ConnectionSourceEvents } from '../IConnectionSource';
 import { PortRange, TlsCertificate } from '../ConnectionManager';
+interface WebSocketServerConfig {
+    portRange: PortRange;
+    tlsCertificate?: TlsCertificate;
+    maxMessageSize?: number;
+}
 export declare class WebSocketServer extends EventEmitter<ConnectionSourceEvents> {
     private httpServer?;
     private wsServer?;
     private readonly abortController;
-    start(portRange: PortRange, tlsCertificate?: TlsCertificate): Promise<number>;
+    private readonly portRange;
+    private readonly tlsCertificate?;
+    private readonly maxMessageSize;
+    constructor(config: WebSocketServerConfig);
+    start(): Promise<number>;
     private startServer;
     stop(): Promise<void>;
     private createWsServer;
 }
+export {};

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

@@ -15,15 +15,18 @@ const lodash_1 = require("lodash");
 const fs_1 = __importDefault(require("fs"));
 const logger = new utils_1.Logger(module);
 class WebSocketServer extends eventemitter3_1.default {
-    constructor() {
-        super(...arguments);
+    constructor(config) {
+        super();
         this.abortController = new AbortController();
+        this.portRange = config.portRange;
+        this.tlsCertificate = config.tlsCertificate;
+        this.maxMessageSize = config.maxMessageSize ?? 1048576;
     }
-    async start(portRange, tlsCertificate) {
-        const ports = (0, lodash_1.range)(portRange.min, portRange.max + 1);
+    async start() {
+        const ports = (0, lodash_1.range)(this.portRange.min, this.portRange.max + 1);
         for (const port of ports) {
             try {
-                await (0, utils_1.asAbortable)(this.startServer(port, tlsCertificate), this.abortController.signal);
+                await (0, utils_1.asAbortable)(this.startServer(port, this.tlsCertificate), this.abortController.signal);
                 return port;
             }
             catch (err) {
@@ -35,7 +38,7 @@ class WebSocketServer extends eventemitter3_1.default {
                 }
             }
         }
-        throw new errors_1.WebSocketServerStartError(`Failed to start WebSocket server on any port in range: ${portRange.min}-${portRange.min}`);
+        throw new errors_1.WebSocketServerStartError(`Failed to start WebSocket server on any port in range: ${this.portRange.min}-${this.portRange.min}`);
     }
     startServer(port, tlsCertificate) {
         const requestListener = (request, response) => {
@@ -51,12 +54,12 @@ class WebSocketServer extends eventemitter3_1.default {
                 }, requestListener)
                 :
                     (0, http_1.createServer)(requestListener);
-            function originIsAllowed(_uorigin) {
+            function originIsAllowed() {
                 return true;
             }
             this.wsServer = this.createWsServer(this.httpServer);
             this.wsServer.on('request', (request) => {
-                if (!originIsAllowed(request.origin)) {
+                if (!originIsAllowed()) {
                     // Make sure we only accept requests from an allowed origin
                     request.reject();
                     logger.trace('IConnection from origin ' + request.origin + ' rejected.');
@@ -97,13 +100,15 @@ class WebSocketServer extends eventemitter3_1.default {
         if (typeof NodeJsWsServer !== 'undefined') {
             return new NodeJsWsServer({
                 httpServer,
-                autoAcceptConnections: false
+                autoAcceptConnections: false,
+                maxReceivedMessageSize: this.maxMessageSize
             });
         }
         else {
             return this.wsServer = new websocket_1.server({
                 httpServer,
-                autoAcceptConnections: false
+                autoAcceptConnections: false,
+                maxReceivedMessageSize: this.maxMessageSize
             });
         }
     }

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/dht/DhtNode.d.ts

@@ -1,17 +1,14 @@
 import { EventEmitter } from 'eventemitter3';
 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 { 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 { 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';
+import { IceServer } from '../connection/WebRTC/WebRtcConnectorRpcLocal';
 export interface DhtNodeEvents {
     newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
     contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
@@ -29,17 +26,19 @@ export interface DhtNodeOptions {
     maxNeighborListSize?: number;
     numberOfNodesPerKBucket?: number;
     joinNoProgressLimit?: number;
+    peerDiscoveryQueryBatchSize?: number;
     dhtJoinTimeout?: number;
     metricsContext?: MetricsContext;
     storeHighestTtl?: number;
     storeMaxTtl?: number;
-    transportLayer?: ITransport;
+    networkConnectivityTimeout?: number;
+    storageRedundancyFactor?: number;
+    transport?: ITransport;
     peerDescriptor?: PeerDescriptor;
     entryPoints?: PeerDescriptor[];
     websocketHost?: string;
     websocketPortRange?: PortRange;
     peerId?: string;
-    nodeName?: string;
     rpcRequestTimeout?: number;
     iceServers?: IceServer[];
     webrtcAllowPrivateAddresses?: boolean;
@@ -47,43 +46,13 @@ export interface DhtNodeOptions {
     webrtcDatachannelBufferThresholdHigh?: number;
     webrtcNewConnectionTimeout?: number;
     webrtcPortRange?: PortRange;
+    maxMessageSize?: number;
     maxConnections?: number;
     tlsCertificate?: TlsCertificate;
     externalIp?: string;
 }
-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;
-    peerId: string;
-    transportLayer?: ITransport;
-    peerDescriptor?: PeerDescriptor;
-    entryPoints?: PeerDescriptor[];
-    websocketHost?: string;
-    websocketPortRange?: PortRange;
-    nodeName?: string;
-    rpcRequestTimeout?: number;
-    iceServers?: IceServer[];
-    webrtcAllowPrivateAddresses?: boolean;
-    webrtcDatachannelBufferThresholdLow?: number;
-    webrtcDatachannelBufferThresholdHigh?: number;
-    webrtcNewConnectionTimeout?: number;
-    externalIp?: string;
-    webrtcPortRange?: PortRange;
-    tlsCertificate?: TlsCertificate;
-    constructor(conf: Partial<DhtNodeOptions>);
-}
 export type Events = TransportEvents & DhtNodeEvents;
-export declare const createPeerDescriptor: (msg?: ConnectivityResponse, peerId?: string, nodeName?: string) => PeerDescriptor;
+export declare const createPeerDescriptor: (msg?: ConnectivityResponse, peerId?: string) => PeerDescriptor;
 export declare class DhtNode extends EventEmitter<Events> implements ITransport {
     private readonly config;
     private bucket?;
@@ -92,11 +61,10 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private openInternetPeers?;
     private randomPeers?;
     private rpcCommunicator?;
-    private transportLayer?;
+    private transport?;
     private ownPeerDescriptor?;
-    private ownPeerId?;
     router?: Router;
-    dataStore?: DataStore;
+    private storeRpcLocal?;
     private localDataStore;
     private recursiveFinder?;
     private peerDiscovery?;
@@ -104,16 +72,14 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private started;
     private stopped;
     private entryPointDisconnectTimeout?;
-    contactAddCounter: number;
-    contactOnAddedCounter: number;
-    constructor(conf: Partial<DhtNodeConfig>);
+    constructor(conf: DhtNodeOptions);
     start(): Promise<void>;
     private initKBuckets;
     private onTransportConnected;
     private onTransportDisconnected;
     private bindDefaultServerMethods;
     private isPeerCloserToIdThanSelf;
-    handleMessage(message: Message): void;
+    private handleMessage;
     private generatePeerDescriptorCallBack;
     private getClosestPeerDescriptors;
     private onKBucketPing;
@@ -127,30 +93,27 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private addNewContact;
     private connectToEntryPoint;
     removeContact(contact: PeerDescriptor, removeFromOpenInternetPeers?: boolean): void;
-    send(msg: Message, _doNotConnect?: boolean): Promise<void>;
-    joinDht(entryPointDescriptors: PeerDescriptor[], doRandomJoin?: boolean, retry?: boolean): Promise<void>;
-    startRecursiveFind(idToFind: Uint8Array, findMode?: FindMode, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
+    send(msg: Message): Promise<void>;
+    joinDht(entryPointDescriptors: PeerDescriptor[], doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
+    startRecursiveFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
     storeDataToDht(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
     storeDataViaPeer(key: Uint8Array, data: Any, peer: PeerDescriptor): Promise<PeerDescriptor[]>;
-    getDataFromDht(idToFind: Uint8Array): Promise<RecursiveFindResult>;
+    getDataFromDht(idToFind: Uint8Array): Promise<DataEntry[]>;
     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;
-    isJoinOngoing(): boolean;
+    waitForNetworkConnectivity(): Promise<void>;
     hasJoined(): boolean;
-    getKnownEntryPoints(): PeerDescriptor[];
     stop(): Promise<void>;
     private getClosestPeers;
     private ping;
-    leaveNotice(request: LeaveNotice, context: ServerCallContext): Promise<Empty>;
+    private leaveNotice;
 }