@streamr/trackerless-network 100.2.4-beta.0 → 100.2.4

package/src/logic/ContentDeliveryLayerNode.ts

@@ -65,6 +65,8 @@ export interface StrictContentDeliveryLayerNodeConfig {
     rpcRequestTimeout?: number
 }
 
+const RANDOM_NODE_VIEW_SIZE = 20
+
 const logger = new Logger(module)
 
 export class ContentDeliveryLayerNode extends EventEmitter<Events> {
@@ -117,26 +119,26 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         this.registerDefaultServerMethods()
         addManagedEventListener<any, any>(
             this.config.layer1Node as any,
-            'closestContactAdded',
-            () => this.onNearbyContactAdded(this.config.layer1Node.getClosestContacts()),
+            'nearbyContactAdded', 
+            () => this.onNearbyContactAdded(),
             this.abortController.signal
         )
         addManagedEventListener<any, any>(
             this.config.layer1Node as any,
-            'closestContactRemoved',
+            'nearbyContactRemoved',
             () => this.onNearbyContactRemoved(),
             this.abortController.signal
         )
         addManagedEventListener<any, any>(
             this.config.layer1Node as any,
             'randomContactAdded',
-            (_peerDescriptor: PeerDescriptor) => this.onRandomContactAdded(),
+            () => this.onRandomContactAdded(),
             this.abortController.signal
         )
         addManagedEventListener<any, any>(
             this.config.layer1Node as any,
             'randomContactRemoved',
-            (_peerDescriptor: PeerDescriptor) => this.onRandomContactRemoved(),
+            () => this.onRandomContactRemoved(),
             this.abortController.signal
         )
         addManagedEventListener<any, any>(
@@ -230,12 +232,12 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         ))
     }
 
-    // TODO refactor so that we don't need to give the parameter? (i.e. would be similar to onNearbyContactRemoved and other event handlers)
-    private onNearbyContactAdded(closestContacts: PeerDescriptor[]): void {
+    private onNearbyContactAdded(): void {
         logger.trace(`New nearby contact found`)
         if (this.isStopped()) {
             return
         }
+        const closestContacts = this.config.layer1Node.getClosestContacts()
         this.updateNearbyNodeView(closestContacts)
         if (this.config.neighbors.size() < this.config.neighborTargetCount) {
             this.config.neighborFinder.start()
@@ -281,7 +283,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         if (this.isStopped()) {
             return
         }
-        const randomContacts = this.config.layer1Node.getRandomContacts()
+        const randomContacts = this.config.layer1Node.getRandomContacts(RANDOM_NODE_VIEW_SIZE)
         this.config.randomNodeView.replaceAll(randomContacts.map((descriptor) =>
             new ContentDeliveryRpcRemote(
                 this.config.localPeerDescriptor,
@@ -301,7 +303,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         if (this.isStopped()) {
             return
         }
-        const randomContacts = this.config.layer1Node.getRandomContacts()
+        const randomContacts = this.config.layer1Node.getRandomContacts(RANDOM_NODE_VIEW_SIZE)
         this.config.randomNodeView.replaceAll(randomContacts.map((descriptor) =>
             new ContentDeliveryRpcRemote(
                 this.config.localPeerDescriptor,

package/src/logic/ContentDeliveryManager.ts

@@ -25,6 +25,7 @@ import { Layer1Node } from './Layer1Node'
 import { ContentDeliveryLayerNode } from './ContentDeliveryLayerNode'
 import { createContentDeliveryLayerNode } from './createContentDeliveryLayerNode'
 import { ProxyClient } from './proxy/ProxyClient'
+import { StreamPartReconnect } from './StreamPartReconnect'
 
 export type StreamPartDelivery = {
     broadcast: (msg: StreamMessage) => void
@@ -146,6 +147,7 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             layer1Node, 
             () => entryPointDiscovery.isLocalNodeEntryPoint()
         )
+        const streamPartReconnect = new StreamPartReconnect(layer1Node, entryPointDiscovery)
         streamPart = {
             proxied: false,
             layer1Node,
@@ -153,6 +155,7 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             entryPointDiscovery,
             broadcast: (msg: StreamMessage) => node.broadcast(msg),
             stop: async () => {
+                streamPartReconnect.destroy()
                 await entryPointDiscovery.destroy()
                 node.stop()
                 await layer1Node.stop()
@@ -169,6 +172,12 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             const entryPoints = await entryPointDiscovery.discoverEntryPointsFromDht(0)
             await entryPointDiscovery.storeSelfAsEntryPointIfNecessary(entryPoints.discoveredEntryPoints.length)
         }
+        layer1Node.on('manualRejoinRequired', async () => {
+            if (!streamPartReconnect.isRunning() && !entryPointDiscovery.isNetworkSplitAvoidanceRunning()) {
+                logger.debug('Manual rejoin required for stream part', { streamPartId })
+                await streamPartReconnect.reconnect()
+            }
+        })
         node.on('entryPointLeaveDetected', () => handleEntryPointLeave())
         setImmediate(async () => {
             try {
@@ -205,12 +214,15 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
     private createLayer1Node(streamPartId: StreamPartID, entryPoints: PeerDescriptor[]): Layer1Node {
         return new DhtNode({
             transport: this.layer0Node!,
+            connectionsView: this.layer0Node!.getConnectionsView(),
             serviceId: 'layer1::' + streamPartId,
             peerDescriptor: this.layer0Node!.getLocalPeerDescriptor(),
             entryPoints,
             numberOfNodesPerKBucket: 4,  // TODO use config option or named constant?
             rpcRequestTimeout: EXISTING_CONNECTION_TIMEOUT,
-            dhtJoinTimeout: 20000  // TODO use config option or named constant?
+            dhtJoinTimeout: 20000,  // TODO use config option or named constant?
+            periodicallyPingNeighbors: true,
+            periodicallyPingRingContacts: true
         })
     }
 

package/src/logic/EntryPointDiscovery.ts

@@ -20,7 +20,7 @@ const parseEntryPointData = (dataEntries: DataEntry[]): PeerDescriptor[] => {
     return dataEntries.filter((entry) => !entry.deleted).map((entry) => Any.unpack(entry.data!, PeerDescriptor))
 }
 
-interface FindEntryPointsResult {
+export interface FindEntryPointsResult {
     entryPointsFromDht: boolean
     discoveredEntryPoints: PeerDescriptor[]
 }
@@ -72,6 +72,7 @@ export class EntryPointDiscovery {
     private readonly storeInterval: number
     private readonly networkSplitAvoidedNodes: Set<DhtAddress> = new Set()
     private isLocalNodeStoredAsEntryPoint = false
+    private networkSplitAvoidanceIsRunning = false
     constructor(config: EntryPointDiscoveryConfig) {
         this.config = config
         this.abortController = new AbortController()
@@ -160,6 +161,7 @@ export class EntryPointDiscovery {
     }
 
     private async avoidNetworkSplit(): Promise<void> {
+        this.networkSplitAvoidanceIsRunning = true
         await exponentialRunOff(async () => {
             const rediscoveredEntrypoints = await this.discoverEntryPoints()
             await this.config.layer1Node.joinDht(rediscoveredEntrypoints, false, false)
@@ -181,6 +183,10 @@ export class EntryPointDiscovery {
         return this.isLocalNodeStoredAsEntryPoint
     }
 
+    public isNetworkSplitAvoidanceRunning(): boolean {
+        return this.networkSplitAvoidanceIsRunning
+    }
+
     async destroy(): Promise<void> {
         this.abortController.abort()
         await this.config.deleteEntryPointData(streamPartIdToDataKey(this.config.streamPartId))

package/src/logic/Layer0Node.ts

@@ -1,4 +1,4 @@
-import { DataEntry, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht'
+import { ConnectionsView, DataEntry, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht'
 import { Any } from '../proto/google/protobuf/any'
 
 export interface Layer0Node extends ITransport {
@@ -11,7 +11,7 @@ export interface Layer0Node extends ITransport {
     waitForNetworkConnectivity(): Promise<void>
     getTransport(): ITransport
     getNeighbors(): PeerDescriptor[]
-    getConnections(): PeerDescriptor[]
+    getConnectionsView(): ConnectionsView
     start(): Promise<void>
     stop(): Promise<void>
 }

package/src/logic/Layer1Node.ts

@@ -1,8 +1,9 @@
 import { DhtAddress, PeerDescriptor, RingContacts } from '@streamr/dht'
 
 export interface Layer1NodeEvents {
-    closestContactAdded: (peerDescriptor: PeerDescriptor) => void
-    closestContactRemoved: (peerDescriptor: PeerDescriptor) => void
+    manualRejoinRequired: () => void
+    nearbyContactAdded: (peerDescriptor: PeerDescriptor) => void
+    nearbyContactRemoved: (peerDescriptor: PeerDescriptor) => void
     randomContactAdded: (peerDescriptor: PeerDescriptor) => void
     randomContactRemoved: (peerDescriptor: PeerDescriptor) => void
     ringContactAdded: (peerDescriptor: PeerDescriptor) => void
@@ -13,9 +14,12 @@ export interface Layer1Node {
     on<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     once<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     off<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
+    on<T extends keyof Layer1NodeEvents>(eventName: T, listener: () => void): void
+    once<T extends keyof Layer1NodeEvents>(eventName: T, listener: () => void): void
+    off<T extends keyof Layer1NodeEvents>(eventName: T, listener: () => void): void
     removeContact: (nodeId: DhtAddress) => void
     getClosestContacts: (maxCount?: number) => PeerDescriptor[]
-    getRandomContacts: () => PeerDescriptor[]
+    getRandomContacts: (maxCount?: number) => PeerDescriptor[]
     getRingContacts: () => RingContacts
     getNeighbors: () => PeerDescriptor[]
     getNeighborCount(): number

package/src/logic/StreamPartReconnect.ts

@@ -0,0 +1,37 @@
+import { scheduleAtInterval } from '@streamr/utils'
+import { EntryPointDiscovery } from './EntryPointDiscovery'
+import { Layer1Node } from './Layer1Node'
+
+const DEFAULT_RECONNECT_INTERVAL = 30 * 1000
+export class StreamPartReconnect {
+    private abortController?: AbortController
+    private readonly layer1Node: Layer1Node
+    private readonly entryPointDiscovery: EntryPointDiscovery
+
+    constructor(layer1Node: Layer1Node, entryPointDiscovery: EntryPointDiscovery) {
+        this.layer1Node = layer1Node
+        this.entryPointDiscovery = entryPointDiscovery
+    }
+
+    async reconnect(timeout = DEFAULT_RECONNECT_INTERVAL): Promise<void> {
+        this.abortController = new AbortController()
+        await scheduleAtInterval(async () => {
+            const entryPoints = await this.entryPointDiscovery.discoverEntryPointsFromDht(0)
+            await this.layer1Node.joinDht(entryPoints.discoveredEntryPoints)
+            if (this.entryPointDiscovery.isLocalNodeEntryPoint()) {
+                await this.entryPointDiscovery.storeSelfAsEntryPointIfNecessary(entryPoints.discoveredEntryPoints.length)
+            }
+            if (this.layer1Node.getNeighborCount() > 0) {
+                this.abortController!.abort()
+            }
+        }, timeout, true, this.abortController.signal)
+    }
+
+    isRunning(): boolean {
+        return this.abortController ? !this.abortController.signal.aborted : false
+    }
+
+    destroy(): void {
+        this.abortController?.abort()
+    }
+}

package/test/benchmark/first-message.ts

@@ -159,7 +159,7 @@ run().then(() => {
     console.log(foundData)
     const layer0Node = currentNode.stack.getLayer0Node() as DhtNode
     console.log(layer0Node.getNeighbors().length)
-    console.log(layer0Node.getConnectionCount())
+    console.log(layer0Node.getConnectionsView().getConnectionCount())
     const streamPartDelivery = contentDeliveryManager
         .getStreamPartDelivery(streamParts[0])! as { layer1Node: Layer1Node, node: ContentDeliveryLayerNode }
     console.log(streamPartDelivery.layer1Node.getNeighbors())

package/test/integration/ContentDeliveryLayerNode-Layer1Node-Latencies.test.ts

@@ -29,11 +29,13 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
 
         entryPointLayer1Node = new DhtNode({
             transport: entrypointCm,
+            connectionsView: entrypointCm,
             peerDescriptor: entrypointDescriptor,
             serviceId: streamPartId
         })
         otherLayer1Nodes = range(otherNodeCount).map((i) => new DhtNode({
             transport: cms[i],
+            connectionsView: cms[i],
             peerDescriptor: peerDescriptors[i],
             serviceId: streamPartId
         }))

package/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts

@@ -44,12 +44,14 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
 
         entryPointLayer1Node = new DhtNode({
             transport: entrypointCm,
+            connectionsView: entrypointCm,
             peerDescriptor: entrypointDescriptor,
             serviceId: streamPartId
         })
 
         otherLayer1Nodes = range(otherNodeCount).map((i) => new DhtNode({
             transport: cms[i],
+            connectionsView: cms[i],
             peerDescriptor: peerDescriptors[i],
             serviceId: streamPartId
         }))

package/test/integration/ContentDeliveryManager.test.ts

@@ -44,11 +44,13 @@ describe('ContentDeliveryManager', () => {
         await transport2.start()
         layer0Node1 = new DhtNode({
             transport: transport1,
+            connectionsView: transport1,
             peerDescriptor: peerDescriptor1,
             entryPoints: [peerDescriptor1]
         })
         layer0Node2 = new DhtNode({
             transport: transport2,
+            connectionsView: transport2,
             peerDescriptor: peerDescriptor2,
             entryPoints: [peerDescriptor1]
         })

package/test/integration/Inspect.test.ts

@@ -30,7 +30,8 @@ describe('inspect', () => {
             layer0: {
                 entryPoints: [publisherDescriptor],
                 peerDescriptor,
-                transport
+                transport,
+                connectionsView: transport
             }
         })
         await node.start()

package/test/integration/NetworkNode.test.ts

@@ -37,14 +37,16 @@ describe('NetworkNode', () => {
             layer0: {
                 entryPoints: [pd1],
                 peerDescriptor: pd1,
-                transport: transport1
+                transport: transport1,
+                connectionsView: transport1
             }
         })
         node2 = createNetworkNode({
             layer0: {
                 entryPoints: [pd1],
                 peerDescriptor: pd2,
-                transport: transport2
+                transport: transport2,
+                connectionsView: transport2
             }
         })
 

package/test/integration/NodeInfoRpc.test.ts

@@ -40,6 +40,7 @@ describe('NetworkStack NodeInfoRpc', () => {
         requesteStack = new NetworkStack({
             layer0: {
                 transport: requesteeTransport1,
+                connectionsView: requesteeTransport1,
                 peerDescriptor: requesteePeerDescriptor,
                 entryPoints: [requesteePeerDescriptor]
             }
@@ -47,6 +48,7 @@ describe('NetworkStack NodeInfoRpc', () => {
         otherStack = new NetworkStack({
             layer0: {
                 transport: otherTransport,
+                connectionsView: otherTransport,
                 peerDescriptor: otherPeerDescriptor,
                 entryPoints: [requesteePeerDescriptor]
             }

package/test/integration/joining-streams-on-offline-peers.test.ts

@@ -28,6 +28,7 @@ describe('Joining stream parts on offline nodes', () => {
         entryPoint = new NetworkStack({
             layer0: {
                 transport: entryPointTransport,
+                connectionsView: entryPointTransport,
                 peerDescriptor: entryPointPeerDescriptor,
                 entryPoints: [entryPointPeerDescriptor]
             }
@@ -36,6 +37,7 @@ describe('Joining stream parts on offline nodes', () => {
         node1 = new NetworkStack({
             layer0: {
                 transport: node1Transport,
+                connectionsView: node1Transport,
                 peerDescriptor: node1PeerDescriptor,
                 entryPoints: [entryPointPeerDescriptor]
             }
@@ -44,6 +46,7 @@ describe('Joining stream parts on offline nodes', () => {
         node2 = new NetworkStack({
             layer0: {
                 transport: node2Transport,
+                connectionsView: node2Transport,
                 peerDescriptor: node2PeerDescriptor,
                 entryPoints: [entryPointPeerDescriptor]
             }

package/test/integration/stream-without-default-entrypoints.test.ts

@@ -53,6 +53,7 @@ describe('stream without default entrypoints', () => {
         entrypoint = createNetworkNode({
             layer0: {
                 transport: entryPointTransport,
+                connectionsView: entryPointTransport,
                 peerDescriptor: entryPointPeerDescriptor,
                 entryPoints: [entryPointPeerDescriptor]
             }
@@ -66,6 +67,7 @@ describe('stream without default entrypoints', () => {
                 layer0: {
                     peerDescriptor,
                     transport,
+                    connectionsView: transport,
                     entryPoints: [entryPointPeerDescriptor]
                 }
             })

package/test/integration/streamEntryPointReplacing.test.ts

@@ -27,6 +27,7 @@ describe('Stream Entry Points are replaced when known entry points leave streams
         const node = new NetworkStack({
             layer0: {
                 transport,
+                connectionsView: transport,
                 peerDescriptor,
                 entryPoints: [entryPointPeerDescriptor]
             }
@@ -41,6 +42,7 @@ describe('Stream Entry Points are replaced when known entry points leave streams
         layer0EntryPoint = new NetworkStack({
             layer0: {
                 transport: entryPointTransport,
+                connectionsView: entryPointTransport,
                 peerDescriptor: entryPointPeerDescriptor,
                 entryPoints: [entryPointPeerDescriptor]
             }

package/test/unit/ContentDeliveryLayerNode.test.ts

@@ -6,7 +6,7 @@ import { MockHandshaker } from '../utils/mock/MockHandshaker'
 import { MockLayer1Node } from '../utils/mock/MockLayer1Node'
 import { MockNeighborFinder } from '../utils/mock/MockNeighborFinder'
 import { MockNeighborUpdateManager } from '../utils/mock/MockNeighborUpdateManager'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createMockContentDeliveryRpcRemote, mockConnectionLocker } from '../utils/utils'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { getNodeIdFromPeerDescriptor } from '@streamr/dht'
@@ -65,11 +65,11 @@ describe('ContentDeliveryLayerNode', () => {
         expect(ids[0]).toEqual(getNodeIdFromPeerDescriptor(mockRemote.getPeerDescriptor()))
     })
 
-    it('Adds Closest Nodes from layer1 contactAdded event to nearbyNodeView', async () => {
+    it('Adds Closest Nodes from layer1 nearbyContactAdded event to nearbyNodeView', async () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
         layer1Node.setClosestContacts([peerDescriptor1, peerDescriptor2])
-        layer1Node.emit('closestContactAdded', peerDescriptor1)
+        layer1Node.emit('nearbyContactAdded', peerDescriptor1)
         await waitForCondition(() => nearbyNodeView.size() === 2)
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor1))).toBeTruthy()
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
@@ -85,12 +85,12 @@ describe('ContentDeliveryLayerNode', () => {
         expect(randomNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
     })
 
-    it('Adds Nodes from layer1 KBucket to nearbyNodeView if its size is below nodeViewSize', async () => {
+    it('Adds Nodes from layer1 neighbors to nearbyNodeView if its size is below nodeViewSize', async () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
         layer1Node.addNewRandomPeerToKBucket()
         layer1Node.setClosestContacts([peerDescriptor1, peerDescriptor2])
-        layer1Node.emit('closestContactAdded', peerDescriptor1)
+        layer1Node.emit('nearbyContactAdded', peerDescriptor1)
         await waitForCondition(() => {
             return nearbyNodeView.size() === 3
         }, 20000)

package/test/unit/ContentDeliveryManager.test.ts

@@ -4,7 +4,7 @@ import { randomEthereumAddress } from '@streamr/test-utils'
 import { waitForCondition } from '@streamr/utils'
 import { ContentDeliveryManager } from '../../src/logic/ContentDeliveryManager'
 import { MockLayer0Node } from '../utils/mock/MockLayer0Node'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createStreamMessage, mockConnectionLocker } from '../utils/utils'
 import { ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 

package/test/unit/ContentDeliveryRpcLocal.test.ts

@@ -3,7 +3,7 @@ import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
 import { ContentDeliveryRpcLocal } from '../../src/logic/ContentDeliveryRpcLocal'
 import { LeaveStreamPartNotice } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
 
 describe('ContentDeliveryRpcLocal', () => {

package/test/unit/Inspector.test.ts

@@ -1,7 +1,7 @@
 import { ListeningRpcCommunicator, createRandomDhtAddress, getNodeIdFromPeerDescriptor } from '@streamr/dht'
 import { utf8ToBinary } from '@streamr/utils'
 import { Inspector } from '../../src/logic/inspect/Inspector'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, mockConnectionLocker } from '../utils/utils'
 import { StreamPartIDUtils } from '@streamr/protocol'
 

package/test/unit/NeighborUpdateRpcLocal.test.ts

@@ -4,7 +4,7 @@ import { NeighborUpdateRpcLocal } from '../../src/logic/neighbor-discovery/Neigh
 import { createMockPeerDescriptor } from '../utils/utils'
 import { NodeList } from '../../src/logic/NodeList'
 import { StreamPartIDUtils } from '@streamr/protocol'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
 import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
 import { range } from 'lodash'

package/test/unit/NodeList.test.ts

@@ -13,7 +13,7 @@ import { NodeList } from '../../src/logic/NodeList'
 import { formStreamPartContentDeliveryServiceId } from '../../src/logic/formStreamPartDeliveryServiceId'
 import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
 import { createMockPeerDescriptor } from '../utils/utils'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 
 const streamPartId = StreamPartIDUtils.parse('stream#0')
 

package/test/unit/StreamPartReconnect.test.ts

@@ -0,0 +1,30 @@
+import { EntryPointDiscovery } from '../../src/logic/EntryPointDiscovery'
+import { StreamPartReconnect } from '../../src/logic/StreamPartReconnect'
+import { MockLayer1Node } from '../utils/mock/MockLayer1Node'
+import { createFakeEntryPointDiscovery } from '../utils/fake/FakeEntryPointDiscovery'
+import { waitForCondition } from '@streamr/utils'
+
+describe('StreamPartReconnect', () => {
+
+    let entryPointDiscovery: EntryPointDiscovery
+    let layer1Node: MockLayer1Node
+    let streamPartReconnect: StreamPartReconnect
+
+    beforeEach(() => {
+        entryPointDiscovery = createFakeEntryPointDiscovery()
+        layer1Node = new MockLayer1Node()
+        streamPartReconnect = new StreamPartReconnect(layer1Node, entryPointDiscovery)
+    })
+
+    afterEach(() => {
+        streamPartReconnect.destroy()
+    })
+
+    it('Happy path', async () => {
+        await streamPartReconnect.reconnect(1000)
+        expect(streamPartReconnect.isRunning()).toEqual(true)
+        layer1Node.addNewRandomPeerToKBucket()
+        await waitForCondition(() => streamPartReconnect.isRunning() === false)
+    })
+
+})

package/test/unit/TemporaryConnectionRpcLocal.test.ts

@@ -1,6 +1,6 @@
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { TemporaryConnectionRpcLocal } from '../../src/logic/temporary-connection/TemporaryConnectionRpcLocal'
-import { MockTransport } from '../utils/mock/Transport'
+import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor } from '../utils/utils'
 import { ListeningRpcCommunicator, getDhtAddressFromRaw } from '@streamr/dht'
 

package/test/utils/fake/FakeEntryPointDiscovery.ts

@@ -0,0 +1,32 @@
+import { PeerDescriptor } from '@streamr/dht'
+import { EntryPointDiscovery, FindEntryPointsResult } from '../../../src/logic/EntryPointDiscovery'
+
+export const createFakeEntryPointDiscovery = (): EntryPointDiscovery => {
+    return new FakeEntryPointDiscovery() as unknown as EntryPointDiscovery
+}
+
+class FakeEntryPointDiscovery {
+
+    private entryPoints: PeerDescriptor[] = []
+
+    setEntryPoints(nodes: PeerDescriptor[]): void {
+        this.entryPoints = nodes
+    } 
+
+    async discoverEntryPointsFromDht(): Promise<FindEntryPointsResult> {
+        return {
+            entryPointsFromDht: true,
+            discoveredEntryPoints: this.entryPoints
+        }
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    async storeSelfAsEntryPointIfNecessary(): Promise<void> {
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    isLocalNodeEntryPoint(): boolean {
+        return true
+    }
+    
+}

package/test/utils/mock/MockConnectionsView.ts

@@ -0,0 +1,18 @@
+import { PeerDescriptor } from '@streamr/dht'
+
+export class MockConnectionsView {
+    // eslint-disable-next-line class-methods-use-this
+    getConnections(): PeerDescriptor[] {
+        return []
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    getConnectionCount(): number {
+        return 0
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    hasConnection(): boolean {
+        return false
+    }
+}

package/test/utils/mock/MockLayer0Node.ts

@@ -1,8 +1,9 @@
-import { PeerDescriptor, DataEntry, ITransport } from '@streamr/dht'
+import { PeerDescriptor, DataEntry, ITransport, TransportEvents, ConnectionsView } from '@streamr/dht'
 import { Layer0Node } from '../../../src/logic/Layer0Node'
 import { EventEmitter } from 'eventemitter3'
+import { MockConnectionsView } from './MockConnectionsView'
 
-export class MockLayer0Node extends EventEmitter implements Layer0Node {
+export class MockLayer0Node extends EventEmitter<TransportEvents> implements Layer0Node {
 
     private readonly peerDescriptor: PeerDescriptor
 
@@ -44,18 +45,8 @@ export class MockLayer0Node extends EventEmitter implements Layer0Node {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    getConnections(): PeerDescriptor[] {
-        return []
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    getConnectionCount(): number {
-        return 0
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    hasConnection(): boolean {
-        return false
+    getConnectionsView(): ConnectionsView {
+        return new MockConnectionsView()
     }
 
     // eslint-disable-next-line class-methods-use-this

package/test/utils/mock/MockLayer1Node.ts

@@ -1,9 +1,9 @@
 import { PeerDescriptor, RingContacts } from '@streamr/dht'
 import { EventEmitter } from 'eventemitter3'
-import { Layer1Node } from '../../../src/logic/Layer1Node'
+import { Layer1Node, Layer1NodeEvents } from '../../../src/logic/Layer1Node'
 import { createMockPeerDescriptor } from '../utils'
 
-export class MockLayer1Node extends EventEmitter implements Layer1Node {
+export class MockLayer1Node extends EventEmitter<Layer1NodeEvents> implements Layer1Node {
 
     private readonly kbucketPeers: PeerDescriptor[] = []
     private closestContacts: PeerDescriptor[] = []