@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-rc.1

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

@@ -1,36 +1,26 @@
-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';
+import { DhtAddress } from '../../identifiers';
 interface DiscoverySessionConfig {
-    bucket: KBucket<DhtNodeRpcRemote>;
-    neighborList: SortedContactList<DhtNodeRpcRemote>;
-    targetId: Uint8Array;
-    localPeerDescriptor: PeerDescriptor;
-    serviceId: ServiceID;
-    rpcCommunicator: RpcCommunicator;
+    targetId: DhtAddress;
     parallelism: number;
     noProgressLimit: number;
-    newContactListener?: (rpcRemote: DhtNodeRpcRemote) => void;
-    rpcRequestTimeout?: number;
+    peerManager: PeerManager;
+    contactedPeers: Set<DhtAddress>;
 }
 export declare class DiscoverySession {
-    readonly sessionId: string;
+    readonly id: string;
     private stopped;
     private emitter;
-    private outgoingClosestPeersRequestsCounter;
     private noProgressCounter;
     private ongoingClosestPeersRequests;
     private readonly config;
     constructor(config: DiscoverySessionConfig);
-    private addNewContacts;
+    private addContacts;
     private getClosestPeersFromContact;
     private onClosestPeersRequestSucceeded;
     private onClosestPeersRequestFailed;
     private findMoreContacts;
-    findClosestNodes(timeout: number): Promise<SortedContactList<DhtNodeRpcRemote>>;
+    findClosestNodes(timeout: number): Promise<void>;
     stop(): void;
 }
 export {};

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

@@ -4,78 +4,65 @@ 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 PeerManager_1 = require("../PeerManager");
+const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 class DiscoverySession {
+    id = (0, uuid_1.v4)();
+    stopped = false;
+    emitter = new eventemitter3_1.default();
+    noProgressCounter = 0;
+    ongoingClosestPeersRequests = new Set();
+    config;
     constructor(config) {
-        this.sessionId = (0, uuid_1.v4)();
-        this.stopped = false;
-        this.emitter = new eventemitter3_1.default();
-        this.outgoingClosestPeersRequestsCounter = 0;
-        this.noProgressCounter = 0;
-        this.ongoingClosestPeersRequests = new Set();
         this.config = config;
     }
-    addNewContacts(contacts) {
+    addContacts(contacts) {
         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.addContact(contacts);
     }
     async getClosestPeersFromContact(contact) {
         if (this.stopped) {
             return [];
         }
-        logger.trace(`Getting closest peers from contact: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
-        this.outgoingClosestPeersRequestsCounter++;
-        this.config.neighborList.setContacted(contact.getPeerId());
+        logger.trace(`Getting closest peers from contact: ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
+        this.config.contactedPeers.add(contact.getNodeId());
         const returnedContacts = await contact.getClosestPeers(this.config.targetId);
-        this.config.neighborList.setActive(contact.getPeerId());
+        this.config.peerManager.setContactActive(contact.getNodeId());
         return returnedContacts;
     }
-    onClosestPeersRequestSucceeded(peerId, contacts) {
-        if (!this.ongoingClosestPeersRequests.has(peerId.toKey())) {
+    onClosestPeersRequestSucceeded(nodeId, contacts) {
+        if (!this.ongoingClosestPeersRequests.has(nodeId)) {
             return;
         }
-        this.ongoingClosestPeersRequests.delete(peerId.toKey());
-        const oldClosestContact = this.config.neighborList.getClosestContactId();
-        this.addNewContacts(contacts);
-        if (this.config.neighborList.getClosestContactId().equals(oldClosestContact)) {
+        this.ongoingClosestPeersRequests.delete(nodeId);
+        const targetId = (0, identifiers_1.getRawFromDhtAddress)(this.config.targetId);
+        const oldClosestNeighbor = this.config.peerManager.getClosestNeighborsTo(this.config.targetId, 1)[0];
+        const oldClosestDistance = (0, PeerManager_1.getDistance)(targetId, (0, identifiers_1.getRawFromDhtAddress)(oldClosestNeighbor.getNodeId()));
+        this.addContacts(contacts);
+        const newClosestNeighbor = this.config.peerManager.getClosestNeighborsTo(this.config.targetId, 1)[0];
+        const newClosestDistance = (0, PeerManager_1.getDistance)(targetId, (0, identifiers_1.getRawFromDhtAddress)(newClosestNeighbor.getNodeId()));
+        if (newClosestDistance >= oldClosestDistance) {
             this.noProgressCounter++;
         }
-        else {
-            this.noProgressCounter = 0;
-        }
     }
     onClosestPeersRequestFailed(peer) {
-        if (!this.ongoingClosestPeersRequests.has(peer.getPeerId().toKey())) {
+        if (!this.ongoingClosestPeersRequests.has(peer.getNodeId())) {
             return;
         }
-        this.ongoingClosestPeersRequests.delete(peer.getPeerId().toKey());
-        this.config.bucket.remove(peer.getPeerId().value);
-        this.config.neighborList.removeContact(peer.getPeerId());
+        this.ongoingClosestPeersRequests.delete(peer.getNodeId());
+        this.config.peerManager.removeContact(peer.getNodeId());
     }
     findMoreContacts() {
         if (this.stopped) {
             return;
         }
-        const uncontacted = this.config.neighborList.getUncontactedContacts(this.config.parallelism);
+        const uncontacted = this.config.peerManager.getClosestContactsTo(this.config.targetId, this.config.parallelism, this.config.contactedPeers);
         if (uncontacted.length === 0 || this.noProgressCounter >= this.config.noProgressLimit) {
             this.emitter.emit('discoveryCompleted');
             this.stopped = true;
@@ -85,25 +72,22 @@ class DiscoverySession {
             if (this.ongoingClosestPeersRequests.size >= this.config.parallelism) {
                 break;
             }
-            this.ongoingClosestPeersRequests.add(nextPeer.getPeerId().toKey());
+            this.ongoingClosestPeersRequests.add(nextPeer.getNodeId());
             // eslint-disable-next-line promise/catch-or-return
             this.getClosestPeersFromContact(nextPeer)
-                .then((contacts) => this.onClosestPeersRequestSucceeded(nextPeer.getPeerId(), contacts))
+                .then((contacts) => this.onClosestPeersRequestSucceeded(nextPeer.getNodeId(), contacts))
                 .catch(() => this.onClosestPeersRequestFailed(nextPeer))
                 .finally(() => {
-                this.outgoingClosestPeersRequestsCounter--;
                 this.findMoreContacts();
             });
         }
     }
     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.getContactCount(this.config.contactedPeers) === 0) {
+            return;
         }
+        // TODO add abortController and signal it in stop()
         await (0, utils_1.runAndWaitForEvents3)([this.findMoreContacts.bind(this)], [[this.emitter, 'discoveryCompleted']], timeout);
-        return this.config.neighborList;
     }
     stop() {
         this.stopped = true;

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

@@ -1 +1 @@
-{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA6D;AAC7D,kEAAwC;AACxC,+BAAyB;AAEzB,gDAAyD;AAEzD,mDAAiG;AAEjG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAejC,MAAa,gBAAgB;IAET,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACjB,OAAO,GAAG,KAAK,CAAA;IACf,OAAO,GAAG,IAAI,uBAAY,EAA0B,CAAA;IACpD,iBAAiB,GAAG,CAAC,CAAA;IACrB,2BAA2B,GAAoB,IAAI,GAAG,EAAE,CAAA;IAC/C,MAAM,CAAwB;IAE/C,YAAY,MAA8B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEO,WAAW,CAAC,QAA0B;QAC1C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,OAAyB;QAC9D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,EAAE,CAAA;QACb,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAA,yCAA2B,EAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC/G,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QACnD,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC5E,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC7D,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEO,8BAA8B,CAAC,MAAkB,EAAE,QAA0B;QACjF,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,OAAM;QACV,CAAC;QACD,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/C,MAAM,QAAQ,GAAG,IAAA,kCAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACpG,MAAM,kBAAkB,GAAG,IAAA,yBAAW,EAAC,QAAQ,EAAE,IAAA,kCAAoB,EAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;QACtG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAC1B,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACpG,MAAM,kBAAkB,GAAG,IAAA,yBAAW,EAAC,QAAQ,EAAE,IAAA,kCAAoB,EAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;QACtG,IAAI,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;YAC3C,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC5B,CAAC;IACL,CAAC;IAEO,2BAA2B,CAAC,IAAsB;QACtD,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YAC1D,OAAM;QACV,CAAC;QACD,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;QACzD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;IAC3D,CAAC;IAEO,gBAAgB;QACpB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAC5D,IAAI,CAAC,MAAM,CAAC,QAAQ,EACpB,IAAI,CAAC,MAAM,CAAC,WAAW,EACvB,IAAI,CAAC,MAAM,CAAC,cAAc,CAC7B,CAAA;QACD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACpF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;YACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YACnB,OAAM;QACV,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,WAAW,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,2BAA2B,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;gBACnE,MAAK;YACT,CAAC;YACD,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAA;YAC1D,mDAAmD;YACnD,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC;iBACpC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;iBACvF,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;iBACvD,OAAO,CAAC,GAAG,EAAE;gBACV,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC3B,CAAC,CAAC,CAAA;QACV,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAAe;QACzC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5E,OAAM;QACV,CAAC;QACD,mDAAmD;QACnD,MAAM,IAAA,4BAAoB,EACtB,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAClC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,EACtC,OAAO,CACV,CAAA;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACvC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAA;IACrC,CAAC;CACJ;AArGD,4CAqGC"}

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

@@ -1,36 +1,40 @@
-import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import KBucket from 'k-bucket';
-import { SortedContactList } from '../contact/SortedContactList';
 import { ConnectionManager } from '../../connection/ConnectionManager';
-import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
+import { PeerManager } from '../PeerManager';
+import { DhtAddress } from '../../identifiers';
 import { ServiceID } from '../../types/ServiceID';
 interface PeerDiscoveryConfig {
-    rpcCommunicator: RoutingRpcCommunicator;
     localPeerDescriptor: PeerDescriptor;
-    bucket: KBucket<DhtNodeRpcRemote>;
-    neighborList: SortedContactList<DhtNodeRpcRemote>;
     joinNoProgressLimit: number;
     peerDiscoveryQueryBatchSize: number;
     serviceId: ServiceID;
     parallelism: number;
     joinTimeout: number;
-    addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
     connectionManager?: ConnectionManager;
-    rpcRequestTimeout?: number;
+    peerManager: PeerManager;
 }
+export declare const createDistantDhtAddress: (address: DhtAddress) => DhtAddress;
 export declare class PeerDiscovery {
-    private readonly config;
     private ongoingDiscoverySessions;
+    private ongoingRingDiscoverySessions;
     private rejoinOngoing;
     private joinCalled;
-    private rejoinTimeoutRef?;
     private readonly abortController;
     private recoveryIntervalStarted;
+    private readonly config;
     constructor(config: PeerDiscoveryConfig);
-    joinDht(entryPointDescriptor: PeerDescriptor, doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
+    joinDht(entryPoints: PeerDescriptor[], doAdditionalDistantPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
+    joinThroughEntryPoint(entryPointDescriptor: PeerDescriptor, contactedPeers: Set<DhtAddress>, additionalDistantJoin: {
+        enabled: true;
+        contactedPeers: Set<DhtAddress>;
+    } | {
+        enabled: false;
+    }, retry?: boolean): Promise<void>;
+    joinRing(): Promise<void>;
     private createSession;
+    private createRingSession;
     private runSessions;
+    private runRingSessions;
     rejoinDht(entryPoint: PeerDescriptor): Promise<void>;
     private ensureRecoveryIntervalIsRunning;
     private fetchClosestPeersFromBucket;

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

@@ -1,60 +1,87 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PeerDiscovery = void 0;
+exports.PeerDiscovery = exports.createDistantDhtAddress = void 0;
 const DiscoverySession_1 = require("./DiscoverySession");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const utils_1 = require("@streamr/utils");
-const kademliaId_1 = require("../../helpers/kademliaId");
+const identifiers_1 = require("../../identifiers");
+const RingDiscoverySession_1 = require("./RingDiscoverySession");
+const ringIdentifiers_1 = require("../contact/ringIdentifiers");
+const createDistantDhtAddress = (address) => {
+    const raw = (0, identifiers_1.getRawFromDhtAddress)(address);
+    const flipped = raw.map((val) => ~val);
+    return (0, identifiers_1.getDhtAddressFromRaw)(flipped);
+};
+exports.createDistantDhtAddress = createDistantDhtAddress;
 const logger = new utils_1.Logger(module);
 class PeerDiscovery {
+    ongoingDiscoverySessions = new Map();
+    ongoingRingDiscoverySessions = new Map();
+    rejoinOngoing = false;
+    joinCalled = false;
+    abortController;
+    recoveryIntervalStarted = false;
+    config;
     constructor(config) {
-        this.ongoingDiscoverySessions = new Map();
-        this.rejoinOngoing = false;
-        this.joinCalled = false;
-        this.recoveryIntervalStarted = false;
         this.config = config;
         this.abortController = new AbortController();
     }
-    async joinDht(entryPointDescriptor, doAdditionalRandomPeerDiscovery = true, retry = true) {
+    async joinDht(entryPoints, doAdditionalDistantPeerDiscovery = true, retry = true) {
+        const contactedPeers = new Set();
+        const distantJoinConfig = doAdditionalDistantPeerDiscovery
+            ? { enabled: true, contactedPeers: new Set() } : { enabled: false };
+        await Promise.all(entryPoints.map((entryPoint) => this.joinThroughEntryPoint(entryPoint, contactedPeers, distantJoinConfig, retry)));
+    }
+    async joinThroughEntryPoint(entryPointDescriptor, 
+    // Note that this set is mutated by DiscoverySession
+    contactedPeers, additionalDistantJoin, retry = true) {
         if (this.isStopped()) {
             return;
         }
         this.joinCalled = true;
         logger.debug(`Joining ${this.config.serviceId === 'layer0' ? 'The Streamr Network' : `Control Layer for ${this.config.serviceId}`}`
-            + ` via entrypoint ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(entryPointDescriptor)}`);
-        if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.localPeerDescriptor)) {
+            + ` via entrypoint ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(entryPointDescriptor)}`);
+        if ((0, identifiers_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.localPeerDescriptor)) {
             return;
         }
         this.config.connectionManager?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
-        this.config.addContact(entryPointDescriptor);
-        const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value;
-        const closest = this.config.bucket.closest(targetId, this.config.peerDiscoveryQueryBatchSize);
-        this.config.neighborList.addContacts(closest);
-        const sessions = [this.createSession(targetId)];
-        if (doAdditionalRandomPeerDiscovery) {
-            sessions.push(this.createSession((0, kademliaId_1.createRandomKademliaId)()));
+        this.config.peerManager.addContact([entryPointDescriptor]);
+        const targetId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
+        const sessions = [this.createSession(targetId, contactedPeers)];
+        if (additionalDistantJoin.enabled) {
+            sessions.push(this.createSession((0, exports.createDistantDhtAddress)(targetId), additionalDistantJoin.contactedPeers));
         }
         await this.runSessions(sessions, entryPointDescriptor, retry);
         this.config.connectionManager?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
     }
-    createSession(targetId) {
+    async joinRing() {
+        const contactedPeers = new Set();
+        const sessions = [this.createRingSession((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.config.localPeerDescriptor), contactedPeers)];
+        await this.runRingSessions(sessions);
+    }
+    createSession(targetId, contactedPeers) {
         const sessionOptions = {
-            bucket: this.config.bucket,
-            neighborList: this.config.neighborList,
             targetId,
-            localPeerDescriptor: this.config.localPeerDescriptor,
-            serviceId: this.config.serviceId,
-            rpcCommunicator: this.config.rpcCommunicator,
             parallelism: this.config.parallelism,
             noProgressLimit: this.config.joinNoProgressLimit,
-            newContactListener: (newPeer) => this.config.addContact(newPeer.getPeerDescriptor())
+            peerManager: this.config.peerManager,
+            contactedPeers
         };
         return new DiscoverySession_1.DiscoverySession(sessionOptions);
     }
+    createRingSession(targetId, contactedPeers) {
+        const sessionOptions = {
+            targetId,
+            parallelism: this.config.parallelism,
+            noProgressLimit: this.config.joinNoProgressLimit,
+            peerManager: this.config.peerManager,
+            contactedPeers
+        };
+        return new RingDiscoverySession_1.RingDiscoverySession(sessionOptions);
+    }
     async runSessions(sessions, entryPointDescriptor, retry) {
         try {
             for (const session of sessions) {
-                this.ongoingDiscoverySessions.set(session.sessionId, session);
+                this.ongoingDiscoverySessions.set(session.id, session);
                 await session.findClosestNodes(this.config.joinTimeout);
             }
         }
@@ -63,8 +90,10 @@ class PeerDiscovery {
         }
         finally {
             if (!this.isStopped()) {
-                if (this.config.bucket.count() === 0) {
+                if (this.config.peerManager.getNeighborCount() === 0) {
                     if (retry) {
+                        // TODO should we catch possible promise rejection?
+                        // TODO use config option or named constant?
                         (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPointDescriptor), 1000, this.abortController.signal);
                     }
                 }
@@ -72,7 +101,21 @@ class PeerDiscovery {
                     await this.ensureRecoveryIntervalIsRunning();
                 }
             }
-            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.sessionId));
+            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
+        }
+    }
+    async runRingSessions(sessions) {
+        try {
+            for (const session of sessions) {
+                this.ongoingRingDiscoverySessions.set(session.id, session);
+                await session.findClosestNodes(this.config.joinTimeout);
+            }
+        }
+        catch (_e) {
+            logger.debug(`Ring join on ${this.config.serviceId} timed out`);
+        }
+        finally {
+            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
         }
     }
     async rejoinDht(entryPoint) {
@@ -82,13 +125,14 @@ class PeerDiscovery {
         logger.debug(`Rejoining DHT ${this.config.serviceId}`);
         this.rejoinOngoing = true;
         try {
-            this.config.neighborList.clear();
-            await this.joinDht(entryPoint);
+            await this.joinThroughEntryPoint(entryPoint, new Set(), { enabled: false });
             logger.debug(`Rejoined DHT successfully ${this.config.serviceId}!`);
         }
         catch (err) {
             logger.warn(`Rejoining DHT ${this.config.serviceId} failed`);
             if (!this.isStopped()) {
+                // TODO should we catch possible promise rejection?
+                // TODO use config option or named constant?
                 (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPoint), 5000, this.abortController.signal);
             }
         }
@@ -99,6 +143,7 @@ class PeerDiscovery {
     async ensureRecoveryIntervalIsRunning() {
         if (!this.recoveryIntervalStarted) {
             this.recoveryIntervalStarted = true;
+            // TODO use config option or named constant?
             await (0, utils_1.scheduleAtInterval)(() => this.fetchClosestPeersFromBucket(), 60000, true, this.abortController.signal);
         }
     }
@@ -106,12 +151,11 @@ class PeerDiscovery {
         if (this.isStopped()) {
             return;
         }
-        const nodes = this.config.bucket.closest((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value, this.config.parallelism);
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
+        const nodes = this.config.peerManager.getClosestNeighborsTo(localNodeId, this.config.parallelism);
         await Promise.allSettled(nodes.map(async (peer) => {
-            const contacts = await peer.getClosestPeers(this.config.localPeerDescriptor.kademliaId);
-            contacts.forEach((contact) => {
-                this.config.addContact(contact);
-            });
+            const contacts = await peer.getClosestPeers(localNodeId);
+            this.config.peerManager.addContact(contacts);
         }));
     }
     isJoinOngoing() {
@@ -125,11 +169,10 @@ class PeerDiscovery {
     }
     stop() {
         this.abortController.abort();
-        if (this.rejoinTimeoutRef) {
-            clearTimeout(this.rejoinTimeoutRef);
-            this.rejoinTimeoutRef = undefined;
-        }
-        this.ongoingDiscoverySessions.forEach((session, _id) => {
+        this.ongoingDiscoverySessions.forEach((session) => {
+            session.stop();
+        });
+        this.ongoingRingDiscoverySessions.forEach((session) => {
             session.stop();
         });
     }

package/dist/src/dht/discovery/PeerDiscovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"PeerDiscovery.js","sourceRoot":"","sources":["../../../../src/dht/discovery/PeerDiscovery.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AAErD,qFAAuI;AAEvI,0CAAgF;AAKhF,yDAAiE;AAkBjE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,aAAa;IAUtB,YAAY,MAA2B;QAP/B,6BAAwB,GAAkC,IAAI,GAAG,EAAE,CAAA;QACnE,kBAAa,GAAG,KAAK,CAAA;QACrB,eAAU,GAAG,KAAK,CAAA;QAGlB,4BAAuB,GAAG,KAAK,CAAA;QAGnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,oBAAoC,EAAE,+BAA+B,GAAG,IAAI,EAAE,KAAK,GAAG,IAAI;QACpG,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;YAClB,OAAM;SACT;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;QACtB,MAAM,CAAC,KAAK,CACR,WAAW,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE;cACpH,mBAAmB,IAAA,sDAA2B,EAAC,oBAAoB,CAAC,EAAE,CAC3E,CAAA;QACD,IAAI,IAAA,kDAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;YAChF,OAAM;SACT;QACD,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC,oBAAoB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,WAAW,CAAC,CAAA;QACxG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAG,IAAA,mDAAwB,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAA;QAChF,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAA;QAC7F,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QAC7C,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/C,IAAI,+BAA+B,EAAE;YACjC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAA,mCAAsB,GAAE,CAAC,CAAC,CAAA;SAC9D;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAA;QAC7D,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,WAAW,CAAC,CAAA;IAE9G,CAAC;IAEO,aAAa,CAAC,QAAoB;QACtC,MAAM,cAAc,GAAG;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACtC,QAAQ;YACR,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YACpD,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAChC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YAC5C,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YAChD,kBAAkB,EAAE,CAAC,OAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;SACzG,CAAA;QACD,OAAO,IAAI,mCAAgB,CAAC,cAAc,CAAC,CAAA;IAC/C,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,QAA4B,EAAE,oBAAoC,EAAE,KAAc;QACxG,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC5B,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBAC7D,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;aAC1D;SACJ;QAAC,OAAO,EAAE,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,CAAA;SACjE;gBAAS;YACN,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;gBACnB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;oBAClC,IAAI,KAAK,EAAE;wBACP,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;qBACrG;iBACJ;qBAAM;oBACH,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAA;iBAC/C;aACJ;YACD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;SACzF;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,UAA0B;QAC7C,IAAI,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE;YACxC,OAAM;SACT;QACD,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QACtD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QACzB,IAAI;YACA,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;YAChC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAC9B,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAA;SACtE;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,CAAA;YAC5D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;gBACnB,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;aAC3F;SACJ;gBAAS;YACN,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;SAC7B;IACL,CAAC;IAEO,KAAK,CAAC,+BAA+B;QACzC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE;YAC/B,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAA;YACnC,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SAC/G;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACrC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;YAClB,OAAM;SACT;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,mDAAwB,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAClI,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAsB,EAAE,EAAE;YAChE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAA;YACvF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YACnC,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEM,aAAa;QAChB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,GAAG,CAAC,CAAA;IAC3E,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IAEO,SAAS;QACb,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAA;IAC9C,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5B,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAA;SACpC;QACD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YACnD,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AA5ID,sCA4IC"}
+{"version":3,"file":"PeerDiscovery.js","sourceRoot":"","sources":["../../../../src/dht/discovery/PeerDiscovery.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,29 @@
+import { PeerManager } from '../PeerManager';
+import { DhtAddress } from '../../identifiers';
+import { RingIdRaw } from '../contact/ringIdentifiers';
+interface RingDiscoverySessionConfig {
+    targetId: RingIdRaw;
+    parallelism: number;
+    noProgressLimit: number;
+    peerManager: PeerManager;
+    contactedPeers: Set<DhtAddress>;
+}
+export declare class RingDiscoverySession {
+    readonly id: string;
+    private stopped;
+    private emitter;
+    private noProgressCounter;
+    private ongoingClosestPeersRequests;
+    private readonly config;
+    private numContactedPeers;
+    private targetIdAsRingId;
+    constructor(config: RingDiscoverySessionConfig);
+    private addContacts;
+    private getClosestPeersFromContact;
+    private onClosestPeersRequestSucceeded;
+    private onClosestPeersRequestFailed;
+    private findMoreContacts;
+    findClosestNodes(timeout: number): Promise<void>;
+    stop(): void;
+}
+export {};