@streamr/trackerless-network 100.2.5-beta.1 → 101.0.0-beta.0

package/test/unit/ContentDeliveryLayerNode.test.ts

@@ -3,7 +3,7 @@ import { NodeList } from '../../src/logic/NodeList'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
 import { MockHandshaker } from '../utils/mock/MockHandshaker'
-import { MockLayer1Node } from '../utils/mock/MockLayer1Node'
+import { MockDiscoveryLayerNode } from '../utils/mock/MockDiscoveryLayerNode'
 import { MockNeighborFinder } from '../utils/mock/MockNeighborFinder'
 import { MockNeighborUpdateManager } from '../utils/mock/MockNeighborUpdateManager'
 import { MockTransport } from '../utils/mock/MockTransport'
@@ -20,7 +20,7 @@ describe('ContentDeliveryLayerNode', () => {
     let nearbyNodeView: NodeList
     let randomNodeView: NodeList
 
-    let layer1Node: MockLayer1Node
+    let discoveryLayerNode: MockDiscoveryLayerNode
 
     beforeEach(async () => {
         const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
@@ -28,7 +28,7 @@ describe('ContentDeliveryLayerNode', () => {
         neighbors = new NodeList(nodeId, 10)
         randomNodeView = new NodeList(nodeId, 10)
         nearbyNodeView = new NodeList(nodeId, 10)
-        layer1Node = new MockLayer1Node()
+        discoveryLayerNode = new MockDiscoveryLayerNode()
 
         contentDeliveryLayerNode = createContentDeliveryLayerNode({
             neighbors,
@@ -36,7 +36,7 @@ describe('ContentDeliveryLayerNode', () => {
             nearbyNodeView,
             transport: new MockTransport(),
             localPeerDescriptor: peerDescriptor,
-            layer1Node,
+            discoveryLayerNode,
             connectionLocker: mockConnectionLocker,
             handshaker: new MockHandshaker() as any,
             neighborUpdateManager: new MockNeighborUpdateManager() as any,
@@ -68,8 +68,8 @@ describe('ContentDeliveryLayerNode', () => {
     it('Adds Closest Nodes from layer1 nearbyContactAdded event to nearbyNodeView', async () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
-        layer1Node.setClosestContacts([peerDescriptor1, peerDescriptor2])
-        layer1Node.emit('nearbyContactAdded', peerDescriptor1)
+        discoveryLayerNode.setClosestContacts([peerDescriptor1, peerDescriptor2])
+        discoveryLayerNode.emit('nearbyContactAdded', peerDescriptor1)
         await waitForCondition(() => nearbyNodeView.size() === 2)
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor1))).toBeTruthy()
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
@@ -78,8 +78,8 @@ describe('ContentDeliveryLayerNode', () => {
     it('Adds Random Nodes from layer1 randomContactAdded event to randomNodeView', async () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
-        layer1Node.setRandomContacts([peerDescriptor1, peerDescriptor2])
-        layer1Node.emit('randomContactAdded', peerDescriptor1)
+        discoveryLayerNode.setRandomContacts([peerDescriptor1, peerDescriptor2])
+        discoveryLayerNode.emit('randomContactAdded', peerDescriptor1)
         await waitForCondition(() => randomNodeView.size() === 2)
         expect(randomNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor1))).toBeTruthy()
         expect(randomNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
@@ -88,9 +88,9 @@ describe('ContentDeliveryLayerNode', () => {
     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('nearbyContactAdded', peerDescriptor1)
+        discoveryLayerNode.addNewRandomPeerToKBucket()
+        discoveryLayerNode.setClosestContacts([peerDescriptor1, peerDescriptor2])
+        discoveryLayerNode.emit('nearbyContactAdded', peerDescriptor1)
         await waitForCondition(() => {
             return nearbyNodeView.size() === 3
         }, 20000)

package/test/unit/ContentDeliveryManager.test.ts

@@ -3,7 +3,7 @@ import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
 import { waitForCondition } from '@streamr/utils'
 import { ContentDeliveryManager } from '../../src/logic/ContentDeliveryManager'
-import { MockLayer0Node } from '../utils/mock/MockLayer0Node'
+import { MockControlLayerNode } from '../utils/mock/MockControlLayerNode'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createStreamMessage, mockConnectionLocker } from '../utils/utils'
 import { ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
@@ -15,7 +15,7 @@ describe('ContentDeliveryManager', () => {
 
     beforeEach(async () => {
         manager = new ContentDeliveryManager({})
-        const mockLayer0 = new MockLayer0Node(peerDescriptor)
+        const mockLayer0 = new MockControlLayerNode(peerDescriptor)
         await manager.start(mockLayer0, new MockTransport(), mockConnectionLocker)
     })
 

package/test/unit/{EntrypointDiscovery.test.ts → PeerDescriptorStoreManager.test.ts}

@@ -1,17 +1,16 @@
-import { PeerDescriptor, areEqualPeerDescriptors } from '@streamr/dht'
-import { StreamPartIDUtils } from '@streamr/protocol'
+import { PeerDescriptor, areEqualPeerDescriptors, createRandomDhtAddress } from '@streamr/dht'
 import { wait } from '@streamr/utils'
-import { EntryPointDiscovery } from '../../src/logic/EntryPointDiscovery'
+import { PeerDescriptorStoreManager } from '../../src/logic/PeerDescriptorStoreManager'
 import { Any } from '../../src/proto/google/protobuf/any'
 import { DataEntry } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
-const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
+const KEY = createRandomDhtAddress()
 
-describe('EntryPointDiscovery', () => {
+describe('PeerDescriptorStoreManager', () => {
 
-    let entryPointDiscoveryWithData: EntryPointDiscovery
-    let entryPointDiscoveryWithoutData: EntryPointDiscovery
+    let withData: PeerDescriptorStoreManager
+    let withoutData: PeerDescriptorStoreManager
     let storeCalled: number
 
     const peerDescriptor = createMockPeerDescriptor()
@@ -35,68 +34,68 @@ describe('EntryPointDiscovery', () => {
         deleted: true
     }
 
-    const fakeFetchEntryPointData = async (): Promise<DataEntry[]> => {
+    const fakeFetchDataFromDht = async (): Promise<DataEntry[]> => {
         return [fakeData, fakeDeletedData]
     }
 
-    const fakeStoreEntryPointData = async (): Promise<PeerDescriptor[]> => {
+    const fakeStoreDataToDht = async (): Promise<PeerDescriptor[]> => {
         storeCalled++
         return [peerDescriptor]
     }
 
-    const fakeEmptyFetchEntryPointData = async (): Promise<DataEntry[]> => {
+    const fakeEmptyFetchDataFromDht = async (): Promise<DataEntry[]> => {
         return []
     }
 
-    const fakeDeleteEntryPointData = async (): Promise<void> => {}
+    const fakeDeleteDataFromDht = async (): Promise<void> => {}
 
     beforeEach(() => {
         storeCalled = 0
-        entryPointDiscoveryWithData = new EntryPointDiscovery({
+        withData = new PeerDescriptorStoreManager({
             localPeerDescriptor: peerDescriptor,
-            streamPartId: STREAM_PART_ID,
-            fetchEntryPointData: fakeFetchEntryPointData,
-            storeEntryPointData: fakeStoreEntryPointData,
-            deleteEntryPointData: fakeDeleteEntryPointData,
+            key: KEY,
+            fetchDataFromDht: fakeFetchDataFromDht,
+            storeDataToDht: fakeStoreDataToDht,
+            deleteDataFromDht: fakeDeleteDataFromDht,
             storeInterval: 2000
         })
-        entryPointDiscoveryWithoutData = new EntryPointDiscovery({
+        withoutData = new PeerDescriptorStoreManager({
             localPeerDescriptor: peerDescriptor,
-            streamPartId: STREAM_PART_ID,
-            fetchEntryPointData: fakeEmptyFetchEntryPointData,
-            storeEntryPointData: fakeStoreEntryPointData,
-            deleteEntryPointData: fakeDeleteEntryPointData,
+            key: KEY,
+            fetchDataFromDht: fakeEmptyFetchDataFromDht,
+            storeDataToDht: fakeStoreDataToDht,
+            deleteDataFromDht: fakeDeleteDataFromDht,
             storeInterval: 2000
         })
     })
 
     afterEach(() => {
-        entryPointDiscoveryWithData.destroy()
+        withData.destroy()
     })
 
     it('discoverEntryPoints filters deleted data', async () => {
-        const res = await entryPointDiscoveryWithData.discoverEntryPoints()
+        const res = await withData.fetchNodes()
         expect(res.length).toBe(1)
         expect(areEqualPeerDescriptors(res[0], peerDescriptor)).toBe(true)
     })
 
     it('discoverEntryPoints without results', async () => {
-        const res = await entryPointDiscoveryWithoutData.discoverEntryPoints()
+        const res = await withoutData.fetchNodes()
         expect(res.length).toBe(0)
     })
 
     it('store on stream without saturated entrypoint count', async () => {
-        await entryPointDiscoveryWithData.storeAndKeepLocalNodeAsEntryPoint()
+        await withData.storeAndKeepLocalNode()
         expect(storeCalled).toEqual(1)
-        expect(entryPointDiscoveryWithData.isLocalNodeEntryPoint()).toEqual(true)
+        expect(withData.isLocalNodeStored()).toEqual(true)
     })
 
     it('will keep stored until destroyed', async () => {
-        await entryPointDiscoveryWithData.storeAndKeepLocalNodeAsEntryPoint()
+        await withData.storeAndKeepLocalNode()
         expect(storeCalled).toEqual(1)
-        expect(entryPointDiscoveryWithData.isLocalNodeEntryPoint()).toEqual(true)
+        expect(withData.isLocalNodeStored()).toEqual(true)
         await wait(4500)
-        await entryPointDiscoveryWithData.destroy()
+        await withData.destroy()
         // we have configured storeInterval to 2 seconds, i.e. after 4.5 seconds it should have been called 2 more items 
         expect(storeCalled).toEqual(3)
     })

package/test/unit/StreamPartIDDataKey.test.ts

@@ -1,5 +1,5 @@
 import { StreamPartIDUtils } from '@streamr/protocol'
-import { streamPartIdToDataKey } from '../../src/logic/EntryPointDiscovery'
+import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 
 describe('StreamPartIDtoDataKey', () => {
 

package/test/unit/StreamPartNetworkSplitAvoidance.test.ts

@@ -1,32 +1,32 @@
 import { MIN_NEIGHBOR_COUNT } from '../../src/logic/StreamPartNetworkSplitAvoidance'
 import { StreamPartNetworkSplitAvoidance } from '../../src/logic/StreamPartNetworkSplitAvoidance'
-import { MockLayer1Node } from '../utils/mock/MockLayer1Node'
+import { MockDiscoveryLayerNode } from '../utils/mock/MockDiscoveryLayerNode'
 
 describe('StreamPartNetworkSplitAvoidance', () => {
 
     let avoidance: StreamPartNetworkSplitAvoidance
-    let layer1Node: MockLayer1Node
+    let discoveryLayerNode: MockDiscoveryLayerNode
     
     beforeEach(() => {
-        layer1Node = new MockLayer1Node()
+        discoveryLayerNode = new MockDiscoveryLayerNode()
         avoidance = new StreamPartNetworkSplitAvoidance({
-            layer1Node,
+            discoveryLayerNode,
             discoverEntryPoints: async () => { 
-                layer1Node.addNewRandomPeerToKBucket() 
-                return layer1Node.getNeighbors()
+                discoveryLayerNode.addNewRandomPeerToKBucket() 
+                return discoveryLayerNode.getNeighbors()
             },
             exponentialRunOfBaseDelay: 1
         })
     })
 
     afterEach(() => {
-        layer1Node.stop()
+        discoveryLayerNode.stop()
         avoidance.destroy()
     })
 
     it('runs avoidance until number of neighbors is above MIN_NEIGHBOR_COUNT', async () => {
         await avoidance.avoidNetworkSplit()
-        expect(layer1Node.getNeighborCount()).toBeGreaterThan(MIN_NEIGHBOR_COUNT)
+        expect(discoveryLayerNode.getNeighborCount()).toBeGreaterThan(MIN_NEIGHBOR_COUNT)
     })
 
 })

package/test/unit/StreamPartReconnect.test.ts

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

package/test/utils/fake/FakePeerDescriptorStoreManager.ts

@@ -0,0 +1,29 @@
+import { PeerDescriptor } from '@streamr/dht'
+import { PeerDescriptorStoreManager } from '../../../src/logic/PeerDescriptorStoreManager'
+
+export const createFakePeerDescriptorStoreManager = (): PeerDescriptorStoreManager => {
+    return new FakePeerDescriptorStoreManager() as unknown as PeerDescriptorStoreManager
+}
+
+class FakePeerDescriptorStoreManager {
+
+    private nodes: PeerDescriptor[] = []
+
+    setNodes(nodes: PeerDescriptor[]): void {
+        this.nodes = nodes
+    } 
+
+    async fetchNodes(): Promise<PeerDescriptor[]> {
+        return this.nodes
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    async storeAndKeepLocalNode(): Promise<void> {
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    isLocalNodeStored(): boolean {
+        return true
+    }
+    
+}

package/test/utils/mock/{MockLayer0Node.ts → MockControlLayerNode.ts}

@@ -1,9 +1,9 @@
 import { PeerDescriptor, DataEntry, ITransport, TransportEvents, ConnectionsView } from '@streamr/dht'
-import { Layer0Node } from '../../../src/logic/Layer0Node'
+import { ControlLayerNode } from '../../../src/logic/ControlLayerNode'
 import { EventEmitter } from 'eventemitter3'
 import { MockConnectionsView } from './MockConnectionsView'
 
-export class MockLayer0Node extends EventEmitter<TransportEvents> implements Layer0Node {
+export class MockControlLayerNode extends EventEmitter<TransportEvents> implements ControlLayerNode {
 
     private readonly peerDescriptor: PeerDescriptor
 

package/test/utils/mock/{MockLayer1Node.ts → MockDiscoveryLayerNode.ts}

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

package/test/utils/utils.ts

@@ -23,7 +23,7 @@ import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/Handshake
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { EthereumAddress, hexToBinary, utf8ToBinary } from '@streamr/utils'
 import { StreamPartID, StreamPartIDUtils } from '@streamr/protocol'
-import { Layer1Node } from '../../src/logic/Layer1Node'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 import { ContentDeliveryRpcClient, HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
 import { RpcCommunicator } from '@streamr/proto-rpc'
 
@@ -42,10 +42,10 @@ export const createMockContentDeliveryLayerNodeAndDhtNode = async (
     entryPointDescriptor: PeerDescriptor,
     streamPartId: StreamPartID,
     simulator: Simulator
-): Promise<[ Layer1Node, ContentDeliveryLayerNode ]> => {
+): Promise<[ DiscoveryLayerNode, ContentDeliveryLayerNode ]> => {
     const mockCm = new SimulatorTransport(localPeerDescriptor, simulator)
     await mockCm.start()
-    const layer1Node = new DhtNode({
+    const discoveryLayerNode = new DhtNode({
         transport: mockCm,
         connectionsView: mockCm,
         peerDescriptor: localPeerDescriptor,
@@ -56,13 +56,13 @@ export const createMockContentDeliveryLayerNodeAndDhtNode = async (
     const contentDeliveryLayerNode = createContentDeliveryLayerNode({
         streamPartId,
         transport: mockCm,
-        layer1Node,
+        discoveryLayerNode,
         connectionLocker: mockCm,
         localPeerDescriptor,
         rpcRequestTimeout: 5000,
         isLocalNodeEntryPoint: () => false
     })
-    return [layer1Node, contentDeliveryLayerNode]
+    return [discoveryLayerNode, contentDeliveryLayerNode]
 }
 
 export const createStreamMessage = (

package/dist/src/logic/EntryPointDiscovery.d.ts

@@ -1,27 +0,0 @@
-import { DataEntry, DhtAddress, PeerDescriptor } from '@streamr/dht';
-import { StreamPartID } from '@streamr/protocol';
-import { Any } from '../proto/google/protobuf/any';
-export declare const streamPartIdToDataKey: (streamPartId: StreamPartID) => DhtAddress;
-export declare const ENTRYPOINT_STORE_LIMIT = 8;
-interface EntryPointDiscoveryConfig {
-    streamPartId: StreamPartID;
-    localPeerDescriptor: PeerDescriptor;
-    fetchEntryPointData: (key: DhtAddress) => Promise<DataEntry[]>;
-    storeEntryPointData: (key: DhtAddress, data: Any) => Promise<PeerDescriptor[]>;
-    deleteEntryPointData: (key: DhtAddress) => Promise<void>;
-    storeInterval?: number;
-}
-export declare class EntryPointDiscovery {
-    private readonly abortController;
-    private readonly config;
-    private readonly storeInterval;
-    private isLocalNodeStoredAsEntryPoint;
-    constructor(config: EntryPointDiscoveryConfig);
-    discoverEntryPoints(): Promise<PeerDescriptor[]>;
-    storeAndKeepLocalNodeAsEntryPoint(): Promise<void>;
-    private storeLocalNodeAsEntryPoint;
-    private keepSelfAsEntryPoint;
-    isLocalNodeEntryPoint(): boolean;
-    destroy(): Promise<void>;
-}
-export {};

package/dist/src/logic/EntryPointDiscovery.js

@@ -1,80 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntryPointDiscovery = exports.ENTRYPOINT_STORE_LIMIT = exports.streamPartIdToDataKey = void 0;
-const dht_1 = require("@streamr/dht");
-const utils_1 = require("@streamr/utils");
-const crypto_1 = require("crypto");
-const any_1 = require("../proto/google/protobuf/any");
-const streamPartIdToDataKey = (streamPartId) => {
-    return (0, dht_1.getDhtAddressFromRaw)(new Uint8Array(((0, crypto_1.createHash)('sha1').update(streamPartId).digest())));
-};
-exports.streamPartIdToDataKey = streamPartIdToDataKey;
-const parseEntryPointData = (dataEntries) => {
-    return dataEntries.filter((entry) => !entry.deleted).map((entry) => any_1.Any.unpack(entry.data, dht_1.PeerDescriptor));
-};
-const logger = new utils_1.Logger(module);
-exports.ENTRYPOINT_STORE_LIMIT = 8;
-class EntryPointDiscovery {
-    abortController;
-    config;
-    storeInterval;
-    isLocalNodeStoredAsEntryPoint = false;
-    constructor(config) {
-        this.config = config;
-        this.abortController = new AbortController();
-        this.storeInterval = this.config.storeInterval ?? 60000;
-    }
-    async discoverEntryPoints() {
-        const dataKey = (0, exports.streamPartIdToDataKey)(this.config.streamPartId);
-        logger.trace(`Discovering entry points for key ${dataKey}`);
-        try {
-            const result = await this.config.fetchEntryPointData(dataKey);
-            return parseEntryPointData(result);
-        }
-        catch (err) {
-            return [];
-        }
-    }
-    async storeAndKeepLocalNodeAsEntryPoint() {
-        if (this.abortController.signal.aborted) {
-            return;
-        }
-        this.isLocalNodeStoredAsEntryPoint = true;
-        await this.storeLocalNodeAsEntryPoint();
-        await this.keepSelfAsEntryPoint();
-    }
-    async storeLocalNodeAsEntryPoint() {
-        const localPeerDescriptor = this.config.localPeerDescriptor;
-        const dataToStore = any_1.Any.pack(localPeerDescriptor, dht_1.PeerDescriptor);
-        try {
-            await this.config.storeEntryPointData((0, exports.streamPartIdToDataKey)(this.config.streamPartId), dataToStore);
-        }
-        catch (err) {
-            logger.warn(`Failed to store self as entrypoint for ${this.config.streamPartId}`);
-        }
-    }
-    async keepSelfAsEntryPoint() {
-        await (0, utils_1.scheduleAtInterval)(async () => {
-            logger.trace(`Attempting to keep self as entrypoint for ${this.config.streamPartId}`);
-            try {
-                const discovered = await this.discoverEntryPoints();
-                if (discovered.length < exports.ENTRYPOINT_STORE_LIMIT
-                    || discovered.some((peerDescriptor) => (0, dht_1.areEqualPeerDescriptors)(peerDescriptor, this.config.localPeerDescriptor))) {
-                    await this.storeLocalNodeAsEntryPoint();
-                }
-            }
-            catch (err) {
-                logger.debug(`Failed to keep self as entrypoint for ${this.config.streamPartId}`);
-            }
-        }, this.storeInterval, false, this.abortController.signal);
-    }
-    isLocalNodeEntryPoint() {
-        return this.isLocalNodeStoredAsEntryPoint;
-    }
-    async destroy() {
-        this.abortController.abort();
-        await this.config.deleteEntryPointData((0, exports.streamPartIdToDataKey)(this.config.streamPartId));
-    }
-}
-exports.EntryPointDiscovery = EntryPointDiscovery;
-//# sourceMappingURL=EntryPointDiscovery.js.map

package/dist/src/logic/EntryPointDiscovery.js.map

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

package/dist/src/logic/Layer0Node.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Layer0Node.js","sourceRoot":"","sources":["../../../src/logic/Layer0Node.ts"],"names":[],"mappings":""}

package/dist/src/logic/Layer1Node.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Layer1Node.js","sourceRoot":"","sources":["../../../src/logic/Layer1Node.ts"],"names":[],"mappings":""}

package/src/logic/EntryPointDiscovery.ts

@@ -1,100 +0,0 @@
-import {
-    DataEntry,
-    DhtAddress,
-    PeerDescriptor,
-    areEqualPeerDescriptors,
-    getDhtAddressFromRaw
-} from '@streamr/dht'
-import { StreamPartID } from '@streamr/protocol'
-import { Logger, scheduleAtInterval } from '@streamr/utils'
-import { createHash } from 'crypto'
-import { Any } from '../proto/google/protobuf/any'
-
-export const streamPartIdToDataKey = (streamPartId: StreamPartID): DhtAddress => {
-    return getDhtAddressFromRaw(new Uint8Array((createHash('sha1').update(streamPartId).digest())))
-}
-
-const parseEntryPointData = (dataEntries: DataEntry[]): PeerDescriptor[] => {
-    return dataEntries.filter((entry) => !entry.deleted).map((entry) => Any.unpack(entry.data!, PeerDescriptor))
-}
-
-const logger = new Logger(module)
-
-export const ENTRYPOINT_STORE_LIMIT = 8
-
-interface EntryPointDiscoveryConfig {
-    streamPartId: StreamPartID
-    localPeerDescriptor: PeerDescriptor
-    fetchEntryPointData: (key: DhtAddress) => Promise<DataEntry[]>
-    storeEntryPointData: (key: DhtAddress, data: Any) => Promise<PeerDescriptor[]>
-    deleteEntryPointData: (key: DhtAddress) => Promise<void>
-    storeInterval?: number
-}
-
-export class EntryPointDiscovery {
-
-    private readonly abortController: AbortController
-    private readonly config: EntryPointDiscoveryConfig
-    private readonly storeInterval: number
-    private isLocalNodeStoredAsEntryPoint = false
-    
-    constructor(config: EntryPointDiscoveryConfig) {
-        this.config = config
-        this.abortController = new AbortController()
-        this.storeInterval = this.config.storeInterval ?? 60000
-    }
-
-    async discoverEntryPoints(): Promise<PeerDescriptor[]> {
-        const dataKey = streamPartIdToDataKey(this.config.streamPartId)
-        logger.trace(`Discovering entry points for key ${dataKey}`)
-        try {
-            const result = await this.config.fetchEntryPointData(dataKey)
-            return parseEntryPointData(result)
-        } catch (err) {
-            return []
-        }    
-    }
-
-    async storeAndKeepLocalNodeAsEntryPoint(): Promise<void> {
-        if (this.abortController.signal.aborted) {
-            return
-        }
-        this.isLocalNodeStoredAsEntryPoint = true
-        await this.storeLocalNodeAsEntryPoint()
-        await this.keepSelfAsEntryPoint()
-    }
-
-    private async storeLocalNodeAsEntryPoint(): Promise<void> {
-        const localPeerDescriptor = this.config.localPeerDescriptor
-        const dataToStore = Any.pack(localPeerDescriptor, PeerDescriptor)
-        try {
-            await this.config.storeEntryPointData(streamPartIdToDataKey(this.config.streamPartId), dataToStore)
-        } catch (err) {
-            logger.warn(`Failed to store self as entrypoint for ${this.config.streamPartId}`)
-        }
-    }
-
-    private async keepSelfAsEntryPoint(): Promise<void> {
-        await scheduleAtInterval(async () => {
-            logger.trace(`Attempting to keep self as entrypoint for ${this.config.streamPartId}`)
-            try {
-                const discovered = await this.discoverEntryPoints()
-                if (discovered.length < ENTRYPOINT_STORE_LIMIT 
-                    || discovered.some((peerDescriptor) => areEqualPeerDescriptors(peerDescriptor, this.config.localPeerDescriptor))) {
-                    await this.storeLocalNodeAsEntryPoint()
-                }
-            } catch (err) {
-                logger.debug(`Failed to keep self as entrypoint for ${this.config.streamPartId}`)
-            }
-        }, this.storeInterval, false, this.abortController.signal)
-    }
-
-    public isLocalNodeEntryPoint(): boolean {
-        return this.isLocalNodeStoredAsEntryPoint
-    }
-
-    async destroy(): Promise<void> {
-        this.abortController.abort()
-        await this.config.deleteEntryPointData(streamPartIdToDataKey(this.config.streamPartId))
-    }
-}

package/test/utils/fake/FakeEntryPointDiscovery.ts

@@ -1,29 +0,0 @@
-import { PeerDescriptor } from '@streamr/dht'
-import { EntryPointDiscovery } 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 discoverEntryPoints(): Promise<PeerDescriptor[]> {
-        return this.entryPoints
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    async storeAndKeepLocalNodeAsEntryPoint(): Promise<void> {
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    isLocalNodeEntryPoint(): boolean {
-        return true
-    }
-    
-}