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

package/src/exports.ts

@@ -1,5 +1,5 @@
 export { NetworkNode, createNetworkNode } from './NetworkNode'
-export { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack'
+export { NetworkOptions, NetworkStack } from './NetworkStack'
 export { ContentDeliveryManagerOptions, streamPartIdToDataKey } from './logic/ContentDeliveryManager'
 export {
     ContentType,
@@ -11,6 +11,8 @@ export {
     MessageRef,
     ProxyDirection,
     SignatureType,
-    StreamMessage
-} from './proto/packages/trackerless-network/protos/NetworkRpc'
+    StreamMessage,
+    ControlLayerInfo
+} from '../generated/packages/trackerless-network/protos/NetworkRpc'
 export { ExternalRpcClient, ExternalRpcClientClass } from './logic/ExternalNetworkRpc'
+export { NodeInfo, StreamPartitionInfo, ContentDeliveryLayerNeighborInfo } from './types'

package/src/logic/ContentDeliveryLayerNode.ts

@@ -4,7 +4,7 @@ import {
     ITransport,
     ListeningRpcCommunicator,
     PeerDescriptor,
-    getNodeIdFromPeerDescriptor,
+    toNodeId,
 } from '@streamr/dht'
 import { Logger, StreamPartID, addManagedEventListener } from '@streamr/utils'
 import { EventEmitter } from 'eventemitter3'
@@ -16,8 +16,8 @@ import {
     StreamMessage,
     TemporaryConnectionRequest,
     TemporaryConnectionResponse,
-} from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { ContentDeliveryRpcLocal } from './ContentDeliveryRpcLocal'
 import { ContentDeliveryRpcRemote } from './ContentDeliveryRpcRemote'
 import { DiscoveryLayerNode } from './DiscoveryLayerNode'
@@ -31,6 +31,7 @@ import { Propagation } from './propagation/Propagation'
 import { ProxyConnectionRpcLocal } from './proxy/ProxyConnectionRpcLocal'
 import { TemporaryConnectionRpcLocal } from './temporary-connection/TemporaryConnectionRpcLocal'
 import { markAndCheckDuplicate } from './utils'
+import { ContentDeliveryLayerNeighborInfo } from '../types'
 
 export interface Events {
     message: (message: StreamMessage) => void
@@ -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()
@@ -91,9 +93,9 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
                     return
                 }
                 const contact = this.options.nearbyNodeView.get(remoteNodeId)
-                || this.options.randomNodeView.get(remoteNodeId)
-                || this.options.neighbors.get(remoteNodeId)
-                || this.options.proxyConnectionRpcLocal?.getConnection(remoteNodeId)?.remote
+                ?? this.options.randomNodeView.get(remoteNodeId)
+                ?? this.options.neighbors.get(remoteNodeId)
+                ?? this.options.proxyConnectionRpcLocal?.getConnection(remoteNodeId)?.remote
                 // TODO: check integrity of notifier?
                 if (contact) {
                     this.options.discoveryLayerNode.removeContact(remoteNodeId)
@@ -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,21 +5,22 @@ 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'
 import { sampleSize } from 'lodash'
-import { ProxyDirection, StreamMessage, StreamPartitionInfo } from '../proto/packages/trackerless-network/protos/NetworkRpc'
+import { ProxyDirection, StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { ContentDeliveryLayerNode } from './ContentDeliveryLayerNode'
 import { ControlLayerNode } from './ControlLayerNode'
 import { DiscoveryLayerNode } from './DiscoveryLayerNode'
@@ -28,6 +29,8 @@ 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'
+import { StreamPartitionInfo } from '../types'
 
 export type StreamPartDelivery = {
     broadcast: (msg: StreamMessage) => void
@@ -37,9 +40,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 +64,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 +175,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 +214,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)
@@ -241,7 +251,8 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             rpcRequestTimeout: EXISTING_CONNECTION_TIMEOUT,
             dhtJoinTimeout: 20000,  // TODO use options option or named constant?
             periodicallyPingNeighbors: true,
-            periodicallyPingRingContacts: true
+            periodicallyPingRingContacts: true,
+            neighborPingLimit: 16
         })
     }
 
@@ -260,6 +271,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 +280,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 +299,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 +343,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 +374,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,14 +1,14 @@
 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 { Empty } from '../../generated/google/protobuf/empty'
 import {
     LeaveStreamPartNotice,
     MessageID,
     MessageRef,
     StreamMessage
-} from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { IContentDeliveryRpc } from '../proto/packages/trackerless-network/protos/NetworkRpc.server'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { IContentDeliveryRpc } from '../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 
 export interface ContentDeliveryRpcLocalOptions {
     localPeerDescriptor: PeerDescriptor
@@ -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

@@ -3,13 +3,15 @@ import { Logger, StreamPartID } from '@streamr/utils'
 import {
     LeaveStreamPartNotice,
     StreamMessage
-} from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 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/ControlLayerNode.ts

@@ -1,5 +1,5 @@
 import { ConnectionsView, DataEntry, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht'
-import { Any } from '../proto/google/protobuf/any'
+import { Any } from '../../generated/google/protobuf/any'
 
 export interface ControlLayerNode extends ITransport {
     joinDht(entryPointDescriptors: PeerDescriptor[]): Promise<void>

package/src/logic/DiscoveryLayerNode.ts

@@ -12,11 +12,11 @@ export interface DiscoveryLayerNodeEvents {
 
 export interface DiscoveryLayerNode {
     on<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
-    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
-    off<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     on<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
-    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
+    off<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     off<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
+    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
+    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
     removeContact: (nodeId: DhtAddress) => void
     getClosestContacts: (maxCount?: number) => PeerDescriptor[]
     getRandomContacts: (maxCount?: number) => PeerDescriptor[]

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}`)
     }
 }
 
@@ -83,7 +83,7 @@ export class GapMisMatchError extends Error {
  */
 export class DuplicateMessageDetector {
     private readonly maxGapCount: number
-    private readonly gaps: Array<[NumberPair, NumberPair]>
+    private readonly gaps: [NumberPair, NumberPair][]
 
     constructor(maxGapCount = 10000) {
         this.maxGapCount = maxGapCount
@@ -94,7 +94,7 @@ export class DuplicateMessageDetector {
      * returns true if number has not yet been seen (i.e. is not a duplicate)
      */
     markAndCheck(previousNumber: NumberPair | null, number: NumberPair): boolean | never {
-        if (previousNumber && previousNumber.greaterThanOrEqual(number)) {
+        if (previousNumber?.greaterThanOrEqual(number)) {
             throw new InvalidNumberingError()
         }
 
@@ -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

@@ -5,7 +5,7 @@ import {
     areEqualPeerDescriptors
 } from '@streamr/dht'
 import { Logger, scheduleAtInterval } from '@streamr/utils'
-import { Any } from '../proto/google/protobuf/any'
+import { Any } from '../../generated/google/protobuf/any'
 
 const parsePeerDescriptor = (dataEntries: DataEntry[]): PeerDescriptor[] => {
     return dataEntries.filter((entry) => !entry.deleted).map((entry) => Any.unpack(entry.data!, PeerDescriptor))
@@ -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,11 +1,11 @@
-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'
 import { StrictContentDeliveryLayerNodeOptions, ContentDeliveryLayerNode } from './ContentDeliveryLayerNode'
 import { NodeList } from './NodeList'
 import { Propagation } from './propagation/Propagation'
-import { StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc'
+import { StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import type { MarkOptional } from 'ts-essentials'
 import { ProxyConnectionRpcLocal } from './proxy/ProxyConnectionRpcLocal'
 import { Inspector } from './inspect/Inspector'
@@ -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/InspectSession.ts

@@ -1,7 +1,7 @@
-import { EventEmitter } from 'eventemitter3'
-import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { binaryToHex } from '@streamr/utils'
 import { DhtAddress } from '@streamr/dht'
+import { toUserId } from '@streamr/utils'
+import { EventEmitter } from 'eventemitter3'
+import { MessageID } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
 
 export interface Events {
     done: () => void
@@ -12,8 +12,9 @@ interface InspectSessionOptions {
 }
 
 const createMessageKey = (messageId: MessageID): string => {
-    return `${binaryToHex(messageId.publisherId)}:${messageId.messageChainId}:${messageId.timestamp}:${messageId.sequenceNumber}`
+    return `${toUserId(messageId.publisherId)}:${messageId.messageChainId}:${messageId.timestamp}:${messageId.sequenceNumber}`
 }
+
 export class InspectSession extends EventEmitter<Events> {
     
     // Boolean indicates if the message has been received by the inspected node

package/src/logic/inspect/Inspector.ts

@@ -1,7 +1,7 @@
-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'
+import { MessageID } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { TemporaryConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { TemporaryConnectionRpcRemote } from '../temporary-connection/TemporaryConnectionRpcRemote'
 import { InspectSession, Events as InspectSessionEvents } from './InspectSession'
 
@@ -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
         })