@streamr/dht 100.2.5-beta.1 → 101.0.0-beta.0

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

@@ -7,6 +7,7 @@ const getClosestNodes_1 = require("../contact/getClosestNodes");
 const ringIdentifiers_1 = require("../contact/ringIdentifiers");
 const DiscoverySession_1 = require("./DiscoverySession");
 const RingDiscoverySession_1 = require("./RingDiscoverySession");
+const DhtNode_1 = require("../DhtNode");
 const createDistantDhtAddress = (address) => {
     const raw = (0, identifiers_1.getRawFromDhtAddress)(address);
     const flipped = raw.map((val) => ~val);
@@ -20,15 +21,15 @@ class PeerDiscovery {
     rejoinOngoing = false;
     joinCalled = false;
     recoveryIntervalStarted = false;
-    config;
-    constructor(config) {
-        this.config = config;
+    options;
+    constructor(options) {
+        this.options = options;
     }
     async joinDht(entryPoints, doAdditionalDistantPeerDiscovery = true, retry = true) {
         const contactedPeers = new Set();
-        const distantJoinConfig = doAdditionalDistantPeerDiscovery
+        const distantJoinOptions = doAdditionalDistantPeerDiscovery
             ? { enabled: true, contactedPeers: new Set() } : { enabled: false };
-        await Promise.all(entryPoints.map((entryPoint) => this.joinThroughEntryPoint(entryPoint, contactedPeers, distantJoinConfig, retry)));
+        await Promise.all(entryPoints.map((entryPoint) => this.joinThroughEntryPoint(entryPoint, contactedPeers, distantJoinOptions, retry)));
     }
     async joinThroughEntryPoint(entryPointDescriptor, 
     // Note that this set is mutated by DiscoverySession
@@ -37,47 +38,48 @@ class PeerDiscovery {
             return;
         }
         this.joinCalled = true;
-        logger.debug(`Joining ${this.config.serviceId === 'layer0' ? 'The Streamr Network' : `Control Layer for ${this.config.serviceId}`}`
+        logger.debug(`Joining ${this.options.serviceId === DhtNode_1.CONTROL_LAYER_NODE_SERVICE_ID
+            ? 'The Streamr Network' : `Control Layer for ${this.options.serviceId}`}`
             + ` via entrypoint ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(entryPointDescriptor)}`);
-        if ((0, identifiers_1.areEqualPeerDescriptors)(entryPointDescriptor, this.config.localPeerDescriptor)) {
+        if ((0, identifiers_1.areEqualPeerDescriptors)(entryPointDescriptor, this.options.localPeerDescriptor)) {
             return;
         }
-        this.config.connectionLocker?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
-        this.config.peerManager.addContact(entryPointDescriptor);
-        const targetId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
+        this.options.connectionLocker?.lockConnection(entryPointDescriptor, `${this.options.serviceId}::joinDht`);
+        this.options.peerManager.addContact(entryPointDescriptor);
+        const targetId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.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.connectionLocker?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
+        this.options.connectionLocker?.unlockConnection(entryPointDescriptor, `${this.options.serviceId}::joinDht`);
     }
     async joinRing() {
         const contactedPeers = new Set();
-        const sessions = [this.createRingSession((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.config.localPeerDescriptor), contactedPeers)];
+        const sessions = [this.createRingSession((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.options.localPeerDescriptor), contactedPeers)];
         await this.runRingSessions(sessions);
     }
     createSession(targetId, contactedPeers) {
         const sessionOptions = {
             targetId,
-            parallelism: this.config.parallelism,
-            noProgressLimit: this.config.joinNoProgressLimit,
-            peerManager: this.config.peerManager,
+            parallelism: this.options.parallelism,
+            noProgressLimit: this.options.joinNoProgressLimit,
+            peerManager: this.options.peerManager,
             contactedPeers,
-            abortSignal: this.config.abortSignal,
-            createDhtNodeRpcRemote: this.config.createDhtNodeRpcRemote
+            abortSignal: this.options.abortSignal,
+            createDhtNodeRpcRemote: this.options.createDhtNodeRpcRemote
         };
         return new DiscoverySession_1.DiscoverySession(sessionOptions);
     }
     createRingSession(targetId, contactedPeers) {
         const sessionOptions = {
             targetId,
-            parallelism: this.config.parallelism,
-            noProgressLimit: this.config.joinNoProgressLimit,
-            peerManager: this.config.peerManager,
+            parallelism: this.options.parallelism,
+            noProgressLimit: this.options.joinNoProgressLimit,
+            peerManager: this.options.peerManager,
             contactedPeers,
-            abortSignal: this.config.abortSignal,
-            createDhtNodeRpcRemote: this.config.createDhtNodeRpcRemote
+            abortSignal: this.options.abortSignal,
+            createDhtNodeRpcRemote: this.options.createDhtNodeRpcRemote
         };
         return new RingDiscoverySession_1.RingDiscoverySession(sessionOptions);
     }
@@ -85,19 +87,19 @@ class PeerDiscovery {
         try {
             for (const session of sessions) {
                 this.ongoingDiscoverySessions.set(session.id, session);
-                await session.findClosestNodes(this.config.joinTimeout);
+                await session.findClosestNodes(this.options.joinTimeout);
             }
         }
         catch (_e) {
-            logger.debug(`DHT join on ${this.config.serviceId} timed out`);
+            logger.debug(`DHT join on ${this.options.serviceId} timed out`);
         }
         finally {
             if (!this.isStopped()) {
-                if (this.config.peerManager.getNeighborCount() === 0) {
+                if (this.options.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.config.abortSignal);
+                        // TODO use options option or named constant?
+                        (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPointDescriptor), 1000, this.options.abortSignal);
                     }
                 }
                 else {
@@ -111,11 +113,11 @@ class PeerDiscovery {
         try {
             for (const session of sessions) {
                 this.ongoingRingDiscoverySessions.set(session.id, session);
-                await session.findClosestNodes(this.config.joinTimeout);
+                await session.findClosestNodes(this.options.joinTimeout);
             }
         }
         catch (_e) {
-            logger.debug(`Ring join on ${this.config.serviceId} timed out`);
+            logger.debug(`Ring join on ${this.options.serviceId} timed out`);
         }
         finally {
             sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
@@ -125,18 +127,18 @@ class PeerDiscovery {
         if (this.isStopped() || this.rejoinOngoing) {
             return;
         }
-        logger.debug(`Rejoining DHT ${this.config.serviceId}`);
+        logger.debug(`Rejoining DHT ${this.options.serviceId}`);
         this.rejoinOngoing = true;
         try {
             await this.joinThroughEntryPoint(entryPoint, contactedPeers, { enabled: true, contactedPeers: distantJoinContactPeers });
-            logger.debug(`Rejoined DHT successfully ${this.config.serviceId}!`);
+            logger.debug(`Rejoined DHT successfully ${this.options.serviceId}!`);
         }
         catch (err) {
-            logger.warn(`Rejoining DHT ${this.config.serviceId} failed`);
+            logger.warn(`Rejoining DHT ${this.options.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.config.abortSignal);
+                // TODO use options option or named constant?
+                (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPoint), 5000, this.options.abortSignal);
             }
         }
         finally {
@@ -146,36 +148,36 @@ class PeerDiscovery {
     async ensureRecoveryIntervalIsRunning() {
         if (!this.recoveryIntervalStarted) {
             this.recoveryIntervalStarted = true;
-            // TODO use config option or named constant?
-            await (0, utils_1.scheduleAtInterval)(() => this.fetchClosestAndRandomNeighbors(), 60000, true, this.config.abortSignal);
+            // TODO use options option or named constant?
+            await (0, utils_1.scheduleAtInterval)(() => this.fetchClosestAndRandomNeighbors(), 60000, true, this.options.abortSignal);
         }
     }
     async fetchClosestAndRandomNeighbors() {
         if (this.isStopped()) {
             return;
         }
-        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
-        const nodes = this.getClosestNeighbors(localNodeId, this.config.parallelism);
+        const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor);
+        const nodes = this.getClosestNeighbors(localNodeId, this.options.parallelism);
         const randomNodes = this.getClosestNeighbors((0, identifiers_1.createRandomDhtAddress)(), 1);
         await Promise.allSettled([
             ...nodes.map(async (node) => {
-                const remote = this.config.createDhtNodeRpcRemote(node);
+                const remote = this.options.createDhtNodeRpcRemote(node);
                 const contacts = await remote.getClosestPeers(localNodeId);
                 for (const contact of contacts) {
-                    this.config.peerManager.addContact(contact);
+                    this.options.peerManager.addContact(contact);
                 }
             }),
             ...randomNodes.map(async (node) => {
-                const remote = this.config.createDhtNodeRpcRemote(node);
+                const remote = this.options.createDhtNodeRpcRemote(node);
                 const contacts = await remote.getClosestPeers((0, identifiers_1.createRandomDhtAddress)());
                 for (const contact of contacts) {
-                    this.config.peerManager.addContact(contact);
+                    this.options.peerManager.addContact(contact);
                 }
             })
         ]);
     }
     getClosestNeighbors(referenceId, maxCount) {
-        return (0, getClosestNodes_1.getClosestNodes)(referenceId, this.config.peerManager.getNeighbors().map((n) => n.getPeerDescriptor()), { maxCount });
+        return (0, getClosestNodes_1.getClosestNodes)(referenceId, this.options.peerManager.getNeighbors().map((n) => n.getPeerDescriptor()), { maxCount });
     }
     isJoinOngoing() {
         return !this.joinCalled ? true : this.ongoingDiscoverySessions.size > 0;
@@ -184,7 +186,7 @@ class PeerDiscovery {
         return this.joinCalled;
     }
     isStopped() {
-        return this.config.abortSignal.aborted;
+        return this.options.abortSignal.aborted;
     }
 }
 exports.PeerDiscovery = PeerDiscovery;

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

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

@@ -2,7 +2,7 @@
 import { DhtAddress } from '../../identifiers';
 import { PeerManager } from '../PeerManager';
 import { RingIdRaw } from '../contact/ringIdentifiers';
-interface RingDiscoverySessionConfig {
+interface RingDiscoverySessionOptions {
     targetId: RingIdRaw;
     parallelism: number;
     noProgressLimit: number;
@@ -15,10 +15,10 @@ export declare class RingDiscoverySession {
     private noProgressCounter;
     private ongoingRequests;
     private doneGate;
-    private readonly config;
+    private readonly options;
     private numContactedPeers;
     private targetIdAsRingId;
-    constructor(config: RingDiscoverySessionConfig);
+    constructor(options: RingDiscoverySessionOptions);
     private addContacts;
     private fetchClosestContactsFromRemote;
     private onRequestSucceeded;

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

@@ -11,30 +11,30 @@ class RingDiscoverySession {
     noProgressCounter = 0;
     ongoingRequests = new Set();
     doneGate = new utils_1.Gate(false);
-    config;
+    options;
     numContactedPeers = 0;
     targetIdAsRingId;
-    constructor(config) {
-        this.config = config;
-        this.targetIdAsRingId = (0, ringIdentifiers_1.getRingIdFromRaw)(this.config.targetId);
+    constructor(options) {
+        this.options = options;
+        this.targetIdAsRingId = (0, ringIdentifiers_1.getRingIdFromRaw)(this.options.targetId);
     }
     addContacts(contacts) {
-        if (this.config.abortSignal.aborted || this.doneGate.isOpen()) {
+        if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
             return;
         }
         for (const contact of contacts) {
-            this.config.peerManager.addContact(contact);
+            this.options.peerManager.addContact(contact);
         }
     }
     async fetchClosestContactsFromRemote(contact) {
-        if (this.config.abortSignal.aborted || this.doneGate.isOpen()) {
+        if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
             return { left: [], right: [] };
         }
         logger.trace(`Getting closest ring peers from contact: ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
         this.numContactedPeers++;
-        this.config.contactedPeers.add(contact.getNodeId());
-        const returnedContacts = await contact.getClosestRingPeers(this.config.targetId);
-        this.config.peerManager.setContactActive(contact.getNodeId());
+        this.options.contactedPeers.add(contact.getNodeId());
+        const returnedContacts = await contact.getClosestRingPeers(this.options.targetId);
+        this.options.peerManager.setContactActive(contact.getNodeId());
         return returnedContacts;
     }
     onRequestSucceeded(nodeId, contacts) {
@@ -42,11 +42,11 @@ class RingDiscoverySession {
             return;
         }
         this.ongoingRequests.delete(nodeId);
-        const oldClosestContacts = this.config.peerManager.getClosestRingContactsTo(this.config.targetId, 1);
+        const oldClosestContacts = this.options.peerManager.getClosestRingContactsTo(this.options.targetId, 1);
         const oldClosestLeftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.targetIdAsRingId, (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(oldClosestContacts.left[0].getPeerDescriptor()));
         const oldClosestRightDistance = (0, ringIdentifiers_1.getLeftDistance)(this.targetIdAsRingId, (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(oldClosestContacts.right[0].getPeerDescriptor()));
         this.addContacts(contacts.left.concat(contacts.right));
-        const newClosestContacts = this.config.peerManager.getClosestRingContactsTo(this.config.targetId, 1);
+        const newClosestContacts = this.options.peerManager.getClosestRingContactsTo(this.options.targetId, 1);
         const newClosestLeftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.targetIdAsRingId, (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(newClosestContacts.left[0].getPeerDescriptor()));
         const newClosestRightDistance = (0, ringIdentifiers_1.getLeftDistance)(this.targetIdAsRingId, (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(newClosestContacts.right[0].getPeerDescriptor()));
         if (newClosestLeftDistance >= oldClosestLeftDistance && newClosestRightDistance >= oldClosestRightDistance) {
@@ -58,15 +58,15 @@ class RingDiscoverySession {
             return;
         }
         this.ongoingRequests.delete(peer.getNodeId());
-        this.config.peerManager.removeContact(peer.getNodeId());
+        this.options.peerManager.removeContact(peer.getNodeId());
     }
     findMoreContacts() {
-        if (this.config.abortSignal.aborted || this.doneGate.isOpen()) {
+        if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
             return;
         }
-        const uncontacted = this.config.peerManager.getClosestRingContactsTo(this.config.targetId, this.config.parallelism, this.config.contactedPeers);
+        const uncontacted = this.options.peerManager.getClosestRingContactsTo(this.options.targetId, this.options.parallelism, this.options.contactedPeers);
         if ((uncontacted.left.length === 0 && uncontacted.right.length === 0)
-            || this.noProgressCounter >= this.config.noProgressLimit) {
+            || this.noProgressCounter >= this.options.noProgressLimit) {
             this.doneGate.open();
             return;
         }
@@ -89,7 +89,7 @@ class RingDiscoverySession {
             }
         }
         for (const nextPeer of merged) {
-            if (this.ongoingRequests.size >= this.config.parallelism) {
+            if (this.ongoingRequests.size >= this.options.parallelism) {
                 break;
             }
             this.ongoingRequests.add(nextPeer.getNodeId());
@@ -103,13 +103,13 @@ class RingDiscoverySession {
         }
     }
     async findClosestNodes(timeout) {
-        if (this.config.peerManager.getNearbyContactCount(this.config.contactedPeers) === 0) {
+        if (this.options.peerManager.getNearbyContactCount(this.options.contactedPeers) === 0) {
             return;
         }
         setImmediate(() => {
             this.findMoreContacts();
         });
-        await (0, utils_1.withTimeout)(this.doneGate.waitUntilOpen(), timeout, 'discovery session timed out', this.config.abortSignal);
+        await (0, utils_1.withTimeout)(this.doneGate.waitUntilOpen(), timeout, 'discovery session timed out', this.options.abortSignal);
     }
 }
 exports.RingDiscoverySession = RingDiscoverySession;

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

@@ -1 +1 @@
-{"version":3,"file":"RingDiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/RingDiscoverySession.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RingDiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/RingDiscoverySession.ts"],"names":[],"mappings":";;;AAAA,0CAA0D;AAC1D,+BAAyB;AACzB,mDAA2E;AAK3E,gEAA8H;AAE9H,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAYjC,MAAa,oBAAoB;IAEb,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACjB,iBAAiB,GAAG,CAAC,CAAA;IACrB,eAAe,GAAoB,IAAI,GAAG,EAAE,CAAA;IAC5C,QAAQ,GAAG,IAAI,YAAI,CAAC,KAAK,CAAC,CAAA;IACjB,OAAO,CAA6B;IAC7C,iBAAiB,GAAG,CAAC,CAAA;IACrB,gBAAgB,CAAQ;IAEhC,YAAY,OAAoC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,gBAAgB,GAAG,IAAA,kCAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnE,CAAC;IAEO,WAAW,CAAC,QAA0B;QAC1C,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7D,OAAM;QACV,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAChD,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,OAAyB;QAClE,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7D,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;QAClC,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,4CAA4C,IAAA,yCAA2B,EAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACpH,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QACpD,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC9D,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEO,kBAAkB,CAAC,MAAkB,EAAE,QAAsB;QACjE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACpC,OAAM;QACV,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACnC,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACtG,MAAM,sBAAsB,GAAG,IAAA,iCAAe,EAC1C,IAAI,CAAC,gBAAgB,EACrB,IAAA,6CAA2B,EAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAC9E,CAAA;QACD,MAAM,uBAAuB,GAAG,IAAA,iCAAe,EAC3C,IAAI,CAAC,gBAAgB,EACrB,IAAA,6CAA2B,EAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAC/E,CAAA;QACD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QACtD,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACtG,MAAM,sBAAsB,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,gBAAgB,EAChE,IAAA,6CAA2B,EAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;QAChF,MAAM,uBAAuB,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,gBAAgB,EACjE,IAAA,6CAA2B,EAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;QACjF,IAAI,sBAAsB,IAAI,sBAAsB,IAAI,uBAAuB,IAAI,uBAAuB,EAAE,CAAC;YACzG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC5B,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,IAAsB;QAC1C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YAC9C,OAAM;QACV,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;QAC7C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;IAC5D,CAAC;IAEO,gBAAgB;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7D,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,wBAAwB,CACjE,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB,IAAI,CAAC,OAAO,CAAC,WAAW,EACxB,IAAI,CAAC,OAAO,CAAC,cAAc,CAC9B,CAAA;QACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;eAC9D,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpB,OAAM;QACV,CAAC;QACD,8BAA8B;QAC9B,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,MAAM,eAAe,GAAoB,IAAI,GAAG,EAAE,CAAA;QAClD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAC1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC9B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;oBACxD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;oBAChC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;gBACxD,CAAC;YACL,CAAC;YACD,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC/B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;oBACzD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;oBACjC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzD,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBACxD,MAAK;YACT,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAA;YAC9C,mDAAmD;YACnD,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC;iBACxC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;iBAC3E,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;iBAC3C,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,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YACpF,OAAM;QACV,CAAC;QACD,YAAY,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAA;QACF,MAAM,IAAA,mBAAW,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,OAAO,EAAE,6BAA6B,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACtH,CAAC;CACJ;AA9HD,oDA8HC"}

package/dist/src/dht/recursive-operation/RecursiveOperationManager.d.ts

@@ -7,7 +7,7 @@ import { LocalDataStore } from '../store/LocalDataStore';
 import { ServiceID } from '../../types/ServiceID';
 import { DhtAddress } from '../../identifiers';
 import { ConnectionsView } from '../../exports';
-interface RecursiveOperationManagerConfig {
+interface RecursiveOperationManagerOptions {
     rpcCommunicator: RoutingRpcCommunicator;
     sessionTransport: ITransport;
     router: Router;
@@ -25,8 +25,8 @@ export interface RecursiveOperationResult {
 export declare class RecursiveOperationManager {
     private ongoingSessions;
     private stopped;
-    private readonly config;
-    constructor(config: RecursiveOperationManagerConfig);
+    private readonly options;
+    constructor(options: RecursiveOperationManagerOptions);
     private registerLocalRpcMethods;
     execute(targetId: DhtAddress, operation: RecursiveOperation, excludedPeer?: DhtAddress, waitForCompletion?: boolean): Promise<RecursiveOperationResult>;
     private sendResponse;

package/dist/src/dht/recursive-operation/RecursiveOperationManager.js

@@ -18,19 +18,19 @@ const logger = new utils_1.Logger(module);
 class RecursiveOperationManager {
     ongoingSessions = new Map();
     stopped = false;
-    config;
-    constructor(config) {
-        this.config = config;
+    options;
+    constructor(options) {
+        this.options = options;
         this.registerLocalRpcMethods();
     }
     registerLocalRpcMethods() {
         const rpcLocal = new RecursiveOperationRpcLocal_1.RecursiveOperationRpcLocal({
             doRouteRequest: (routedMessage) => this.doRouteRequest(routedMessage),
-            addContact: (contact) => this.config.addContact(contact),
-            isMostLikelyDuplicate: (requestId) => this.config.router.isMostLikelyDuplicate(requestId),
-            addToDuplicateDetector: (requestId) => this.config.router.addToDuplicateDetector(requestId)
+            addContact: (contact) => this.options.addContact(contact),
+            isMostLikelyDuplicate: (requestId) => this.options.router.isMostLikelyDuplicate(requestId),
+            addToDuplicateDetector: (requestId) => this.options.router.addToDuplicateDetector(requestId)
         });
-        this.config.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeRequest', async (routedMessage) => {
+        this.options.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeRequest', async (routedMessage) => {
             if (this.stopped) {
                 return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
             }
@@ -44,27 +44,27 @@ class RecursiveOperationManager {
             return { closestNodes: [] };
         }
         const session = new RecursiveOperationSession_1.RecursiveOperationSession({
-            transport: this.config.sessionTransport,
+            transport: this.options.sessionTransport,
             targetId,
-            localPeerDescriptor: this.config.localPeerDescriptor,
-            // TODO use config option or named constant?
-            waitedRoutingPathCompletions: this.config.connectionsView.getConnectionCount() > 1 ? 2 : 1,
+            localPeerDescriptor: this.options.localPeerDescriptor,
+            // TODO use options option or named constant?
+            waitedRoutingPathCompletions: this.options.connectionsView.getConnectionCount() > 1 ? 2 : 1,
             operation,
             // TODO would it make sense to give excludedPeer as one of the fields RecursiveOperationSession?
             doRouteRequest: (routedMessage) => {
                 return this.doRouteRequest(routedMessage, excludedPeer);
             }
         });
-        if (this.config.connectionsView.getConnectionCount() === 0) {
-            const dataEntries = Array.from(this.config.localDataStore.values(targetId));
-            session.onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), [this.config.localPeerDescriptor], [this.config.localPeerDescriptor], dataEntries, true);
+        if (this.options.connectionsView.getConnectionCount() === 0) {
+            const dataEntries = Array.from(this.options.localDataStore.values(targetId));
+            session.onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor), [this.options.localPeerDescriptor], [this.options.localPeerDescriptor], dataEntries, true);
             return session.getResults();
         }
         this.ongoingSessions.set(session.getId(), session);
         if (waitForCompletion === true) {
             try {
-                await (0, utils_1.runAndWaitForEvents3)([() => session.start(this.config.serviceId)], [[session, 'completed']], 
-                // TODO use config option or named constant?
+                await (0, utils_1.runAndWaitForEvents3)([() => session.start(this.options.serviceId)], [[session, 'completed']], 
+                // TODO use options option or named constant?
                 15000);
             }
             catch (err) {
@@ -72,35 +72,35 @@ class RecursiveOperationManager {
             }
         }
         else {
-            session.start(this.config.serviceId);
+            session.start(this.options.serviceId);
             // Wait for delete operation to be sent out by the router
             // TODO: Add a feature to wait for the router to pass the message?
             await (0, utils_1.wait)(50);
         }
         if (operation === DhtRpc_1.RecursiveOperation.FETCH_DATA) {
-            const dataEntries = Array.from(this.config.localDataStore.values(targetId));
+            const dataEntries = Array.from(this.options.localDataStore.values(targetId));
             if (dataEntries.length > 0) {
-                this.sendResponse([this.config.localPeerDescriptor], this.config.localPeerDescriptor, session.getId(), [], dataEntries, true);
+                this.sendResponse([this.options.localPeerDescriptor], this.options.localPeerDescriptor, session.getId(), [], dataEntries, true);
             }
         }
         else if (operation === DhtRpc_1.RecursiveOperation.DELETE_DATA) {
-            this.config.localDataStore.markAsDeleted(targetId, (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor));
+            this.options.localDataStore.markAsDeleted(targetId, (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor));
         }
         this.ongoingSessions.delete(session.getId());
         session.stop();
         return session.getResults();
     }
     sendResponse(routingPath, targetPeerDescriptor, serviceId, closestConnectedNodes, dataEntries, noCloserNodesFound = false) {
-        const isOwnNode = (0, identifiers_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, targetPeerDescriptor);
+        const isOwnNode = (0, identifiers_1.areEqualPeerDescriptors)(this.options.localPeerDescriptor, targetPeerDescriptor);
         if (isOwnNode && this.ongoingSessions.has(serviceId)) {
             this.ongoingSessions.get(serviceId)
-                .onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound);
+                .onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor), routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound);
         }
         else {
-            // TODO use config option or named constant?
-            const remoteCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(serviceId, this.config.sessionTransport, { rpcRequestTimeout: 15000 });
-            const rpcRemote = new RecursiveOperationSessionRpcRemote_1.RecursiveOperationSessionRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, remoteCommunicator, DhtRpc_client_1.RecursiveOperationSessionRpcClient, 
-            // TODO use config option or named constant?
+            // TODO use options option or named constant?
+            const remoteCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(serviceId, this.options.sessionTransport, { rpcRequestTimeout: 15000 });
+            const rpcRemote = new RecursiveOperationSessionRpcRemote_1.RecursiveOperationSessionRpcRemote(this.options.localPeerDescriptor, targetPeerDescriptor, remoteCommunicator, DhtRpc_client_1.RecursiveOperationSessionRpcClient, 
+            // TODO use options option or named constant?
             10000);
             rpcRemote.sendResponse(routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound);
             remoteCommunicator.destroy();
@@ -112,21 +112,21 @@ class RecursiveOperationManager {
         }
         const targetId = (0, identifiers_1.getDhtAddressFromRaw)(routedMessage.target);
         const request = routedMessage.message.body.recursiveOperationRequest;
-        // TODO use config option or named constant?
+        // TODO use options option or named constant?
         const closestConnectedNodes = this.getClosestConnectedNodes(targetId, 5);
         const dataEntries = (request.operation === DhtRpc_1.RecursiveOperation.FETCH_DATA)
-            ? Array.from(this.config.localDataStore.values(targetId))
+            ? Array.from(this.options.localDataStore.values(targetId))
             : [];
         if (request.operation === DhtRpc_1.RecursiveOperation.DELETE_DATA) {
-            this.config.localDataStore.markAsDeleted(targetId, (0, identifiers_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer));
+            this.options.localDataStore.markAsDeleted(targetId, (0, identifiers_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer));
         }
-        if ((0, utils_1.areEqualBinaries)(this.config.localPeerDescriptor.nodeId, routedMessage.target)) {
+        if ((0, utils_1.areEqualBinaries)(this.options.localPeerDescriptor.nodeId, routedMessage.target)) {
             // TODO this is also very similar case to what we do at line 255, could simplify the code paths?
             this.sendResponse(routedMessage.routingPath, routedMessage.sourcePeer, request.sessionId, closestConnectedNodes, dataEntries, true);
             return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
         }
         else {
-            const ack = this.config.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.RECURSIVE, excludedPeer);
+            const ack = this.options.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.RECURSIVE, excludedPeer);
             if ((ack.error === undefined) || (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS)) {
                 const noCloserContactsFound = (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS) ||
                     (closestConnectedNodes.length > 0
@@ -138,7 +138,7 @@ class RecursiveOperationManager {
         }
     }
     getClosestConnectedNodes(referenceId, limit) {
-        const connectedNodes = this.config.connectionsView.getConnections().map((c) => this.config.createDhtNodeRpcRemote(c));
+        const connectedNodes = this.options.connectionsView.getConnections().map((c) => this.options.createDhtNodeRpcRemote(c));
         const sorted = new SortedContactList_1.SortedContactList({
             referenceId,
             maxSize: limit,
@@ -150,7 +150,7 @@ class RecursiveOperationManager {
     isPeerCloserToIdThanSelf(peer, nodeIdOrDataKey) {
         const nodeIdOrDataKeyRaw = (0, identifiers_1.getRawFromDhtAddress)(nodeIdOrDataKey);
         const distance1 = (0, PeerManager_1.getDistance)(peer.nodeId, nodeIdOrDataKeyRaw);
-        const distance2 = (0, PeerManager_1.getDistance)(this.config.localPeerDescriptor.nodeId, nodeIdOrDataKeyRaw);
+        const distance2 = (0, PeerManager_1.getDistance)(this.options.localPeerDescriptor.nodeId, nodeIdOrDataKeyRaw);
         return distance1 < distance2;
     }
     stop() {

package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map

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