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

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

@@ -78,6 +78,7 @@ export declare class ConnectionManager extends EventEmitter<Events> implements I
     private isConnectionToSelf;
     private isOwnWebSocketServer;
     private createConnection;
+    private canOpenWsConnection;
     getConnection(peerDescriptor: PeerDescriptor): ManagedConnection | undefined;
     getPeerDescriptor(): PeerDescriptor;
     hasConnection(peerDescriptor: PeerDescriptor): boolean;

package/dist/src/connection/ConnectionManager.js

@@ -42,6 +42,7 @@ const DuplicateDetector_1 = require("../dht/routing/DuplicateDetector");
 const SortedContactList_1 = require("../dht/contact/SortedContactList");
 const Contact_1 = require("../dht/contact/Contact");
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
+const AddressTools_1 = require("../helpers/AddressTools");
 class ConnectionManagerConfig {
     constructor(conf) {
         this.maxConnections = 80;
@@ -297,13 +298,24 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
         if (this.simulatorConnector) {
             return this.simulatorConnector.connect(peerDescriptor);
         }
-        else if (peerDescriptor.websocket || this.ownPeerDescriptor.websocket) {
-            if (!(peerDescriptor.type === DhtRpc_1.NodeType.BROWSER && this.ownPeerDescriptor.websocket?.tls)) {
+        else if ((peerDescriptor.websocket || this.ownPeerDescriptor.websocket)) {
+            if (this.canOpenWsConnection(peerDescriptor)) {
                 return this.webSocketConnector.connect(peerDescriptor);
             }
         }
         return this.webrtcConnector.connect(peerDescriptor);
     }
+    canOpenWsConnection(peerDescriptor) {
+        if (!(this.ownPeerDescriptor.type === DhtRpc_1.NodeType.BROWSER || peerDescriptor.type === DhtRpc_1.NodeType.BROWSER)) {
+            return true;
+        }
+        if (this.ownPeerDescriptor.websocket) {
+            return (peerDescriptor.type === DhtRpc_1.NodeType.BROWSER && this.ownPeerDescriptor.websocket.tls)
+                || (this.ownPeerDescriptor.websocket.host === 'localhost' || ((0, AddressTools_1.isPrivateIPv4)(this.ownPeerDescriptor.websocket.host)));
+        }
+        return (this.ownPeerDescriptor.type === DhtRpc_1.NodeType.BROWSER && peerDescriptor.websocket.tls)
+            || (peerDescriptor.websocket.host === 'localhost' || ((0, AddressTools_1.isPrivateIPv4)(peerDescriptor.websocket.host)));
+    }
     getConnection(peerDescriptor) {
         const hexId = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor);
         return this.connections.get(hexId);

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

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

package/dist/src/connection/ConnectivityChecker.js

@@ -83,15 +83,20 @@ class ConnectivityChecker {
                 }, ConnectivityChecker.CONNECTIVITY_CHECKER_TIMEOUT);
                 const listener = (bytes) => {
                     outgoingConnection.close('OTHER');
-                    const message = DhtRpc_1.Message.fromBinary(bytes);
-                    if (message.body.oneofKind === 'connectivityResponse') {
-                        const connectivityResponseMessage = message.body.connectivityResponse;
-                        outgoingConnection.off('data', listener);
-                        clearTimeout(timeoutId);
-                        resolve(connectivityResponseMessage);
+                    try {
+                        const message = DhtRpc_1.Message.fromBinary(bytes);
+                        if (message.body.oneofKind === 'connectivityResponse') {
+                            const connectivityResponseMessage = message.body.connectivityResponse;
+                            outgoingConnection.off('data', listener);
+                            clearTimeout(timeoutId);
+                            resolve(connectivityResponseMessage);
+                        }
+                        else {
+                            return;
+                        }
                     }
-                    else {
-                        return;
+                    catch (err) {
+                        logger.trace(`Could not parse message: ${err}`);
                     }
                 };
                 outgoingConnection.on('data', listener);
@@ -112,15 +117,20 @@ class ConnectivityChecker {
     listenToIncomingConnectivityRequests(connectionToListenTo) {
         connectionToListenTo.on('data', (data) => {
             logger.trace('server received data');
-            const message = DhtRpc_1.Message.fromBinary(data);
-            if (message.body.oneofKind === 'connectivityRequest') {
-                logger.trace('received connectivity request');
-                this.handleIncomingConnectivityRequest(connectionToListenTo, message.body.connectivityRequest).then(() => {
-                    logger.trace('handleIncomingConnectivityRequest ok');
-                    return;
-                }).catch((e) => {
-                    logger.error('handleIncomingConnectivityRequest' + e);
-                });
+            try {
+                const message = DhtRpc_1.Message.fromBinary(data);
+                if (message.body.oneofKind === 'connectivityRequest') {
+                    logger.trace('received connectivity request');
+                    this.handleIncomingConnectivityRequest(connectionToListenTo, message.body.connectivityRequest).then(() => {
+                        logger.trace('handleIncomingConnectivityRequest ok');
+                        return;
+                    }).catch((e) => {
+                        logger.error('handleIncomingConnectivityRequest' + e);
+                    });
+                }
+            }
+            catch (err) {
+                logger.trace(`Could not parse message: ${err}`);
             }
         });
     }

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

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

package/dist/src/connection/Handshaker.js

@@ -10,22 +10,27 @@ class Handshaker extends eventemitter3_1.EventEmitter {
     constructor(ownPeerDescriptor, protocolVersion, connection) {
         super();
         this.onData = (data) => {
-            const message = DhtRpc_1.Message.fromBinary(data);
-            if (message.body.oneofKind === 'handshakeRequest') {
-                logger.trace('handshake request received');
-                const handshake = message.body.handshakeRequest;
-                this.emit('handshakeRequest', handshake.peerDescriptor);
-            }
-            if (message.body.oneofKind === 'handshakeResponse') {
-                logger.trace('handshake response received');
-                const handshake = message.body.handshakeResponse;
-                if (handshake.responseError) {
-                    this.emit('handshakeFailed', handshake.responseError);
+            try {
+                const message = DhtRpc_1.Message.fromBinary(data);
+                if (message.body.oneofKind === 'handshakeRequest') {
+                    logger.trace('handshake request received');
+                    const handshake = message.body.handshakeRequest;
+                    this.emit('handshakeRequest', handshake.peerDescriptor);
                 }
-                else {
-                    this.emit('handshakeCompleted', handshake.peerDescriptor);
+                if (message.body.oneofKind === 'handshakeResponse') {
+                    logger.trace('handshake response received');
+                    const handshake = message.body.handshakeResponse;
+                    if (handshake.responseError) {
+                        this.emit('handshakeFailed', handshake.responseError);
+                    }
+                    else {
+                        this.emit('handshakeCompleted', handshake.peerDescriptor);
+                    }
                 }
             }
+            catch (err) {
+                logger.error('error while parsing handshake message', err);
+            }
         };
         this.ownPeerDescriptor = ownPeerDescriptor;
         this.protocolVersion = protocolVersion;

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

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

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

@@ -50,7 +50,6 @@ class ServerWebSocket extends eventemitter3_1.default {
         this.socket?.removeAllListeners();
         this.socket = undefined;
         this.emit('disconnected', disconnectionType, reasonCode, description);
-        this.removeAllListeners();
     }
     send(data) {
         // If in an Karma / Electron test, use the NodeJS implementation

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

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

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

@@ -1,6 +1,4 @@
-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';
@@ -123,7 +121,7 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     private onKBucketAdded;
     private addClosestContactToBucket;
     private getClosestActiveContactNotInBucket;
-    getNeighborList(): SortedContactList<DhtPeer>;
+    getClosestContacts(maxCount?: number): PeerDescriptor[];
     getNodeId(): PeerID;
     getBucketSize(): number;
     private addNewContact;
@@ -133,6 +131,7 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
     joinDht(entryPointDescriptors: PeerDescriptor[], doRandomJoin?: boolean, retry?: boolean): Promise<void>;
     startRecursiveFind(idToFind: Uint8Array, findMode?: FindMode, 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>;
     deleteDataFromDht(idToDelete: Uint8Array): Promise<void>;
     findDataViaPeer(idToFind: Uint8Array, peer: PeerDescriptor): Promise<DataEntry[]>;

package/dist/src/dht/DhtNode.js

@@ -1,27 +1,4 @@
 "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 };
 };
@@ -34,7 +11,6 @@ const SortedContactList_1 = require("./contact/SortedContactList");
 const RoutingRpcCommunicator_1 = require("../transport/RoutingRpcCommunicator");
 const PeerID_1 = require("../helpers/PeerID");
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
-const Err = __importStar(require("../helpers/errors"));
 const ConnectionManager_1 = require("../connection/ConnectionManager");
 const DhtRpc_client_1 = require("../proto/packages/dht/protos/DhtRpc.client");
 const utils_1 = require("@streamr/utils");
@@ -46,10 +22,11 @@ const RecursiveFinder_1 = require("./find/RecursiveFinder");
 const DataStore_1 = require("./store/DataStore");
 const PeerDiscovery_1 = require("./discovery/PeerDiscovery");
 const LocalDataStore_1 = require("./store/LocalDataStore");
-const registerExternalApiRpcMethod_1 = require("./registerExternalApiRpcMethod");
+const registerExternalApiRpcMethods_1 = require("./registerExternalApiRpcMethods");
 const RemoteExternalApi_1 = require("./RemoteExternalApi");
 const exports_1 = require("../exports");
 const isNodeJS_1 = require("../helpers/browser/isNodeJS");
+const lodash_1 = require("lodash");
 class DhtNodeConfig {
     constructor(conf) {
         this.serviceId = 'layer0';
@@ -85,7 +62,8 @@ const createPeerDescriptor = (msg, peerId, nodeName) => {
     else {
         kademliaId = (0, utils_1.hexToBinary)(peerId);
     }
-    const ret = { kademliaId, nodeName: nodeName ? nodeName : (0, utils_1.binaryToHex)(kademliaId), type: DhtRpc_1.NodeType.NODEJS };
+    const nodeType = (0, isNodeJS_1.isNodeJS)() ? DhtRpc_1.NodeType.NODEJS : DhtRpc_1.NodeType.BROWSER;
+    const ret = { kademliaId, nodeName: nodeName ? nodeName : (0, utils_1.binaryToHex)(kademliaId), type: nodeType };
     if (msg && msg.websocket) {
         ret.websocket = { host: msg.websocket.host, port: msg.websocket.port, tls: msg.websocket.tls };
         ret.openInternet = true;
@@ -115,17 +93,17 @@ class DhtNode extends eventemitter3_1.EventEmitter {
                 // TODO: Update contact info to the connection manager and reconnect
             });
             this.neighborList = new SortedContactList_1.SortedContactList(selfId, this.config.maxNeighborListSize);
-            this.neighborList.on('contactRemoved', (peerDescriptor, activeContacts) => {
+            this.neighborList.on('contactRemoved', (removedContact, activeContacts) => {
                 if (this.stopped) {
                     return;
                 }
-                this.emit('contactRemoved', peerDescriptor, activeContacts);
-                this.randomPeers.addContact(new DhtPeer_1.DhtPeer(this.ownPeerDescriptor, peerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId));
+                this.emit('contactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor()));
+                this.randomPeers.addContact(new DhtPeer_1.DhtPeer(this.ownPeerDescriptor, removedContact.getPeerDescriptor(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId));
             });
-            this.neighborList.on('newContact', (peerDescriptor, activeContacts) => this.emit('newContact', peerDescriptor, activeContacts));
+            this.neighborList.on('newContact', (newContact, activeContacts) => this.emit('newContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
             this.openInternetPeers = new SortedContactList_1.SortedContactList(selfId, this.config.maxNeighborListSize / 2);
-            this.openInternetPeers.on('contactRemoved', (peerDescriptor, activeContacts) => this.emit('openInternetContactRemoved', peerDescriptor, activeContacts));
-            this.openInternetPeers.on('newContact', (peerDescriptor, activeContacts) => this.emit('newOpenInternetContact', peerDescriptor, activeContacts));
+            this.openInternetPeers.on('contactRemoved', (removedContact, activeContacts) => this.emit('openInternetContactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+            this.openInternetPeers.on('newContact', (newContact, activeContacts) => this.emit('newOpenInternetContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
             this.transportLayer.on('connected', (peerDescriptor) => this.onTransportConnected(peerDescriptor));
             this.transportLayer.on('disconnected', (peerDescriptor, disonnectionType) => {
                 this.onTransportDisconnected(peerDescriptor, disonnectionType);
@@ -139,8 +117,8 @@ class DhtNode extends eventemitter3_1.EventEmitter {
                 this.connections.set(peerId.toKey(), dhtPeer);
             });
             this.randomPeers = new RandomContactList_1.RandomContactList(selfId, this.config.maxNeighborListSize);
-            this.randomPeers.on('contactRemoved', (peerDescriptor, activeContacts) => this.emit('randomContactRemoved', peerDescriptor, activeContacts));
-            this.randomPeers.on('newContact', (peerDescriptor, activeContacts) => this.emit('newRandomContact', peerDescriptor, activeContacts));
+            this.randomPeers.on('contactRemoved', (removedContact, activeContacts) => this.emit('randomContactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+            this.randomPeers.on('newContact', (newContact, activeContacts) => this.emit('newRandomContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
         };
         this.generatePeerDescriptorCallBack = (connectivityResponse) => {
             if (this.config.peerDescriptor) {
@@ -264,7 +242,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
                 return this.bucket.closest(id, n);
             }
         });
-        (0, registerExternalApiRpcMethod_1.registerExternalApiRpcMethod)(this);
+        (0, registerExternalApiRpcMethods_1.registerExternalApiRpcMethods)(this);
         if (this.connectionManager && this.config.entryPoints && this.config.entryPoints.length > 0
             && !(0, peerIdFromPeerDescriptor_1.isSamePeerDescriptor)(this.config.entryPoints[0], this.ownPeerDescriptor)) {
             this.connectToEntryPoint(this.config.entryPoints[0]);
@@ -411,8 +389,8 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         }
         return undefined;
     }
-    getNeighborList() {
-        return this.neighborList;
+    getClosestContacts(maxCount) {
+        return this.neighborList.getClosestContacts(maxCount).map((c) => c.getPeerDescriptor());
     }
     getNodeId() {
         return this.ownPeerId;
@@ -481,8 +459,15 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         return this.recursiveFinder.startRecursiveFind(idToFind, findMode, excludedPeer);
     }
     async storeDataToDht(key, data) {
+        if (this.isJoinOngoing() && this.config.entryPoints && this.config.entryPoints.length > 0) {
+            return this.storeDataViaPeer(key, data, (0, lodash_1.sample)(this.config.entryPoints));
+        }
         return this.dataStore.storeDataToDht(key, data);
     }
+    async storeDataViaPeer(key, data, peer) {
+        const target = new RemoteExternalApi_1.RemoteExternalApi(this.ownPeerDescriptor, peer, this.config.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ExternalApiServiceClient(this.rpcCommunicator.getRpcClientTransport())));
+        return await target.storeData(key, data);
+    }
     async getDataFromDht(idToFind) {
         return this.recursiveFinder.startRecursiveFind(idToFind, DhtRpc_1.FindMode.DATA);
     }
@@ -492,7 +477,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         }
     }
     async findDataViaPeer(idToFind, peer) {
-        const target = new RemoteExternalApi_1.RemoteExternalApi(this.ownPeerDescriptor, peer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ExternalApiServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
+        const target = new RemoteExternalApi_1.RemoteExternalApi(this.ownPeerDescriptor, peer, this.config.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ExternalApiServiceClient(this.rpcCommunicator.getRpcClientTransport())));
         return await target.findData(idToFind);
     }
     getRpcCommunicator() {
@@ -538,13 +523,10 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         return this.config.entryPoints || [];
     }
     async stop() {
-        if (this.stopped) {
+        if (this.stopped || !this.started) {
             return;
         }
         logger.trace('stop()');
-        if (!this.started) {
-            throw new Err.CouldNotStop('Cannot not stop() before start()');
-        }
         this.stopped = true;
         if (this.entryPointDisconnectTimeout) {
             clearTimeout(this.entryPointDisconnectTimeout);