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

package/dist/src/dht/PeerManager.js

@@ -0,0 +1,288 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PeerManager = exports.getDistance = void 0;
+const utils_1 = require("@streamr/utils");
+const k_bucket_1 = __importDefault(require("k-bucket"));
+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);
+};
+exports.getDistance = getDistance;
+class PeerManager extends eventemitter3_1.default {
+    // Glossary: 
+    // * 'neighbors' are the nodes that are our neighbors according to 
+    //   the protocol of the layer we are in
+    // * 'connections' are the nodes that are connected to this node on Layer0
+    // * 'contacts' are all non-unresponsive nodes that we know about
+    // The kademlia k-bucket
+    bucket;
+    // Nodes that are connected to this node on Layer0
+    connections = new Map();
+    // All nodes that we know about
+    contacts;
+    randomPeers;
+    ringContacts;
+    stopped = false;
+    config;
+    constructor(config) {
+        super();
+        this.config = config;
+        this.bucket = new k_bucket_1.default({
+            localNodeId: (0, identifiers_1.getRawFromDhtAddress)(this.config.localNodeId),
+            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));
+        this.bucket.on('updated', () => {
+            // TODO: Update contact info to the connection manager and reconnect
+        });
+        this.contacts = new SortedContactList_1.SortedContactList({
+            referenceId: this.config.localNodeId,
+            maxSize: this.config.maxContactListSize,
+            allowToContainReferenceId: false,
+            emitEvents: true
+        });
+        this.contacts.on('contactRemoved', (removedContact, activeContacts) => {
+            if (this.stopped) {
+                return;
+            }
+            this.emit('contactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor()));
+            this.randomPeers.addContact(this.config.createDhtNodeRpcRemote(removedContact.getPeerDescriptor()));
+        });
+        this.contacts.on('contactAdded', (contactAdded, activeContacts) => this.emit('contactAdded', contactAdded.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+        this.randomPeers = new RandomContactList_1.RandomContactList(this.config.localNodeId, this.config.maxContactListSize);
+        this.randomPeers.on('contactRemoved', (removedContact, activeContacts) => this.emit('randomContactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+        this.randomPeers.on('contactAdded', (contactAdded, activeContacts) => this.emit('randomContactAdded', contactAdded.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
+    }
+    onKBucketPing(oldContacts, newContact) {
+        if (this.stopped) {
+            return;
+        }
+        const sortingList = new SortedContactList_1.SortedContactList({
+            referenceId: this.config.localNodeId,
+            maxSize: 100, // TODO use config option or named constant?
+            allowToContainReferenceId: false,
+            emitEvents: false
+        });
+        sortingList.addContacts(oldContacts);
+        const sortedContacts = sortingList.getAllContacts();
+        const removableNodeId = sortedContacts[sortedContacts.length - 1].getNodeId();
+        this.config.connectionManager?.weakUnlockConnection(removableNodeId, this.config.lockId);
+        this.bucket.remove((0, identifiers_1.getRawFromDhtAddress)(removableNodeId));
+        this.bucket.add(newContact);
+    }
+    onKBucketRemoved(nodeId) {
+        if (this.stopped) {
+            return;
+        }
+        this.config.connectionManager?.weakUnlockConnection(nodeId, this.config.lockId);
+        logger.trace(`Removed contact ${nodeId}`);
+        if (this.bucket.count() === 0) {
+            this.emit('kBucketEmpty');
+        }
+    }
+    onKBucketAdded(contact) {
+        if (this.stopped) {
+            return;
+        }
+        if (contact.getNodeId() !== this.config.localNodeId) {
+            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.lockId);
+            if (this.connections.has(contact.getNodeId())) {
+                logger.trace(`Added new contact ${nodeId}`);
+            }
+            else { // open connection by pinging
+                logger.trace('starting ping ' + nodeId);
+                contact.ping().then((result) => {
+                    if (result) {
+                        logger.trace(`Added new contact ${nodeId}`);
+                    }
+                    else {
+                        logger.trace('ping failed ' + nodeId);
+                        this.config.connectionManager?.weakUnlockConnection(nodeId, this.config.lockId);
+                        this.removeContact(nodeId);
+                        this.addClosestContactToBucket();
+                    }
+                    return;
+                }).catch((_e) => {
+                    this.config.connectionManager?.weakUnlockConnection(nodeId, this.config.lockId);
+                    this.removeContact(nodeId);
+                    this.addClosestContactToBucket();
+                });
+            }
+        }
+    }
+    addClosestContactToBucket() {
+        if (this.stopped) {
+            return;
+        }
+        const closest = this.getClosestActiveContactNotInBucket();
+        if (closest) {
+            this.addContact([closest.getPeerDescriptor()]);
+        }
+    }
+    getClosestActiveContactNotInBucket() {
+        for (const contactId of this.contacts.getContactIds()) {
+            if (!this.bucket.get((0, identifiers_1.getRawFromDhtAddress)(contactId)) && this.contacts.isActive(contactId)) {
+                return this.contacts.getContact(contactId).contact;
+            }
+        }
+        return undefined;
+    }
+    onContactConnected(peerDescriptor) {
+        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        if (nodeId === this.config.localNodeId) {
+            logger.error('handleConnected() to self');
+        }
+        const rpcRemote = this.config.createDhtNodeRpcRemote(peerDescriptor);
+        if (!this.connections.has(nodeId)) {
+            this.connections.set(nodeId, rpcRemote);
+            logger.trace('connectionschange add ' + this.connections.size);
+        }
+        else {
+            logger.trace('new connection not set to connections, there is already a connection with the peer ID');
+        }
+        logger.trace('connected: ' + nodeId + ' ' + this.connections.size);
+    }
+    onContactDisconnected(nodeId, gracefulLeave) {
+        logger.trace('disconnected: ' + nodeId);
+        this.connections.delete(nodeId);
+        if (this.config.isLayer0) {
+            this.bucket.remove((0, identifiers_1.getRawFromDhtAddress)(nodeId));
+            if (gracefulLeave === true) {
+                logger.trace(nodeId + ' ' + 'onTransportDisconnected with gracefulLeave ' + gracefulLeave);
+                this.removeContact(nodeId);
+            }
+            else {
+                logger.trace(nodeId + ' ' + 'onTransportDisconnected with gracefulLeave ' + gracefulLeave);
+            }
+        }
+    }
+    removeContact(nodeId) {
+        if (this.stopped) {
+            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);
+    }
+    stop() {
+        this.stopped = true;
+        this.bucket.toArray().forEach((rpcRemote) => {
+            rpcRemote.leaveNotice();
+            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();
+    }
+    getClosestNeighborsTo(referenceId, limit, excludedNodeIds) {
+        const closest = new SortedContactList_1.SortedContactList({
+            referenceId,
+            allowToContainReferenceId: true,
+            emitEvents: false,
+            excludedNodeIds
+        });
+        this.bucket.toArray().forEach((contact) => closest.addContact(contact));
+        return closest.getClosestContacts(limit);
+    }
+    // TODO reduce copy-paste?
+    getClosestContactsTo(referenceId, limit, excludedNodeIds) {
+        const closest = new SortedContactList_1.SortedContactList({
+            referenceId,
+            allowToContainReferenceId: true,
+            emitEvents: false,
+            excludedNodeIds
+        });
+        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);
+    }
+    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;
+    }
+    getConnectionCount() {
+        return this.connections.size;
+    }
+    getNeighborCount() {
+        return this.bucket.count();
+    }
+    getNeighbors() {
+        return this.bucket.toArray().map((rpcRemote) => rpcRemote.getPeerDescriptor());
+    }
+    setContactActive(nodeId) {
+        this.contacts.setActive(nodeId);
+    }
+    addContact(peerDescriptors, setActive) {
+        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);
+                const isInRingContacts = this.ringContacts.getContact(contact) !== 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);
+                }
+                if (!isInRingContacts) {
+                    this.ringContacts.addContact(remote);
+                }
+            }
+        });
+    }
+}
+exports.PeerManager = PeerManager;
+//# sourceMappingURL=PeerManager.js.map

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

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

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

@@ -1,8 +1,8 @@
-import { PeerID } from '../../helpers/PeerID';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { DhtAddress } from '../../identifiers';
 export declare class Contact {
     private peerDescriptor;
     constructor(peerDescriptor: PeerDescriptor);
     getPeerDescriptor(): PeerDescriptor;
-    getPeerId(): PeerID;
+    getNodeId(): DhtAddress;
 }

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Contact = void 0;
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const identifiers_1 = require("../../identifiers");
 class Contact {
+    peerDescriptor;
     constructor(peerDescriptor) {
         this.peerDescriptor = peerDescriptor;
     }
     getPeerDescriptor() {
         return this.peerDescriptor;
     }
-    getPeerId() {
-        return (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.peerDescriptor);
+    getNodeId() {
+        return (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.peerDescriptor);
     }
 }
 exports.Contact = Contact;

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

@@ -1 +1 @@
-{"version":3,"file":"Contact.js","sourceRoot":"","sources":["../../../../src/dht/contact/Contact.ts"],"names":[],"mappings":";;;AAEA,qFAAiF;AAEjF,MAAa,OAAO;IAGhB,YAAY,cAA8B;QACtC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAEM,SAAS;QACZ,OAAO,IAAA,mDAAwB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACxD,CAAC;CACJ;AAdD,0BAcC"}
+{"version":3,"file":"Contact.js","sourceRoot":"","sources":["../../../../src/dht/contact/Contact.ts"],"names":[],"mappings":";;;AACA,mDAA2E;AAE3E,MAAa,OAAO;IAER,cAAc,CAAgB;IAEtC,YAAY,cAA8B;QACtC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAEM,SAAS;QACZ,OAAO,IAAA,yCAA2B,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;CACJ;AAfD,0BAeC"}

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

@@ -1,5 +1,5 @@
-import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import EventEmitter from 'eventemitter3';
+import { DhtAddress } from '../../identifiers';
 export declare class ContactState<C> {
     contacted: boolean;
     active: boolean;
@@ -8,18 +8,18 @@ export declare class ContactState<C> {
 }
 export interface Events<C> {
     contactRemoved: (removedContact: C, closestContacts: C[]) => void;
-    newContact: (newContact: C, closestContacts: C[]) => void;
+    contactAdded: (contactAdded: C, closestContacts: C[]) => void;
 }
 export declare class ContactList<C extends {
-    getPeerId: () => PeerID;
+    getNodeId: () => DhtAddress;
 }> extends EventEmitter<Events<C>> {
-    protected contactsById: Map<PeerIDKey, ContactState<C>>;
-    protected contactIds: PeerID[];
-    protected ownId: PeerID;
+    protected contactsById: Map<DhtAddress, ContactState<C>>;
+    protected contactIds: DhtAddress[];
+    protected localNodeId: DhtAddress;
     protected maxSize: number;
     protected defaultContactQueryLimit: number;
-    constructor(ownId: PeerID, maxSize: number, defaultContactQueryLimit?: number);
-    getContact(id: PeerID): ContactState<C>;
+    constructor(localNodeId: DhtAddress, maxSize: number, defaultContactQueryLimit?: number);
+    getContact(id: DhtAddress): ContactState<C> | undefined;
     getSize(): number;
     clear(): void;
     stop(): void;

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

@@ -6,24 +6,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContactList = exports.ContactState = void 0;
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 class ContactState {
+    contacted = false;
+    active = false;
+    contact;
     constructor(contact) {
-        this.contacted = false;
-        this.active = false;
         this.contact = contact;
     }
 }
 exports.ContactState = ContactState;
 class ContactList extends eventemitter3_1.default {
-    constructor(ownId, maxSize, defaultContactQueryLimit = 20) {
+    contactsById = new Map();
+    // TODO move this to SortedContactList
+    contactIds = [];
+    localNodeId;
+    maxSize;
+    defaultContactQueryLimit;
+    constructor(localNodeId, maxSize, defaultContactQueryLimit = 20) {
         super();
-        this.contactsById = new Map();
-        this.contactIds = [];
-        this.ownId = ownId;
+        this.localNodeId = localNodeId;
         this.maxSize = maxSize;
         this.defaultContactQueryLimit = defaultContactQueryLimit;
     }
     getContact(id) {
-        return this.contactsById.get(id.toKey());
+        return this.contactsById.get(id);
     }
     getSize() {
         return this.contactIds.length;

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

@@ -1 +1 @@
-{"version":3,"file":"ContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/ContactList.ts"],"names":[],"mappings":";;;;;;AACA,kEAAwC;AAExC,MAAa,YAAY;IAKrB,YAAY,OAAU;QAJf,cAAS,GAAG,KAAK,CAAA;QACjB,WAAM,GAAG,KAAK,CAAA;QAIjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AARD,oCAQC;AAOD,MAAa,WAAmD,SAAQ,uBAAuB;IAQ3F,YACI,KAAa,EACb,OAAe,EACf,wBAAwB,GAAG,EAAE;QAE7B,KAAK,EAAE,CAAA;QAXD,iBAAY,GAAoC,IAAI,GAAG,EAAE,CAAA;QACzD,eAAU,GAAa,EAAE,CAAA;QAW/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;IAC5D,CAAC;IAEM,UAAU,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAE,CAAA;IAC7C,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;CACJ;AApCD,kCAoCC"}
+{"version":3,"file":"ContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/ContactList.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AAGxC,MAAa,YAAY;IACd,SAAS,GAAG,KAAK,CAAA;IACjB,MAAM,GAAG,KAAK,CAAA;IACd,OAAO,CAAG;IAEjB,YAAY,OAAU;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AARD,oCAQC;AAOD,MAAa,WAAuD,SAAQ,uBAAuB;IAErF,YAAY,GAAqC,IAAI,GAAG,EAAE,CAAA;IACpE,sCAAsC;IAC5B,UAAU,GAAiB,EAAE,CAAA;IAC7B,WAAW,CAAY;IACvB,OAAO,CAAQ;IACf,wBAAwB,CAAA;IAElC,YACI,WAAuB,EACvB,OAAe,EACf,wBAAwB,GAAG,EAAE;QAE7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;IAC5D,CAAC;IAEM,UAAU,CAAC,EAAc;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;CACJ;AArCD,kCAqCC"}

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

@@ -1,11 +1,11 @@
-import { PeerID } from '../../helpers/PeerID';
+import { DhtAddress } from '../../identifiers';
 import { ContactList } from './ContactList';
 export declare class RandomContactList<C extends {
-    getPeerId: () => PeerID;
+    getNodeId: () => DhtAddress;
 }> extends ContactList<C> {
     private randomness;
-    constructor(ownId: PeerID, maxSize: number, randomness?: number, defaultContactQueryLimit?: number);
+    constructor(localNodeId: DhtAddress, maxSize: number, randomness?: number, defaultContactQueryLimit?: number);
     addContact(contact: C): void;
-    removeContact(id: PeerID): boolean;
+    removeContact(id: DhtAddress): boolean;
     getContacts(limit?: number): C[];
 }

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

@@ -3,33 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RandomContactList = void 0;
 const ContactList_1 = require("./ContactList");
 class RandomContactList extends ContactList_1.ContactList {
-    constructor(ownId, maxSize, randomness = 0.20, defaultContactQueryLimit) {
-        super(ownId, maxSize, defaultContactQueryLimit);
+    randomness;
+    constructor(localNodeId, maxSize, randomness = 0.20, defaultContactQueryLimit) {
+        super(localNodeId, maxSize, defaultContactQueryLimit);
         this.randomness = randomness;
     }
     addContact(contact) {
-        if (this.ownId.equals(contact.getPeerId())) {
+        if (this.localNodeId === contact.getNodeId()) {
             return;
         }
-        if (!this.contactsById.has(contact.getPeerId().toKey())) {
+        if (!this.contactsById.has(contact.getNodeId())) {
             const roll = Math.random();
             if (roll < this.randomness) {
                 if (this.getSize() === this.maxSize && this.getSize() > 0) {
                     const toRemove = this.contactIds[0];
                     this.removeContact(toRemove);
                 }
-                this.contactIds.push(contact.getPeerId());
-                this.contactsById.set(contact.getPeerId().toKey(), new ContactList_1.ContactState(contact));
-                this.emit('newContact', contact, this.getContacts());
+                this.contactIds.push(contact.getNodeId());
+                this.contactsById.set(contact.getNodeId(), new ContactList_1.ContactState(contact));
+                this.emit('contactAdded', contact, this.getContacts());
             }
         }
     }
     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;
+            const index = this.contactIds.findIndex((nodeId) => (nodeId === id));
             this.contactIds.splice(index, 1);
-            this.contactsById.delete(id.toKey());
+            this.contactsById.delete(id);
             this.emit('contactRemoved', removed, this.getContacts());
             return true;
         }
@@ -38,7 +39,7 @@ class RandomContactList extends ContactList_1.ContactList {
     getContacts(limit = this.defaultContactQueryLimit) {
         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);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"RandomContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/RandomContactList.ts"],"names":[],"mappings":";;;AACA,+CAAyD;AAEzD,MAAa,iBAAyD,SAAQ,yBAAc;IAIxF,YACI,KAAa,EACb,OAAe,EACf,UAAU,GAAG,IAAI,EACjB,wBAAiC;QAEjC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAA;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,UAAU,CAAC,OAAU;QACjB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YACxC,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACrD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YAC1B,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE;gBACxB,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;oBACnC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;iBAC/B;gBACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBAC7E,IAAI,CAAC,IAAI,CACL,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,WAAW,EAAE,CACrB,CAAA;aACJ;SACJ;IACL,CAAC;IAED,aAAa,CAAC,EAAU;QACpB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAE,CAAC,OAAO,CAAA;YAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;YACxE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;YACpC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;YACxD,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,wBAAwB;QACpD,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;YACxD,IAAI,OAAO,EAAE;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AA1DD,8CA0DC"}
+{"version":3,"file":"RandomContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/RandomContactList.ts"],"names":[],"mappings":";;;AACA,+CAAyD;AAEzD,MAAa,iBAA6D,SAAQ,yBAAc;IAEpF,UAAU,CAAQ;IAE1B,YACI,WAAuB,EACvB,OAAe,EACf,UAAU,GAAG,IAAI,EACjB,wBAAiC;QAEjC,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAA;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,UAAU,CAAC,OAAU;QACjB,IAAI,IAAI,CAAC,WAAW,KAAK,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YAC3C,OAAM;QACV,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YAC1B,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;oBACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;oBACnC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;gBAChC,CAAC;gBACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBACrE,IAAI,CAAC,IAAI,CACL,cAAc,EACd,OAAO,EACP,IAAI,CAAC,WAAW,EAAE,CACrB,CAAA;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,aAAa,CAAC,EAAc;QACxB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,OAAO,CAAA;YAClD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAA;YACpE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC5B,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;YACxD,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,wBAAwB;QACpD,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAChD,IAAI,OAAO,EAAE,CAAC;gBACV,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YAC7B,CAAC;QACL,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AA1DD,8CA0DC"}

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[];
+}