@streamr/dht 0.0.1-tatum.4 → 0.0.1-tatum.6

package/src/proto/packages/dht/protos/DhtRpc.ts

@@ -39,6 +39,28 @@ export interface StoreDataResponse {
      */
     error: string;
 }
+/**
+ * @generated from protobuf message dht.ExternalStoreDataRequest
+ */
+export interface ExternalStoreDataRequest {
+    /**
+     * @generated from protobuf field: bytes key = 1;
+     */
+    key: Uint8Array;
+    /**
+     * @generated from protobuf field: google.protobuf.Any data = 2;
+     */
+    data?: Any;
+}
+/**
+ * @generated from protobuf message dht.ExternalStoreDataResponse
+ */
+export interface ExternalStoreDataResponse {
+    /**
+     * @generated from protobuf field: repeated dht.PeerDescriptor storers = 1;
+     */
+    storers: PeerDescriptor[];
+}
 /**
  * @generated from protobuf message dht.MigrateDataRequest
  */
@@ -806,6 +828,31 @@ class StoreDataResponse$Type extends MessageType$<StoreDataResponse> {
  */
 export const StoreDataResponse = new StoreDataResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
+class ExternalStoreDataRequest$Type extends MessageType$<ExternalStoreDataRequest> {
+    constructor() {
+        super("dht.ExternalStoreDataRequest", [
+            { no: 1, name: "key", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
+            { no: 2, name: "data", kind: "message", T: () => Any }
+        ]);
+    }
+}
+/**
+ * @generated MessageType for protobuf message dht.ExternalStoreDataRequest
+ */
+export const ExternalStoreDataRequest = new ExternalStoreDataRequest$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class ExternalStoreDataResponse$Type extends MessageType$<ExternalStoreDataResponse> {
+    constructor() {
+        super("dht.ExternalStoreDataResponse", [
+            { no: 1, name: "storers", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
+        ]);
+    }
+}
+/**
+ * @generated MessageType for protobuf message dht.ExternalStoreDataResponse
+ */
+export const ExternalStoreDataResponse = new ExternalStoreDataResponse$Type();
+// @generated message type with reflection information, may provide speed optimized methods
 class MigrateDataRequest$Type extends MessageType$<MigrateDataRequest> {
     constructor() {
         super("dht.MigrateDataRequest", [
@@ -1348,5 +1395,6 @@ export const ConnectionLocker = new ServiceType("dht.ConnectionLocker", [
  * @generated ServiceType for protobuf service dht.ExternalApiService
  */
 export const ExternalApiService = new ServiceType("dht.ExternalApiService", [
-    { name: "findData", options: {}, I: FindDataRequest, O: FindDataResponse }
+    { name: "findData", options: {}, I: FindDataRequest, O: FindDataResponse },
+    { name: "externalStoreData", options: {}, I: ExternalStoreDataRequest, O: ExternalStoreDataResponse }
 ]);

package/test/benchmark/KademliaCorrectness.test.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 import { Simulator } from '../../src/connection/Simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
+import { PeerID } from '../../src/exports'
 import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createMockConnectionDhtNode } from '../utils/utils'
 import { execSync } from 'child_process'
@@ -70,7 +71,7 @@ describe('Kademlia correctness', () => {
                 groundTruthString += groundTruth[i + ''][j].name + ','
             }
 
-            const kademliaNeighbors = nodes[i].getNeighborList().getContactIds()
+            const kademliaNeighbors = nodes[i].getClosestContacts().map((p) => PeerID.fromValue(p.kademliaId))
 
             let kadString = 'kademliaNeighbors: '
             kademliaNeighbors.forEach((neighbor) => {

package/test/end-to-end/Layer0-Layer1.test.ts

@@ -1,6 +1,6 @@
 import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { DhtNode } from '../../src/dht/DhtNode'
-import { peerIdFromPeerDescriptor } from '../../src/helpers/peerIdFromPeerDescriptor'
+import { isSamePeerDescriptor } from '../../src/helpers/peerIdFromPeerDescriptor'
 
 describe('Layer0-Layer1', () => {
     const epPeerDescriptor: PeerDescriptor = {
@@ -76,14 +76,14 @@ describe('Layer0-Layer1', () => {
             stream2Node1.joinDht([epPeerDescriptor]),
             stream2Node2.joinDht([epPeerDescriptor])
         ])
-        expect(stream1Node1.getNeighborList().getSize()).toEqual(1)
-        expect(stream1Node2.getNeighborList().getSize()).toEqual(1)
-        expect(stream2Node1.getNeighborList().getSize()).toEqual(1)
-        expect(stream2Node2.getNeighborList().getSize()).toEqual(1)
-
-        expect(stream1Node1.getNeighborList().getContactIds()[0].equals(peerIdFromPeerDescriptor(node1.getPeerDescriptor()))).toEqual(true)
-        expect(stream1Node2.getNeighborList().getContactIds()[0].equals(peerIdFromPeerDescriptor(epPeerDescriptor))).toEqual(true)
-        expect(stream2Node1.getNeighborList().getContactIds()[0].equals(peerIdFromPeerDescriptor(node2.getPeerDescriptor()))).toEqual(true)
-        expect(stream2Node2.getNeighborList().getContactIds()[0].equals(peerIdFromPeerDescriptor(epPeerDescriptor))).toEqual(true)
+        expect(stream1Node1.getClosestContacts()).toHaveLength(1)
+        expect(stream1Node2.getClosestContacts()).toHaveLength(1)
+        expect(stream2Node1.getClosestContacts()).toHaveLength(1)
+        expect(stream2Node2.getClosestContacts()).toHaveLength(1)
+
+        expect(isSamePeerDescriptor(stream1Node1.getClosestContacts()[0], node1.getPeerDescriptor())).toBe(true)
+        expect(isSamePeerDescriptor(stream1Node2.getClosestContacts()[0], epPeerDescriptor)).toBe(true)
+        expect(isSamePeerDescriptor(stream2Node1.getClosestContacts()[0], node2.getPeerDescriptor())).toBe(true)
+        expect(isSamePeerDescriptor(stream2Node2.getClosestContacts()[0], epPeerDescriptor)).toBe(true)
     })
 })

package/test/integration/DhtNodeExternalAPI.test.ts

@@ -39,5 +39,14 @@ describe('DhtNodeExternalApi', () => {
         const foundData = await remote.findDataViaPeer(PeerID.fromString('key').value, dhtNode1.getPeerDescriptor())
         expect(foundData).toEqual([])
     })
+
+    it('external store data happy path', async () => {
+        const data = Any.pack(dhtNode1.getPeerDescriptor(), PeerDescriptor)
+        const key = PeerID.fromString('key').value 
+
+        await remote.storeDataViaPeer(key, data, dhtNode1.getPeerDescriptor())
+        const foundData = await remote.findDataViaPeer(key, dhtNode1.getPeerDescriptor())
+        expect(Any.unpack(foundData[0].data!, PeerDescriptor)).toEqual(dhtNode1.getPeerDescriptor())
+    })
   
 })

package/test/integration/DhtWithMockConnectionLatencies.test.ts

@@ -39,7 +39,7 @@ describe('Mock connection Dht joining with latencies', () => {
         await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
         nodes.forEach((node) => {
             expect(node.getBucketSize()).toBeGreaterThanOrEqual(node.getK() - 2)
-            expect(node.getNeighborList().getSize()).toBeGreaterThanOrEqual(node.getK() - 2)
+            expect(node.getClosestContacts().length).toBeGreaterThanOrEqual(node.getK() - 2)
         })
         expect(entryPoint.getBucketSize()).toBeGreaterThanOrEqual(entryPoint.getK() - 2)
     }, 60 * 1000)

package/test/integration/DhtWithMockConnections.test.ts

@@ -39,7 +39,7 @@ describe('Mock IConnection DHT Joining', () => {
         await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
         nodes.forEach((node) => {
             expect(node.getBucketSize()).toBeGreaterThanOrEqual(node.getK() - 2)
-            expect(node.getNeighborList().getSize()).toBeGreaterThanOrEqual(node.getK() - 2)
+            expect(node.getClosestContacts().length).toBeGreaterThanOrEqual(node.getK() - 2)
         })
         expect(entryPoint.getBucketSize()).toBeGreaterThanOrEqual(entryPoint.getK() - 2)
     }, 60000)

package/test/integration/DhtWithRealConnectionLatencies.test.ts

@@ -40,7 +40,7 @@ describe('Mock connection Dht joining with real latencies', () => {
         await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
         nodes.forEach((node) => {
             expect(node.getBucketSize()).toBeGreaterThanOrEqual(node.getK() - 3)
-            expect(node.getNeighborList().getSize()).toBeGreaterThanOrEqual(node.getK() - 3)
+            expect(node.getClosestContacts().length).toBeGreaterThanOrEqual(node.getK() - 3)
         })
         expect(entryPoint.getBucketSize()).toBeGreaterThanOrEqual(entryPoint.getK())
     }, 60 * 1000)

package/test/integration/RemoteRouter.test.ts

@@ -32,7 +32,7 @@ describe('RemoteRouter', () => {
             clientRpcCommunicator.handleIncomingMessage(message)
         })
         const client = toProtoRpcClient(new RoutingServiceClient(clientRpcCommunicator.getRpcClientTransport()))
-        remoteRouter = new RemoteRouter(clientPeerDescriptor, serverPeerDescriptor, client, serviceId)
+        remoteRouter = new RemoteRouter(clientPeerDescriptor, serverPeerDescriptor, serviceId, client)
     })
 
     it('routeMessage happy path', async () => {

package/test/integration/RemoteStore.test.ts

@@ -44,7 +44,7 @@ describe('RemoteStore', () => {
             clientRpcCommunicator.handleIncomingMessage(message)
         })
         const client = toProtoRpcClient(new StoreServiceClient(clientRpcCommunicator.getRpcClientTransport()))
-        remoteStore = new RemoteStore(clientPeerDescriptor, serverPeerDescriptor, client, serviceId)
+        remoteStore = new RemoteStore(clientPeerDescriptor, serverPeerDescriptor, serviceId, client)
     })
 
     it('storeData happy path', async () => {

package/test/unit/RandomContactList.test.ts

@@ -1,87 +1,45 @@
 import { RandomContactList } from '../../src/dht/contact/RandomContactList'
-import type { ServiceInfo, MethodInfo } from '@protobuf-ts/runtime-rpc'
-import { PeerID } from '../../src/helpers/PeerID'
-import { toProtoRpcClient } from '@streamr/proto-rpc'
-import { IDhtRpcServiceClient } from '../../src/proto/packages/dht/protos/DhtRpc.client'
-import { LeaveNotice, NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { FindDataRequest, FindDataResponse, PingResponse } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { PingRequest } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { ClosestPeersResponse } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { ClosestPeersRequest } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { UnaryCall } from '@protobuf-ts/runtime-rpc'
-import type { RpcOptions } from '@protobuf-ts/runtime-rpc'
-import { DhtPeer } from '../../src/dht/DhtPeer'
-import { IMessageType } from '@protobuf-ts/runtime'
-import { Empty } from '../../src/proto/google/protobuf/empty'
+import { PeerID } from '../../src/exports'
 
-class MockRpcClient implements IDhtRpcServiceClient, ServiceInfo {
-    typeName = 'MockRpcClient'
-    methods: MethodInfo<any, any> [] = [
-        { name: 'getClosestPeers', O: {} as IMessageType<ClosestPeersResponse> } as MethodInfo<any, any>,
-        { name: 'ping', O: {} as IMessageType<PingResponse> } as MethodInfo<any, any>,
-        { name: 'findData', O: {} as IMessageType<FindDataRequest> } as MethodInfo<any, any>,
-        { name: 'leaveNotice', O: {} as IMessageType<Empty> } as MethodInfo<any, any>
-    ]
-    options = {}
-
-    // eslint-disable-next-line class-methods-use-this
-    getClosestPeers(_input: ClosestPeersRequest, _options?: RpcOptions): UnaryCall<ClosestPeersRequest, ClosestPeersResponse> {
-        return {} as UnaryCall<ClosestPeersRequest, ClosestPeersResponse>
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    ping(_input: PingRequest, _options?: RpcOptions): UnaryCall <PingRequest, PingResponse> {
-        return {} as UnaryCall<PingRequest, PingResponse>
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    findData(_input: FindDataRequest, _options?: RpcOptions): UnaryCall<FindDataRequest, FindDataResponse> {
-        return {} as UnaryCall<FindDataRequest, FindDataResponse>
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    leaveNotice(_input: LeaveNotice, _options?: RpcOptions): UnaryCall<LeaveNotice, Empty> {
-        return {} as UnaryCall<LeaveNotice, Empty>
-    }
+const createItem = (kademliaId: Uint8Array): { getPeerId: () => PeerID } => {
+    return { getPeerId: () => PeerID.fromValue(kademliaId) }
 }
 
 describe('RandomContactList', () => {
-    const serviceId = 'random'
-    const id0 = PeerID.fromValue(Buffer.from([0, 0, 0, 0]))
-    const id1 = PeerID.fromValue(Buffer.from([0, 0, 0, 1]))
-    const id2 = PeerID.fromValue(Buffer.from([0, 0, 0, 2]))
-    const id3 = PeerID.fromValue(Buffer.from([0, 0, 0, 3]))
-    const id4 = PeerID.fromValue(Buffer.from([0, 0, 0, 4]))
-
-    const descriptor0: PeerDescriptor = { kademliaId: id0.value, type: NodeType.NODEJS }
-    const descriptor1: PeerDescriptor = { kademliaId: id1.value, type: NodeType.NODEJS }
-    const descriptor2: PeerDescriptor = { kademliaId: id2.value, type: NodeType.NODEJS }
-    const descriptor3: PeerDescriptor = { kademliaId: id3.value, type: NodeType.NODEJS }
-    const descriptor4: PeerDescriptor = { kademliaId: id4.value, type: NodeType.NODEJS }
-
-    const peer1 = new DhtPeer(descriptor0, descriptor1, toProtoRpcClient(new MockRpcClient()), serviceId)
-    const peer2 = new DhtPeer(descriptor0, descriptor2, toProtoRpcClient(new MockRpcClient()), serviceId)
-    const peer3 = new DhtPeer(descriptor0, descriptor3, toProtoRpcClient(new MockRpcClient()), serviceId)
-    const peer4 = new DhtPeer(descriptor0, descriptor4, toProtoRpcClient(new MockRpcClient()), serviceId)
+    const item0 = createItem(new Uint8Array([0, 0, 0, 0]))
+    const item1 = createItem(new Uint8Array([0, 0, 0, 1]))
+    const item2 = createItem(new Uint8Array([0, 0, 0, 2]))
+    const item3 = createItem(new Uint8Array([0, 0, 0, 3]))
+    const item4 = createItem(new Uint8Array([0, 0, 0, 4]))
 
     it('adds contacts correctly', () => {
-        const list = new RandomContactList(id0, 5, 1)
-        list.addContact(peer1)
-        list.addContact(peer2)
-        list.addContact(peer3)
-        list.addContact(peer3)
-        list.addContact(peer4)
-        list.addContact(peer4)
+        const list = new RandomContactList(item0.getPeerId(), 5, 1)
+        list.addContact(item1)
+        list.addContact(item2)
+        list.addContact(item3)
+        list.addContact(item3)
+        list.addContact(item4)
+        list.addContact(item4)
         expect(list.getSize()).toEqual(4)
+        expect(list.getContacts()).toEqual(
+            [item1, item2, item3, item4]
+        )
     })
 
     it('removes contacts correctly', () => {
-        const list = new RandomContactList(id0, 5, 1)
-        list.addContact(peer1)
-        list.addContact(peer2)
-        list.removeContact(id2)
-        expect(list.getContact(id1)).toBeTruthy()
-        expect(list.getSize()).toEqual(1)
+        const list = new RandomContactList(item0.getPeerId(), 5, 1)
+        list.addContact(item1)
+        list.addContact(item2)
+        list.addContact(item3)
+        list.addContact(item4)
+        list.removeContact(item2.getPeerId())
+        expect(list.getContact(item1.getPeerId())).toBeTruthy()
+        expect(list.getContact(item3.getPeerId())).toBeTruthy()
+        expect(list.getContact(item4.getPeerId())).toBeTruthy()
+        expect(list.getContacts()).toEqual(
+            [item1, item3, item4]
+        )
+        expect(list.getSize()).toEqual(3)
     })
 
 })

package/test/unit/SortedContactList.test.ts

@@ -1,127 +1,103 @@
 import { SortedContactList } from '../../src/dht/contact/SortedContactList'
-import type { ServiceInfo, MethodInfo } from '@protobuf-ts/runtime-rpc'
 import { PeerID } from '../../src/helpers/PeerID'
-import { toProtoRpcClient } from '@streamr/proto-rpc'
-import { IDhtRpcServiceClient } from '../../src/proto/packages/dht/protos/DhtRpc.client'
-import { LeaveNotice, NodeType, PeerDescriptor, RouteMessageAck } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { FindDataRequest, FindDataResponse, PingResponse } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { PingRequest } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { ClosestPeersResponse } from '../../src/proto/packages/dht/protos/DhtRpc'
-import type { ClosestPeersRequest } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { UnaryCall } from '@protobuf-ts/runtime-rpc'
-import type { RpcOptions } from '@protobuf-ts/runtime-rpc'
-import { DhtPeer } from '../../src/dht/DhtPeer'
-import { IMessageType } from '@protobuf-ts/runtime'
-import { Empty } from '../../src/proto/google/protobuf/empty'
 
-/* eslint-disable class-methods-use-this */
-class MockRpcClient implements IDhtRpcServiceClient, ServiceInfo {
-    typeName = 'MockRpcClient'
-    methods: MethodInfo<any, any> [] = [
-        { name: 'getClosestPeers', O: {} as IMessageType<ClosestPeersResponse> } as MethodInfo<any, any>,
-        { name: 'ping', O: {} as IMessageType<PingResponse> } as MethodInfo<any, any>,
-        { name: 'findData', O: {} as IMessageType<RouteMessageAck> } as MethodInfo<any, any>,
-        { name: 'leaveNotice', O: {} as IMessageType<Empty> } as MethodInfo<any, any>
-    ]
-    options = {}
-    getClosestPeers(_input: ClosestPeersRequest, _options?: RpcOptions): UnaryCall<ClosestPeersRequest, ClosestPeersResponse> {
-        return {} as UnaryCall<ClosestPeersRequest, ClosestPeersResponse>
-    }
-    ping(_input: PingRequest, _options?: RpcOptions): UnaryCall <PingRequest, PingResponse> {
-        return {} as UnaryCall<PingRequest, PingResponse>
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    findData(_input: FindDataRequest, _options?: RpcOptions): UnaryCall<FindDataRequest, FindDataResponse> {
-        return {} as UnaryCall<FindDataRequest, FindDataResponse>
-    }
-
-    leaveNotice(_input: LeaveNotice, _options?: RpcOptions): UnaryCall<LeaveNotice, Empty> {
-        return {} as UnaryCall<LeaveNotice, Empty>
-    }
+const createItem = (kademliaId: Uint8Array): { getPeerId: () => PeerID } => {
+    return { getPeerId: () => PeerID.fromValue(kademliaId) }
 }
 
 describe('SortedContactList', () => {
-    const serviceId = 'sorted'
-    const id0 = PeerID.fromValue(Buffer.from([0, 0, 0, 0]))
-    const id1 = PeerID.fromValue(Buffer.from([0, 0, 0, 1]))
-    const id2 = PeerID.fromValue(Buffer.from([0, 0, 0, 2]))
-    const id3 = PeerID.fromValue(Buffer.from([0, 0, 0, 3]))
-    const id4 = PeerID.fromValue(Buffer.from([0, 0, 0, 4]))
-
-    const descriptor0: PeerDescriptor = { kademliaId: id0.value, type: NodeType.NODEJS }
-    const descriptor1: PeerDescriptor = { kademliaId: id1.value, type: NodeType.NODEJS }
-    const descriptor2: PeerDescriptor = { kademliaId: id2.value, type: NodeType.NODEJS }
-    const descriptor3: PeerDescriptor = { kademliaId: id3.value, type: NodeType.NODEJS }
-    const descriptor4: PeerDescriptor = { kademliaId: id4.value, type: NodeType.NODEJS }
-
-    const peer1 = new DhtPeer(descriptor0, descriptor1, toProtoRpcClient(new MockRpcClient()), serviceId)
-    const peer2 = new DhtPeer(descriptor0, descriptor2, toProtoRpcClient(new MockRpcClient()), serviceId)
-    const peer3 = new DhtPeer(descriptor0, descriptor3, toProtoRpcClient(new MockRpcClient()), serviceId)
-    const peer4 = new DhtPeer(descriptor0, descriptor4, toProtoRpcClient(new MockRpcClient()), serviceId)
+    const item0 = createItem(new Uint8Array([0, 0, 0, 0]))
+    const item1 = createItem(new Uint8Array([0, 0, 0, 1]))
+    const item2 = createItem(new Uint8Array([0, 0, 0, 2]))
+    const item3 = createItem(new Uint8Array([0, 0, 0, 3]))
+    const item4 = createItem(new Uint8Array([0, 0, 0, 4]))
 
     it('compares Ids correctly', async () => {
-        const list = new SortedContactList(id0, 10)
-        expect(list.compareIds(id0, id0)).toBe(0)
-        expect(list.compareIds(id1, id1)).toBe(0)
-        expect(list.compareIds(id0, id1)).toBe(-1)
-        expect(list.compareIds(id0, id2)).toBe(-2)
-        expect(list.compareIds(id1, id0)).toBe(1)
-        expect(list.compareIds(id2, id0)).toBe(2)
-        expect(list.compareIds(id2, id3)).toBe(-1)
-        expect(list.compareIds(id1, id4)).toBe(-3)
+        const list = new SortedContactList(item0.getPeerId(), 10)
+        expect(list.compareIds(item0.getPeerId(), item0.getPeerId())).toBe(0)
+        expect(list.compareIds(item1.getPeerId(), item1.getPeerId())).toBe(0)
+        expect(list.compareIds(item0.getPeerId(), item1.getPeerId())).toBe(-1)
+        expect(list.compareIds(item0.getPeerId(), item2.getPeerId())).toBe(-2)
+        expect(list.compareIds(item1.getPeerId(), item0.getPeerId())).toBe(1)
+        expect(list.compareIds(item2.getPeerId(), item0.getPeerId())).toBe(2)
+        expect(list.compareIds(item2.getPeerId(), item3.getPeerId())).toBe(-1)
+        expect(list.compareIds(item1.getPeerId(), item4.getPeerId())).toBe(-3)
     })
     
     it('orders itself correctly', async () => {
-
-        const list = new SortedContactList(id0, 10)
-
-        list.addContact(peer3)
-        list.addContact(peer2)
-        list.addContact(peer1)
-
+        const list = new SortedContactList(item0.getPeerId(), 10)
+        list.addContact(item3)
+        list.addContact(item2)
+        list.addContact(item1)
         const contacts = list.getUncontactedContacts(3)
         expect(contacts.length).toEqual(3)
-        expect(contacts[0]).toEqual(peer1)
-        expect(contacts[1]).toEqual(peer2)
-        expect(contacts[2]).toEqual(peer3)
+        expect(contacts[0]).toEqual(item1)
+        expect(contacts[1]).toEqual(item2)
+        expect(contacts[2]).toEqual(item3)
     })
     
     it('handles contacted nodes correctly', async () => {
-        const list = new SortedContactList(id0, 10)
-
-        list.addContact(peer3)
-        list.addContact(peer2)
-        list.addContact(peer1)
-
-        list.setContacted(id2)
+        const list = new SortedContactList(item0.getPeerId(), 10)
+        list.addContact(item3)
+        list.addContact(item2)
+        list.addContact(item1)
+        list.setContacted(item2.getPeerId())
         const contacts = list.getUncontactedContacts(3)
         expect(contacts.length).toEqual(2)
-        expect(contacts[0]).toEqual(peer1)
-        expect(contacts[1]).toEqual(peer3)
+        expect(contacts[0]).toEqual(item1)
+        expect(contacts[1]).toEqual(item3)
     })
 
     it('cannot exceed maxSize', async () => {
-        const list = new SortedContactList(id0, 3)
-        list.addContact(peer4)
-        list.addContact(peer3)
-        list.addContact(peer2)
-        list.addContact(peer1)
+        const list = new SortedContactList(item0.getPeerId(), 3)
+        const onContactRemoved = jest.fn()
+        list.on('contactRemoved', onContactRemoved)
+        list.addContact(item1)
+        list.addContact(item4)
+        list.addContact(item3)
+        list.addContact(item2)
         expect(list.getSize()).toEqual(3)
-        expect(list.getContact(id4)).toBeFalsy()
+        expect(onContactRemoved).toBeCalledWith(item4, [item1, item2, item3])
+        expect(list.getContact(item4.getPeerId())).toBeFalsy()
     })
 
     it('removing contacts', async () => {
-        const list = new SortedContactList(id0, 8)
-        list.addContact(peer4)
-        list.addContact(peer3)
-        list.addContact(peer2)
-        list.addContact(peer1)
-        list.removeContact(id2)
+        const list = new SortedContactList(item0.getPeerId(), 8)
+        const onContactRemoved = jest.fn()
+        list.on('contactRemoved', onContactRemoved)
+        list.addContact(item4)
+        list.addContact(item3)
+        list.addContact(item2)
+        list.addContact(item1)
+        list.removeContact(item2.getPeerId())
         expect(list.getSize()).toEqual(3)
-        expect(list.getContact(id2)).toBeFalsy()
+        expect(list.getContact(item2.getPeerId())).toBeFalsy()
         expect(list.getContactIds()).toEqual(list.getContactIds().sort(list.compareIds))
+        expect(list.getAllContacts()).toEqual([item1, item3, item4])
+        expect(onContactRemoved).toBeCalledWith(item2, [item1, item3, item4])
         const ret = list.removeContact(PeerID.fromValue(Buffer.from([0, 0, 0, 6])))
         expect(ret).toEqual(false)
     })
+
+    it('get closes contacts', () => {
+        const list = new SortedContactList(item0.getPeerId(), 8)
+        list.addContact(item1)
+        list.addContact(item3)
+        list.addContact(item4)
+        list.addContact(item2)
+        expect(list.getClosestContacts(2)).toEqual([item1, item2])
+        expect(list.getClosestContacts()).toEqual([item1, item2, item3, item4])
+    })
+
+    it('get active contacts', () => {
+        const list = new SortedContactList(item0.getPeerId(), 8)
+        list.addContact(item1)
+        list.addContact(item3)
+        list.addContact(item4)
+        list.addContact(item2)
+        list.setActive(item2.getPeerId())
+        list.setActive(item3.getPeerId())
+        list.setActive(item4.getPeerId())
+        expect(list.getActiveContacts()).toEqual([item2, item3, item4])
+    })
 })

package/dist/src/dht/registerExternalApiRpcMethod.d.ts

@@ -1,2 +0,0 @@
-import { DhtNode } from '../exports';
-export declare const registerExternalApiRpcMethod: (thisNode: DhtNode) => void;

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

@@ -1 +0,0 @@
-{"version":3,"file":"registerExternalApiRpcMethod.js","sourceRoot":"","sources":["../../../src/dht/registerExternalApiRpcMethod.ts"],"names":[],"mappings":";;;AACA,gEAAiG;AAE1F,MAAM,4BAA4B,GAAG,CAAC,QAAiB,EAAQ,EAAE;IACpE,MAAM,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAA;IACrD,eAAe,CAAC,iBAAiB,CAC7B,wBAAe,EACf,yBAAgB,EAChB,UAAU,EACV,CAAC,GAAoB,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,EACjD,EAAE,OAAO,EAAE,KAAK,EAAE,CACrB,CAAA;AACL,CAAC,CAAA;AATY,QAAA,4BAA4B,gCASxC;AAED,yDAAyD;AACzD,MAAM,QAAQ,GAAG,KAAK,EAAE,QAAiB,EAAE,eAAgC,EAA6B,EAAE;IACtG,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,UAAU,EAAE,iBAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACtH,IAAI,MAAM,CAAC,WAAW,EAAE;QACpB,OAAO,yBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;KACtE;SAAM;QACH,OAAO,yBAAgB,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,EAAE;YACf,KAAK,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACL;AACL,CAAC,CAAA"}

package/src/dht/registerExternalApiRpcMethod.ts

@@ -1,26 +0,0 @@
-import { DhtNode } from '../exports'
-import { FindDataRequest, FindDataResponse, FindMode } from '../proto/packages/dht/protos/DhtRpc'
-
-export const registerExternalApiRpcMethod = (thisNode: DhtNode): void => {
-    const rpcCommunicator = thisNode.getRpcCommunicator()
-    rpcCommunicator.registerRpcMethod(
-        FindDataRequest, 
-        FindDataResponse, 
-        'findData', 
-        (req: FindDataRequest) => findData(thisNode, req),
-        { timeout: 15000 }
-    )
-}
-
-// IDHTRpcService method for external findRecursive calls
-const findData = async (thisNode: DhtNode, findDataRequest: FindDataRequest): Promise<FindDataResponse> => {
-    const result = await thisNode.startRecursiveFind(findDataRequest.kademliaId, FindMode.DATA, findDataRequest.requestor)
-    if (result.dataEntries) {
-        return FindDataResponse.create({ dataEntries: result.dataEntries })
-    } else {
-        return FindDataResponse.create({ 
-            dataEntries: [],
-            error: 'Could not find data with the given key' 
-        })
-    }
-}