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

package/dist/src/dht/DhtNode.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DhtNode = exports.createPeerDescriptor = exports.DhtNodeConfig = void 0;
-const DhtPeer_1 = require("./DhtPeer");
+exports.DhtNode = exports.createPeerDescriptor = void 0;
+const RemoteDhtNode_1 = require("./RemoteDhtNode");
 const k_bucket_1 = __importDefault(require("k-bucket"));
 const eventemitter3_1 = require("eventemitter3");
 const SortedContactList_1 = require("./contact/SortedContactList");
@@ -19,42 +19,17 @@ const RandomContactList_1 = require("./contact/RandomContactList");
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
 const Router_1 = require("./routing/Router");
 const RecursiveFinder_1 = require("./find/RecursiveFinder");
-const DataStore_1 = require("./store/DataStore");
+const StoreRpcLocal_1 = require("./store/StoreRpcLocal");
 const PeerDiscovery_1 = require("./discovery/PeerDiscovery");
 const LocalDataStore_1 = require("./store/LocalDataStore");
 const registerExternalApiRpcMethods_1 = require("./registerExternalApiRpcMethods");
-const RemoteExternalApi_1 = require("./RemoteExternalApi");
-const exports_1 = require("../exports");
-const isNodeJS_1 = require("../helpers/browser/isNodeJS");
+const ExternalApiRpcRemote_1 = require("./ExternalApiRpcRemote");
+const UUID_1 = require("../helpers/UUID");
+const isBrowserEnvironment_1 = require("../helpers/browser/isBrowserEnvironment");
 const lodash_1 = require("lodash");
-class DhtNodeConfig {
-    constructor(conf) {
-        this.serviceId = 'layer0';
-        this.joinParallelism = 3;
-        this.maxNeighborListSize = 200;
-        this.numberOfNodesPerKBucket = 8;
-        this.joinNoProgressLimit = 4;
-        this.dhtJoinTimeout = 60000;
-        this.getClosestContactsLimit = 5;
-        this.maxConnections = 80;
-        this.storeHighestTtl = 60000;
-        this.storeMaxTtl = 60000;
-        this.storeNumberOfCopies = 5;
-        this.metricsContext = new utils_1.MetricsContext();
-        this.peerId = new exports_1.UUID().toHex();
-        // assign given non-undefined config vars over defaults
-        let k;
-        for (k in conf) {
-            if (conf[k] === undefined) {
-                delete conf[k];
-            }
-        }
-        Object.assign(this, conf);
-    }
-}
-exports.DhtNodeConfig = DhtNodeConfig;
+const ConnectorFacade_1 = require("../connection/ConnectorFacade");
 const logger = new utils_1.Logger(module);
-const createPeerDescriptor = (msg, peerId, nodeName) => {
+const createPeerDescriptor = (msg, peerId) => {
     let kademliaId;
     if (msg) {
         kademliaId = peerId ? (0, utils_1.hexToBinary)(peerId) : PeerID_1.PeerID.fromIp(msg.host).value;
@@ -62,8 +37,8 @@ const createPeerDescriptor = (msg, peerId, nodeName) => {
     else {
         kademliaId = (0, utils_1.hexToBinary)(peerId);
     }
-    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 };
+    const nodeType = (0, isBrowserEnvironment_1.isBrowserEnvironment)() ? DhtRpc_1.NodeType.BROWSER : DhtRpc_1.NodeType.NODEJS;
+    const ret = { kademliaId, type: nodeType };
     if (msg && msg.websocket) {
         ret.websocket = { host: msg.websocket.host, port: msg.websocket.port, tls: msg.websocket.tls };
         ret.openInternet = true;
@@ -78,8 +53,6 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         this.localDataStore = new LocalDataStore_1.LocalDataStore();
         this.started = false;
         this.stopped = false;
-        this.contactAddCounter = 0;
-        this.contactOnAddedCounter = 0;
         this.initKBuckets = (selfId) => {
             this.bucket = new k_bucket_1.default({
                 localNodeId: selfId.value,
@@ -89,7 +62,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             this.bucket.on('ping', (oldContacts, newContact) => this.onKBucketPing(oldContacts, newContact));
             this.bucket.on('removed', (contact) => this.onKBucketRemoved(contact));
             this.bucket.on('added', (contact) => this.onKBucketAdded(contact));
-            this.bucket.on('updated', (_oldContact, _newContact) => {
+            this.bucket.on('updated', () => {
                 // TODO: Update contact info to the connection manager and reconnect
             });
             this.neighborList = new SortedContactList_1.SortedContactList(selfId, this.config.maxNeighborListSize);
@@ -98,23 +71,22 @@ class DhtNode extends eventemitter3_1.EventEmitter {
                     return;
                 }
                 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.randomPeers.addContact(new RemoteDhtNode_1.RemoteDhtNode(this.ownPeerDescriptor, removedContact.getPeerDescriptor(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId));
             });
             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', (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.transport.on('connected', (peerDescriptor) => this.onTransportConnected(peerDescriptor));
+            this.transport.on('disconnected', (peerDescriptor, disonnectionType) => {
                 this.onTransportDisconnected(peerDescriptor, disonnectionType);
             });
-            this.transportLayer.getAllConnectionPeerDescriptors().map((peer) => {
-                const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(peer);
-                const dhtPeer = new DhtPeer_1.DhtPeer(this.ownPeerDescriptor, peer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
-                if (peerId.equals(this.ownPeerId)) {
+            this.transport.getAllConnectionPeerDescriptors().forEach((peer) => {
+                const remoteDhtNode = new RemoteDhtNode_1.RemoteDhtNode(this.ownPeerDescriptor, peer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
+                if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.ownPeerDescriptor)) {
                     logger.error('own peerdescriptor added to connections in initKBucket');
                 }
-                this.connections.set(peerId.toKey(), dhtPeer);
+                this.connections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peer), remoteDhtNode);
             });
             this.randomPeers = new RandomContactList_1.RandomContactList(selfId, this.config.maxNeighborListSize);
             this.randomPeers.on('contactRemoved', (removedContact, activeContacts) => this.emit('randomContactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
@@ -125,11 +97,26 @@ class DhtNode extends eventemitter3_1.EventEmitter {
                 this.ownPeerDescriptor = this.config.peerDescriptor;
             }
             else {
-                this.ownPeerDescriptor = (0, exports.createPeerDescriptor)(connectivityResponse, this.config.peerId, this.config.nodeName);
+                this.ownPeerDescriptor = (0, exports.createPeerDescriptor)(connectivityResponse, this.config.peerId);
             }
             return this.ownPeerDescriptor;
         };
-        this.config = new DhtNodeConfig(conf);
+        this.config = (0, utils_1.merge)({
+            serviceId: 'layer0',
+            joinParallelism: 3,
+            maxNeighborListSize: 200,
+            numberOfNodesPerKBucket: 8,
+            joinNoProgressLimit: 4,
+            dhtJoinTimeout: 60000,
+            peerDiscoveryQueryBatchSize: 5,
+            maxConnections: 80,
+            storeHighestTtl: 60000,
+            storeMaxTtl: 60000,
+            networkConnectivityTimeout: 10000,
+            storageRedundancyFactor: 5,
+            metricsContext: new utils_1.MetricsContext(),
+            peerId: new UUID_1.UUID().toHex()
+        }, conf);
         this.send = this.send.bind(this);
     }
     async start() {
@@ -138,69 +125,71 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         }
         logger.trace(`Starting new Streamr Network DHT Node with serviceId ${this.config.serviceId}`);
         this.started = true;
-        if (!(0, isNodeJS_1.isNodeJS)()) {
+        if ((0, isBrowserEnvironment_1.isBrowserEnvironment)()) {
             this.config.websocketPortRange = undefined;
             if (this.config.peerDescriptor) {
                 this.config.peerDescriptor.websocket = undefined;
             }
         }
-        // If transportLayer is given, do not create a ConnectionManager
-        if (this.config.transportLayer) {
-            this.transportLayer = this.config.transportLayer;
-            this.ownPeerDescriptor = this.transportLayer.getPeerDescriptor();
-            if (this.config.transportLayer instanceof ConnectionManager_1.ConnectionManager) {
-                this.connectionManager = this.config.transportLayer;
+        // If transport is given, do not create a ConnectionManager
+        if (this.config.transport) {
+            this.transport = this.config.transport;
+            this.ownPeerDescriptor = this.transport.getPeerDescriptor();
+            if (this.config.transport instanceof ConnectionManager_1.ConnectionManager) {
+                this.connectionManager = this.config.transport;
             }
         }
         else {
-            const connectionManagerConfig = {
-                transportLayer: this,
+            const connectorFacadeConfig = {
+                transport: this,
                 entryPoints: this.config.entryPoints,
                 iceServers: this.config.iceServers,
-                metricsContext: this.config.metricsContext,
                 webrtcAllowPrivateAddresses: this.config.webrtcAllowPrivateAddresses,
                 webrtcDatachannelBufferThresholdLow: this.config.webrtcDatachannelBufferThresholdLow,
                 webrtcDatachannelBufferThresholdHigh: this.config.webrtcDatachannelBufferThresholdHigh,
                 webrtcNewConnectionTimeout: this.config.webrtcNewConnectionTimeout,
                 webrtcPortRange: this.config.webrtcPortRange,
-                maxConnections: this.config.maxConnections,
+                maxMessageSize: this.config.maxMessageSize,
                 tlsCertificate: this.config.tlsCertificate,
-                externalIp: this.config.externalIp
+                externalIp: this.config.externalIp,
+                createOwnPeerDescriptor: (connectivityResponse) => this.generatePeerDescriptorCallBack(connectivityResponse),
             };
             // If own PeerDescriptor is given in config, create a ConnectionManager with ws server
             if (this.config.peerDescriptor?.websocket) {
-                connectionManagerConfig.websocketHost = this.config.peerDescriptor.websocket.host;
-                connectionManagerConfig.websocketPortRange = {
+                connectorFacadeConfig.websocketHost = this.config.peerDescriptor.websocket.host;
+                connectorFacadeConfig.websocketPortRange = {
                     min: this.config.peerDescriptor.websocket.port,
                     max: this.config.peerDescriptor.websocket.port
                 };
                 // If websocketPortRange is given, create ws server using it, websocketHost can be undefined
             }
             else if (this.config.websocketPortRange) {
-                connectionManagerConfig.websocketHost = this.config.websocketHost;
-                connectionManagerConfig.websocketPortRange = this.config.websocketPortRange;
+                connectorFacadeConfig.websocketHost = this.config.websocketHost;
+                connectorFacadeConfig.websocketPortRange = this.config.websocketPortRange;
             }
-            const connectionManager = new ConnectionManager_1.ConnectionManager(connectionManagerConfig);
-            await connectionManager.start(this.generatePeerDescriptorCallBack);
+            const connectionManager = new ConnectionManager_1.ConnectionManager({
+                createConnectorFacade: () => new ConnectorFacade_1.DefaultConnectorFacade(connectorFacadeConfig),
+                maxConnections: this.config.maxConnections,
+                metricsContext: this.config.metricsContext
+            });
+            await connectionManager.start();
             this.connectionManager = connectionManager;
-            this.transportLayer = connectionManager;
+            this.transport = connectionManager;
         }
-        this.rpcCommunicator = new RoutingRpcCommunicator_1.RoutingRpcCommunicator(this.config.serviceId, this.transportLayer.send, { rpcRequestTimeout: this.config.rpcRequestTimeout });
-        this.transportLayer.on('message', (message) => this.handleMessage(message));
+        this.rpcCommunicator = new RoutingRpcCommunicator_1.RoutingRpcCommunicator(this.config.serviceId, this.transport.send, { rpcRequestTimeout: this.config.rpcRequestTimeout });
+        this.transport.on('message', (message) => this.handleMessage(message));
         this.bindDefaultServerMethods();
-        this.ownPeerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor);
-        this.initKBuckets(this.ownPeerId);
+        this.initKBuckets((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor));
         this.peerDiscovery = new PeerDiscovery_1.PeerDiscovery({
             rpcCommunicator: this.rpcCommunicator,
             ownPeerDescriptor: this.ownPeerDescriptor,
-            ownPeerId: this.ownPeerId,
             bucket: this.bucket,
             connections: this.connections,
             neighborList: this.neighborList,
             randomPeers: this.randomPeers,
             openInternetPeers: this.openInternetPeers,
             joinNoProgressLimit: this.config.joinNoProgressLimit,
-            getClosestContactsLimit: this.config.getClosestContactsLimit,
+            peerDiscoveryQueryBatchSize: this.config.peerDiscoveryQueryBatchSize,
             joinTimeout: this.config.dhtJoinTimeout,
             serviceId: this.config.serviceId,
             parallelism: this.config.joinParallelism,
@@ -211,7 +200,6 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             rpcCommunicator: this.rpcCommunicator,
             connections: this.connections,
             ownPeerDescriptor: this.ownPeerDescriptor,
-            ownPeerId: this.ownPeerId,
             addContact: this.addNewContact.bind(this),
             serviceId: this.config.serviceId,
             connectionManager: this.connectionManager
@@ -223,19 +211,18 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             connections: this.connections,
             ownPeerDescriptor: this.ownPeerDescriptor,
             serviceId: this.config.serviceId,
-            ownPeerId: this.ownPeerId,
             addContact: this.addNewContact.bind(this),
             isPeerCloserToIdThanSelf: this.isPeerCloserToIdThanSelf.bind(this),
             localDataStore: this.localDataStore
         });
-        this.dataStore = new DataStore_1.DataStore({
+        this.storeRpcLocal = new StoreRpcLocal_1.StoreRpcLocal({
             rpcCommunicator: this.rpcCommunicator,
             recursiveFinder: this.recursiveFinder,
             ownPeerDescriptor: this.ownPeerDescriptor,
             serviceId: this.config.serviceId,
             highestTtl: this.config.storeHighestTtl,
             maxTtl: this.config.storeMaxTtl,
-            numberOfCopies: this.config.storeNumberOfCopies,
+            redundancyFactor: this.config.storageRedundancyFactor,
             localDataStore: this.localDataStore,
             dhtNodeEmitter: this,
             getNodesClosestToIdFromBucket: (id, n) => {
@@ -244,39 +231,37 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         });
         (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)) {
+            && !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.entryPoints[0], this.ownPeerDescriptor)) {
             this.connectToEntryPoint(this.config.entryPoints[0]);
         }
     }
     onTransportConnected(peerDescriptor) {
-        if (this.ownPeerId.equals(PeerID_1.PeerID.fromValue(peerDescriptor.kademliaId))) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, peerDescriptor)) {
             logger.error('onTransportConnected() to self');
         }
-        const dhtPeer = new DhtPeer_1.DhtPeer(this.ownPeerDescriptor, peerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
-        if (!this.connections.has(PeerID_1.PeerID.fromValue(dhtPeer.id).toKey())) {
-            this.connections.set(PeerID_1.PeerID.fromValue(dhtPeer.id).toKey(), dhtPeer);
-            logger.trace(' ' + this.config.nodeName + ' connectionschange add ' + this.connections.size);
+        const remoteDhtNode = new RemoteDhtNode_1.RemoteDhtNode(this.ownPeerDescriptor, peerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
+        if (!this.connections.has(PeerID_1.PeerID.fromValue(remoteDhtNode.id).toKey())) {
+            this.connections.set(PeerID_1.PeerID.fromValue(remoteDhtNode.id).toKey(), remoteDhtNode);
+            logger.trace('connectionschange add ' + this.connections.size);
         }
         else {
             logger.trace('new connection not set to connections, there is already a connection with the peer ID');
         }
-        if (this.ownPeerDescriptor.nodeName === 'entrypoint') {
-            logger.trace('connected: ' + this.ownPeerDescriptor.nodeName + ', ' + peerDescriptor.nodeName + ' ' + this.connections.size);
-        }
+        logger.trace('connected: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor) + ' ' + this.connections.size);
         this.emit('connected', peerDescriptor);
     }
     onTransportDisconnected(peerDescriptor, dicsonnectionType) {
-        logger.trace('disconnected: ' + this.config.nodeName + ', ' + peerDescriptor.nodeName + ' ');
+        logger.trace('disconnected: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor));
         this.connections.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor));
         // only remove from bucket if we are on layer 0
         if (this.connectionManager) {
             this.bucket.remove(peerDescriptor.kademliaId);
             if (dicsonnectionType === 'OUTGOING_GRACEFUL_LEAVE' || dicsonnectionType === 'INCOMING_GRACEFUL_LEAVE') {
-                logger.trace(this.config.nodeName + ', ' + peerDescriptor.nodeName + ' ' + 'onTransportDisconnected with type ' + dicsonnectionType);
+                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with type ' + dicsonnectionType);
                 this.removeContact(peerDescriptor, true);
             }
             else {
-                logger.trace(this.config.nodeName + ', ' + peerDescriptor.nodeName + ' ' + 'onTransportDisconnected with type ' + dicsonnectionType);
+                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with type ' + dicsonnectionType);
             }
         }
         this.emit('disconnected', peerDescriptor, dicsonnectionType);
@@ -297,25 +282,24 @@ class DhtNode extends eventemitter3_1.EventEmitter {
     }
     handleMessage(message) {
         if (message.serviceId === this.config.serviceId) {
-            logger.trace('callig this.handleMessageFromPeer ' + this.config.nodeName + ', ' +
-                message.sourceDescriptor?.nodeName + ' ' + message.serviceId + ' ' + message.messageId);
+            logger.trace('callig this.handleMessageFromPeer ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(message.sourceDescriptor)
+                + ' ' + message.serviceId + ' ' + message.messageId);
             this.rpcCommunicator?.handleMessageFromPeer(message);
         }
         else {
-            logger.trace('emit "message" ' + this.config.nodeName + ', ' + message.sourceDescriptor?.nodeName +
-                ' ' + message.serviceId + ' ' + message.messageId);
+            logger.trace('emit "message" ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(message.sourceDescriptor) + ' ' + message.serviceId + ' ' + message.messageId);
             this.emit('message', message);
         }
     }
     getClosestPeerDescriptors(kademliaId, limit) {
         const closestPeers = this.bucket.closest(kademliaId, limit);
-        return closestPeers.map((dhtPeer) => dhtPeer.getPeerDescriptor());
+        return closestPeers.map((remoteDhtNode) => remoteDhtNode.getPeerDescriptor());
     }
     onKBucketPing(oldContacts, newContact) {
         if (this.stopped) {
             return;
         }
-        const sortingList = new SortedContactList_1.SortedContactList(this.ownPeerId, 100);
+        const sortingList = new SortedContactList_1.SortedContactList(this.getNodeId(), 100);
         sortingList.addContacts(oldContacts);
         const sortedContacts = sortingList.getAllContacts();
         this.connectionManager?.weakUnlockConnection(sortedContacts[sortedContacts.length - 1].getPeerDescriptor());
@@ -327,7 +311,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             return;
         }
         this.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
-        logger.trace(`Removed contact ${contact.getPeerId().value.toString()}`);
+        logger.trace(`Removed contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor())}`);
         this.emit('kbucketContactRemoved', contact.getPeerDescriptor());
         if (this.bucket.count() === 0
             && !this.peerDiscovery.isJoinOngoing()
@@ -342,23 +326,22 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (this.stopped) {
             return;
         }
-        this.contactOnAddedCounter++;
-        if (!this.stopped && !contact.getPeerId().equals(this.ownPeerId)) {
+        if (!this.stopped && !contact.getPeerId().equals(this.getNodeId())) {
             // Important to lock here, before the ping result is known
             this.connectionManager?.weakLockConnection(contact.getPeerDescriptor());
             if (this.connections.has(contact.getPeerId().toKey())) {
-                logger.trace(`Added new contact ${contact.getPeerId().value.toString()}`);
-                this.emit('newKbucketContact', contact.getPeerDescriptor(), this.neighborList.getClosestContacts(this.config.getClosestContactsLimit).map((peer) => peer.getPeerDescriptor()));
+                logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor())}`);
+                this.emit('newKbucketContact', contact.getPeerDescriptor(), this.neighborList.getClosestContacts(this.config.peerDiscoveryQueryBatchSize).map((peer) => peer.getPeerDescriptor()));
             }
             else { // open connection by pinging
-                logger.trace('starting ping ' + this.config.nodeName + ', ' + contact.getPeerDescriptor().nodeName + ' ');
+                logger.trace('starting ping ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor()));
                 contact.ping().then((result) => {
                     if (result) {
-                        logger.trace(`Added new contact ${contact.getPeerId().value.toString()}`);
-                        this.emit('newKbucketContact', contact.getPeerDescriptor(), this.neighborList.getClosestContacts(this.config.getClosestContactsLimit).map((peer) => peer.getPeerDescriptor()));
+                        logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor())}`);
+                        this.emit('newKbucketContact', contact.getPeerDescriptor(), this.neighborList.getClosestContacts(this.config.peerDiscoveryQueryBatchSize).map((peer) => peer.getPeerDescriptor()));
                     }
                     else {
-                        logger.trace('ping failed ' + this.config.nodeName + ', ' + contact.getPeerDescriptor().nodeName + ' ');
+                        logger.trace('ping failed ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor()));
                         this.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
                         this.removeContact(contact.getPeerDescriptor());
                         this.addClosestContactToBucket();
@@ -393,7 +376,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         return this.neighborList.getClosestContacts(maxCount).map((c) => c.getPeerDescriptor());
     }
     getNodeId() {
-        return this.ownPeerId;
+        return (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor);
     }
     getBucketSize() {
         return this.bucket.count();
@@ -402,24 +385,23 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (!this.started || this.stopped) {
             return;
         }
-        const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
-        if (!peerId.equals(this.ownPeerId)) {
-            logger.trace(`Adding new contact ${contact.kademliaId.toString()}`);
-            const dhtPeer = new DhtPeer_1.DhtPeer(this.ownPeerDescriptor, contact, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
+        if (!(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(contact, this.ownPeerDescriptor)) {
+            logger.trace(`Adding new contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact)}`);
+            const remoteDhtNode = new RemoteDhtNode_1.RemoteDhtNode(this.ownPeerDescriptor, contact, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtRpcServiceClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId);
             if (!this.bucket.get(contact.kademliaId) && !this.neighborList.getContact((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact))) {
-                this.neighborList.addContact(dhtPeer);
+                this.neighborList.addContact(remoteDhtNode);
                 if (contact.openInternet) {
-                    this.openInternetPeers.addContact(dhtPeer);
+                    this.openInternetPeers.addContact(remoteDhtNode);
                 }
                 if (setActive) {
+                    const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
                     this.neighborList.setActive(peerId);
                     this.openInternetPeers.setActive(peerId);
                 }
-                this.contactAddCounter++;
-                this.bucket.add(dhtPeer);
+                this.bucket.add(remoteDhtNode);
             }
             else {
-                this.randomPeers.addContact(dhtPeer);
+                this.randomPeers.addContact(remoteDhtNode);
             }
         }
     }
@@ -433,7 +415,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (!this.started || this.stopped) {
             return;
         }
-        logger.trace(`Removing contact ${contact.kademliaId.toString()}`);
+        logger.trace(`Removing contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact)}`);
         const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
         this.bucket.remove(peerId.value);
         this.neighborList.removeContact(peerId);
@@ -442,49 +424,53 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             this.openInternetPeers.removeContact(peerId);
         }
     }
-    async send(msg, _doNotConnect) {
+    async send(msg) {
         if (!this.started || this.stopped) {
             return;
         }
         const reachableThrough = this.peerDiscovery.isJoinOngoing() ? this.config.entryPoints || [] : [];
         await this.router.send(msg, reachableThrough);
     }
-    async joinDht(entryPointDescriptors, doRandomJoin, retry) {
+    async joinDht(entryPointDescriptors, doAdditionalRandomPeerDiscovery, retry) {
         if (!this.started) {
             throw new Error('Cannot join DHT before calling start() on DhtNode');
         }
-        await Promise.all(entryPointDescriptors.map((entryPoint) => this.peerDiscovery.joinDht(entryPoint, doRandomJoin, retry)));
+        await Promise.all(entryPointDescriptors.map((entryPoint) => this.peerDiscovery.joinDht(entryPoint, doAdditionalRandomPeerDiscovery, retry)));
     }
-    async startRecursiveFind(idToFind, findMode, excludedPeer) {
-        return this.recursiveFinder.startRecursiveFind(idToFind, findMode, excludedPeer);
+    async startRecursiveFind(idToFind, fetchData, excludedPeer) {
+        return this.recursiveFinder.startRecursiveFind(idToFind, fetchData, excludedPeer);
     }
     async storeDataToDht(key, data) {
-        if (this.isJoinOngoing() && this.config.entryPoints && this.config.entryPoints.length > 0) {
+        if (this.peerDiscovery.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);
+        return this.storeRpcLocal.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);
+        const rpcRemote = new ExternalApiRpcRemote_1.ExternalApiRpcRemote(this.ownPeerDescriptor, peer, this.config.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ExternalApiRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+        return await rpcRemote.storeData(key, data);
     }
     async getDataFromDht(idToFind) {
-        return this.recursiveFinder.startRecursiveFind(idToFind, DhtRpc_1.FindMode.DATA);
+        if (this.peerDiscovery.isJoinOngoing() && this.config.entryPoints && this.config.entryPoints.length > 0) {
+            return this.findDataViaPeer(idToFind, (0, lodash_1.sample)(this.config.entryPoints));
+        }
+        const result = await this.recursiveFinder.startRecursiveFind(idToFind, true);
+        return result.dataEntries ?? [];
     }
     async deleteDataFromDht(idToDelete) {
         if (!this.stopped) {
-            return this.dataStore.deleteDataFromDht(idToDelete);
+            return this.storeRpcLocal.deleteDataFromDht(idToDelete);
         }
     }
     async findDataViaPeer(idToFind, 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.findData(idToFind);
+        const rpcRemote = new ExternalApiRpcRemote_1.ExternalApiRpcRemote(this.ownPeerDescriptor, peer, this.config.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ExternalApiRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+        return await rpcRemote.findData(idToFind);
     }
     getRpcCommunicator() {
         return this.rpcCommunicator;
     }
     getTransport() {
-        return this.transportLayer;
+        return this.transport;
     }
     getPeerDescriptor() {
         return this.ownPeerDescriptor;
@@ -492,14 +478,8 @@ class DhtNode extends eventemitter3_1.EventEmitter {
     getAllConnectionPeerDescriptors() {
         return Array.from(this.connections.values()).map((peer) => peer.getPeerDescriptor());
     }
-    getK() {
-        return this.config.numberOfNodesPerKBucket;
-    }
     getKBucketPeers() {
-        return this.bucket.toArray().map((dhtPeer) => dhtPeer.getPeerDescriptor());
-    }
-    getOpenInternetPeerDescriptors() {
-        return this.openInternetPeers.getAllContacts().map((contact) => contact.getPeerDescriptor());
+        return this.bucket.toArray().map((remoteDhtNode) => remoteDhtNode.getPeerDescriptor());
     }
     getNumberOfConnections() {
         return this.connections.size;
@@ -513,15 +493,12 @@ class DhtNode extends eventemitter3_1.EventEmitter {
     getNumberOfWeakLockedConnections() {
         return this.connectionManager.getNumberOfWeakLockedConnections();
     }
-    isJoinOngoing() {
-        return this.peerDiscovery.isJoinOngoing();
+    async waitForNetworkConnectivity() {
+        await (0, utils_1.waitForCondition)(() => this.connections.size > 0, this.config.networkConnectivityTimeout);
     }
     hasJoined() {
         return this.peerDiscovery.isJoinCalled();
     }
-    getKnownEntryPoints() {
-        return this.config.entryPoints || [];
-    }
     async stop() {
         if (this.stopped || !this.started) {
             return;
@@ -531,7 +508,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (this.entryPointDisconnectTimeout) {
             clearTimeout(this.entryPointDisconnectTimeout);
         }
-        this.bucket.toArray().map((dhtPeer) => this.bucket.remove(dhtPeer.id));
+        this.bucket.toArray().forEach((remoteDhtNode) => this.bucket.remove(remoteDhtNode.id));
         this.bucket.removeAllListeners();
         this.localDataStore.clear();
         this.neighborList.stop();
@@ -544,7 +521,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (this.connectionManager) {
             await this.connectionManager.stop();
         }
-        this.transportLayer = undefined;
+        this.transport = undefined;
         this.connectionManager = undefined;
         this.connections.clear();
         this.removeAllListeners();
@@ -553,14 +530,14 @@ class DhtNode extends eventemitter3_1.EventEmitter {
     async getClosestPeers(request, context) {
         this.addNewContact(context.incomingSourceDescriptor);
         const response = {
-            peers: this.getClosestPeerDescriptors(request.kademliaId, this.config.getClosestContactsLimit),
+            peers: this.getClosestPeerDescriptors(request.kademliaId, this.config.peerDiscoveryQueryBatchSize),
             requestId: request.requestId
         };
         return response;
     }
     // IDHTRpcService implementation
     async ping(request, context) {
-        logger.trace('received ping request: ' + this.config.nodeName + ', ' + context.incomingSourceDescriptor?.nodeName);
+        logger.trace('received ping request: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(context.incomingSourceDescriptor));
         setImmediate(() => {
             this.addNewContact(context.incomingSourceDescriptor);
         });