@streamr/dht 100.0.0-pretestnet.2 → 100.0.0-pretestnet.4

package/dist/src/connection/{WebSocket/WebSocketServer.js → websocket/WebsocketServer.js}

@@ -3,22 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketServer = void 0;
+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 ServerWebsocket_1 = require("./ServerWebsocket");
 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 logger = new utils_1.Logger(module);
-class WebSocketServer extends eventemitter3_1.default {
+class WebsocketServer extends eventemitter3_1.default {
     constructor(config) {
         super();
         this.abortController = new AbortController();
         this.portRange = config.portRange;
+        this.enableTls = config.enableTls;
         this.tlsCertificate = config.tlsCertificate;
         this.maxMessageSize = config.maxMessageSize ?? 1048576;
     }
@@ -26,7 +29,7 @@ class WebSocketServer extends eventemitter3_1.default {
         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, this.tlsCertificate), this.abortController.signal);
+                await (0, utils_1.asAbortable)(this.startServer(port, this.enableTls), this.abortController.signal);
                 return port;
             }
             catch (err) {
@@ -34,26 +37,37 @@ class WebSocketServer extends eventemitter3_1.default {
                     logger.debug(`failed to start WebSocket server on port: ${port} reattempting on next port`);
                 }
                 else {
-                    throw new errors_1.WebSocketServerStartError(err);
+                    throw new errors_1.WebsocketServerStartError(err);
                 }
             }
         }
-        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.portRange.min}-${this.portRange.min}`);
     }
-    startServer(port, tlsCertificate) {
+    // If tlsCertificate has been given the tls boolean is ignored
+    // TODO: could be simplified?
+    startServer(port, tls) {
         const requestListener = (request, response) => {
             logger.trace('Received request for ' + request.url);
             response.writeHead(404);
             response.end();
         };
         return new Promise((resolve, reject) => {
-            this.httpServer = tlsCertificate ?
-                (0, https_1.createServer)({
-                    key: fs_1.default.readFileSync(tlsCertificate.privateKeyFileName),
-                    cert: fs_1.default.readFileSync(tlsCertificate.certFileName)
-                }, requestListener)
-                :
-                    (0, http_1.createServer)(requestListener);
+            if (this.tlsCertificate) {
+                this.httpServer = (0, https_1.createServer)({
+                    key: fs_1.default.readFileSync(this.tlsCertificate.privateKeyFileName),
+                    cert: fs_1.default.readFileSync(this.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);
+                this.httpServer = (0, https_1.createServer)({
+                    key: certificate.serverKey,
+                    cert: certificate.serverCert
+                }, requestListener);
+            }
             function originIsAllowed() {
                 return true;
             }
@@ -67,10 +81,10 @@ class WebSocketServer extends eventemitter3_1.default {
                 }
                 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 ServerWebsocket_1.ServerWebsocket(connection, request.resourceURL));
             });
             this.httpServer.once('error', (err) => {
-                reject(new errors_1.WebSocketServerStartError('Starting Websocket server failed', err));
+                reject(new errors_1.WebsocketServerStartError('Starting Websocket server failed', err));
             });
             this.httpServer.once('listening', () => {
                 logger.debug('Websocket server is listening on port ' + port);
@@ -81,10 +95,16 @@ class WebSocketServer extends eventemitter3_1.default {
                 this.httpServer.listen(port, '0.0.0.0');
             }
             catch (e) {
-                reject(new errors_1.WebSocketServerStartError('Websocket server threw an exception', e));
+                reject(new errors_1.WebsocketServerStartError('Websocket server threw an exception', e));
             }
         });
     }
+    updateCertificate(cert, key) {
+        this.httpServer.setSecureContext({
+            cert,
+            key
+        });
+    }
     stop() {
         this.abortController.abort();
         this.removeAllListeners();
@@ -113,5 +133,5 @@ class WebSocketServer extends eventemitter3_1.default {
         }
     }
 }
-exports.WebSocketServer = WebSocketServer;
-//# sourceMappingURL=WebSocketServer.js.map
+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":"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"}

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

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'eventemitter3';
-import { RoutingRpcCommunicator } from '../transport/RoutingRpcCommunicator';
 import { PeerID } from '../helpers/PeerID';
 import { ConnectivityResponse, Message, PeerDescriptor, DataEntry } from '../proto/packages/dht/protos/DhtRpc';
 import { ITransport, TransportEvents } from '../transport/ITransport';
@@ -7,16 +6,12 @@ import { ConnectionManager, PortRange, TlsCertificate } from '../connection/Conn
 import { MetricsContext } from '@streamr/utils';
 import { Any } from '../proto/google/protobuf/any';
 import { Router } from './routing/Router';
-import { RecursiveFindResult } from './find/RecursiveFinder';
-import { IceServer } from '../connection/WebRTC/WebRtcConnectorRpcLocal';
+import { FindResult } from './find/Finder';
+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;
 }
@@ -38,6 +33,7 @@ export interface DhtNodeOptions {
     entryPoints?: PeerDescriptor[];
     websocketHost?: string;
     websocketPortRange?: PortRange;
+    websocketServerEnableTls?: boolean;
     peerId?: string;
     rpcRequestTimeout?: number;
     iceServers?: IceServer[];
@@ -50,6 +46,8 @@ export interface DhtNodeOptions {
     maxConnections?: number;
     tlsCertificate?: TlsCertificate;
     externalIp?: string;
+    autoCertifierUrl?: string;
+    autoCertifierConfigFile?: string;
 }
 export type Events = TransportEvents & DhtNodeEvents;
 export declare const createPeerDescriptor: (msg?: ConnectivityResponse, peerId?: string) => PeerDescriptor;
@@ -58,15 +56,14 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private bucket?;
     private connections;
     private neighborList?;
-    private openInternetPeers?;
     private randomPeers?;
     private rpcCommunicator?;
     private transport?;
-    private ownPeerDescriptor?;
+    private localPeerDescriptor?;
     router?: Router;
     private storeRpcLocal?;
     private localDataStore;
-    private recursiveFinder?;
+    private finder?;
     private peerDiscovery?;
     connectionManager?: ConnectionManager;
     private started;
@@ -77,11 +74,10 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private initKBuckets;
     private onTransportConnected;
     private onTransportDisconnected;
-    private bindDefaultServerMethods;
+    private bindRpcLocalMethods;
     private isPeerCloserToIdThanSelf;
     private handleMessage;
     private generatePeerDescriptorCallBack;
-    private getClosestPeerDescriptors;
     private onKBucketPing;
     private onKBucketRemoved;
     private onKBucketAdded;
@@ -92,18 +88,17 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     getBucketSize(): number;
     private addNewContact;
     private connectToEntryPoint;
-    removeContact(contact: PeerDescriptor, removeFromOpenInternetPeers?: boolean): void;
+    removeContact(contact: PeerDescriptor): void;
     send(msg: Message): Promise<void>;
     joinDht(entryPointDescriptors: PeerDescriptor[], doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
-    startRecursiveFind(idToFind: Uint8Array, fetchData?: boolean, excludedPeer?: PeerDescriptor): Promise<RecursiveFindResult>;
+    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[]>;
-    getRpcCommunicator(): RoutingRpcCommunicator;
     getTransport(): ITransport;
-    getPeerDescriptor(): PeerDescriptor;
+    getLocalPeerDescriptor(): PeerDescriptor;
     getAllConnectionPeerDescriptors(): PeerDescriptor[];
     getKBucketPeers(): PeerDescriptor[];
     getNumberOfConnections(): number;
@@ -113,7 +108,4 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     waitForNetworkConnectivity(): Promise<void>;
     hasJoined(): boolean;
     stop(): Promise<void>;
-    private getClosestPeers;
-    private ping;
-    private leaveNotice;
 }