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

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/{Remote.d.ts → RpcRemote.d.ts}

@@ -1,18 +1,19 @@
+import type { ServiceInfo } from '@protobuf-ts/runtime-rpc';
+import { ClassType, ClientTransport, ProtoRpcClient, RpcCommunicator } from '@streamr/proto-rpc';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { ProtoRpcClient } from '@streamr/proto-rpc';
 import { DhtRpcOptions } from '../../rpc-protocol/DhtRpcOptions';
-import { ServiceID } from '../../types/ServiceID';
+import { DhtCallContext } from '../../rpc-protocol/DhtCallContext';
 export declare const EXISTING_CONNECTION_TIMEOUT = 5000;
-export declare abstract class Remote<T> {
+export declare abstract class RpcRemote<T extends ServiceInfo & ClassType> {
     private readonly localPeerDescriptor;
     private readonly remotePeerDescriptor;
-    private readonly serviceId;
     private readonly client;
-    private readonly rpcTimeout?;
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, client: ProtoRpcClient<T>, rpcTimeout?: number);
+    private readonly timeout?;
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, rpcCommunicator: RpcCommunicator<DhtCallContext>, clientClass: {
+        new (clientTransport: ClientTransport): T;
+    }, timeout?: number);
     getPeerDescriptor(): PeerDescriptor;
     getLocalPeerDescriptor(): PeerDescriptor;
-    getServiceId(): string;
     getClient(): ProtoRpcClient<T>;
     formDhtRpcOptions(opts?: Omit<DhtRpcOptions, 'sourceDescriptor' | 'targetDescriptor'>): DhtRpcOptions;
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Remote = exports.EXISTING_CONNECTION_TIMEOUT = void 0;
+exports.RpcRemote = exports.EXISTING_CONNECTION_TIMEOUT = void 0;
+const proto_rpc_1 = require("@streamr/proto-rpc");
 const IConnection_1 = require("../../connection/IConnection");
 const Connectivity_1 = require("../../helpers/Connectivity");
 // Should connect directly to the server, timeout can be low
@@ -12,7 +13,7 @@ const WEBSOCKET_SERVER_TIMEOUT = 7500;
 const WEBRTC_TIMEOUT = 15000;
 // default timeout for existing connections
 exports.EXISTING_CONNECTION_TIMEOUT = 5000;
-const getRpcTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
+const getTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
     const connectionType = (0, Connectivity_1.expectedConnectionType)(localPeerDescriptor, remotePeerDescriptor);
     if (connectionType === IConnection_1.ConnectionType.WEBSOCKET_CLIENT) {
         return WEBSOCKET_CLIENT_TIMEOUT;
@@ -25,13 +26,18 @@ const getRpcTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
     }
     return WEBRTC_TIMEOUT;
 };
-class Remote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client, rpcTimeout) {
+class RpcRemote {
+    localPeerDescriptor;
+    remotePeerDescriptor;
+    client;
+    timeout;
+    constructor(localPeerDescriptor, remotePeerDescriptor, rpcCommunicator, 
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
+    clientClass, timeout) {
         this.localPeerDescriptor = localPeerDescriptor;
         this.remotePeerDescriptor = remotePeerDescriptor;
-        this.client = client;
-        this.serviceId = serviceId;
-        this.rpcTimeout = rpcTimeout;
+        this.client = (0, proto_rpc_1.toProtoRpcClient)(new clientClass(rpcCommunicator.getRpcClientTransport()));
+        this.timeout = timeout;
     }
     getPeerDescriptor() {
         return this.remotePeerDescriptor;
@@ -39,9 +45,6 @@ class Remote {
     getLocalPeerDescriptor() {
         return this.localPeerDescriptor;
     }
-    getServiceId() {
-        return this.serviceId;
-    }
     getClient() {
         return this.client;
     }
@@ -49,10 +52,10 @@ class Remote {
         return {
             sourceDescriptor: this.localPeerDescriptor,
             targetDescriptor: this.remotePeerDescriptor,
-            timeout: this.rpcTimeout ?? getRpcTimeout(this.localPeerDescriptor, this.remotePeerDescriptor),
+            timeout: this.timeout ?? getTimeout(this.localPeerDescriptor, this.remotePeerDescriptor),
             ...opts
         };
     }
 }
-exports.Remote = Remote;
-//# sourceMappingURL=Remote.js.map
+exports.RpcRemote = RpcRemote;
+//# sourceMappingURL=RpcRemote.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/contact/RpcRemote.ts"],"names":[],"mappings":";;;AACA,kDAAkH;AAClH,8DAA6D;AAC7D,6DAAmE;AAKnE,4DAA4D;AAC5D,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,uGAAuG;AACvG,kDAAkD;AAClD,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,sFAAsF;AACtF,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B,2CAA2C;AAC9B,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAE/C,MAAM,UAAU,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAU,EAAE;IACrG,MAAM,cAAc,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IACxF,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE,CAAC;QACrD,OAAO,wBAAwB,CAAA;IACnC,CAAC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE,CAAC;QAC5D,OAAO,wBAAwB,CAAA;IACnC,CAAC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE,CAAC;QAClD,OAAO,cAAc,CAAA;IACzB,CAAC;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,SAAS;IAEV,mBAAmB,CAAgB;IACnC,oBAAoB,CAAgB;IACpC,MAAM,CAAmB;IACzB,OAAO,CAAS;IAEjC,YACI,mBAAmC,EACnC,oBAAoC,EACpC,eAAgD;IAChD,mEAAmE;IACnE,WAA0D,EAC1D,OAAgB;QAEhB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,WAAW,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QACxF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YACxF,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AAzCD,8BAyCC"}

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

@@ -1,23 +1,37 @@
-import { PeerID } from '../../helpers/PeerID';
-import { ContactList } from './ContactList';
+import { ContactState, Events } from './ContactList';
+import EventEmitter from 'eventemitter3';
+import { DhtAddress } from '../../identifiers';
+export interface SortedContactListConfig {
+    referenceId: DhtAddress;
+    allowToContainReferenceId: boolean;
+    emitEvents: boolean;
+    maxSize?: number;
+    nodeIdDistanceLimit?: DhtAddress;
+    excludedNodeIds?: Set<DhtAddress>;
+}
 export declare class SortedContactList<C extends {
-    getPeerId: () => PeerID;
-}> extends ContactList<C> {
-    private allowLocalPeerId;
-    private peerIdDistanceLimit?;
-    private excludedPeerIDs?;
-    constructor(ownId: PeerID, maxSize: number, defaultContactQueryLimit?: number, allowLocalPeerId?: boolean, peerIdDistanceLimit?: PeerID, excludedPeerIDs?: PeerID[]);
-    getClosestContactId(): PeerID;
-    getContactIds(): PeerID[];
+    getNodeId: () => DhtAddress;
+}> extends EventEmitter<Events<C>> {
+    private config;
+    private contactsById;
+    private contactIds;
+    constructor(config: SortedContactListConfig);
+    getClosestContactId(): DhtAddress;
+    getContactIds(): DhtAddress[];
     addContact(contact: C): void;
     addContacts(contacts: C[]): void;
-    setContacted(contactId: PeerID): void;
-    setActive(contactId: PeerID): void;
+    getContact(id: DhtAddress): ContactState<C> | undefined;
+    setContacted(contactId: DhtAddress): void;
+    setActive(contactId: DhtAddress): void;
     getClosestContacts(limit?: number): C[];
     getUncontactedContacts(num: number): C[];
     getActiveContacts(limit?: number): C[];
-    compareIds(id1: PeerID, id2: PeerID): number;
-    removeContact(id: PeerID): boolean;
-    isActive(id: PeerID): boolean;
+    compareIds(id1: DhtAddress, id2: DhtAddress): number;
+    private distanceToReferenceId;
+    removeContact(id: DhtAddress): boolean;
+    isActive(id: DhtAddress): boolean;
     getAllContacts(): C[];
+    getSize(): number;
+    clear(): void;
+    stop(): void;
 }

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

@@ -4,15 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SortedContactList = void 0;
-const k_bucket_1 = __importDefault(require("k-bucket"));
 const ContactList_1 = require("./ContactList");
-class SortedContactList extends ContactList_1.ContactList {
-    constructor(ownId, maxSize, defaultContactQueryLimit, allowLocalPeerId = false, peerIdDistanceLimit, excludedPeerIDs) {
-        super(ownId, maxSize, defaultContactQueryLimit);
+const lodash_1 = require("lodash");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const PeerManager_1 = require("../PeerManager");
+const identifiers_1 = require("../../identifiers");
+class SortedContactList extends eventemitter3_1.default {
+    config;
+    contactsById = new Map();
+    contactIds = [];
+    constructor(config) {
+        super();
+        this.config = config;
         this.compareIds = this.compareIds.bind(this);
-        this.allowLocalPeerId = allowLocalPeerId;
-        this.peerIdDistanceLimit = peerIdDistanceLimit;
-        this.excludedPeerIDs = excludedPeerIDs;
     }
     getClosestContactId() {
         return this.contactIds[0];
@@ -21,59 +25,73 @@ class SortedContactList extends ContactList_1.ContactList {
         return this.contactIds;
     }
     addContact(contact) {
-        if (this.excludedPeerIDs
-            && this.excludedPeerIDs.some((peerId) => contact.getPeerId().equals(peerId))) {
+        const contactId = contact.getNodeId();
+        if (this.config.excludedNodeIds !== undefined && this.config.excludedNodeIds.has(contactId)) {
             return;
         }
-        if ((!this.allowLocalPeerId && this.ownId.equals(contact.getPeerId())) ||
-            (this.peerIdDistanceLimit !== undefined && this.compareIds(this.peerIdDistanceLimit, contact.getPeerId()) < 0)) {
+        if ((!this.config.allowToContainReferenceId && (this.config.referenceId === contactId)) ||
+            (this.config.nodeIdDistanceLimit !== undefined && this.compareIds(this.config.nodeIdDistanceLimit, contactId) < 0)) {
             return;
         }
-        if (!this.contactsById.has(contact.getPeerId().toKey())) {
-            if (this.contactIds.length < this.maxSize) {
-                this.contactsById.set(contact.getPeerId().toKey(), new ContactList_1.ContactState(contact));
-                this.contactIds.push(contact.getPeerId());
-                this.contactIds.sort(this.compareIds);
+        if (!this.contactsById.has(contactId)) {
+            if ((this.config.maxSize === undefined) || (this.contactIds.length < this.config.maxSize)) {
+                this.contactsById.set(contactId, new ContactList_1.ContactState(contact));
+                const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contactId, (id) => { return this.distanceToReferenceId(id); });
+                this.contactIds.splice(index, 0, contactId);
+                if (this.config.emitEvents) {
+                    this.emit('contactAdded', contact, this.getClosestContacts());
+                }
             }
-            else if (this.compareIds(this.contactIds[this.maxSize - 1], contact.getPeerId()) > 0) {
+            else if (this.compareIds(this.contactIds[this.config.maxSize - 1], contactId) > 0) {
                 const removedId = this.contactIds.pop();
-                const removedContact = this.contactsById.get(removedId.toKey()).contact;
-                this.contactsById.delete(removedId.toKey());
-                this.contactsById.set(contact.getPeerId().toKey(), new ContactList_1.ContactState(contact));
-                this.contactIds.push(contact.getPeerId());
-                this.contactIds.sort(this.compareIds);
-                this.emit('contactRemoved', removedContact, this.getClosestContacts());
+                const removedContact = this.contactsById.get(removedId).contact;
+                this.contactsById.delete(removedId);
+                this.contactsById.set(contactId, new ContactList_1.ContactState(contact));
+                const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contactId, (id) => { return this.distanceToReferenceId(id); });
+                this.contactIds.splice(index, 0, contactId);
+                if (this.config.emitEvents) {
+                    const closestContacts = this.getClosestContacts();
+                    this.emit('contactRemoved', removedContact, closestContacts);
+                    this.emit('contactAdded', contact, closestContacts);
+                }
             }
-            this.emit('newContact', contact, this.getClosestContacts());
         }
     }
     addContacts(contacts) {
         contacts.forEach((contact) => this.addContact(contact));
     }
+    getContact(id) {
+        return this.contactsById.get(id);
+    }
     setContacted(contactId) {
-        if (this.contactsById.has(contactId.toKey())) {
-            this.contactsById.get(contactId.toKey()).contacted = true;
+        if (this.contactsById.has(contactId)) {
+            this.contactsById.get(contactId).contacted = true;
         }
     }
     setActive(contactId) {
-        if (this.contactsById.has(contactId.toKey())) {
-            this.contactsById.get(contactId.toKey()).active = true;
+        if (this.contactsById.has(contactId)) {
+            this.contactsById.get(contactId).active = true;
         }
     }
-    getClosestContacts(limit = this.defaultContactQueryLimit) {
+    getClosestContacts(limit) {
         const ret = [];
         this.contactIds.forEach((contactId) => {
-            const contact = this.contactsById.get(contactId.toKey());
+            const contact = this.contactsById.get(contactId);
             if (contact) {
                 ret.push(contact.contact);
             }
         });
-        return ret.slice(0, limit);
+        if (limit === undefined) {
+            return ret;
+        }
+        else {
+            return ret.slice(0, limit);
+        }
     }
     getUncontactedContacts(num) {
         const ret = [];
         for (const contactId of this.contactIds) {
-            const contact = this.contactsById.get(contactId.toKey());
+            const contact = this.contactsById.get(contactId);
             if (contact && !contact.contacted) {
                 ret.push(contact.contact);
                 if (ret.length >= num) {
@@ -86,7 +104,7 @@ class SortedContactList extends ContactList_1.ContactList {
     getActiveContacts(limit) {
         const ret = [];
         this.contactIds.forEach((contactId) => {
-            const contact = this.contactsById.get(contactId.toKey());
+            const contact = this.contactsById.get(contactId);
             if (contact && contact.active) {
                 ret.push(contact.contact);
             }
@@ -99,26 +117,45 @@ class SortedContactList extends ContactList_1.ContactList {
         }
     }
     compareIds(id1, id2) {
-        const distance1 = k_bucket_1.default.distance(this.ownId.value, id1.value);
-        const distance2 = k_bucket_1.default.distance(this.ownId.value, id2.value);
+        const distance1 = this.distanceToReferenceId(id1);
+        const distance2 = this.distanceToReferenceId(id2);
         return distance1 - distance2;
     }
+    // TODO inline this method?
+    distanceToReferenceId(id) {
+        // TODO maybe this class should store the referenceId also as DhtAddressRaw so that we don't need to convert it here?
+        return (0, PeerManager_1.getDistance)((0, identifiers_1.getRawFromDhtAddress)(this.config.referenceId), (0, identifiers_1.getRawFromDhtAddress)(id));
+    }
     removeContact(id) {
-        if (this.contactsById.has(id.toKey())) {
-            const removed = this.contactsById.get(id.toKey()).contact;
-            const index = this.contactIds.findIndex((element) => element.equals(id));
+        if (this.contactsById.has(id)) {
+            const removed = this.contactsById.get(id).contact;
+            // TODO use sortedIndexBy?
+            const index = this.contactIds.findIndex((nodeId) => (nodeId === id));
             this.contactIds.splice(index, 1);
-            this.contactsById.delete(id.toKey());
-            this.emit('contactRemoved', removed, this.getClosestContacts());
+            this.contactsById.delete(id);
+            if (this.config.emitEvents) {
+                this.emit('contactRemoved', removed, this.getClosestContacts());
+            }
             return true;
         }
         return false;
     }
     isActive(id) {
-        return this.contactsById.has(id.toKey()) ? this.contactsById.get(id.toKey()).active : false;
+        return this.contactsById.has(id) ? this.contactsById.get(id).active : false;
     }
     getAllContacts() {
-        return this.contactIds.map((peerId) => this.contactsById.get(peerId.toKey()).contact);
+        return this.contactIds.map((nodeId) => this.contactsById.get(nodeId).contact);
+    }
+    getSize() {
+        return this.contactIds.length;
+    }
+    clear() {
+        this.contactsById.clear();
+        this.contactIds = [];
+    }
+    stop() {
+        this.removeAllListeners();
+        this.clear();
     }
 }
 exports.SortedContactList = SortedContactList;

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"}