@streamr/dht 100.0.0-testnet-three.6 → 100.1.0

package/dist/src/dht/PeerManager.js

@@ -10,6 +10,8 @@ const RandomContactList_1 = require("./contact/RandomContactList");
 const SortedContactList_1 = require("./contact/SortedContactList");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const identifiers_1 = require("../identifiers");
+const RingContactList_1 = require("./contact/RingContactList");
+const ringIdentifiers_1 = require("./contact/ringIdentifiers");
 const logger = new utils_1.Logger(module);
 const getDistance = (nodeIdOrDataKeyRaw1, nodeIdOrDataKeyRaw2) => {
     return k_bucket_1.default.distance(nodeIdOrDataKeyRaw1, nodeIdOrDataKeyRaw2);
@@ -28,6 +30,7 @@ class PeerManager extends eventemitter3_1.default {
     // All nodes that we know about
     contacts;
     randomPeers;
+    ringContacts;
     stopped = false;
     config;
     constructor(config) {
@@ -38,6 +41,13 @@ class PeerManager extends eventemitter3_1.default {
             numberOfNodesPerKBucket: this.config.numberOfNodesPerKBucket,
             numberOfNodesToPing: this.config.numberOfNodesPerKBucket
         });
+        this.ringContacts = new RingContactList_1.RingContactList((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.config.localPeerDescriptor), true);
+        this.ringContacts.on('ringContactAdded', (peerDescriptor, closestPeers) => {
+            this.emit('ringContactAdded', peerDescriptor, closestPeers);
+        });
+        this.ringContacts.on('ringContactRemoved', (peerDescriptor, closestPeers) => {
+            this.emit('ringContactRemoved', peerDescriptor, closestPeers);
+        });
         this.bucket.on('ping', (oldContacts, newContact) => this.onKBucketPing(oldContacts, newContact));
         this.bucket.on('removed', (contact) => this.onKBucketRemoved((0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())));
         this.bucket.on('added', (contact) => this.onKBucketAdded(contact));
@@ -75,7 +85,7 @@ class PeerManager extends eventemitter3_1.default {
         sortingList.addContacts(oldContacts);
         const sortedContacts = sortingList.getAllContacts();
         const removableNodeId = sortedContacts[sortedContacts.length - 1].getNodeId();
-        this.config.connectionManager?.weakUnlockConnection(removableNodeId);
+        this.config.connectionLocker?.weakUnlockConnection(removableNodeId, this.config.lockId);
         this.bucket.remove((0, identifiers_1.getRawFromDhtAddress)(removableNodeId));
         this.bucket.add(newContact);
     }
@@ -83,7 +93,7 @@ class PeerManager extends eventemitter3_1.default {
         if (this.stopped) {
             return;
         }
-        this.config.connectionManager?.weakUnlockConnection(nodeId);
+        this.config.connectionLocker?.weakUnlockConnection(nodeId, this.config.lockId);
         logger.trace(`Removed contact ${nodeId}`);
         if (this.bucket.count() === 0) {
             this.emit('kBucketEmpty');
@@ -97,7 +107,7 @@ class PeerManager extends eventemitter3_1.default {
             const peerDescriptor = contact.getPeerDescriptor();
             const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
             // Important to lock here, before the ping result is known
-            this.config.connectionManager?.weakLockConnection(nodeId);
+            this.config.connectionLocker?.weakLockConnection(nodeId, this.config.lockId);
             if (this.connections.has(contact.getNodeId())) {
                 logger.trace(`Added new contact ${nodeId}`);
             }
@@ -109,13 +119,13 @@ class PeerManager extends eventemitter3_1.default {
                     }
                     else {
                         logger.trace('ping failed ' + nodeId);
-                        this.config.connectionManager?.weakUnlockConnection(nodeId);
+                        this.config.connectionLocker?.weakUnlockConnection(nodeId, this.config.lockId);
                         this.removeContact(nodeId);
                         this.addClosestContactToBucket();
                     }
                     return;
                 }).catch((_e) => {
-                    this.config.connectionManager?.weakUnlockConnection(nodeId);
+                    this.config.connectionLocker?.weakUnlockConnection(nodeId, this.config.lockId);
                     this.removeContact(nodeId);
                     this.addClosestContactToBucket();
                 });
@@ -128,7 +138,7 @@ class PeerManager extends eventemitter3_1.default {
         }
         const closest = this.getClosestActiveContactNotInBucket();
         if (closest) {
-            this.addContact([closest.getPeerDescriptor()]);
+            this.addContact(closest.getPeerDescriptor());
         }
     }
     getClosestActiveContactNotInBucket() {
@@ -173,6 +183,7 @@ class PeerManager extends eventemitter3_1.default {
             return;
         }
         logger.trace(`Removing contact ${nodeId}`);
+        this.ringContacts.removeContact(this.contacts.getContact(nodeId)?.contact);
         this.bucket.remove((0, identifiers_1.getRawFromDhtAddress)(nodeId));
         this.contacts.removeContact(nodeId);
         this.randomPeers.removeContact(nodeId);
@@ -184,6 +195,10 @@ class PeerManager extends eventemitter3_1.default {
             this.bucket.remove(rpcRemote.id);
         });
         this.bucket.removeAllListeners();
+        this.ringContacts.getAllContacts().forEach((rpcRemote) => {
+            rpcRemote.leaveNotice();
+            this.ringContacts.removeContact(rpcRemote);
+        });
         this.contacts.stop();
         this.randomPeers.stop();
         this.connections.clear();
@@ -193,10 +208,11 @@ class PeerManager extends eventemitter3_1.default {
             referenceId,
             allowToContainReferenceId: true,
             emitEvents: false,
-            excludedNodeIds
+            excludedNodeIds,
+            maxSize: limit
         });
         this.bucket.toArray().forEach((contact) => closest.addContact(contact));
-        return closest.getClosestContacts(limit);
+        return closest.getAllContacts();
     }
     // TODO reduce copy-paste?
     getClosestContactsTo(referenceId, limit, excludedNodeIds) {
@@ -204,21 +220,20 @@ class PeerManager extends eventemitter3_1.default {
             referenceId,
             allowToContainReferenceId: true,
             emitEvents: false,
-            excludedNodeIds
+            excludedNodeIds,
+            maxSize: limit
         });
         this.contacts.getAllContacts().map((contact) => closest.addContact(contact));
-        // TODO should set the excludeSet and limit to SortedContactList constructor and remove these line
-        return closest.getClosestContacts(limit);
+        return closest.getAllContacts();
+    }
+    getClosestRingContactsTo(ringIdRaw, limit, excludedIds) {
+        const closest = new RingContactList_1.RingContactList(ringIdRaw, false, excludedIds);
+        this.contacts.getAllContacts().map((contact) => closest.addContact(contact));
+        this.ringContacts.getAllContacts().map((contact) => closest.addContact(contact));
+        return closest.getClosestContacts(limit ?? 8);
     }
     getContactCount(excludedNodeIds) {
-        return this.contacts.getAllContacts().filter((contact) => {
-            if (!excludedNodeIds) {
-                return true;
-            }
-            else {
-                return !excludedNodeIds.has(contact.getNodeId());
-            }
-        }).length;
+        return this.contacts.getSize(excludedNodeIds);
     }
     getConnectionCount() {
         return this.connections.size;
@@ -232,31 +247,30 @@ class PeerManager extends eventemitter3_1.default {
     setContactActive(nodeId) {
         this.contacts.setActive(nodeId);
     }
-    addContact(peerDescriptors, setActive) {
+    addContact(peerDescriptor) {
         if (this.stopped) {
             return;
         }
-        peerDescriptors.forEach((contact) => {
-            const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(contact);
-            if (nodeId !== this.config.localNodeId) {
-                logger.trace(`Adding new contact ${nodeId}`);
-                const remote = this.config.createDhtNodeRpcRemote(contact);
-                const isInBucket = (this.bucket.get(contact.nodeId) !== null);
-                const isInContacts = (this.contacts.getContact(nodeId) !== undefined);
-                if (isInBucket || isInContacts) {
-                    this.randomPeers.addContact(remote);
-                }
-                if (!isInBucket) {
-                    this.bucket.add(remote);
-                }
-                if (!isInContacts) {
-                    this.contacts.addContact(remote);
-                }
-                if (setActive) {
-                    this.contacts.setActive(nodeId);
-                }
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        if (nodeId !== this.config.localNodeId) {
+            logger.trace(`Adding new contact ${nodeId}`);
+            const remote = this.config.createDhtNodeRpcRemote(peerDescriptor);
+            const isInBucket = (this.bucket.get(peerDescriptor.nodeId) !== null);
+            const isInContacts = (this.contacts.getContact(nodeId) !== undefined);
+            const isInRingContacts = this.ringContacts.getContact(peerDescriptor) !== undefined;
+            if (isInBucket || isInContacts) {
+                this.randomPeers.addContact(remote);
             }
-        });
+            if (!isInBucket) {
+                this.bucket.add(remote);
+            }
+            if (!isInContacts) {
+                this.contacts.addContact(remote);
+            }
+            if (!isInRingContacts) {
+                this.ringContacts.addContact(remote);
+            }
+        }
     }
 }
 exports.PeerManager = PeerManager;

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

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

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

@@ -0,0 +1,31 @@
+import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { RingIdRaw } from './ringIdentifiers';
+import { DhtAddress } from '../../identifiers';
+import EventEmitter from 'eventemitter3';
+export interface RingContacts {
+    left: PeerDescriptor[];
+    right: PeerDescriptor[];
+}
+export interface RingContactListEvents {
+    ringContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
+    ringContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
+}
+export declare class RingContactList<C extends {
+    getPeerDescriptor(): PeerDescriptor;
+}> extends EventEmitter<RingContactListEvents> {
+    private readonly numNeighborsPerSide;
+    private readonly referenceId;
+    private readonly excludedIds;
+    private readonly leftNeighbors;
+    private readonly rightNeighbors;
+    private readonly emitEvents;
+    constructor(rawReferenceId: RingIdRaw, emitEvents: boolean, excludedIds?: Set<DhtAddress>);
+    addContact(contact: C): void;
+    removeContact(contact?: C): void;
+    getContact(peerDescriptor: PeerDescriptor): C | undefined;
+    getClosestContacts(limitPerSide?: number): {
+        left: C[];
+        right: C[];
+    };
+    getAllContacts(): C[];
+}

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

@@ -0,0 +1,133 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RingContactList = void 0;
+const ordered_map_1 = require("@js-sdsl/ordered-map");
+const ringIdentifiers_1 = require("./ringIdentifiers");
+const identifiers_1 = require("../../identifiers");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+class RingContactList extends eventemitter3_1.default {
+    numNeighborsPerSide = 5;
+    referenceId;
+    excludedIds;
+    leftNeighbors;
+    rightNeighbors;
+    emitEvents;
+    constructor(rawReferenceId, emitEvents, excludedIds) {
+        super();
+        this.referenceId = (0, ringIdentifiers_1.getRingIdFromRaw)(rawReferenceId);
+        this.emitEvents = emitEvents;
+        this.excludedIds = excludedIds ?? new Set();
+        this.leftNeighbors = new ordered_map_1.OrderedMap();
+        this.rightNeighbors = new ordered_map_1.OrderedMap();
+    }
+    addContact(contact) {
+        const id = (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(contact.getPeerDescriptor());
+        if (id === this.referenceId || this.excludedIds.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()))) {
+            return;
+        }
+        let elementAdded = false;
+        let elementRemoved = false;
+        const leftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.referenceId, id);
+        const lastLeftNeighbor = this.leftNeighbors.back();
+        if (lastLeftNeighbor === undefined || leftDistance < lastLeftNeighbor[0]) {
+            this.leftNeighbors.setElement(leftDistance, contact);
+            elementAdded = true;
+            if (this.leftNeighbors.size() > this.numNeighborsPerSide) {
+                this.leftNeighbors.eraseElementByIterator(this.leftNeighbors.rBegin());
+                elementRemoved = true;
+            }
+        }
+        const rightDistance = (0, ringIdentifiers_1.getRightDistance)(this.referenceId, id);
+        const lastRightNeighbor = this.rightNeighbors.back();
+        if (lastRightNeighbor === undefined || rightDistance < lastRightNeighbor[0]) {
+            this.rightNeighbors.setElement(rightDistance, contact);
+            elementAdded = true;
+            if (this.rightNeighbors.size() > this.numNeighborsPerSide) {
+                this.rightNeighbors.eraseElementByIterator(this.rightNeighbors.rBegin());
+                elementRemoved = true;
+            }
+        }
+        if (this.emitEvents && (elementAdded || elementRemoved)) {
+            const closestContacts = this.getClosestContacts();
+            const closestDescriptors = {
+                left: closestContacts.left.map((c) => c.getPeerDescriptor()),
+                right: closestContacts.right.map((c) => c.getPeerDescriptor())
+            };
+            if (elementAdded) {
+                this.emit('ringContactAdded', contact.getPeerDescriptor(), closestDescriptors);
+            }
+            if (elementRemoved) {
+                this.emit('ringContactRemoved', contact.getPeerDescriptor(), closestDescriptors);
+            }
+        }
+    }
+    removeContact(contact) {
+        if (contact === undefined) {
+            return;
+        }
+        const id = (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(contact.getPeerDescriptor());
+        const leftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.referenceId, id);
+        const rightDistance = (0, ringIdentifiers_1.getRightDistance)(this.referenceId, id);
+        let elementRemoved = false;
+        if (this.leftNeighbors.eraseElementByKey(leftDistance)) {
+            elementRemoved = true;
+        }
+        if (this.rightNeighbors.eraseElementByKey(rightDistance)) {
+            elementRemoved = true;
+        }
+        if (this.emitEvents && elementRemoved) {
+            const closestContacts = this.getClosestContacts();
+            const closestDescriptors = { left: closestContacts.left.map((c) => c.getPeerDescriptor()),
+                right: closestContacts.right.map((c) => c.getPeerDescriptor()) };
+            this.emit('ringContactRemoved', contact.getPeerDescriptor(), closestDescriptors);
+        }
+    }
+    getContact(peerDescriptor) {
+        const id = (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(peerDescriptor);
+        const leftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.referenceId, id);
+        const rightDistance = (0, ringIdentifiers_1.getRightDistance)(this.referenceId, id);
+        if (this.leftNeighbors.getElementByKey(leftDistance)) {
+            return this.leftNeighbors.getElementByKey(leftDistance);
+        }
+        if (this.rightNeighbors.getElementByKey(rightDistance)) {
+            return this.rightNeighbors.getElementByKey(rightDistance);
+        }
+        return undefined;
+    }
+    getClosestContacts(limitPerSide) {
+        const leftContacts = [];
+        const rightContacts = [];
+        let leftCount = 0;
+        for (const item of this.leftNeighbors) {
+            if (limitPerSide != undefined && leftCount >= limitPerSide) {
+                break;
+            }
+            leftContacts.push(item[1]);
+            leftCount++;
+        }
+        let rightCount = 0;
+        for (const item of this.rightNeighbors) {
+            if (limitPerSide != undefined && rightCount >= limitPerSide) {
+                break;
+            }
+            rightContacts.push(item[1]);
+            rightCount++;
+        }
+        return { left: leftContacts, right: rightContacts };
+    }
+    getAllContacts() {
+        const ret = [];
+        for (const item of this.leftNeighbors) {
+            ret.push(item[1]);
+        }
+        for (const item of this.rightNeighbors) {
+            ret.push(item[1]);
+        }
+        return ret;
+    }
+}
+exports.RingContactList = RingContactList;
+//# sourceMappingURL=RingContactList.js.map

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

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

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

@@ -21,6 +21,7 @@ export declare class SortedContactList<C extends {
     addContact(contact: C): void;
     addContacts(contacts: C[]): void;
     getContact(id: DhtAddress): ContactState<C> | undefined;
+    has(id: DhtAddress): boolean;
     setContacted(contactId: DhtAddress): void;
     setActive(contactId: DhtAddress): void;
     getClosestContacts(limit?: number): C[];
@@ -31,7 +32,7 @@ export declare class SortedContactList<C extends {
     removeContact(id: DhtAddress): boolean;
     isActive(id: DhtAddress): boolean;
     getAllContacts(): C[];
-    getSize(): number;
+    getSize(excludedNodeIds?: Set<DhtAddress>): number;
     clear(): void;
     stop(): void;
 }

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

@@ -63,6 +63,9 @@ class SortedContactList extends eventemitter3_1.default {
     getContact(id) {
         return this.contactsById.get(id);
     }
+    has(id) {
+        return this.contactsById.has(id);
+    }
     setContacted(contactId) {
         if (this.contactsById.has(contactId)) {
             this.contactsById.get(contactId).contacted = true;
@@ -74,25 +77,16 @@ class SortedContactList extends eventemitter3_1.default {
         }
     }
     getClosestContacts(limit) {
-        const ret = [];
-        this.contactIds.forEach((contactId) => {
-            const contact = this.contactsById.get(contactId);
-            if (contact) {
-                ret.push(contact.contact);
-            }
-        });
-        if (limit === undefined) {
-            return ret;
-        }
-        else {
-            return ret.slice(0, limit);
-        }
+        const ret = this.getAllContacts();
+        return (limit === undefined)
+            ? ret
+            : ret.slice(0, limit);
     }
     getUncontactedContacts(num) {
         const ret = [];
         for (const contactId of this.contactIds) {
             const contact = this.contactsById.get(contactId);
-            if (contact && !contact.contacted) {
+            if (!contact.contacted) {
                 ret.push(contact.contact);
                 if (ret.length >= num) {
                     return ret;
@@ -105,7 +99,7 @@ class SortedContactList extends eventemitter3_1.default {
         const ret = [];
         this.contactIds.forEach((contactId) => {
             const contact = this.contactsById.get(contactId);
-            if (contact && contact.active) {
+            if (contact.active) {
                 ret.push(contact.contact);
             }
         });
@@ -146,8 +140,16 @@ class SortedContactList extends eventemitter3_1.default {
     getAllContacts() {
         return this.contactIds.map((nodeId) => this.contactsById.get(nodeId).contact);
     }
-    getSize() {
-        return this.contactIds.length;
+    getSize(excludedNodeIds) {
+        let excludedCount = 0;
+        if (excludedNodeIds !== undefined) {
+            for (const nodeId of excludedNodeIds) {
+                if (this.has(nodeId)) {
+                    excludedCount++;
+                }
+            }
+        }
+        return this.contactIds.length - excludedCount;
     }
     clear() {
         this.contactsById.clear();

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

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

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

@@ -0,0 +1,16 @@
+import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+export type RingIdRaw = Uint8Array & {
+    __ringIdRaw: never;
+};
+export type RingId = number & {
+    __ringId: never;
+};
+export type RingDistance = number & {
+    __ringDistance: never;
+};
+export declare const RING_SIZE: number;
+export declare const getRingIdFromRaw: (raw: RingIdRaw) => RingId;
+export declare const getRingIdRawFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => RingIdRaw;
+export declare const getRingIdFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => RingId;
+export declare const getLeftDistance: (referenceId: RingId, id: RingId) => RingDistance;
+export declare const getRightDistance: (referenceId: RingId, id: RingId) => RingDistance;

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

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRightDistance = exports.getLeftDistance = exports.getRingIdFromPeerDescriptor = exports.getRingIdRawFromPeerDescriptor = exports.getRingIdFromRaw = exports.RING_SIZE = void 0;
+exports.RING_SIZE = 2 ** 120 - 1; // 2^120 - 1
+const binaryToBigInt = (binary) => {
+    return binary.reduce((acc, val) => (acc << BigInt(8)) | BigInt(val), BigInt(0));
+};
+const getRingIdFromRaw = (raw) => Number(binaryToBigInt(raw));
+exports.getRingIdFromRaw = getRingIdFromRaw;
+const getRingIdRawFromPeerDescriptor = (peerDescriptor) => {
+    const regionAsBuffer = Buffer.alloc(4);
+    regionAsBuffer.writeUInt32BE(peerDescriptor.region ?? 0, 0);
+    const ipAsbuffer = Buffer.alloc(4);
+    ipAsbuffer.writeUInt32BE(peerDescriptor.ipAddress ?? 0, 0);
+    const uniquePartAsBuffer = Buffer.from(peerDescriptor.nodeId.subarray(peerDescriptor.nodeId.length - 7, peerDescriptor.nodeId.length));
+    const arr = [
+        regionAsBuffer,
+        ipAsbuffer,
+        uniquePartAsBuffer
+    ];
+    const buffer = Buffer.concat(arr);
+    return new Uint8Array(buffer);
+};
+exports.getRingIdRawFromPeerDescriptor = getRingIdRawFromPeerDescriptor;
+const getRingIdFromPeerDescriptor = (peerDescriptor) => {
+    const raw = (0, exports.getRingIdRawFromPeerDescriptor)(peerDescriptor);
+    return Number(binaryToBigInt(raw));
+};
+exports.getRingIdFromPeerDescriptor = getRingIdFromPeerDescriptor;
+const getLeftDistance = (referenceId, id) => {
+    const diff = Math.abs(referenceId - id);
+    if (referenceId > id) {
+        // if id is smaller than referenceId, then the distance is the difference
+        return diff;
+    }
+    else {
+        // if id is bigger than referenceId, then the distance is the ringSize - difference
+        return exports.RING_SIZE - diff;
+    }
+};
+exports.getLeftDistance = getLeftDistance;
+const getRightDistance = (referenceId, id) => {
+    const diff = Math.abs(referenceId - id);
+    if (referenceId > id) {
+        // if id is smaller than referenceId, then the distance is the ringSize - difference
+        return exports.RING_SIZE - diff;
+    }
+    else {
+        // if id is bigger than referenceId, then the distance is the difference
+        return diff;
+    }
+};
+exports.getRightDistance = getRightDistance;
+//# sourceMappingURL=ringIdentifiers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ringIdentifiers.js","sourceRoot":"","sources":["../../../../src/dht/contact/ringIdentifiers.ts"],"names":[],"mappings":";;;AAUa,QAAA,SAAS,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA,CAAG,YAAY;AAEpD,MAAM,cAAc,GAAG,CAAC,MAAkB,EAAU,EAAE;IAClD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AACnF,CAAC,CAAA;AAEM,MAAM,gBAAgB,GAAG,CAAC,GAAc,EAAU,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAW,CAAA;AAApF,QAAA,gBAAgB,oBAAoE;AAE1F,MAAM,8BAA8B,GAAG,CAAC,cAA8B,EAAa,EAAE;IACxF,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACtC,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClC,UAAU,CAAC,aAAa,CAAC,cAAc,CAAC,SAAS,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAEtI,MAAM,GAAG,GAAG;QACR,cAAc;QACd,UAAU;QACV,kBAAkB;KACrB,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAc,CAAA;AAC9C,CAAC,CAAA;AAhBY,QAAA,8BAA8B,kCAgB1C;AAEM,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAU,EAAE;IAClF,MAAM,GAAG,GAAG,IAAA,sCAA8B,EAAC,cAAc,CAAC,CAAA;IAC1D,OAAO,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAW,CAAA;AAChD,CAAC,CAAA;AAHY,QAAA,2BAA2B,+BAGvC;AAEM,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,EAAU,EAAgB,EAAE;IAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAA;IACvC,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;QACnB,yEAAyE;QACzE,OAAO,IAAoB,CAAA;IAC/B,CAAC;SAAM,CAAC;QACJ,mFAAmF;QACnF,OAAO,iBAAS,GAAG,IAAoB,CAAA;IAC3C,CAAC;AACL,CAAC,CAAA;AATY,QAAA,eAAe,mBAS3B;AAEM,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAE,EAAU,EAAgB,EAAE;IAC9E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAA;IACvC,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;QACnB,oFAAoF;QACpF,OAAO,iBAAS,GAAG,IAAoB,CAAA;IAC3C,CAAC;SAAM,CAAC;QACJ,wEAAwE;QACxE,OAAO,IAAoB,CAAA;IAC/B,CAAC;AACL,CAAC,CAAA;AATY,QAAA,gBAAgB,oBAS5B"}

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

@@ -24,7 +24,9 @@ class DiscoverySession {
         if (this.stopped) {
             return;
         }
-        this.config.peerManager.addContact(contacts);
+        for (const contact of contacts) {
+            this.config.peerManager.addContact(contact);
+        }
     }
     async getClosestPeersFromContact(contact) {
         if (this.stopped) {