@streamr/dht 100.0.0-testnet-one.4 → 100.0.0-testnet-two.1

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

@@ -1,35 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RandomContactList = void 0;
+const nodeId_1 = require("../../helpers/nodeId");
 const ContactList_1 = require("./ContactList");
 class RandomContactList extends ContactList_1.ContactList {
-    constructor(ownId, maxSize, randomness = 0.20, defaultContactQueryLimit) {
-        super(ownId, maxSize, defaultContactQueryLimit);
+    constructor(localNodeId, maxSize, randomness = 0.20, defaultContactQueryLimit) {
+        super(localNodeId, maxSize, defaultContactQueryLimit);
         this.randomness = randomness;
     }
     addContact(contact) {
-        if (this.ownId.equals(contact.getPeerId())) {
+        if ((0, nodeId_1.areEqualNodeIds)(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.contactIds.push(contact.getNodeId());
+                this.contactsById.set(contact.getNodeId(), new ContactList_1.ContactState(contact));
                 this.emit('newContact', 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) => (0, nodeId_1.areEqualNodeIds)(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":";;;AAAA,iDAA8D;AAC9D,+CAAyD;AAEzD,MAAa,iBAAyD,SAAQ,yBAAc;IAIxF,YACI,WAAmB,EACnB,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,IAAA,wBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YACxD,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YAC7C,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,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBACrE,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,EAAE;YAC3B,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,IAAA,wBAAe,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAChF,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;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,CAAA;YAChD,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"}

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

@@ -1,18 +1,21 @@
+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';
 export declare const EXISTING_CONNECTION_TIMEOUT = 5000;
-export declare abstract class RpcRemote<T> {
+export declare abstract class RpcRemote<T extends ServiceInfo & ClassType> {
     private readonly localPeerDescriptor;
     private readonly remotePeerDescriptor;
     private readonly serviceId;
     private readonly client;
     private readonly timeout?;
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, client: ProtoRpcClient<T>, timeout?: number);
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, rpcCommunicator: RpcCommunicator, clientClass: {
+        new (clientTransport: ClientTransport): T;
+    }, timeout?: number);
     getPeerDescriptor(): PeerDescriptor;
     getLocalPeerDescriptor(): PeerDescriptor;
-    getServiceId(): string;
+    getServiceId(): ServiceID;
     getClient(): ProtoRpcClient<T>;
     formDhtRpcOptions(opts?: Omit<DhtRpcOptions, 'sourceDescriptor' | 'targetDescriptor'>): DhtRpcOptions;
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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
@@ -26,10 +27,12 @@ const getTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
     return WEBRTC_TIMEOUT;
 };
 class RpcRemote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client, timeout) {
+    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, rpcCommunicator, 
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
+    clientClass, timeout) {
         this.localPeerDescriptor = localPeerDescriptor;
         this.remotePeerDescriptor = remotePeerDescriptor;
-        this.client = client;
+        this.client = (0, proto_rpc_1.toProtoRpcClient)(new clientClass(rpcCommunicator.getRpcClientTransport()));
         this.serviceId = serviceId;
         this.timeout = timeout;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"RpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/contact/RpcRemote.ts"],"names":[],"mappings":";;;AAIA,8DAA6D;AAC7D,6DAAmE;AAEnE,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;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,SAAS;IAQ3B,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,MAAyB,EACzB,OAAgB;QAEhB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,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,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,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;AA9CD,8BA8CC"}
+{"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;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,SAAS;IAQ3B,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,eAAgC;IAChC,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,SAAS,GAAG,SAAS,CAAA;QAC1B,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,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,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;AAhDD,8BAgDC"}

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

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

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

@@ -8,6 +8,7 @@ const ContactList_1 = require("./ContactList");
 const lodash_1 = require("lodash");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const PeerManager_1 = require("../PeerManager");
+const nodeId_1 = require("../../helpers/nodeId");
 class SortedContactList extends eventemitter3_1.default {
     constructor(config) {
         super();
@@ -23,27 +24,28 @@ class SortedContactList extends eventemitter3_1.default {
         return this.contactIds;
     }
     addContact(contact) {
-        if (this.config.excludedPeerIDs !== undefined
-            && this.config.excludedPeerIDs.some((peerId) => contact.getPeerId().equals(peerId))) {
+        if (this.config.excludedNodeIds !== undefined && this.config.excludedNodeIds.has(contact.getNodeId())) {
             return;
         }
-        if ((!this.config.allowToContainReferenceId && this.config.referenceId.equals(contact.getPeerId())) ||
-            (this.config.peerIdDistanceLimit !== undefined && this.compareIds(this.config.peerIdDistanceLimit, contact.getPeerId()) < 0)) {
+        if ((!this.config.allowToContainReferenceId && (0, nodeId_1.areEqualNodeIds)(this.config.referenceId, contact.getNodeId())) ||
+            (this.config.nodeIdDistanceLimit !== undefined && this.compareIds(this.config.nodeIdDistanceLimit, contact.getNodeId()) < 0)) {
             return;
         }
-        if (!this.contactsById.has(contact.getPeerId().toKey())) {
+        if (!this.contactsById.has(contact.getNodeId())) {
             if ((this.config.maxSize === undefined) || (this.contactIds.length < this.config.maxSize)) {
-                this.contactsById.set(contact.getPeerId().toKey(), new ContactList_1.ContactState(contact));
-                const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contact.getPeerId(), (id) => { return this.distanceToReferenceId(id); });
-                this.contactIds.splice(index, 0, contact.getPeerId());
+                this.contactsById.set(contact.getNodeId(), new ContactList_1.ContactState(contact));
+                // eslint-disable-next-line max-len
+                const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contact.getNodeId(), (id) => { return this.distanceToReferenceId(id); });
+                this.contactIds.splice(index, 0, contact.getNodeId());
             }
-            else if (this.compareIds(this.contactIds[this.config.maxSize - 1], contact.getPeerId()) > 0) {
+            else if (this.compareIds(this.contactIds[this.config.maxSize - 1], contact.getNodeId()) > 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));
-                const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contact.getPeerId(), (id) => { return this.distanceToReferenceId(id); });
-                this.contactIds.splice(index, 0, contact.getPeerId());
+                const removedContact = this.contactsById.get(removedId).contact;
+                this.contactsById.delete(removedId);
+                this.contactsById.set(contact.getNodeId(), new ContactList_1.ContactState(contact));
+                // eslint-disable-next-line max-len
+                const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contact.getNodeId(), (id) => { return this.distanceToReferenceId(id); });
+                this.contactIds.splice(index, 0, contact.getNodeId());
                 if (this.config.emitEvents) {
                     this.emit('contactRemoved', removedContact, this.getClosestContacts());
                 }
@@ -57,22 +59,22 @@ class SortedContactList extends eventemitter3_1.default {
         contacts.forEach((contact) => this.addContact(contact));
     }
     getContact(id) {
-        return this.contactsById.get(id.toKey());
+        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) {
         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);
             }
@@ -87,7 +89,7 @@ class SortedContactList extends eventemitter3_1.default {
     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) {
@@ -100,7 +102,7 @@ class SortedContactList extends eventemitter3_1.default {
     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);
             }
@@ -119,14 +121,16 @@ class SortedContactList extends eventemitter3_1.default {
     }
     // TODO inline this method?
     distanceToReferenceId(id) {
-        return (0, PeerManager_1.getDistance)(this.config.referenceId.value, id.value);
+        // TODO maybe this class should store the referenceId also as UInt8Array so that we don't need to convert it here?
+        return (0, PeerManager_1.getDistance)(this.config.referenceId, 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) => (0, nodeId_1.areEqualNodeIds)(nodeId, id));
             this.contactIds.splice(index, 1);
-            this.contactsById.delete(id.toKey());
+            this.contactsById.delete(id);
             if (this.config.emitEvents) {
                 this.emit('contactRemoved', removed, this.getClosestContacts());
             }
@@ -135,10 +139,10 @@ class SortedContactList extends eventemitter3_1.default {
         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;

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":";;;;;;AAAA,+CAAoD;AACpD,mCAAsC;AACtC,kEAAwC;AACxC,gDAA4C;AAC5C,iDAA8D;AAe9D,MAAa,iBAAyD,SAAQ,uBAAuB;IAMjG,YACI,MAA+B;QAE/B,KAAK,EAAE,CAAA;QANH,iBAAY,GAAiC,IAAI,GAAG,EAAE,CAAA;QACtD,eAAU,GAAa,EAAE,CAAA;QAM7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IAEM,mBAAmB;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAC7B,CAAC;IAEM,aAAa;QAChB,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IAEM,UAAU,CAAC,OAAU;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YACnG,OAAM;SACT;QAED,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,yBAAyB,IAAI,IAAA,wBAAe,EAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YACzG,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAC9H,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBACvF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBAErE,mCAAmC;gBACnC,MAAM,KAAK,GAAG,IAAA,sBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAU,EAAE,EAAE,GAAG,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;gBAC5H,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;aACxD;iBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE;gBAC3F,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAA;gBACvC,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAU,CAAE,CAAC,OAAO,CAAA;gBACjE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAU,CAAC,CAAA;gBACpC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBAErE,mCAAmC;gBACnC,MAAM,KAAK,GAAG,IAAA,sBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAU,EAAE,EAAE,GAAG,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;gBAC5H,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACrD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;oBACxB,IAAI,CAAC,IAAI,CACL,gBAAgB,EAChB,cAAc,EACd,IAAI,CAAC,kBAAkB,EAAE,CAC5B,CAAA;iBACJ;aACJ;YACD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gBACxB,IAAI,CAAC,IAAI,CACL,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,kBAAkB,EAAE,CAC5B,CAAA;aACJ;SACJ;IACL,CAAC;IAEM,WAAW,CAAC,QAAa;QAC5B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3D,CAAC;IAEM,UAAU,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC;IAEM,YAAY,CAAC,SAAiB;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,SAAS,GAAG,IAAI,CAAA;SACrD;IACL,CAAC;IAEM,SAAS,CAAC,SAAiB;QAC9B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,MAAM,GAAG,IAAI,CAAA;SAClD;IACL,CAAC;IAEM,kBAAkB,CAAC,KAAc;QACpC,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;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,OAAO,GAAG,CAAA;SACb;aAAM;YACH,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;SAC7B;IACL,CAAC;IAEM,sBAAsB,CAAC,GAAW;QACrC,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAChD,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;gBACzB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;oBACnB,OAAO,GAAG,CAAA;iBACb;aACJ;SACJ;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IAEM,iBAAiB,CAAC,KAAc;QACnC,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,IAAI,OAAO,CAAC,MAAM,EAAE;gBAC3B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;SAC7B;aAAM;YACH,OAAO,GAAG,CAAA;SACb;IACL,CAAC;IAEM,UAAU,CAAC,GAAW,EAAE,GAAW;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;QACjD,OAAO,SAAS,GAAG,SAAS,CAAA;IAChC,CAAC;IAED,2BAA2B;IACnB,qBAAqB,CAAC,EAAU;QACpC,kHAAkH;QAClH,OAAO,IAAA,yBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;IACnD,CAAC;IAEM,aAAa,CAAC,EAAU;QAC3B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,OAAO,CAAA;YAClD,0BAA0B;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,wBAAe,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gBACxB,IAAI,CAAC,IAAI,CACL,gBAAgB,EAChB,OAAO,EACP,IAAI,CAAC,kBAAkB,EAAE,CAC5B,CAAA;aACJ;YACD,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,QAAQ,CAAC,EAAU;QACtB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAA;IAChF,CAAC;IAEM,cAAc;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,OAAO,CAAC,CAAA;IAClF,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;AArLD,8CAqLC"}

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

@@ -1,19 +1,17 @@
-import { PeerIDKey } from '../../helpers/PeerID';
 import { PeerManager } from '../PeerManager';
 interface DiscoverySessionConfig {
     targetId: Uint8Array;
     parallelism: number;
     noProgressLimit: number;
     peerManager: PeerManager;
-    contactedPeers: Set<PeerIDKey>;
 }
 export declare class DiscoverySession {
-    readonly sessionId: string;
+    readonly id: string;
     private stopped;
     private emitter;
-    private outgoingClosestPeersRequestsCounter;
     private noProgressCounter;
     private ongoingClosestPeersRequests;
+    private contactedPeers;
     private readonly config;
     constructor(config: DiscoverySessionConfig);
     private addNewContacts;

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

@@ -9,15 +9,16 @@ const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const uuid_1 = require("uuid");
 const PeerManager_1 = require("../PeerManager");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const nodeId_1 = require("../../helpers/nodeId");
 const logger = new utils_1.Logger(module);
 class DiscoverySession {
     constructor(config) {
-        this.sessionId = (0, uuid_1.v4)();
+        this.id = (0, uuid_1.v4)();
         this.stopped = false;
         this.emitter = new eventemitter3_1.default();
-        this.outgoingClosestPeersRequestsCounter = 0;
         this.noProgressCounter = 0;
         this.ongoingClosestPeersRequests = new Set();
+        this.contactedPeers = new Set();
         this.config = config;
     }
     addNewContacts(contacts) {
@@ -31,41 +32,37 @@ class DiscoverySession {
             return [];
         }
         logger.trace(`Getting closest peers from contact: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
-        this.outgoingClosestPeersRequestsCounter++;
-        this.config.contactedPeers.add(contact.getPeerId().toKey());
+        this.contactedPeers.add(contact.getNodeId());
         const returnedContacts = await contact.getClosestPeers(this.config.targetId);
-        this.config.peerManager.handlePeerActive(contact.getPeerId());
+        this.config.peerManager.handlePeerActive(contact.getNodeId());
         return returnedContacts;
     }
-    onClosestPeersRequestSucceeded(peerId, contacts) {
-        if (!this.ongoingClosestPeersRequests.has(peerId.toKey())) {
+    onClosestPeersRequestSucceeded(nodeId, contacts) {
+        if (!this.ongoingClosestPeersRequests.has(nodeId)) {
             return;
         }
-        this.ongoingClosestPeersRequests.delete(peerId.toKey());
-        const oldClosestNeighbor = this.config.peerManager.getClosestNeighborsTo(this.config.targetId, 1)[0];
-        const oldClosestDistance = (0, PeerManager_1.getDistance)(this.config.targetId, oldClosestNeighbor.getPeerId().value);
+        this.ongoingClosestPeersRequests.delete(nodeId);
+        const oldClosestNeighbor = this.config.peerManager.getClosestNeighborsTo((0, nodeId_1.getNodeIdFromBinary)(this.config.targetId), 1)[0];
+        const oldClosestDistance = (0, PeerManager_1.getDistance)((0, nodeId_1.getNodeIdFromBinary)(this.config.targetId), oldClosestNeighbor.getNodeId());
         this.addNewContacts(contacts);
-        const newClosestNeighbor = this.config.peerManager.getClosestNeighborsTo(this.config.targetId, 1)[0];
-        const newClosestDistance = (0, PeerManager_1.getDistance)(this.config.targetId, newClosestNeighbor.getPeerId().value);
+        const newClosestNeighbor = this.config.peerManager.getClosestNeighborsTo((0, nodeId_1.getNodeIdFromBinary)(this.config.targetId), 1)[0];
+        const newClosestDistance = (0, PeerManager_1.getDistance)((0, nodeId_1.getNodeIdFromBinary)(this.config.targetId), newClosestNeighbor.getNodeId());
         if (newClosestDistance >= oldClosestDistance) {
             this.noProgressCounter++;
         }
-        else {
-            this.noProgressCounter = 0;
-        }
     }
     onClosestPeersRequestFailed(peer) {
-        if (!this.ongoingClosestPeersRequests.has(peer.getPeerId().toKey())) {
+        if (!this.ongoingClosestPeersRequests.has(peer.getNodeId())) {
             return;
         }
-        this.ongoingClosestPeersRequests.delete(peer.getPeerId().toKey());
-        this.config.peerManager.handlePeerUnresponsive(peer.getPeerId());
+        this.ongoingClosestPeersRequests.delete(peer.getNodeId());
+        this.config.peerManager.handlePeerUnresponsive(peer.getNodeId());
     }
     findMoreContacts() {
         if (this.stopped) {
             return;
         }
-        const uncontacted = this.config.peerManager.getClosestContactsTo(this.config.targetId, this.config.parallelism, this.config.contactedPeers);
+        const uncontacted = this.config.peerManager.getClosestContactsTo((0, nodeId_1.getNodeIdFromBinary)(this.config.targetId), this.config.parallelism, this.contactedPeers);
         if (uncontacted.length === 0 || this.noProgressCounter >= this.config.noProgressLimit) {
             this.emitter.emit('discoveryCompleted');
             this.stopped = true;
@@ -75,19 +72,18 @@ class DiscoverySession {
             if (this.ongoingClosestPeersRequests.size >= this.config.parallelism) {
                 break;
             }
-            this.ongoingClosestPeersRequests.add(nextPeer.getPeerId().toKey());
+            this.ongoingClosestPeersRequests.add(nextPeer.getNodeId());
             // eslint-disable-next-line promise/catch-or-return
             this.getClosestPeersFromContact(nextPeer)
-                .then((contacts) => this.onClosestPeersRequestSucceeded(nextPeer.getPeerId(), contacts))
+                .then((contacts) => this.onClosestPeersRequestSucceeded(nextPeer.getNodeId(), contacts))
                 .catch(() => this.onClosestPeersRequestFailed(nextPeer))
                 .finally(() => {
-                this.outgoingClosestPeersRequestsCounter--;
                 this.findMoreContacts();
             });
         }
     }
     async findClosestNodes(timeout) {
-        if (this.config.peerManager.getNumberOfContacts(this.config.contactedPeers) === 0) {
+        if (this.config.peerManager.getNumberOfContacts(this.contactedPeers) === 0) {
             return;
         }
         // TODO add abortController and signal it in stop()

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

@@ -1 +1 @@
-{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA6D;AAC7D,kEAAwC;AACxC,+BAAyB;AAGzB,gDAAyD;AAEzD,qFAAoF;AAEpF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAejC,MAAa,gBAAgB;IAUzB,YAAY,MAA8B;QAT1B,cAAS,GAAG,IAAA,SAAE,GAAE,CAAA;QAExB,YAAO,GAAG,KAAK,CAAA;QACf,YAAO,GAAG,IAAI,uBAAY,EAA0B,CAAA;QACpD,wCAAmC,GAAG,CAAC,CAAA;QACvC,sBAAiB,GAAG,CAAC,CAAA;QACrB,gCAA2B,GAAgB,IAAI,GAAG,EAAE,CAAA;QAIxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEO,cAAc,CAAC,QAA0B;QAC7C,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IACpD,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,OAAyB;QAC9D,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAO,EAAE,CAAA;SACZ;QACD,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAA,sDAA2B,EAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC/G,IAAI,CAAC,mCAAmC,EAAE,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;QAC3D,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC5E,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC7D,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEO,8BAA8B,CAAC,MAAc,EAAE,QAA0B;QAC7E,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE;YACvD,OAAM;SACT;QACD,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACpG,MAAM,kBAAkB,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAA;QAClG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAC7B,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACpG,MAAM,kBAAkB,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAA;QAClG,IAAI,kBAAkB,IAAI,kBAAkB,EAAE;YAC1C,IAAI,CAAC,iBAAiB,EAAE,CAAA;SAC3B;aAAM;YACH,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAA;SAC7B;IACL,CAAC;IAEO,2BAA2B,CAAC,IAAsB;QACtD,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACjE,OAAM;SACT;QACD,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;QACjE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;IACpE,CAAC;IAEO,gBAAgB;QACpB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QAC3I,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YACnF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;YACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YACnB,OAAM;SACT;QACD,KAAK,MAAM,QAAQ,IAAI,WAAW,EAAE;YAChC,IAAI,IAAI,CAAC,2BAA2B,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;gBAClE,MAAK;aACR;YACD,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;YAClE,mDAAmD;YACnD,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC;iBACpC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;iBACvF,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;iBACvD,OAAO,CAAC,GAAG,EAAE;gBACV,IAAI,CAAC,mCAAmC,EAAE,CAAA;gBAC1C,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC3B,CAAC,CAAC,CAAA;SACT;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAAe;QACzC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC/E,OAAM;SACT;QACD,mDAAmD;QACnD,MAAM,IAAA,4BAAoB,EACtB,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAClC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,EACtC,OAAO,CACV,CAAA;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACvC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAA;IACrC,CAAC;CACJ;AArGD,4CAqGC"}
+{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":"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"}

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

@@ -2,7 +2,6 @@ import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
 import { ConnectionManager } from '../../connection/ConnectionManager';
 import { PeerManager } from '../PeerManager';
 import { ServiceID } from '../../types/ServiceID';
-import { PeerIDKey } from '../../helpers/PeerID';
 interface PeerDiscoveryConfig {
     localPeerDescriptor: PeerDescriptor;
     joinNoProgressLimit: number;
@@ -14,16 +13,14 @@ interface PeerDiscoveryConfig {
     peerManager: PeerManager;
 }
 export declare class PeerDiscovery {
-    private readonly config;
     private ongoingDiscoverySessions;
     private rejoinOngoing;
     private joinCalled;
-    private rejoinTimeoutRef?;
     private readonly abortController;
     private recoveryIntervalStarted;
+    private readonly config;
     constructor(config: PeerDiscoveryConfig);
-    joinDht(entryPoints: PeerDescriptor[], doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
-    joinThroughEntryPoint(entryPointDescriptor: PeerDescriptor, contactedPeers: Set<PeerIDKey>, doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
+    joinDht(entryPointDescriptor: PeerDescriptor, doAdditionalRandomPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
     private createSession;
     private runSessions;
     rejoinDht(entryPoint: PeerDescriptor): Promise<void>;

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

@@ -15,13 +15,7 @@ class PeerDiscovery {
         this.config = config;
         this.abortController = new AbortController();
     }
-    async joinDht(entryPoints, doAdditionalRandomPeerDiscovery = true, retry = true) {
-        const contactedPeers = new Set();
-        await Promise.all(entryPoints.map((entryPoint) => this.joinThroughEntryPoint(entryPoint, contactedPeers, doAdditionalRandomPeerDiscovery, retry)));
-    }
-    async joinThroughEntryPoint(entryPointDescriptor, 
-    // Note that this set is mutated by DiscoverySession
-    contactedPeers, doAdditionalRandomPeerDiscovery = true, retry = true) {
+    async joinDht(entryPointDescriptor, doAdditionalRandomPeerDiscovery = true, retry = true) {
         if (this.isStopped()) {
             return;
         }
@@ -34,27 +28,26 @@ class PeerDiscovery {
         this.config.connectionManager?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
         this.config.peerManager.handleNewPeers([entryPointDescriptor]);
         const targetId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.config.localPeerDescriptor).value;
-        const sessions = [this.createSession(targetId, contactedPeers)];
+        const sessions = [this.createSession(targetId)];
         if (doAdditionalRandomPeerDiscovery) {
-            sessions.push(this.createSession((0, nodeId_1.createRandomNodeId)(), contactedPeers));
+            sessions.push(this.createSession((0, nodeId_1.createRandomNodeId)()));
         }
         await this.runSessions(sessions, entryPointDescriptor, retry);
         this.config.connectionManager?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
     }
-    createSession(targetId, contactedPeers) {
+    createSession(targetId) {
         const sessionOptions = {
             targetId,
             parallelism: this.config.parallelism,
             noProgressLimit: this.config.joinNoProgressLimit,
-            peerManager: this.config.peerManager,
-            contactedPeers
+            peerManager: this.config.peerManager
         };
         return new DiscoverySession_1.DiscoverySession(sessionOptions);
     }
     async runSessions(sessions, entryPointDescriptor, retry) {
         try {
             for (const session of sessions) {
-                this.ongoingDiscoverySessions.set(session.sessionId, session);
+                this.ongoingDiscoverySessions.set(session.id, session);
                 await session.findClosestNodes(this.config.joinTimeout);
             }
         }
@@ -66,6 +59,7 @@ class PeerDiscovery {
                 if (this.config.peerManager.getNumberOfNeighbors() === 0) {
                     if (retry) {
                         // TODO should we catch possible promise rejection?
+                        // TODO use config option or named constant?
                         (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPointDescriptor), 1000, this.abortController.signal);
                     }
                 }
@@ -73,7 +67,7 @@ class PeerDiscovery {
                     await this.ensureRecoveryIntervalIsRunning();
                 }
             }
-            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.sessionId));
+            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
         }
     }
     async rejoinDht(entryPoint) {
@@ -83,13 +77,14 @@ class PeerDiscovery {
         logger.debug(`Rejoining DHT ${this.config.serviceId}`);
         this.rejoinOngoing = true;
         try {
-            await this.joinThroughEntryPoint(entryPoint, new Set());
+            await this.joinDht(entryPoint);
             logger.debug(`Rejoined DHT successfully ${this.config.serviceId}!`);
         }
         catch (err) {
             logger.warn(`Rejoining DHT ${this.config.serviceId} failed`);
             if (!this.isStopped()) {
                 // TODO should we catch possible promise rejection?
+                // TODO use config option or named constant?
                 (0, utils_1.setAbortableTimeout)(() => this.rejoinDht(entryPoint), 5000, this.abortController.signal);
             }
         }
@@ -100,6 +95,7 @@ class PeerDiscovery {
     async ensureRecoveryIntervalIsRunning() {
         if (!this.recoveryIntervalStarted) {
             this.recoveryIntervalStarted = true;
+            // TODO use config option or named constant?
             await (0, utils_1.scheduleAtInterval)(() => this.fetchClosestPeersFromBucket(), 60000, true, this.abortController.signal);
         }
     }
@@ -107,7 +103,7 @@ class PeerDiscovery {
         if (this.isStopped()) {
             return;
         }
-        const nodes = this.config.peerManager.getClosestNeighborsTo(this.config.localPeerDescriptor.nodeId, this.config.parallelism);
+        const nodes = this.config.peerManager.getClosestNeighborsTo((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), this.config.parallelism);
         await Promise.allSettled(nodes.map(async (peer) => {
             const contacts = await peer.getClosestPeers(this.config.localPeerDescriptor.nodeId);
             this.config.peerManager.handleNewPeers(contacts);
@@ -124,10 +120,6 @@ class PeerDiscovery {
     }
     stop() {
         this.abortController.abort();
-        if (this.rejoinTimeoutRef) {
-            clearTimeout(this.rejoinTimeoutRef);
-            this.rejoinTimeoutRef = undefined;
-        }
         this.ongoingDiscoverySessions.forEach((session) => {
             session.stop();
         });