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

package/dist/src/dht/DhtNode.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DhtNode = exports.createPeerDescriptor = void 0;
-const RemoteDhtNode_1 = require("./RemoteDhtNode");
+const DhtNodeRpcRemote_1 = require("./DhtNodeRpcRemote");
 const k_bucket_1 = __importDefault(require("k-bucket"));
 const eventemitter3_1 = require("eventemitter3");
 const SortedContactList_1 = require("./contact/SortedContactList");
@@ -18,16 +18,17 @@ const proto_rpc_1 = require("@streamr/proto-rpc");
 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 Finder_1 = require("./find/Finder");
 const StoreRpcLocal_1 = require("./store/StoreRpcLocal");
 const PeerDiscovery_1 = require("./discovery/PeerDiscovery");
 const LocalDataStore_1 = require("./store/LocalDataStore");
-const registerExternalApiRpcMethods_1 = require("./registerExternalApiRpcMethods");
 const ExternalApiRpcRemote_1 = require("./ExternalApiRpcRemote");
 const UUID_1 = require("../helpers/UUID");
 const isBrowserEnvironment_1 = require("../helpers/browser/isBrowserEnvironment");
 const lodash_1 = require("lodash");
 const ConnectorFacade_1 = require("../connection/ConnectorFacade");
+const DhtNodeRpcLocal_1 = require("./DhtNodeRpcLocal");
+const ExternalApiRpcLocal_1 = require("./ExternalApiRpcLocal");
 const logger = new utils_1.Logger(module);
 const createPeerDescriptor = (msg, peerId) => {
     let kademliaId;
@@ -41,7 +42,6 @@ const createPeerDescriptor = (msg, peerId) => {
     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;
     }
     return ret;
 };
@@ -53,54 +53,6 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         this.localDataStore = new LocalDataStore_1.LocalDataStore();
         this.started = false;
         this.stopped = false;
-        this.initKBuckets = (selfId) => {
-            this.bucket = new k_bucket_1.default({
-                localNodeId: selfId.value,
-                numberOfNodesPerKBucket: this.config.numberOfNodesPerKBucket,
-                numberOfNodesToPing: this.config.numberOfNodesPerKBucket
-            });
-            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', () => {
-                // TODO: Update contact info to the connection manager and reconnect
-            });
-            this.neighborList = new SortedContactList_1.SortedContactList(selfId, this.config.maxNeighborListSize);
-            this.neighborList.on('contactRemoved', (removedContact, activeContacts) => {
-                if (this.stopped) {
-                    return;
-                }
-                this.emit('contactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor()));
-                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.transport.on('connected', (peerDescriptor) => this.onTransportConnected(peerDescriptor));
-            this.transport.on('disconnected', (peerDescriptor, disonnectionType) => {
-                this.onTransportDisconnected(peerDescriptor, disonnectionType);
-            });
-            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((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())));
-            this.randomPeers.on('newContact', (newContact, activeContacts) => this.emit('newRandomContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
-        };
-        this.generatePeerDescriptorCallBack = (connectivityResponse) => {
-            if (this.config.peerDescriptor) {
-                this.ownPeerDescriptor = this.config.peerDescriptor;
-            }
-            else {
-                this.ownPeerDescriptor = (0, exports.createPeerDescriptor)(connectivityResponse, this.config.peerId);
-            }
-            return this.ownPeerDescriptor;
-        };
         this.config = (0, utils_1.merge)({
             serviceId: 'layer0',
             joinParallelism: 3,
@@ -134,7 +86,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         // If transport is given, do not create a ConnectionManager
         if (this.config.transport) {
             this.transport = this.config.transport;
-            this.ownPeerDescriptor = this.transport.getPeerDescriptor();
+            this.localPeerDescriptor = this.transport.getLocalPeerDescriptor();
             if (this.config.transport instanceof ConnectionManager_1.ConnectionManager) {
                 this.connectionManager = this.config.transport;
             }
@@ -150,9 +102,12 @@ class DhtNode extends eventemitter3_1.EventEmitter {
                 webrtcNewConnectionTimeout: this.config.webrtcNewConnectionTimeout,
                 webrtcPortRange: this.config.webrtcPortRange,
                 maxMessageSize: this.config.maxMessageSize,
+                websocketServerEnableTls: this.config.websocketServerEnableTls,
                 tlsCertificate: this.config.tlsCertificate,
                 externalIp: this.config.externalIp,
-                createOwnPeerDescriptor: (connectivityResponse) => this.generatePeerDescriptorCallBack(connectivityResponse),
+                autoCertifierUrl: this.config.autoCertifierUrl,
+                autoCertifierConfigFile: this.config.autoCertifierConfigFile,
+                createLocalPeerDescriptor: (connectivityResponse) => this.generatePeerDescriptorCallBack(connectivityResponse),
             };
             // If own PeerDescriptor is given in config, create a ConnectionManager with ws server
             if (this.config.peerDescriptor?.websocket) {
@@ -178,38 +133,35 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         }
         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.initKBuckets((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor));
+        this.initKBuckets((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor));
         this.peerDiscovery = new PeerDiscovery_1.PeerDiscovery({
             rpcCommunicator: this.rpcCommunicator,
-            ownPeerDescriptor: this.ownPeerDescriptor,
+            localPeerDescriptor: this.localPeerDescriptor,
             bucket: this.bucket,
-            connections: this.connections,
             neighborList: this.neighborList,
-            randomPeers: this.randomPeers,
-            openInternetPeers: this.openInternetPeers,
             joinNoProgressLimit: this.config.joinNoProgressLimit,
             peerDiscoveryQueryBatchSize: this.config.peerDiscoveryQueryBatchSize,
             joinTimeout: this.config.dhtJoinTimeout,
             serviceId: this.config.serviceId,
             parallelism: this.config.joinParallelism,
             addContact: this.addNewContact.bind(this),
-            connectionManager: this.connectionManager
+            connectionManager: this.connectionManager,
+            rpcRequestTimeout: this.config.rpcRequestTimeout
         });
         this.router = new Router_1.Router({
             rpcCommunicator: this.rpcCommunicator,
             connections: this.connections,
-            ownPeerDescriptor: this.ownPeerDescriptor,
+            localPeerDescriptor: this.localPeerDescriptor,
             addContact: this.addNewContact.bind(this),
             serviceId: this.config.serviceId,
             connectionManager: this.connectionManager
         });
-        this.recursiveFinder = new RecursiveFinder_1.RecursiveFinder({
+        this.finder = new Finder_1.Finder({
             rpcCommunicator: this.rpcCommunicator,
             router: this.router,
             sessionTransport: this,
             connections: this.connections,
-            ownPeerDescriptor: this.ownPeerDescriptor,
+            localPeerDescriptor: this.localPeerDescriptor,
             serviceId: this.config.serviceId,
             addContact: this.addNewContact.bind(this),
             isPeerCloserToIdThanSelf: this.isPeerCloserToIdThanSelf.bind(this),
@@ -217,8 +169,8 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         });
         this.storeRpcLocal = new StoreRpcLocal_1.StoreRpcLocal({
             rpcCommunicator: this.rpcCommunicator,
-            recursiveFinder: this.recursiveFinder,
-            ownPeerDescriptor: this.ownPeerDescriptor,
+            finder: this.finder,
+            localPeerDescriptor: this.localPeerDescriptor,
             serviceId: this.config.serviceId,
             highestTtl: this.config.storeHighestTtl,
             maxTtl: this.config.storeMaxTtl,
@@ -227,73 +179,130 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             dhtNodeEmitter: this,
             getNodesClosestToIdFromBucket: (id, n) => {
                 return this.bucket.closest(id, n);
-            }
+            },
+            rpcRequestTimeout: this.config.rpcRequestTimeout
         });
-        (0, registerExternalApiRpcMethods_1.registerExternalApiRpcMethods)(this);
+        this.bindRpcLocalMethods();
         if (this.connectionManager && this.config.entryPoints && this.config.entryPoints.length > 0
-            && !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.entryPoints[0], this.ownPeerDescriptor)) {
+            && !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.entryPoints[0], this.localPeerDescriptor)) {
             this.connectToEntryPoint(this.config.entryPoints[0]);
         }
     }
+    initKBuckets(selfId) {
+        this.bucket = new k_bucket_1.default({
+            localNodeId: selfId.value,
+            numberOfNodesPerKBucket: this.config.numberOfNodesPerKBucket,
+            numberOfNodesToPing: this.config.numberOfNodesPerKBucket
+        });
+        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', () => {
+            // TODO: Update contact info to the connection manager and reconnect
+        });
+        this.neighborList = new SortedContactList_1.SortedContactList(selfId, this.config.maxNeighborListSize);
+        this.neighborList.on('contactRemoved', (removedContact, activeContacts) => {
+            if (this.stopped) {
+                return;
+            }
+            this.emit('contactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor()));
+            this.randomPeers.addContact(new DhtNodeRpcRemote_1.DhtNodeRpcRemote(this.localPeerDescriptor, removedContact.getPeerDescriptor(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtNodeRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId, this.config.rpcRequestTimeout));
+        });
+        this.neighborList.on('newContact', (newContact, activeContacts) => this.emit('newContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+        this.transport.on('connected', (peerDescriptor) => this.onTransportConnected(peerDescriptor));
+        this.transport.on('disconnected', (peerDescriptor, gracefulLeave) => {
+            this.onTransportDisconnected(peerDescriptor, gracefulLeave);
+        });
+        this.transport.getAllConnectionPeerDescriptors().forEach((peer) => {
+            const rpcRemote = new DhtNodeRpcRemote_1.DhtNodeRpcRemote(this.localPeerDescriptor, peer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtNodeRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId, this.config.rpcRequestTimeout);
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(peer, this.localPeerDescriptor)) {
+                logger.error('own peerdescriptor added to connections in initKBucket');
+            }
+            this.connections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peer), rpcRemote);
+        });
+        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())));
+        this.randomPeers.on('newContact', (newContact, activeContacts) => this.emit('newRandomContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+    }
     onTransportConnected(peerDescriptor) {
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, peerDescriptor)) {
+        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, peerDescriptor)) {
             logger.error('onTransportConnected() to self');
         }
-        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);
+        const rpcRemote = new DhtNodeRpcRemote_1.DhtNodeRpcRemote(this.localPeerDescriptor, peerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtNodeRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId, this.config.rpcRequestTimeout);
+        if (!this.connections.has(PeerID_1.PeerID.fromValue(rpcRemote.id).toKey())) {
+            this.connections.set(PeerID_1.PeerID.fromValue(rpcRemote.id).toKey(), rpcRemote);
             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');
         }
-        logger.trace('connected: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor) + ' ' + this.connections.size);
+        logger.trace('connected: ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' ' + this.connections.size);
         this.emit('connected', peerDescriptor);
     }
-    onTransportDisconnected(peerDescriptor, dicsonnectionType) {
-        logger.trace('disconnected: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor));
+    onTransportDisconnected(peerDescriptor, gracefulLeave) {
+        logger.trace('disconnected: ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(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((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with type ' + dicsonnectionType);
-                this.removeContact(peerDescriptor, true);
+            if (gracefulLeave === true) {
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with gracefulLeave ' + gracefulLeave);
+                this.removeContact(peerDescriptor);
             }
             else {
-                logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with type ' + dicsonnectionType);
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with gracefulLeave ' + gracefulLeave);
             }
         }
-        this.emit('disconnected', peerDescriptor, dicsonnectionType);
+        this.emit('disconnected', peerDescriptor, gracefulLeave);
     }
-    bindDefaultServerMethods() {
+    bindRpcLocalMethods() {
         if (!this.started || this.stopped) {
             return;
         }
-        logger.trace(`Binding default DHT RPC methods`);
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.ClosestPeersRequest, DhtRpc_1.ClosestPeersResponse, 'getClosestPeers', (req, context) => this.getClosestPeers(req, context));
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.PingRequest, DhtRpc_1.PingResponse, 'ping', (req, context) => this.ping(req, context));
-        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.LeaveNotice, 'leaveNotice', (req, context) => this.leaveNotice(req, context));
+        const dhtNodeRpcLocal = new DhtNodeRpcLocal_1.DhtNodeRpcLocal({
+            bucket: this.bucket,
+            serviceId: this.config.serviceId,
+            peerDiscoveryQueryBatchSize: this.config.peerDiscoveryQueryBatchSize,
+            addNewContact: (contact) => this.addNewContact(contact),
+            removeContact: (contact) => this.removeContact(contact)
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.ClosestPeersRequest, DhtRpc_1.ClosestPeersResponse, 'getClosestPeers', (req, context) => dhtNodeRpcLocal.getClosestPeers(req, context));
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.PingRequest, DhtRpc_1.PingResponse, 'ping', (req, context) => dhtNodeRpcLocal.ping(req, context));
+        this.rpcCommunicator.registerRpcNotification(DhtRpc_1.LeaveNotice, 'leaveNotice', (req, context) => dhtNodeRpcLocal.leaveNotice(req, context));
+        const externalApiRpcLocal = new ExternalApiRpcLocal_1.ExternalApiRpcLocal({
+            startFind: (idToFind, fetchData, excludedPeer) => {
+                return this.startFind(idToFind, fetchData, excludedPeer);
+            },
+            storeDataToDht: (key, data) => this.storeDataToDht(key, data)
+        });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.ExternalFindDataRequest, DhtRpc_1.ExternalFindDataResponse, 'externalFindData', (req, context) => externalApiRpcLocal.externalFindData(req, context), { timeout: 10000 });
+        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.ExternalStoreDataRequest, DhtRpc_1.ExternalStoreDataResponse, 'externalStoreData', (req) => externalApiRpcLocal.externalStoreData(req), { timeout: 10000 });
     }
     isPeerCloserToIdThanSelf(peer1, compareToId) {
         const distance1 = this.bucket.distance(peer1.kademliaId, compareToId.value);
-        const distance2 = this.bucket.distance(this.ownPeerDescriptor.kademliaId, compareToId.value);
+        const distance2 = this.bucket.distance(this.localPeerDescriptor.kademliaId, compareToId.value);
         return distance1 < distance2;
     }
     handleMessage(message) {
         if (message.serviceId === this.config.serviceId) {
-            logger.trace('callig this.handleMessageFromPeer ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(message.sourceDescriptor)
+            logger.trace('callig this.handleMessageFromPeer ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(message.sourceDescriptor)
                 + ' ' + message.serviceId + ' ' + message.messageId);
             this.rpcCommunicator?.handleMessageFromPeer(message);
         }
         else {
-            logger.trace('emit "message" ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(message.sourceDescriptor) + ' ' + message.serviceId + ' ' + message.messageId);
+            logger.trace('emit "message" ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(message.sourceDescriptor)
+                + ' ' + message.serviceId + ' ' + message.messageId);
             this.emit('message', message);
         }
     }
-    getClosestPeerDescriptors(kademliaId, limit) {
-        const closestPeers = this.bucket.closest(kademliaId, limit);
-        return closestPeers.map((remoteDhtNode) => remoteDhtNode.getPeerDescriptor());
+    generatePeerDescriptorCallBack(connectivityResponse) {
+        if (this.config.peerDescriptor) {
+            this.localPeerDescriptor = this.config.peerDescriptor;
+        }
+        else {
+            this.localPeerDescriptor = (0, exports.createPeerDescriptor)(connectivityResponse, this.config.peerId);
+        }
+        return this.localPeerDescriptor;
     }
     onKBucketPing(oldContacts, newContact) {
         if (this.stopped) {
@@ -311,8 +320,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             return;
         }
         this.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
-        logger.trace(`Removed contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor())}`);
-        this.emit('kbucketContactRemoved', contact.getPeerDescriptor());
+        logger.trace(`Removed contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
         if (this.bucket.count() === 0
             && !this.peerDiscovery.isJoinOngoing()
             && this.config.entryPoints
@@ -326,22 +334,20 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (this.stopped) {
             return;
         }
-        if (!this.stopped && !contact.getPeerId().equals(this.getNodeId())) {
+        if (!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 ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor())}`);
-                this.emit('newKbucketContact', contact.getPeerDescriptor(), this.neighborList.getClosestContacts(this.config.peerDiscoveryQueryBatchSize).map((peer) => peer.getPeerDescriptor()));
+                logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
             }
             else { // open connection by pinging
-                logger.trace('starting ping ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor()));
+                logger.trace('starting ping ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()));
                 contact.ping().then((result) => {
                     if (result) {
-                        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()));
+                        logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
                     }
                     else {
-                        logger.trace('ping failed ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact.getPeerDescriptor()));
+                        logger.trace('ping failed ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()));
                         this.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
                         this.removeContact(contact.getPeerDescriptor());
                         this.addClosestContactToBucket();
@@ -376,7 +382,7 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         return this.neighborList.getClosestContacts(maxCount).map((c) => c.getPeerDescriptor());
     }
     getNodeId() {
-        return (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor);
+        return (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor);
     }
     getBucketSize() {
         return this.bucket.count();
@@ -385,23 +391,19 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (!this.started || this.stopped) {
             return;
         }
-        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 (!(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(contact, this.localPeerDescriptor)) {
+            logger.trace(`Adding new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact)}`);
+            const rpcRemote = new DhtNodeRpcRemote_1.DhtNodeRpcRemote(this.localPeerDescriptor, contact, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtNodeRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.config.serviceId, this.config.rpcRequestTimeout);
             if (!this.bucket.get(contact.kademliaId) && !this.neighborList.getContact((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact))) {
-                this.neighborList.addContact(remoteDhtNode);
-                if (contact.openInternet) {
-                    this.openInternetPeers.addContact(remoteDhtNode);
-                }
+                this.neighborList.addContact(rpcRemote);
                 if (setActive) {
                     const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
                     this.neighborList.setActive(peerId);
-                    this.openInternetPeers.setActive(peerId);
                 }
-                this.bucket.add(remoteDhtNode);
+                this.bucket.add(rpcRemote);
             }
             else {
-                this.randomPeers.addContact(remoteDhtNode);
+                this.randomPeers.addContact(rpcRemote);
             }
         }
     }
@@ -411,24 +413,21 @@ class DhtNode extends eventemitter3_1.EventEmitter {
             this.connectionManager.unlockConnection(entryPoint, 'temporary-layer0-connection');
         }, 10 * 1000);
     }
-    removeContact(contact, removeFromOpenInternetPeers = false) {
+    removeContact(contact) {
         if (!this.started || this.stopped) {
             return;
         }
-        logger.trace(`Removing contact ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(contact)}`);
+        logger.trace(`Removing contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact)}`);
         const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
         this.bucket.remove(peerId.value);
         this.neighborList.removeContact(peerId);
         this.randomPeers.removeContact(peerId);
-        if (removeFromOpenInternetPeers) {
-            this.openInternetPeers.removeContact(peerId);
-        }
     }
     async send(msg) {
         if (!this.started || this.stopped) {
             return;
         }
-        const reachableThrough = this.peerDiscovery.isJoinOngoing() ? this.config.entryPoints || [] : [];
+        const reachableThrough = this.peerDiscovery.isJoinOngoing() ? this.config.entryPoints ?? [] : [];
         await this.router.send(msg, reachableThrough);
     }
     async joinDht(entryPointDescriptors, doAdditionalRandomPeerDiscovery, retry) {
@@ -437,8 +436,8 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         }
         await Promise.all(entryPointDescriptors.map((entryPoint) => this.peerDiscovery.joinDht(entryPoint, doAdditionalRandomPeerDiscovery, retry)));
     }
-    async startRecursiveFind(idToFind, fetchData, excludedPeer) {
-        return this.recursiveFinder.startRecursiveFind(idToFind, fetchData, excludedPeer);
+    async startFind(idToFind, fetchData, excludedPeer) {
+        return this.finder.startFind(idToFind, fetchData, excludedPeer);
     }
     async storeDataToDht(key, data) {
         if (this.peerDiscovery.isJoinOngoing() && this.config.entryPoints && this.config.entryPoints.length > 0) {
@@ -447,14 +446,14 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         return this.storeRpcLocal.storeDataToDht(key, data);
     }
     async storeDataViaPeer(key, data, peer) {
-        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())));
+        const rpcRemote = new ExternalApiRpcRemote_1.ExternalApiRpcRemote(this.localPeerDescriptor, 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) {
         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);
+        const result = await this.finder.startFind(idToFind, true);
         return result.dataEntries ?? [];
     }
     async deleteDataFromDht(idToDelete) {
@@ -463,23 +462,20 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         }
     }
     async findDataViaPeer(idToFind, peer) {
-        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;
+        const rpcRemote = new ExternalApiRpcRemote_1.ExternalApiRpcRemote(this.localPeerDescriptor, peer, this.config.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.ExternalApiRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+        return await rpcRemote.externalFindData(idToFind);
     }
     getTransport() {
         return this.transport;
     }
-    getPeerDescriptor() {
-        return this.ownPeerDescriptor;
+    getLocalPeerDescriptor() {
+        return this.localPeerDescriptor;
     }
     getAllConnectionPeerDescriptors() {
         return Array.from(this.connections.values()).map((peer) => peer.getPeerDescriptor());
     }
     getKBucketPeers() {
-        return this.bucket.toArray().map((remoteDhtNode) => remoteDhtNode.getPeerDescriptor());
+        return this.bucket.toArray().map((rpcRemote) => rpcRemote.getPeerDescriptor());
     }
     getNumberOfConnections() {
         return this.connections.size;
@@ -508,52 +504,28 @@ class DhtNode extends eventemitter3_1.EventEmitter {
         if (this.entryPointDisconnectTimeout) {
             clearTimeout(this.entryPointDisconnectTimeout);
         }
-        this.bucket.toArray().forEach((remoteDhtNode) => this.bucket.remove(remoteDhtNode.id));
+        this.bucket.toArray().forEach((rpcRemote) => {
+            rpcRemote.leaveNotice();
+            this.bucket.remove(rpcRemote.id);
+        });
         this.bucket.removeAllListeners();
         this.localDataStore.clear();
         this.neighborList.stop();
         this.randomPeers.stop();
-        this.openInternetPeers.stop();
         this.rpcCommunicator.stop();
         this.router.stop();
-        this.recursiveFinder.stop();
+        this.finder.stop();
         this.peerDiscovery.stop();
-        if (this.connectionManager) {
-            await this.connectionManager.stop();
+        if (this.config.transport === undefined) {
+            // if the transport was not given in config, the instance was created in start() and 
+            // this component is responsible for stopping it
+            await this.transport.stop();
         }
         this.transport = undefined;
         this.connectionManager = undefined;
         this.connections.clear();
         this.removeAllListeners();
     }
-    // IDHTRpcService implementation
-    async getClosestPeers(request, context) {
-        this.addNewContact(context.incomingSourceDescriptor);
-        const response = {
-            peers: this.getClosestPeerDescriptors(request.kademliaId, this.config.peerDiscoveryQueryBatchSize),
-            requestId: request.requestId
-        };
-        return response;
-    }
-    // IDHTRpcService implementation
-    async ping(request, context) {
-        logger.trace('received ping request: ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(context.incomingSourceDescriptor));
-        setImmediate(() => {
-            this.addNewContact(context.incomingSourceDescriptor);
-        });
-        const response = {
-            requestId: request.requestId
-        };
-        return response;
-    }
-    // IDHTRpcService implementation
-    async leaveNotice(request, context) {
-        // TODO check signature??
-        if (request.serviceId === this.config.serviceId) {
-            this.removeContact(context.incomingSourceDescriptor);
-        }
-        return {};
-    }
 }
 exports.DhtNode = DhtNode;
 //# sourceMappingURL=DhtNode.js.map