@streamr/dht 100.0.0-pretestnet.4 → 100.0.0-testnet-one.0

package/dist/src/dht/DhtNodeRpcRemote.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DhtNodeRpcRemote = void 0;
 const uuid_1 = require("uuid");
 const utils_1 = require("@streamr/utils");
-const Remote_1 = require("./contact/Remote");
+const RpcRemote_1 = require("./contact/RpcRemote");
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
-class DhtNodeRpcRemote extends Remote_1.Remote {
+class DhtNodeRpcRemote extends RpcRemote_1.RpcRemote {
     constructor(localPeerDescriptor, peerDescriptor, client, serviceId, rpcRequestTimeout) {
         super(localPeerDescriptor, peerDescriptor, serviceId, client, rpcRequestTimeout);
         this.id = this.getPeerId().value;
         this.vectorClock = DhtNodeRpcRemote.counter++;
     }
-    async getClosestPeers(kademliaId) {
+    async getClosestPeers(nodeId) {
         logger.trace(`Requesting getClosestPeers on ${this.getServiceId()} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())}`);
         const request = {
-            kademliaId,
+            nodeId,
             requestId: (0, uuid_1.v4)()
         };
         try {

package/dist/src/dht/DhtNodeRpcRemote.js.map

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

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

@@ -1,16 +1,16 @@
 import { IExternalApiRpc } from '../proto/packages/dht/protos/DhtRpc.server';
-import { ExternalFindDataRequest, ExternalFindDataResponse, ExternalStoreDataRequest, ExternalStoreDataResponse, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { ExternalFindDataRequest, ExternalFindDataResponse, ExternalStoreDataRequest, ExternalStoreDataResponse, FindAction, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { FindResult } from './find/Finder';
 import { Any } from '../proto/google/protobuf/any';
 interface ExternalApiRpcLocalConfig {
-    startFind: (idToFind: Uint8Array, fetchData: boolean, excludedPeer: PeerDescriptor) => Promise<FindResult>;
-    storeDataToDht: (key: Uint8Array, data: Any) => Promise<PeerDescriptor[]>;
+    startFind: (idToFind: Uint8Array, action: FindAction, excludedPeer: PeerDescriptor) => Promise<FindResult>;
+    storeDataToDht: (key: Uint8Array, data: Any, creator: PeerDescriptor) => Promise<PeerDescriptor[]>;
 }
 export declare class ExternalApiRpcLocal implements IExternalApiRpc {
     private readonly config;
     constructor(config: ExternalApiRpcLocalConfig);
     externalFindData(findDataRequest: ExternalFindDataRequest, context: ServerCallContext): Promise<ExternalFindDataResponse>;
-    externalStoreData(request: ExternalStoreDataRequest): Promise<ExternalStoreDataResponse>;
+    externalStoreData(request: ExternalStoreDataRequest, context: ServerCallContext): Promise<ExternalStoreDataResponse>;
 }
 export {};

package/dist/src/dht/ExternalApiRpcLocal.js

@@ -8,19 +8,12 @@ class ExternalApiRpcLocal {
     }
     async externalFindData(findDataRequest, context) {
         const senderPeerDescriptor = context.incomingSourceDescriptor;
-        const result = await this.config.startFind(findDataRequest.kademliaId, true, senderPeerDescriptor);
-        if (result.dataEntries) {
-            return DhtRpc_1.ExternalFindDataResponse.create({ dataEntries: result.dataEntries });
-        }
-        else {
-            return DhtRpc_1.ExternalFindDataResponse.create({
-                dataEntries: [],
-                error: 'Could not find data with the given key'
-            });
-        }
+        const result = await this.config.startFind(findDataRequest.key, DhtRpc_1.FindAction.FETCH_DATA, senderPeerDescriptor);
+        return DhtRpc_1.ExternalFindDataResponse.create({ entries: result.dataEntries ?? [] });
     }
-    async externalStoreData(request) {
-        const result = await this.config.storeDataToDht(request.key, request.data);
+    async externalStoreData(request, context) {
+        const senderPeerDescriptor = context.incomingSourceDescriptor;
+        const result = await this.config.storeDataToDht(request.key, request.data, senderPeerDescriptor);
         return DhtRpc_1.ExternalStoreDataResponse.create({
             storers: result
         });

package/dist/src/dht/ExternalApiRpcLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalApiRpcLocal.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcLocal.ts"],"names":[],"mappings":";;;AACA,gEAM4C;AAW5C,MAAa,mBAAmB;IAI5B,YAAY,MAAiC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,eAAwC,EAAE,OAA0B;QACvF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAA;QAClG,IAAI,MAAM,CAAC,WAAW,EAAE;YACpB,OAAO,iCAAwB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;SAC9E;aAAM;YACH,OAAO,iCAAwB,CAAC,MAAM,CAAC;gBACnC,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,wCAAwC;aAClD,CAAC,CAAA;SACL;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAiC;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAK,CAAC,CAAA;QAC3E,OAAO,kCAAyB,CAAC,MAAM,CAAC;YACpC,OAAO,EAAE,MAAM;SAClB,CAAC,CAAA;IACN,CAAC;CACJ;AA3BD,kDA2BC"}
+{"version":3,"file":"ExternalApiRpcLocal.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcLocal.ts"],"names":[],"mappings":";;;AACA,gEAO4C;AAW5C,MAAa,mBAAmB;IAI5B,YAAY,MAAiC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,eAAwC,EAAE,OAA0B;QACvF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,mBAAU,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAA;QAC5G,OAAO,iCAAwB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAA;IACjF,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAiC,EAAE,OAA0B;QACjF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAK,EAAE,oBAAoB,CAAC,CAAA;QACjG,OAAO,kCAAyB,CAAC,MAAM,CAAC;YACpC,OAAO,EAAE,MAAM;SAClB,CAAC,CAAA;IACN,CAAC;CACJ;AArBD,kDAqBC"}

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

@@ -1,8 +1,8 @@
 import { Any } from '../proto/google/protobuf/any';
 import { DataEntry, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { IExternalApiRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
-import { Remote } from './contact/Remote';
-export declare class ExternalApiRpcRemote extends Remote<IExternalApiRpcClient> {
-    externalFindData(idToFind: Uint8Array): Promise<DataEntry[]>;
+import { RpcRemote } from './contact/RpcRemote';
+export declare class ExternalApiRpcRemote extends RpcRemote<IExternalApiRpcClient> {
+    externalFindData(key: Uint8Array): Promise<DataEntry[]>;
     storeData(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
 }

package/dist/src/dht/ExternalApiRpcRemote.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalApiRpcRemote = void 0;
-const Remote_1 = require("./contact/Remote");
-class ExternalApiRpcRemote extends Remote_1.Remote {
-    async externalFindData(idToFind) {
+const RpcRemote_1 = require("./contact/RpcRemote");
+class ExternalApiRpcRemote extends RpcRemote_1.RpcRemote {
+    async externalFindData(key) {
         const request = {
-            kademliaId: idToFind
+            key
         };
         const options = this.formDhtRpcOptions({
             timeout: 10000
         });
         try {
             const data = await this.getClient().externalFindData(request, options);
-            return data.dataEntries;
+            return data.entries;
         }
         catch (err) {
             return [];

package/dist/src/dht/ExternalApiRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAGA,6CAAyC;AAEzC,MAAa,oBAAqB,SAAQ,eAA6B;IAEnE,KAAK,CAAC,gBAAgB,CAAC,QAAoB;QACvC,MAAM,OAAO,GAA4B;YACrC,UAAU,EAAE,QAAQ;SACvB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,WAAW,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG;YACH,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;CACJ;AAhCD,oDAgCC"}
+{"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAGA,mDAA+C;AAE/C,MAAa,oBAAqB,SAAQ,qBAAgC;IAEtE,KAAK,CAAC,gBAAgB,CAAC,GAAe;QAClC,MAAM,OAAO,GAA4B;YACrC,GAAG;SACN,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,OAAO,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG;YACH,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;CACJ;AAhCD,oDAgCC"}

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

@@ -0,0 +1,48 @@
+import KBucket from 'k-bucket';
+import { PeerID, PeerIDKey } from '../helpers/PeerID';
+import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { DhtNodeRpcRemote } from './DhtNodeRpcRemote';
+import { SortedContactList } from './contact/SortedContactList';
+import { ConnectionManager } from '../connection/ConnectionManager';
+import EventEmitter from 'eventemitter3';
+interface PeerManagerConfig {
+    numberOfNodesPerKBucket: number;
+    maxNeighborListSize: number;
+    peerDiscoveryQueryBatchSize: number;
+    ownPeerId: PeerID;
+    connectionManager: ConnectionManager;
+    isLayer0: boolean;
+    createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => DhtNodeRpcRemote;
+}
+export interface PeerManagerEvents {
+    newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    newRandomContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    randomContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    kBucketEmpty: () => void;
+}
+export declare class PeerManager extends EventEmitter<PeerManagerEvents> {
+    bucket?: KBucket<DhtNodeRpcRemote>;
+    readonly connections: Map<PeerIDKey, DhtNodeRpcRemote>;
+    neighborList?: SortedContactList<DhtNodeRpcRemote>;
+    private randomPeers?;
+    private readonly config;
+    private stopped;
+    constructor(config: PeerManagerConfig);
+    private initKBuckets;
+    private onKBucketPing;
+    private onKBucketRemoved;
+    private onKBucketAdded;
+    private addClosestContactToBucket;
+    private getClosestActiveContactNotInBucket;
+    handleConnected(peerDescriptor: PeerDescriptor): void;
+    handleDisconnected(peerDescriptor: PeerDescriptor, gracefulLeave: boolean): void;
+    handlePeerLeaving(peerDescriptor: PeerDescriptor): void;
+    private removeContact;
+    stop(): void;
+    getNumberOfConnections(): number;
+    handlePeerActive(peerId: PeerID): void;
+    handlePeerUnresponsive(peerId: PeerID): void;
+    handleNewPeers(contacts: PeerDescriptor[], setActive?: boolean): void;
+}
+export {};

package/dist/src/dht/PeerManager.js

@@ -0,0 +1,208 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PeerManager = void 0;
+const utils_1 = require("@streamr/utils");
+const k_bucket_1 = __importDefault(require("k-bucket"));
+const PeerID_1 = require("../helpers/PeerID");
+const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
+const RandomContactList_1 = require("./contact/RandomContactList");
+const SortedContactList_1 = require("./contact/SortedContactList");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const logger = new utils_1.Logger(module);
+class PeerManager extends eventemitter3_1.default {
+    constructor(config) {
+        super();
+        // TODO make private
+        this.connections = new Map();
+        this.stopped = false;
+        this.config = config;
+        this.initKBuckets();
+    }
+    initKBuckets() {
+        this.bucket = new k_bucket_1.default({
+            localNodeId: this.config.ownPeerId.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(this.config.ownPeerId, 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(this.config.createDhtNodeRpcRemote(removedContact.getPeerDescriptor()));
+        });
+        this.neighborList.on('newContact', (newContact, activeContacts) => this.emit('newContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+        this.randomPeers = new RandomContactList_1.RandomContactList(this.config.ownPeerId, 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())));
+    }
+    onKBucketPing(oldContacts, newContact) {
+        if (this.stopped) {
+            return;
+        }
+        const sortingList = new SortedContactList_1.SortedContactList(this.config.ownPeerId, 100);
+        sortingList.addContacts(oldContacts);
+        const sortedContacts = sortingList.getAllContacts();
+        this.config.connectionManager?.weakUnlockConnection(sortedContacts[sortedContacts.length - 1].getPeerDescriptor());
+        this.bucket?.remove(sortedContacts[sortedContacts.length - 1].getPeerId().value);
+        this.bucket.add(newContact);
+    }
+    onKBucketRemoved(contact) {
+        if (this.stopped) {
+            return;
+        }
+        this.config.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
+        logger.trace(`Removed contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
+        if (this.bucket.count() === 0) {
+            this.emit('kBucketEmpty');
+        }
+    }
+    onKBucketAdded(contact) {
+        if (this.stopped) {
+            return;
+        }
+        if (!contact.getPeerId().equals(this.config.ownPeerId)) {
+            // Important to lock here, before the ping result is known
+            this.config.connectionManager?.weakLockConnection(contact.getPeerDescriptor());
+            if (this.connections.has(contact.getPeerId().toKey())) {
+                logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
+            }
+            else { // open connection by pinging
+                logger.trace('starting ping ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()));
+                contact.ping().then((result) => {
+                    if (result) {
+                        logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
+                    }
+                    else {
+                        logger.trace('ping failed ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()));
+                        this.config.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
+                        this.removeContact(contact.getPeerDescriptor());
+                        this.addClosestContactToBucket();
+                    }
+                    return;
+                }).catch((_e) => {
+                    this.config.connectionManager?.weakUnlockConnection(contact.getPeerDescriptor());
+                    this.removeContact(contact.getPeerDescriptor());
+                    this.addClosestContactToBucket();
+                });
+            }
+        }
+    }
+    addClosestContactToBucket() {
+        if (this.stopped) {
+            return;
+        }
+        const closest = this.getClosestActiveContactNotInBucket();
+        if (closest) {
+            this.handleNewPeers([closest.getPeerDescriptor()]);
+        }
+    }
+    getClosestActiveContactNotInBucket() {
+        for (const contactId of this.neighborList.getContactIds()) {
+            if (!this.bucket.get(contactId.value) && this.neighborList.isActive(contactId)) {
+                return this.neighborList.getContact(contactId).contact;
+            }
+        }
+        return undefined;
+    }
+    handleConnected(peerDescriptor) {
+        if (PeerID_1.PeerID.fromValue(peerDescriptor.nodeId).equals(this.config.ownPeerId)) {
+            logger.error('handleConnected() to self');
+        }
+        const rpcRemote = this.config.createDhtNodeRpcRemote(peerDescriptor);
+        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.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' ' + this.connections.size);
+    }
+    handleDisconnected(peerDescriptor, gracefulLeave) {
+        logger.trace('disconnected: ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
+        this.connections.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor));
+        if (this.config.isLayer0) {
+            this.bucket.remove(peerDescriptor.nodeId);
+            if (gracefulLeave === true) {
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with gracefulLeave ' + gracefulLeave);
+                this.removeContact(peerDescriptor);
+            }
+            else {
+                logger.trace((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor) + ' ' + 'onTransportDisconnected with gracefulLeave ' + gracefulLeave);
+            }
+        }
+    }
+    handlePeerLeaving(peerDescriptor) {
+        this.removeContact(peerDescriptor);
+    }
+    removeContact(contact) {
+        if (this.stopped) {
+            return;
+        }
+        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);
+    }
+    stop() {
+        this.stopped = true;
+        this.bucket.toArray().forEach((rpcRemote) => {
+            rpcRemote.leaveNotice();
+            this.bucket.remove(rpcRemote.id);
+        });
+        this.bucket.removeAllListeners();
+        this.neighborList.stop();
+        this.randomPeers.stop();
+        this.connections.clear();
+    }
+    getNumberOfConnections() {
+        return this.connections.size;
+    }
+    handlePeerActive(peerId) {
+        this.neighborList.setActive(peerId);
+    }
+    handlePeerUnresponsive(peerId) {
+        this.bucket.remove(peerId.value);
+        this.neighborList.removeContact(peerId);
+    }
+    handleNewPeers(contacts, setActive = false) {
+        if (this.stopped) {
+            return;
+        }
+        contacts.forEach((contact) => {
+            if (!PeerID_1.PeerID.fromValue(contact.nodeId).equals(this.config.ownPeerId)) {
+                logger.trace(`Adding new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact)}`);
+                const rpcRemote = this.config.createDhtNodeRpcRemote(contact);
+                if ((this.bucket.get(contact.nodeId) === null)
+                    && (this.neighborList.getContact((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact)) === undefined)) {
+                    this.neighborList.addContact(rpcRemote);
+                    if (setActive) {
+                        const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
+                        this.neighborList.setActive(peerId);
+                    }
+                    this.bucket.add(rpcRemote);
+                }
+                else {
+                    this.randomPeers.addContact(rpcRemote);
+                }
+                if (this.neighborList.getContact(rpcRemote.getPeerId()) !== undefined) {
+                    this.neighborList.addContact(rpcRemote);
+                }
+            }
+        });
+    }
+}
+exports.PeerManager = PeerManager;
+//# sourceMappingURL=PeerManager.js.map

package/dist/src/dht/PeerManager.js.map

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

package/dist/src/dht/contact/ContactList.d.ts

@@ -19,7 +19,7 @@ export declare class ContactList<C extends {
     protected maxSize: number;
     protected defaultContactQueryLimit: number;
     constructor(ownId: PeerID, maxSize: number, defaultContactQueryLimit?: number);
-    getContact(id: PeerID): ContactState<C>;
+    getContact(id: PeerID): ContactState<C> | undefined;
     getSize(): number;
     clear(): void;
     stop(): void;

package/dist/src/dht/contact/ContactList.js

@@ -17,6 +17,7 @@ class ContactList extends eventemitter3_1.default {
     constructor(ownId, maxSize, defaultContactQueryLimit = 20) {
         super();
         this.contactsById = new Map();
+        // TODO move this to SortedContactList
         this.contactIds = [];
         this.ownId = ownId;
         this.maxSize = maxSize;

package/dist/src/dht/contact/ContactList.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/ContactList.ts"],"names":[],"mappings":";;;;;;AACA,kEAAwC;AAExC,MAAa,YAAY;IAKrB,YAAY,OAAU;QAJf,cAAS,GAAG,KAAK,CAAA;QACjB,WAAM,GAAG,KAAK,CAAA;QAIjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AARD,oCAQC;AAOD,MAAa,WAAmD,SAAQ,uBAAuB;IAQ3F,YACI,KAAa,EACb,OAAe,EACf,wBAAwB,GAAG,EAAE;QAE7B,KAAK,EAAE,CAAA;QAXD,iBAAY,GAAoC,IAAI,GAAG,EAAE,CAAA;QACzD,eAAU,GAAa,EAAE,CAAA;QAW/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;IAC5D,CAAC;IAEM,UAAU,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAE,CAAA;IAC7C,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;CACJ;AApCD,kCAoCC"}
+{"version":3,"file":"ContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/ContactList.ts"],"names":[],"mappings":";;;;;;AACA,kEAAwC;AAExC,MAAa,YAAY;IAKrB,YAAY,OAAU;QAJf,cAAS,GAAG,KAAK,CAAA;QACjB,WAAM,GAAG,KAAK,CAAA;QAIjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AARD,oCAQC;AAOD,MAAa,WAAmD,SAAQ,uBAAuB;IAS3F,YACI,KAAa,EACb,OAAe,EACf,wBAAwB,GAAG,EAAE;QAE7B,KAAK,EAAE,CAAA;QAZD,iBAAY,GAAoC,IAAI,GAAG,EAAE,CAAA;QACnE,sCAAsC;QAC5B,eAAU,GAAa,EAAE,CAAA;QAW/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;IAC5D,CAAC;IAEM,UAAU,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;IAC5C,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;CACJ;AArCD,kCAqCC"}

package/dist/src/dht/contact/{Remote.d.ts → RpcRemote.d.ts}

@@ -3,13 +3,13 @@ import { ProtoRpcClient } from '@streamr/proto-rpc';
 import { DhtRpcOptions } from '../../rpc-protocol/DhtRpcOptions';
 import { ServiceID } from '../../types/ServiceID';
 export declare const EXISTING_CONNECTION_TIMEOUT = 5000;
-export declare abstract class Remote<T> {
+export declare abstract class RpcRemote<T> {
     private readonly localPeerDescriptor;
     private readonly remotePeerDescriptor;
     private readonly serviceId;
     private readonly client;
-    private readonly rpcTimeout?;
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, client: ProtoRpcClient<T>, rpcTimeout?: number);
+    private readonly timeout?;
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, client: ProtoRpcClient<T>, timeout?: number);
     getPeerDescriptor(): PeerDescriptor;
     getLocalPeerDescriptor(): PeerDescriptor;
     getServiceId(): string;

package/dist/src/dht/contact/{Remote.js → RpcRemote.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Remote = exports.EXISTING_CONNECTION_TIMEOUT = void 0;
+exports.RpcRemote = exports.EXISTING_CONNECTION_TIMEOUT = void 0;
 const IConnection_1 = require("../../connection/IConnection");
 const Connectivity_1 = require("../../helpers/Connectivity");
 // Should connect directly to the server, timeout can be low
@@ -12,7 +12,7 @@ const WEBSOCKET_SERVER_TIMEOUT = 7500;
 const WEBRTC_TIMEOUT = 15000;
 // default timeout for existing connections
 exports.EXISTING_CONNECTION_TIMEOUT = 5000;
-const getRpcTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
+const getTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
     const connectionType = (0, Connectivity_1.expectedConnectionType)(localPeerDescriptor, remotePeerDescriptor);
     if (connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT) {
         return WEBSOCKET_CLIENT_TIMEOUT;
@@ -25,13 +25,13 @@ const getRpcTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
     }
     return WEBRTC_TIMEOUT;
 };
-class Remote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client, rpcTimeout) {
+class RpcRemote {
+    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client, timeout) {
         this.localPeerDescriptor = localPeerDescriptor;
         this.remotePeerDescriptor = remotePeerDescriptor;
         this.client = client;
         this.serviceId = serviceId;
-        this.rpcTimeout = rpcTimeout;
+        this.timeout = timeout;
     }
     getPeerDescriptor() {
         return this.remotePeerDescriptor;
@@ -49,10 +49,10 @@ class Remote {
         return {
             sourceDescriptor: this.localPeerDescriptor,
             targetDescriptor: this.remotePeerDescriptor,
-            timeout: this.rpcTimeout ?? getRpcTimeout(this.localPeerDescriptor, this.remotePeerDescriptor),
+            timeout: this.timeout ?? getTimeout(this.localPeerDescriptor, this.remotePeerDescriptor),
             ...opts
         };
     }
 }
-exports.Remote = Remote;
-//# sourceMappingURL=Remote.js.map
+exports.RpcRemote = RpcRemote;
+//# sourceMappingURL=RpcRemote.js.map

package/dist/src/dht/contact/RpcRemote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/contact/RpcRemote.ts"],"names":[],"mappings":";;;AAIA,8DAA6D;AAC7D,6DAAmE;AAEnE,4DAA4D;AAC5D,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,uGAAuG;AACvG,kDAAkD;AAClD,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,sFAAsF;AACtF,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B,2CAA2C;AAC9B,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAE/C,MAAM,UAAU,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAU,EAAE;IACrG,MAAM,cAAc,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IACxF,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,SAAS;IAQ3B,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,MAAyB,EACzB,OAAgB;QAEhB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YACxF,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AA9CD,8BA8CC"}

package/dist/src/dht/discovery/DiscoverySession.d.ts

@@ -1,20 +1,13 @@
-import { RpcCommunicator } from '@streamr/proto-rpc';
-import KBucket from 'k-bucket';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { SortedContactList } from '../contact/SortedContactList';
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
-import { ServiceID } from '../../types/ServiceID';
+import { PeerManager } from '../PeerManager';
 interface DiscoverySessionConfig {
-    bucket: KBucket<DhtNodeRpcRemote>;
-    neighborList: SortedContactList<DhtNodeRpcRemote>;
     targetId: Uint8Array;
     localPeerDescriptor: PeerDescriptor;
-    serviceId: ServiceID;
-    rpcCommunicator: RpcCommunicator;
     parallelism: number;
     noProgressLimit: number;
-    newContactListener?: (rpcRemote: DhtNodeRpcRemote) => void;
-    rpcRequestTimeout?: number;
+    peerManager: PeerManager;
 }
 export declare class DiscoverySession {
     readonly sessionId: string;

package/dist/src/dht/discovery/DiscoverySession.js

@@ -4,12 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiscoverySession = void 0;
-const proto_rpc_1 = require("@streamr/proto-rpc");
 const utils_1 = require("@streamr/utils");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const uuid_1 = require("uuid");
-const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
-const DhtNodeRpcRemote_1 = require("../DhtNodeRpcRemote");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const logger = new utils_1.Logger(module);
 class DiscoverySession {
@@ -26,17 +23,7 @@ class DiscoverySession {
         if (this.stopped) {
             return;
         }
-        contacts.forEach((contact) => {
-            if (!(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(contact, this.config.localPeerDescriptor)) {
-                const rpcRemote = new DhtNodeRpcRemote_1.DhtNodeRpcRemote(this.config.localPeerDescriptor, contact, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.DhtNodeRpcClient(this.config.rpcCommunicator.getRpcClientTransport())), this.config.serviceId, this.config.rpcRequestTimeout);
-                if (this.config.newContactListener) {
-                    this.config.newContactListener(rpcRemote);
-                }
-                if (!this.config.neighborList.getContact(rpcRemote.getPeerId())) {
-                    this.config.neighborList.addContact(rpcRemote);
-                }
-            }
-        });
+        this.config.peerManager.handleNewPeers(contacts);
     }
     async getClosestPeersFromContact(contact) {
         if (this.stopped) {
@@ -44,9 +31,9 @@ class DiscoverySession {
         }
         logger.trace(`Getting closest peers from contact: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
         this.outgoingClosestPeersRequestsCounter++;
-        this.config.neighborList.setContacted(contact.getPeerId());
+        this.config.peerManager.neighborList.setContacted(contact.getPeerId());
         const returnedContacts = await contact.getClosestPeers(this.config.targetId);
-        this.config.neighborList.setActive(contact.getPeerId());
+        this.config.peerManager.handlePeerActive(contact.getPeerId());
         return returnedContacts;
     }
     onClosestPeersRequestSucceeded(peerId, contacts) {
@@ -54,9 +41,9 @@ class DiscoverySession {
             return;
         }
         this.ongoingClosestPeersRequests.delete(peerId.toKey());
-        const oldClosestContact = this.config.neighborList.getClosestContactId();
+        const oldClosestContact = this.config.peerManager.neighborList.getClosestContactId();
         this.addNewContacts(contacts);
-        if (this.config.neighborList.getClosestContactId().equals(oldClosestContact)) {
+        if (this.config.peerManager.neighborList.getClosestContactId().equals(oldClosestContact)) {
             this.noProgressCounter++;
         }
         else {
@@ -68,14 +55,13 @@ class DiscoverySession {
             return;
         }
         this.ongoingClosestPeersRequests.delete(peer.getPeerId().toKey());
-        this.config.bucket.remove(peer.getPeerId().value);
-        this.config.neighborList.removeContact(peer.getPeerId());
+        this.config.peerManager.handlePeerUnresponsive(peer.getPeerId());
     }
     findMoreContacts() {
         if (this.stopped) {
             return;
         }
-        const uncontacted = this.config.neighborList.getUncontactedContacts(this.config.parallelism);
+        const uncontacted = this.config.peerManager.neighborList.getUncontactedContacts(this.config.parallelism);
         if (uncontacted.length === 0 || this.noProgressCounter >= this.config.noProgressLimit) {
             this.emitter.emit('discoveryCompleted');
             this.stopped = true;
@@ -97,13 +83,13 @@ class DiscoverySession {
         }
     }
     async findClosestNodes(timeout) {
-        if (this.config.neighborList.getUncontactedContacts(this.config.parallelism).length === 0) {
-            logger.trace('getUncontactedContacts length was 0 in beginning of discovery, this.neighborList.size: '
-                + this.config.neighborList.getSize());
-            return this.config.neighborList;
+        if (this.config.peerManager.neighborList.getUncontactedContacts(this.config.parallelism).length === 0) {
+            logger.trace('getUncontactedContacts length was 0 in beginning of discovery, neighborList.size: '
+                + this.config.peerManager.neighborList.getSize());
+            return this.config.peerManager.neighborList;
         }
         await (0, utils_1.runAndWaitForEvents3)([this.findMoreContacts.bind(this)], [[this.emitter, 'discoveryCompleted']], timeout);
-        return this.config.neighborList;
+        return this.config.peerManager.neighborList;
     }
     stop() {
         this.stopped = true;