@streamr/trackerless-network 101.1.2 → 102.0.0-beta.0

package/dist/test/utils/utils.d.ts

@@ -1,5 +1,5 @@
 import { ConnectionLocker, PeerDescriptor, Simulator } from '@streamr/dht';
-import { EthereumAddress, StreamPartID } from '@streamr/utils';
+import { StreamPartID, UserID } from '@streamr/utils';
 import { NetworkNode } from '../../src/NetworkNode';
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode';
 import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote';
@@ -8,7 +8,7 @@ import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/Handshake
 import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc';
 export declare const mockConnectionLocker: ConnectionLocker;
 export declare const createMockContentDeliveryLayerNodeAndDhtNode: (localPeerDescriptor: PeerDescriptor, entryPointDescriptor: PeerDescriptor, streamPartId: StreamPartID, simulator: Simulator) => Promise<[DiscoveryLayerNode, ContentDeliveryLayerNode]>;
-export declare const createStreamMessage: (content: string, streamPartId: StreamPartID, publisherId: EthereumAddress, timestamp?: number, sequenceNumber?: number) => StreamMessage;
+export declare const createStreamMessage: (content: string, streamPartId: StreamPartID, publisherId: UserID, timestamp?: number, sequenceNumber?: number) => StreamMessage;
 export declare const createMockPeerDescriptor: (opts?: Omit<Partial<PeerDescriptor>, 'nodeId' | 'type'>) => PeerDescriptor;
 export declare const createMockContentDeliveryRpcRemote: (remotePeerDescriptor?: PeerDescriptor) => ContentDeliveryRpcRemote;
 export declare const createMockHandshakeRpcRemote: () => HandshakeRpcRemote;

package/dist/test/utils/utils.js

@@ -70,7 +70,7 @@ exports.createStreamMessage = createStreamMessage;
 const createMockPeerDescriptor = (opts) => {
     return {
         ...opts,
-        nodeId: (0, dht_1.getRawFromDhtAddress)((0, dht_1.createRandomDhtAddress)()),
+        nodeId: (0, dht_1.toDhtAddressRaw)((0, dht_1.randomDhtAddress)()),
         type: dht_1.NodeType.NODEJS,
         region: (0, dht_1.getRandomRegion)()
     };

package/dist/test/utils/utils.js.map

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

package/jest.config.js

@@ -1,5 +1,8 @@
 const rootConfig = require('../../jest.config')
 module.exports = {
     ...rootConfig,
+    setupFilesAfterEnv: rootConfig.setupFilesAfterEnv.concat(
+        '@streamr/test-utils/setupCustomMatchers'
+    ),
     testTimeout: 15000
 }

package/karma-setup.js

@@ -0,0 +1,7 @@
+/**
+ * This setup script is executed indirectly by Karma via the `browser-test-runner`
+ * package. See karma-config.js in that package for more details.
+ */
+
+const { customMatchers } = require('@streamr/test-utils')
+expect.extend(customMatchers)

package/karma.config.js

@@ -19,4 +19,4 @@ module.exports = createKarmaConfig(TEST_PATHS, createWebpackConfig({
         '@streamr/dht': path.resolve('../dht/src/exports.ts'),
         '@streamr/proto-rpc': path.resolve('../proto-rpc/src/exports.ts'),
     }
-}))
+}), __dirname)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/trackerless-network",
-  "version": "101.1.2",
+  "version": "102.0.0-beta.0",
   "description": "Minimal and extendable implementation of the Streamr Network node.",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "build": "tsc -b tsconfig.node.json",
     "build-browser": "webpack --mode=development --progress",
     "generate-protoc-code": "./proto.sh",
-    "check": "tsc -p ./tsconfig.jest.json --noEmit",
+    "check": "tsc -p ./tsconfig.jest.json",
     "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "coverage": "jest --coverage",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
@@ -30,10 +30,10 @@
   "dependencies": {
     "@protobuf-ts/runtime": "^2.8.2",
     "@protobuf-ts/runtime-rpc": "^2.8.2",
-    "@streamr/dht": "101.1.2",
-    "@streamr/proto-rpc": "101.1.2",
-    "@streamr/test-utils": "101.1.2",
-    "@streamr/utils": "101.1.2",
+    "@streamr/dht": "102.0.0-beta.0",
+    "@streamr/proto-rpc": "102.0.0-beta.0",
+    "@streamr/test-utils": "102.0.0-beta.0",
+    "@streamr/utils": "102.0.0-beta.0",
     "eventemitter3": "^5.0.0",
     "lodash": "^4.17.21",
     "uuid": "^10.0.0",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@streamr/browser-test-runner": "^0.0.1",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash": "^4.17.10",
     "@types/uuid": "^10.0.0",
     "@types/yallist": "^4.0.1",
     "expect": "^29.6.2",

package/protos/NetworkRpc.proto

@@ -163,7 +163,13 @@ enum ProxyDirection {
 message StreamPartitionInfo {
   string id = 1;
   repeated dht.PeerDescriptor controlLayerNeighbors = 2;
-  repeated dht.PeerDescriptor contentDeliveryLayerNeighbors = 3;
+  repeated dht.PeerDescriptor deprecatedContentDeliveryLayerNeighbors = 3;
+  repeated ContentDeliveryLayerNeighborInfo contentDeliveryLayerNeighbors = 4;
+}
+
+message ContentDeliveryLayerNeighborInfo {
+  dht.PeerDescriptor peerDescriptor = 1;
+  optional int32 rtt = 2;
 }
 
 message ControlLayerInfo {

package/src/NetworkNode.ts

@@ -1,11 +1,11 @@
-import { DhtAddress, PeerDescriptor } from '@streamr/dht'
-import { EthereumAddress, MetricsContext, StreamPartID } from '@streamr/utils'
-import { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack'
-import { ProxyDirection, StreamMessage } from './proto/packages/trackerless-network/protos/NetworkRpc'
-import { ExternalNetworkRpc, ExternalRpcClient, ExternalRpcClientClass } from './logic/ExternalNetworkRpc'
 import { IMessageType } from '@protobuf-ts/runtime'
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
+import { DhtAddress, PeerDescriptor } from '@streamr/dht'
 import { ProtoRpcClient } from '@streamr/proto-rpc'
+import { MetricsContext, StreamPartID, UserID } from '@streamr/utils'
+import { ExternalNetworkRpc, ExternalRpcClient, ExternalRpcClientClass } from './logic/ExternalNetworkRpc'
+import { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack'
+import { ProxyDirection, StreamMessage } from './proto/packages/trackerless-network/protos/NetworkRpc'
 
 export const createNetworkNode = (opts: NetworkOptions): NetworkNode => {
     return new NetworkNode(new NetworkStack(opts))
@@ -46,7 +46,7 @@ export class NetworkNode {
         streamPartId: StreamPartID,
         nodes: PeerDescriptor[],
         direction: ProxyDirection,
-        userId: EthereumAddress,
+        userId: UserID,
         connectionCount?: number
     ): Promise<void> {
         await this.stack.getContentDeliveryManager().setProxies(streamPartId, nodes, direction, userId, connectionCount)
@@ -113,9 +113,11 @@ export class NetworkNode {
         return this.stack.fetchNodeInfo(node)
     }
 
-    // eslint-disable-next-line class-methods-use-this
     getDiagnosticInfo(): Record<string, unknown> {
-        return {}
+        return {
+            controlLayer: this.stack.getControlLayerNode().getDiagnosticInfo(),
+            contentLayer: this.stack.getContentDeliveryManager().getDiagnosticInfo()
+        }
     }
 
     registerExternalNetworkRpcMethod<

package/src/NetworkStack.ts

@@ -5,7 +5,7 @@ import {
     ListeningRpcCommunicator,
     PeerDescriptor,
     areEqualPeerDescriptors,
-    getNodeIdFromPeerDescriptor
+    toNodeId
 } from '@streamr/dht'
 import { Logger, MetricsContext, StreamID, StreamPartID, toStreamPartID, waitForCondition } from '@streamr/utils'
 import { pull } from 'lodash'
@@ -66,7 +66,8 @@ export class NetworkStack {
         this.metricsContext = options.metricsContext ?? new MetricsContext()
         this.controlLayerNode = new DhtNode({
             ...options.layer0,
-            metricsContext: this.metricsContext
+            metricsContext: this.metricsContext,
+            allowIncomingPrivateConnections: options.networkNode?.acceptProxyConnections
         })
         this.contentDeliveryManager = new ContentDeliveryManager({
             ...options.networkNode,
@@ -106,7 +107,7 @@ export class NetworkStack {
     async start(doJoin = true): Promise<void> {
         logger.info('Starting a Streamr Network Node')
         await this.controlLayerNode!.start()
-        logger.info(`Node id is ${getNodeIdFromPeerDescriptor(this.controlLayerNode!.getLocalPeerDescriptor())}`)
+        logger.info(`Node id is ${toNodeId(this.controlLayerNode!.getLocalPeerDescriptor())}`)
         const connectionManager = this.controlLayerNode!.getTransport() as ConnectionManager
         if ((this.options.layer0?.entryPoints !== undefined) && (this.options.layer0.entryPoints.some((entryPoint) => 
             areEqualPeerDescriptors(entryPoint, this.controlLayerNode!.getLocalPeerDescriptor())

package/src/logic/ContentDeliveryLayerNode.ts

@@ -4,12 +4,13 @@ import {
     ITransport,
     ListeningRpcCommunicator,
     PeerDescriptor,
-    getNodeIdFromPeerDescriptor,
+    toNodeId,
 } from '@streamr/dht'
 import { Logger, StreamPartID, addManagedEventListener } from '@streamr/utils'
 import { EventEmitter } from 'eventemitter3'
 import {
     CloseTemporaryConnection,
+    ContentDeliveryLayerNeighborInfo,
     LeaveStreamPartNotice,
     MessageID,
     MessageRef,
@@ -75,6 +76,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
     private options: StrictContentDeliveryLayerNodeOptions
     private readonly contentDeliveryRpcLocal: ContentDeliveryRpcLocal
     private abortController: AbortController = new AbortController()
+    private messagesPropagated = 0
 
     constructor(options: StrictContentDeliveryLayerNodeOptions) {
         super()
@@ -164,7 +166,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
             (id, remote) => {
                 this.options.propagation.onNeighborJoined(id)
                 this.options.connectionLocker.weakLockConnection(
-                    getNodeIdFromPeerDescriptor(remote.getPeerDescriptor()),
+                    toNodeId(remote.getPeerDescriptor()),
                     this.options.streamPartId
                 )
                 this.emit('neighborConnected', id)
@@ -176,7 +178,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
             'nodeRemoved',
             (_id, remote) => {
                 this.options.connectionLocker.weakUnlockConnection(
-                    getNodeIdFromPeerDescriptor(remote.getPeerDescriptor()),
+                    toNodeId(remote.getPeerDescriptor()),
                     this.options.streamPartId
                 )
             },
@@ -315,7 +317,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
     }
 
     private onNodeDisconnected(peerDescriptor: PeerDescriptor): void {
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+        const nodeId = toNodeId(peerDescriptor)
         if (this.options.neighbors.has(nodeId)) {
             this.options.neighbors.remove(nodeId)
             this.options.neighborFinder.start([nodeId])
@@ -339,7 +341,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         this.options.neighbors.getAll().map((remote) => {
             remote.leaveStreamPartNotice(this.options.streamPartId, this.options.isLocalNodeEntryPoint())
             this.options.connectionLocker.weakUnlockConnection(
-                getNodeIdFromPeerDescriptor(remote.getPeerDescriptor()),
+                toNodeId(remote.getPeerDescriptor()),
                 this.options.streamPartId
             )
         })
@@ -360,6 +362,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         this.emit('message', msg)
         const skipBackPropagation = previousNode !== undefined && !this.options.temporaryConnectionRpcLocal.hasNode(previousNode)
         this.options.propagation.feedUnseenMessage(msg, this.getPropagationTargets(msg), skipBackPropagation ? previousNode : null)
+        this.messagesPropagated += 1
     }
 
     inspect(peerDescriptor: PeerDescriptor): Promise<boolean> {
@@ -376,7 +379,7 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
     }
 
     getOwnNodeId(): DhtAddress {
-        return getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor)
+        return toNodeId(this.options.localPeerDescriptor)
     }
 
     getOutgoingHandshakeCount(): number {
@@ -390,11 +393,32 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
         return this.options.neighbors.getAll().map((n) => n.getPeerDescriptor())
     }
 
+    getInfos(): ContentDeliveryLayerNeighborInfo[] {
+        return this.options.neighbors.getAll().map((n) => {
+            return {
+                peerDescriptor: n.getPeerDescriptor(),
+                rtt: n.getRtt()
+            }
+        })
+    }
+
     getNearbyNodeView(): NodeList {
         return this.options.nearbyNodeView
     }
 
+    public getDiagnosticInfo(): Record<string, unknown> {
+        return {
+            neighborCount: this.options.neighbors.size(),
+            nearbyNodeViewCount: this.options.nearbyNodeView.size(),
+            randomNodeViewCount: this.options.randomNodeView.size(),
+            leftNodeViewCount: this.options.leftNodeView.size(),
+            rightNodeViewCount: this.options.rightNodeView.size(),
+            messagesPropagated: this.messagesPropagated
+        }
+    }
+
     private isStopped() {
         return this.abortController.signal.aborted
     }
+
 }

package/src/logic/ContentDeliveryManager.ts

@@ -5,16 +5,17 @@ import {
     EXISTING_CONNECTION_TIMEOUT,
     ITransport,
     PeerDescriptor,
-    getDhtAddressFromRaw,
-    getNodeIdFromPeerDescriptor
+    toDhtAddress,
+    toNodeId
 } from '@streamr/dht'
 import {
-    EthereumAddress,
     Logger,
     Metric,
     MetricsContext,
     MetricsDefinition,
-    RateMetric, StreamID, StreamPartID, StreamPartIDUtils, toStreamPartID
+    RateMetric, StreamID, StreamPartID, StreamPartIDUtils,
+    UserID,
+    toStreamPartID
 } from '@streamr/utils'
 import { createHash } from 'crypto'
 import { EventEmitter } from 'eventemitter3'
@@ -28,6 +29,7 @@ import { MIN_NEIGHBOR_COUNT as NETWORK_SPLIT_AVOIDANCE_MIN_NEIGHBOR_COUNT, Strea
 import { StreamPartReconnect } from './StreamPartReconnect'
 import { createContentDeliveryLayerNode } from './createContentDeliveryLayerNode'
 import { ProxyClient } from './proxy/ProxyClient'
+import { ConnectionManager } from '@streamr/dht/src/exports'
 
 export type StreamPartDelivery = {
     broadcast: (msg: StreamMessage) => void
@@ -37,9 +39,11 @@ export type StreamPartDelivery = {
     discoveryLayerNode: DiscoveryLayerNode
     node: ContentDeliveryLayerNode
     networkSplitAvoidance: StreamPartNetworkSplitAvoidance
+    getDiagnosticInfo: () => Record<string, unknown>
 } | {
     proxied: true
     client: ProxyClient
+    getDiagnosticInfo: () => Record<string, unknown>
 })
 
 export interface Events {
@@ -59,10 +63,11 @@ export interface ContentDeliveryManagerOptions {
     streamPartitionMinPropagationTargets?: number
     acceptProxyConnections?: boolean
     rpcRequestTimeout?: number
+    neighborUpdateInterval?: number
 }
 
 export const streamPartIdToDataKey = (streamPartId: StreamPartID): DhtAddress => {
-    return getDhtAddressFromRaw(new Uint8Array((createHash('sha1').update(streamPartId).digest())))
+    return toDhtAddress(new Uint8Array((createHash('sha1').update(streamPartId).digest())))
 }
 
 export class ContentDeliveryManager extends EventEmitter<Events> {
@@ -169,7 +174,8 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
                 await peerDescriptorStoreManager.destroy()
                 node.stop()
                 await discoveryLayerNode.stop()
-            }
+            },
+            getDiagnosticInfo: () => node.getDiagnosticInfo()
         }
         this.streamParts.set(streamPartId, streamPart)
         node.on('message', (message: StreamMessage) => {
@@ -207,6 +213,9 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             // leaveStreamPart has been called (or leaveStreamPart called, and then setProxies called)
             return
         }
+        if ((this.transport! as ConnectionManager).isPrivateClientMode()) {
+            await (this.transport! as ConnectionManager).disablePrivateClientMode()
+        }
         await streamPart.discoveryLayerNode.start()
         await streamPart.node.start()
         const knownEntryPoints = this.knownStreamPartEntryPoints.get(streamPartId)
@@ -260,6 +269,7 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             neighborTargetCount: this.options.streamPartitionNeighborTargetCount,
             acceptProxyConnections: this.options.acceptProxyConnections,
             rpcRequestTimeout: this.options.rpcRequestTimeout,
+            neighborUpdateInterval: this.options.neighborUpdateInterval,
             isLocalNodeEntryPoint
         })
     }
@@ -268,7 +278,7 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
         streamPartId: StreamPartID,
         nodes: PeerDescriptor[],
         direction: ProxyDirection,
-        userId: EthereumAddress,
+        userId: UserID,
         connectionCount?: number
     ): Promise<void> {
         // TODO explicit default value for "acceptProxyConnections" or make it required
@@ -287,11 +297,15 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
                     proxied: true,
                     client,
                     broadcast: (msg: StreamMessage) => client.broadcast(msg),
-                    stop: async () => client.stop()
+                    stop: async () => client.stop(),
+                    getDiagnosticInfo: () => client.getDiagnosticInfo()
                 })
                 client.on('message', (message: StreamMessage) => {
                     this.emit('newMessage', message)
                 })
+                if (Array.from(this.streamParts.values()).every((streamPart) => streamPart.proxied)) {
+                    await (this.transport! as ConnectionManager).enablePrivateClientMode()
+                }
                 await client.start()
             }
             await client.setProxies(nodes, direction, userId, connectionCount)
@@ -327,7 +341,8 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             return {
                 id: streamPartId,
                 controlLayerNeighbors: stream.discoveryLayerNode.getNeighbors(),
-                contentDeliveryLayerNeighbors: stream.node.getNeighbors()
+                deprecatedContentDeliveryLayerNeighbors: [],
+                contentDeliveryLayerNeighbors: stream.node.getInfos()
             }
         })
 
@@ -357,17 +372,28 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
     }
 
     getNodeId(): DhtAddress {
-        return getNodeIdFromPeerDescriptor(this.controlLayerNode!.getLocalPeerDescriptor())
+        return toNodeId(this.controlLayerNode!.getLocalPeerDescriptor())
     }
 
     getNeighbors(streamPartId: StreamPartID): DhtAddress[] {
         const streamPart = this.streamParts.get(streamPartId)
         return (streamPart !== undefined) && (streamPart.proxied === false)
-            ? streamPart.node.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+            ? streamPart.node.getNeighbors().map((n) => toNodeId(n))
             : []
     }
 
     getStreamParts(): StreamPartID[] {
         return Array.from(this.streamParts.keys()).map((id) => StreamPartIDUtils.parse(id))
     }
+
+    getDiagnosticInfo(): Record<string, unknown> {
+        return {
+            streamParts: this.getStreamParts().map((id) => { 
+                return {
+                    id,
+                    info: this.getStreamPartDelivery(id)!.getDiagnosticInfo()
+                }
+            })
+        }
+    }
 }

package/src/logic/ContentDeliveryRpcLocal.ts

@@ -1,5 +1,5 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
-import { DhtAddress, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { DhtAddress, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, toNodeId } from '@streamr/dht'
 import { StreamPartID } from '@streamr/utils'
 import { Empty } from '../proto/google/protobuf/empty'
 import {
@@ -29,7 +29,7 @@ export class ContentDeliveryRpcLocal implements IContentDeliveryRpc {
     }
 
     async sendStreamMessage(message: StreamMessage, context: ServerCallContext): Promise<Empty> {
-        const previousNode = getNodeIdFromPeerDescriptor((context as DhtCallContext).incomingSourceDescriptor!)
+        const previousNode = toNodeId((context as DhtCallContext).incomingSourceDescriptor!)
         this.options.markForInspection(previousNode, message.messageId!)
         if (this.options.markAndCheckDuplicate(message.messageId!, message.previousMessageRef)) {
             this.options.broadcast(message, previousNode)
@@ -40,7 +40,7 @@ export class ContentDeliveryRpcLocal implements IContentDeliveryRpc {
     async leaveStreamPartNotice(message: LeaveStreamPartNotice, context: ServerCallContext): Promise<Empty> {
         if (message.streamPartId === this.options.streamPartId) {
             const sourcePeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-            const remoteNodeId = getNodeIdFromPeerDescriptor(sourcePeerDescriptor)
+            const remoteNodeId = toNodeId(sourcePeerDescriptor)
             this.options.onLeaveNotice(remoteNodeId, message.isEntryPoint)
         }
         return Empty

package/src/logic/ContentDeliveryRpcRemote.ts

@@ -10,6 +10,8 @@ const logger = new Logger(module)
 
 export class ContentDeliveryRpcRemote extends RpcRemote<ContentDeliveryRpcClient> {
 
+    private rtt?: number
+
     async sendStreamMessage(msg: StreamMessage): Promise<void> {
         const options = this.formDhtRpcOptions({
             notification: true
@@ -31,4 +33,12 @@ export class ContentDeliveryRpcRemote extends RpcRemote<ContentDeliveryRpcClient
             logger.debug('Failed to send leaveStreamPartNotice')
         })
     }
+
+    setRtt(rtt: number): void {
+        this.rtt = rtt
+    }
+
+    getRtt(): number | undefined {
+        return this.rtt
+    }
 }

package/src/logic/DuplicateMessageDetector.ts

@@ -54,7 +54,7 @@ export class InvalidNumberingError extends Error {
 export class GapMisMatchError extends Error {
     constructor(state: string, previousNumber: NumberPair, number: NumberPair) {
         super('pre-condition: gap overlap in given numbers:'
-            + ` previousNumber=${previousNumber}, number=${number}, state=${state}`)
+            + ` previousNumber=${previousNumber.toString()}, number=${number.toString()}, state=${state}`)
     }
 }
 
@@ -162,6 +162,6 @@ export class DuplicateMessageDetector {
     }
 
     toString(): string {
-        return this.gaps.map(([lower, upper]) => `(${lower}, ${upper}]`).join(', ')
+        return this.gaps.map(([lower, upper]) => `(${lower.toString()}, ${upper.toString()}]`).join(', ')
     }
 }

package/src/logic/ExternalNetworkRpc.ts

@@ -5,7 +5,6 @@ import { ClassType, ClientTransport, ProtoRpcClient, toProtoRpcClient } from '@s
 
 export const SERVICE_ID = 'external-network-service'
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type ExternalRpcClient = ServiceInfo & ClassType
 // eslint-disable-next-line @typescript-eslint/prefer-function-type, @typescript-eslint/consistent-type-definitions
 export type ExternalRpcClientClass<T extends ExternalRpcClient> = { new (clientTransport: ClientTransport): T }

package/src/logic/NodeList.ts

@@ -1,4 +1,4 @@
-import { DhtAddress, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { DhtAddress, toNodeId } from '@streamr/dht'
 import { sample } from 'lodash'
 import { ContentDeliveryRpcRemote } from './ContentDeliveryRpcRemote'
 import { EventEmitter } from 'eventemitter3'
@@ -36,7 +36,7 @@ export class NodeList extends EventEmitter<Events> {
     }
 
     add(remote: ContentDeliveryRpcRemote): void {
-        const nodeId = getNodeIdFromPeerDescriptor(remote.getPeerDescriptor())
+        const nodeId = toNodeId(remote.getPeerDescriptor())
         if ((this.ownId !== nodeId) && (this.nodes.size < this.limit)) {
             const isExistingNode = this.nodes.has(nodeId)
             this.nodes.set(nodeId, remote)
@@ -107,7 +107,8 @@ export class NodeList extends EventEmitter<Events> {
     }
 
     stop(): void {
-        this.nodes.forEach((node) => this.remove(getNodeIdFromPeerDescriptor(node.getPeerDescriptor())))
+        this.nodes.forEach((node) => this.remove(toNodeId(node.getPeerDescriptor())))
         this.removeAllListeners()
     }
+
 }

package/src/logic/PeerDescriptorStoreManager.ts

@@ -32,7 +32,6 @@ export class PeerDescriptorStoreManager {
 
     private readonly abortController: AbortController
     private readonly options: PeerDescriptorStoreManagerOptions
-    // eslint-disable-next-line no-underscore-dangle
     private isLocalNodeStored_ = false
 
     constructor(options: PeerDescriptorStoreManagerOptions) {

package/src/logic/StreamPartNetworkSplitAvoidance.ts

@@ -1,4 +1,4 @@
-import { areEqualPeerDescriptors, DhtAddress, getNodeIdFromPeerDescriptor, PeerDescriptor } from '@streamr/dht'
+import { areEqualPeerDescriptors, DhtAddress, toNodeId, PeerDescriptor } from '@streamr/dht'
 import { Logger, wait } from '@streamr/utils'
 import { DiscoveryLayerNode } from './DiscoveryLayerNode'
 
@@ -28,11 +28,12 @@ const exponentialRunOff = async (
         try {
             await task()
         } catch {
-            logger.debug(`${description} failed, retrying in ${delay} ms`)
+            logger.trace(`${description} failed, retrying in ${delay} ms`)
         }
         try { // Abort controller throws unexpected errors in destroy?
             await wait(delay, abortSignal)
         } catch (err) {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             logger.trace(`${err}`)  // TODO Do we need logging?
         }
     }
@@ -62,14 +63,14 @@ export class StreamPartNetworkSplitAvoidance {
         this.running = true
         await exponentialRunOff(async () => {
             const discoveredEntrypoints = await this.options.discoverEntryPoints()
-            const filteredEntryPoints = discoveredEntrypoints.filter((peer) => !this.excludedNodes.has(getNodeIdFromPeerDescriptor(peer)))
+            const filteredEntryPoints = discoveredEntrypoints.filter((peer) => !this.excludedNodes.has(toNodeId(peer)))
             await this.options.discoveryLayerNode.joinDht(filteredEntryPoints, false, false)
             if (this.options.discoveryLayerNode.getNeighborCount() < MIN_NEIGHBOR_COUNT) {
                 // Filter out nodes that are not neighbors as those nodes are assumed to be offline
                 const newExcludes = filteredEntryPoints
                     .filter((peer) => !this.options.discoveryLayerNode.getNeighbors()
                         .some((neighbor) => areEqualPeerDescriptors(neighbor, peer)))
-                    .map((peer) => getNodeIdFromPeerDescriptor(peer))
+                    .map((peer) => toNodeId(peer))
                 newExcludes.forEach((node) => this.excludedNodes.add(node))
                 throw new Error(`Network split is still possible`)
             }

package/src/logic/createContentDeliveryLayerNode.ts

@@ -1,4 +1,4 @@
-import { DhtAddress, ListeningRpcCommunicator, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { DhtAddress, ListeningRpcCommunicator, toNodeId } from '@streamr/dht'
 import { Handshaker } from './neighbor-discovery/Handshaker'
 import { NeighborFinder } from './neighbor-discovery/NeighborFinder'
 import { NeighborUpdateManager } from './neighbor-discovery/NeighborUpdateManager'
@@ -24,7 +24,7 @@ type ContentDeliveryLayerNodeOptions = MarkOptional<StrictContentDeliveryLayerNo
     }
 
 const createConfigWithDefaults = (options: ContentDeliveryLayerNodeOptions): StrictContentDeliveryLayerNodeOptions => {
-    const ownNodeId = getNodeIdFromPeerDescriptor(options.localPeerDescriptor)
+    const ownNodeId = toNodeId(options.localPeerDescriptor)
     const rpcCommunicator = options.rpcCommunicator ?? new ListeningRpcCommunicator(
         formStreamPartContentDeliveryServiceId(options.streamPartId),
         options.transport

package/src/logic/inspect/Inspector.ts

@@ -1,4 +1,4 @@
-import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator, LockID, PeerDescriptor, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator, LockID, PeerDescriptor, toNodeId } from '@streamr/dht'
 import { Logger, StreamPartID, waitForEvent3 } from '@streamr/utils'
 import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
 import { TemporaryConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
@@ -47,7 +47,7 @@ export class Inspector {
             TemporaryConnectionRpcClient
         )
         await rpcRemote.openConnection()
-        this.connectionLocker.weakLockConnection(getNodeIdFromPeerDescriptor(peerDescriptor), lockId)
+        this.connectionLocker.weakLockConnection(toNodeId(peerDescriptor), lockId)
     }
 
     async defaultCloseInspectConnection(peerDescriptor: PeerDescriptor, lockId: LockID): Promise<void> {
@@ -58,11 +58,11 @@ export class Inspector {
             TemporaryConnectionRpcClient
         )
         await rpcRemote.closeConnection()
-        this.connectionLocker.weakUnlockConnection(getNodeIdFromPeerDescriptor(peerDescriptor), lockId)
+        this.connectionLocker.weakUnlockConnection(toNodeId(peerDescriptor), lockId)
     }
 
     async inspect(peerDescriptor: PeerDescriptor): Promise<boolean> {
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+        const nodeId = toNodeId(peerDescriptor)
         const session = new InspectSession({
             inspectedNode: nodeId
         })