@streamr/dht 0.0.1-tatum.5 → 0.0.1-tatum.7

package/test/utils/utils.ts

@@ -2,8 +2,6 @@ import { DhtNode } from '../../src/dht/DhtNode'
 import {
     ClosestPeersRequest,
     ClosestPeersResponse,
-    LeaveNotice,
-    MigrateDataRequest,
     MigrateDataResponse,
     NodeType,
     PeerDescriptor,
@@ -17,7 +15,6 @@ import {
     WebSocketConnectionResponse,
     RecursiveFindRequest, 
     FindMode,
-    DeleteDataRequest,
     DeleteDataResponse
 } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
@@ -28,7 +25,6 @@ import {
     IStoreService,
     IWebSocketConnectorService
 } from '../../src/proto/packages/dht/protos/DhtRpc.server'
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Simulator } from '../../src/connection/Simulator/Simulator'
 import { ConnectionManager } from '../../src/connection/ConnectionManager'
 import { v4 } from 'uuid'
@@ -37,20 +33,20 @@ import { Empty } from '../../src/proto/google/protobuf/empty'
 import { Any } from '../../src/proto/google/protobuf/any'
 import { wait, waitForCondition } from '@streamr/utils'
 import { RoutingRpcCommunicator } from '../../src/transport/RoutingRpcCommunicator'
+import { SimulatorTransport } from '../../src/connection/Simulator/SimulatorTransport'
 
 export const generateId = (stringId: string): Uint8Array => {
     return PeerID.fromString(stringId).value
 }
 
-export const createMockConnectionDhtNode = async (stringId: string,
+export const createMockConnectionDhtNode = async (
+    stringId: string,
     simulator: Simulator,
     binaryId?: Uint8Array,
-    K?: number,
-    nodeName?: string,
+    numberOfNodesPerKBucket?: number,
     maxConnections = 80,
     dhtJoinTimeout = 45000
 ): Promise<DhtNode> => {
-
     let id: PeerID
     if (binaryId) {
         id = PeerID.fromValue(binaryId)
@@ -60,47 +56,42 @@ export const createMockConnectionDhtNode = async (stringId: string,
     const peerDescriptor: PeerDescriptor = {
         kademliaId: id.value,
         type: NodeType.NODEJS,
-        region: getRandomRegion(),
-        nodeName: nodeName ? nodeName : stringId
+        region: getRandomRegion()
     }
-
-    const mockConnectionManager = new ConnectionManager({
-        ownPeerDescriptor: peerDescriptor,
-        simulator: simulator
-    })
-
+    const mockConnectionManager = new SimulatorTransport(peerDescriptor, simulator)
+    await mockConnectionManager.start()
     const node = new DhtNode({
         peerDescriptor: peerDescriptor,
-        transportLayer: mockConnectionManager,
-        nodeName: nodeName,
-        numberOfNodesPerKBucket: K ? K : 8,
+        transport: mockConnectionManager,
+        numberOfNodesPerKBucket,
         maxConnections: maxConnections,
         dhtJoinTimeout
     })
     await node.start()
-
     return node
 }
 
-export const createMockConnectionLayer1Node = async (stringId: string, layer0Node: DhtNode, serviceId?: string): Promise<DhtNode> => {
+export const createMockConnectionLayer1Node = async (
+    stringId: string,
+    layer0Node: DhtNode,
+    serviceId?: string,
+    numberOfNodesPerKBucket = 8
+): Promise<DhtNode> => {
     const id = PeerID.fromString(stringId)
     const descriptor: PeerDescriptor = {
         kademliaId: id.value,
         type: NodeType.NODEJS,
-        nodeName: stringId
     }
-
     const node = new DhtNode({
-        peerDescriptor: descriptor, transportLayer: layer0Node,
-        serviceId: serviceId ? serviceId : 'layer1', numberOfNodesPerKBucket: 8, nodeName: stringId
+        peerDescriptor: descriptor, transport: layer0Node,
+        serviceId: serviceId ? serviceId : 'layer1', numberOfNodesPerKBucket
     })
     await node.start()
     return node
 }
 
 export const createWrappedClosestPeersRequest = (
-    sourceDescriptor: PeerDescriptor,
-    _udestinationDescriptor: PeerDescriptor
+    sourceDescriptor: PeerDescriptor
 ): RpcMessage => {
 
     const routedMessage: ClosestPeersRequest = {
@@ -129,13 +120,13 @@ export const createRecursiveFindRequest = (
 }
 
 interface IDhtRpcWithError extends IDhtRpcService {
-    throwPingError: (request: PingRequest, _context: ServerCallContext) => Promise<PingResponse>
-    respondPingWithTimeout: (request: PingRequest, _context: ServerCallContext) => Promise<PingResponse>
-    throwGetClosestPeersError: (request: ClosestPeersRequest, _context: ServerCallContext) => Promise<ClosestPeersResponse>
+    throwPingError: (request: PingRequest) => Promise<PingResponse>
+    respondPingWithTimeout: (request: PingRequest) => Promise<PingResponse>
+    throwGetClosestPeersError: (request: ClosestPeersRequest) => Promise<ClosestPeersResponse>
 }
 
 export const MockDhtRpc: IDhtRpcWithError = {
-    async getClosestPeers(_request: ClosestPeersRequest, _context: ServerCallContext): Promise<ClosestPeersResponse> {
+    async getClosestPeers(): Promise<ClosestPeersResponse> {
         const neighbors = getMockPeers()
         const response: ClosestPeersResponse = {
             peers: neighbors,
@@ -143,36 +134,36 @@ export const MockDhtRpc: IDhtRpcWithError = {
         }
         return response
     },
-    async ping(request: PingRequest, _context: ServerCallContext): Promise<PingResponse> {
+    async ping(request: PingRequest): Promise<PingResponse> {
         const response: PingResponse = {
             requestId: request.requestId
         }
         return response
     },
-    async leaveNotice(_request: LeaveNotice, _context: ServerCallContext): Promise<Empty> {
+    async leaveNotice(): Promise<Empty> {
         return {}
     },
-    async throwPingError(_urequest: PingRequest, _context: ServerCallContext): Promise<PingResponse> {
+    async throwPingError(): Promise<PingResponse> {
         throw new Error()
     },
-    async respondPingWithTimeout(request: PingRequest, _context: ServerCallContext): Promise<PingResponse> {
+    async respondPingWithTimeout(request: PingRequest): Promise<PingResponse> {
         const response: PingResponse = {
             requestId: request.requestId
         }
         await wait(2000)
         return response
     },
-    async throwGetClosestPeersError(_urequest: ClosestPeersRequest, _context: ServerCallContext): Promise<ClosestPeersResponse> {
+    async throwGetClosestPeersError(): Promise<ClosestPeersResponse> {
         throw new Error('Closest peers error')
     }
 }
 
 interface IRouterServiceWithError extends IRoutingService {
-    throwRouteMessageError: (request: RouteMessageWrapper, _context: ServerCallContext) => Promise<RouteMessageAck>
+    throwRouteMessageError: (request: RouteMessageWrapper) => Promise<RouteMessageAck>
 }
 
 export const MockRoutingService: IRouterServiceWithError = {
-    async routeMessage(routed: RouteMessageWrapper, _context: ServerCallContext): Promise<RouteMessageAck> {
+    async routeMessage(routed: RouteMessageWrapper): Promise<RouteMessageAck> {
         const response: RouteMessageAck = {
             requestId: routed.requestId,
             destinationPeer: routed.sourcePeer,
@@ -181,7 +172,7 @@ export const MockRoutingService: IRouterServiceWithError = {
         }
         return response
     },
-    async findRecursively(routed: RouteMessageWrapper, _context: ServerCallContext): Promise<RouteMessageAck> {
+    async findRecursively(routed: RouteMessageWrapper): Promise<RouteMessageAck> {
         const response: RouteMessageAck = {
             requestId: routed.requestId,
             destinationPeer: routed.sourcePeer,
@@ -190,7 +181,7 @@ export const MockRoutingService: IRouterServiceWithError = {
         }
         return response
     },
-    async forwardMessage(routed: RouteMessageWrapper, _context: ServerCallContext): Promise<RouteMessageAck> {
+    async forwardMessage(routed: RouteMessageWrapper): Promise<RouteMessageAck> {
         const response: RouteMessageAck = {
             requestId: routed.requestId,
             destinationPeer: routed.sourcePeer,
@@ -199,40 +190,40 @@ export const MockRoutingService: IRouterServiceWithError = {
         }
         return response
     },
-    async throwRouteMessageError(_urequest: RouteMessageWrapper, _context: ServerCallContext): Promise<RouteMessageAck> {
+    async throwRouteMessageError(): Promise<RouteMessageAck> {
         throw new Error()
     }
 }
 
 interface IStoreServiceWithError extends IStoreService {
-    throwStoreDataError: (request: StoreDataRequest, _context: ServerCallContext) => Promise<StoreDataResponse>
-    storeDataErrorString: (request: StoreDataRequest, _context: ServerCallContext) => Promise<StoreDataResponse>
+    throwStoreDataError: (request: StoreDataRequest) => Promise<StoreDataResponse>
+    storeDataErrorString: (request: StoreDataRequest) => Promise<StoreDataResponse>
 }
 
 export const MockStoreService: IStoreServiceWithError = {
-    async storeData(_request: StoreDataRequest, _context: ServerCallContext): Promise<StoreDataResponse> {
+    async storeData(): Promise<StoreDataResponse> {
         return {
             error: ''
         }
     },
-    async throwStoreDataError(_request: StoreDataRequest, _context: ServerCallContext): Promise<StoreDataResponse> {
+    async throwStoreDataError(): Promise<StoreDataResponse> {
         throw new Error('Mock')
     },
-    async storeDataErrorString(_request: StoreDataRequest, _context: ServerCallContext): Promise<StoreDataResponse> {
+    async storeDataErrorString(): Promise<StoreDataResponse> {
         return {
             error: 'Mock'
         }
     },
-    async migrateData(_request: MigrateDataRequest, _context: ServerCallContext): Promise<MigrateDataResponse> {
+    async migrateData(): Promise<MigrateDataResponse> {
         return MigrateDataResponse.create()
     },
-    async deleteData(_request: DeleteDataRequest, _context: ServerCallContext): Promise<DeleteDataResponse> {
+    async deleteData(): Promise<DeleteDataResponse> {
         return DeleteDataResponse.create()
     }
 }
 
 export const MockWebSocketConnectorRpc: IWebSocketConnectorService = {
-    async requestConnection(request: WebSocketConnectionRequest, _context: ServerCallContext): Promise<WebSocketConnectionResponse> {
+    async requestConnection(request: WebSocketConnectionRequest): Promise<WebSocketConnectionResponse> {
         const responseConnection: WebSocketConnectionResponse = {
             target: request.target,
             requester: request.requester,

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

@@ -1 +0,0 @@
-{"version":3,"file":"DhtPeer.js","sourceRoot":"","sources":["../../../src/dht/DhtPeer.ts"],"names":[],"mappings":";;;AAOA,+BAAyB;AACzB,0CAAuC;AAEvC,6CAAyC;AAEzC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAQjC,MAAa,OAAQ,SAAQ,eAA4B;IAMrD,YACI,iBAAiC,EACjC,cAA8B,EAC9B,MAA4C,EAC5C,SAAiB;QAEjB,KAAK,CAAC,iBAAiB,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAC3D,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAA;QAChC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,UAAsB;QACxC,MAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,YAAY,EAAE,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QACrG,MAAM,OAAO,GAAwB;YACjC,UAAU;YACV,SAAS,EAAE,IAAA,SAAE,GAAE;SAClB,CAAA;QACD,IAAI;YACA,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACvF,OAAO,KAAK,CAAC,KAAK,CAAA;SACrB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACrE,MAAM,GAAG,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,YAAY,EAAE,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC1F,MAAM,OAAO,GAAgB;YACzB,SAAS,EAAE,IAAA,SAAE,GAAE;SAClB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC1D,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE;gBACtC,OAAO,IAAI,CAAA;aACd;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,YAAY,EAAE,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,CAAA;SAC/F;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,WAAW;QACP,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,YAAY,EAAE,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC9F,MAAM,OAAO,GAAgB;YACzB,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;SACjC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACvD,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,CAAC,CAAA;QAClD,CAAC,CAAC,CAAA;IACN,CAAC;;AA9DL,0BA+DC;AA7DkB,eAAO,GAAG,CAAC,CAAA"}

package/dist/src/helpers/browser/isBrowser.d.ts

@@ -1 +0,0 @@
-export declare const isNodeJS: () => boolean;

package/dist/src/helpers/browser/isBrowser.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNodeJS = void 0;
-const isNodeJS = () => false;
-exports.isNodeJS = isNodeJS;
-//# sourceMappingURL=isBrowser.js.map

package/dist/src/helpers/browser/isBrowser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isBrowser.js","sourceRoot":"","sources":["../../../../src/helpers/browser/isBrowser.ts"],"names":[],"mappings":";;;AAAO,MAAM,QAAQ,GAAG,GAAY,EAAE,CAAC,KAAK,CAAA;AAA/B,QAAA,QAAQ,YAAuB"}

package/dist/src/helpers/browser/isNodeJS.d.ts

@@ -1 +0,0 @@
-export declare const isNodeJS: () => boolean;

package/dist/src/helpers/browser/isNodeJS.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNodeJS = void 0;
-const isNodeJS = () => true;
-exports.isNodeJS = isNodeJS;
-//# sourceMappingURL=isNodeJS.js.map

package/dist/src/helpers/browser/isNodeJS.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isNodeJS.js","sourceRoot":"","sources":["../../../../src/helpers/browser/isNodeJS.ts"],"names":[],"mappings":";;;AAAO,MAAM,QAAQ,GAAG,GAAY,EAAE,CAAC,IAAI,CAAA;AAA9B,QAAA,QAAQ,YAAsB"}

package/src/helpers/browser/isBrowser.ts

@@ -1 +0,0 @@
-export const isNodeJS = (): boolean => false

package/src/helpers/browser/isNodeJS.ts

@@ -1 +0,0 @@
-export const isNodeJS = (): boolean => true

package/test/integration/DhtWithMockConnectionLatencies.test.ts

@@ -1,46 +0,0 @@
-import { DhtNode } from '../../src/dht/DhtNode'
-import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { createMockConnectionDhtNode } from '../utils/utils'
-import { LatencyType, Simulator } from '../../src/connection/Simulator/Simulator'
-
-describe('Mock connection Dht joining with latencies', () => {
-    let entryPoint: DhtNode
-    let nodes: DhtNode[]
-    let simulator: Simulator
-    let entrypointDescriptor: PeerDescriptor
-    
-    beforeEach(async () => {
-        nodes = []
-        simulator = new Simulator(LatencyType.RANDOM)
-        const entryPointId = '0'
-        entryPoint = await createMockConnectionDhtNode(entryPointId, simulator)
-        entrypointDescriptor = {
-            kademliaId: entryPoint.getNodeId().value,
-            type: NodeType.NODEJS,
-            nodeName: '0'
-        }
-        for (let i = 1; i < 100; i++) {
-            const nodeId = `${i}`
-            const node = await createMockConnectionDhtNode(nodeId, simulator)
-            nodes.push(node)
-        }
-    })
-
-    afterEach(async () => {
-        await Promise.all([
-            entryPoint.stop(),
-            ...nodes.map((node) => node.stop())
-        ])
-        simulator.stop()
-    })
-
-    it('Happy path', async () => {
-        await entryPoint.joinDht([entrypointDescriptor])
-        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(entryPoint.getBucketSize()).toBeGreaterThanOrEqual(entryPoint.getK() - 2)
-    }, 60 * 1000)
-})

package/test/integration/DhtWithMockConnections.test.ts

@@ -1,46 +0,0 @@
-import { Simulator } from '../../src/connection/Simulator/Simulator'
-import { DhtNode } from '../../src/dht/DhtNode'
-import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { createMockConnectionDhtNode } from '../utils/utils'
-
-describe('Mock IConnection DHT Joining', () => {
-    let entryPoint: DhtNode
-    let nodes: DhtNode[]
-    let entrypointDescriptor: PeerDescriptor
-    let simulator: Simulator
-
-    beforeEach(async () => {
-        nodes = []
-        simulator = new Simulator()
-        const entryPointId = '0'
-        entryPoint = await createMockConnectionDhtNode(entryPointId, simulator)
-        entrypointDescriptor = {
-            kademliaId: entryPoint.getNodeId().value,
-            type: NodeType.NODEJS,
-            nodeName: '0'
-        }
-        for (let i = 1; i < 100; i++) {
-            const nodeId = `${i}`
-            const node = await createMockConnectionDhtNode(nodeId, simulator)
-            nodes.push(node)
-        }
-    })
-
-    afterEach(async () => {
-        await Promise.all([
-            entryPoint.stop(),
-            ...nodes.map(async (node) => node.stop())
-        ])
-        simulator.stop()
-    })
-
-    it('Happy path', async () => {
-        await entryPoint.joinDht([entrypointDescriptor])
-        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(entryPoint.getBucketSize()).toBeGreaterThanOrEqual(entryPoint.getK() - 2)
-    }, 60000)
-})

package/test/integration/DhtWithRealConnectionLatencies.test.ts

@@ -1,47 +0,0 @@
-import { DhtNode } from '../../src/dht/DhtNode'
-import { createMockConnectionDhtNode } from '../utils/utils'
-import { LatencyType, Simulator } from '../../src/connection/Simulator/Simulator'
-import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { getRandomRegion } from '../../src/connection/Simulator/pings'
-
-describe('Mock connection Dht joining with real latencies', () => {
-    let entryPoint: DhtNode
-    let nodes: DhtNode[]
-    let simulator: Simulator
-    let entrypointDescriptor: PeerDescriptor
-    
-    beforeEach(async () => {
-        nodes = []
-        simulator = new Simulator(LatencyType.REAL)
-        const entryPointId = '0'
-        entryPoint = await createMockConnectionDhtNode(entryPointId, simulator)
-        entrypointDescriptor = {
-            kademliaId: entryPoint.getNodeId().value,
-            type: NodeType.NODEJS,
-            region: getRandomRegion()
-        }
-        for (let i = 1; i < 100; i++) {
-            const nodeId = `${i}`
-            const node = await createMockConnectionDhtNode(nodeId, simulator)
-            nodes.push(node)
-        }
-    })
-
-    afterEach(async () => {
-        await Promise.all([
-            entryPoint.stop(),
-            ...nodes.map((node) => node.stop())
-        ])
-        simulator.stop()
-    })
-
-    it('Happy path', async () => {
-        await entryPoint.joinDht([entrypointDescriptor])
-        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(entryPoint.getBucketSize()).toBeGreaterThanOrEqual(entryPoint.getK())
-    }, 60 * 1000)
-})