@streamr/dht 101.1.2 → 102.0.0-beta.0

package/src/connection/websocket/WebsocketClientConnectorRpcRemote.ts

@@ -1,17 +1,17 @@
 import {
     WebsocketConnectionRequest
-} from '../../proto/packages/dht/protos/DhtRpc'
+} from '../../../generated/packages/dht/protos/DhtRpc'
 import { Logger } from '@streamr/utils'
 import { RpcRemote } from '../../dht/contact/RpcRemote'
-import { WebsocketClientConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
-import { getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { WebsocketClientConnectorRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
+import { toNodeId } from '../../identifiers'
 
 const logger = new Logger(module)
 
 export class WebsocketClientConnectorRpcRemote extends RpcRemote<WebsocketClientConnectorRpcClient> {
 
     async requestConnection(): Promise<void> {
-        logger.trace(`Requesting WebSocket connection from ${getNodeIdFromPeerDescriptor(this.getLocalPeerDescriptor())}`)
+        logger.trace(`Requesting WebSocket connection from ${toNodeId(this.getLocalPeerDescriptor())}`)
         const request: WebsocketConnectionRequest = {}
         const options = this.formDhtRpcOptions()
         return this.getClient().requestConnection(request, options)

package/src/connection/websocket/WebsocketServerConnector.ts

@@ -2,9 +2,9 @@ import { GeoIpLocator } from '@streamr/geoip-location'
 import { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator'
 import { Action, connectivityMethodToWebsocketUrl } from './WebsocketClientConnector'
 import { WebsocketServer } from './WebsocketServer'
-import { areEqualPeerDescriptors, DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { areEqualPeerDescriptors, DhtAddress, toNodeId } from '../../identifiers'
 import { AutoCertifierClientFacade } from './AutoCertifierClientFacade'
-import { ConnectivityResponse, HandshakeError, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { ConnectivityResponse, HandshakeError, PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { NatType, PortRange, TlsCertificate } from '../ConnectionManager'
 import { ITransport } from '../../transport/ITransport'
 import { ipv4ToNumber, Logger, wait } from '@streamr/utils'
@@ -17,7 +17,7 @@ import { shuffle } from 'lodash'
 import { sendConnectivityRequest } from '../connectivityChecker'
 import { acceptHandshake, Handshaker, rejectHandshake } from '../Handshaker'
 import { WebsocketClientConnectorRpcRemote } from './WebsocketClientConnectorRpcRemote'
-import { WebsocketClientConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
+import { WebsocketClientConnectorRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
 import { WebsocketServerStartError } from '../../helpers/errors'
 import * as Err from '../../helpers/errors'
 import { expectedConnectionType } from '../../helpers/Connectivity'
@@ -126,7 +126,7 @@ export class WebsocketServerConnector {
         remoteVersion: string,
         targetPeerDescriptor?: PeerDescriptor
     ) {
-        const nodeId = getNodeIdFromPeerDescriptor(sourcePeerDescriptor)
+        const nodeId = toNodeId(sourcePeerDescriptor)
         if (this.ongoingConnectRequests.has(nodeId)) {
             const { pendingConnection, delFunc } = this.ongoingConnectRequests.get(nodeId)!
             if (!isMaybeSupportedVersion(remoteVersion)) {
@@ -195,7 +195,7 @@ export class WebsocketServerConnector {
                     throw new Err.ConnectionFailed('ConnectivityChecker is destroyed')
                 }
             } catch (err) {
-                const error = `Failed to connect to entrypoint with id ${getNodeIdFromPeerDescriptor(entryPoint)} `
+                const error = `Failed to connect to entrypoint with id ${toNodeId(entryPoint)} `
                     + `and URL ${connectivityMethodToWebsocketUrl(entryPoint.websocket!)}`
                 logger.error(error, { err })
                 shuffledEntrypoints.shift()
@@ -227,7 +227,7 @@ export class WebsocketServerConnector {
     }
 
     public connect(targetPeerDescriptor: PeerDescriptor): PendingConnection {
-        const nodeId = getNodeIdFromPeerDescriptor(targetPeerDescriptor)
+        const nodeId = toNodeId(targetPeerDescriptor)
         if (this.ongoingConnectRequests.has(nodeId)) {
             return this.ongoingConnectRequests.get(nodeId)!.pendingConnection
         }
@@ -251,7 +251,7 @@ export class WebsocketServerConnector {
             })
         })
         const pendingConnection = new PendingConnection(targetPeerDescriptor)
-        const nodeId = getNodeIdFromPeerDescriptor(targetPeerDescriptor)
+        const nodeId = toNodeId(targetPeerDescriptor)
         // TODO: can this leak?
         const delFunc = () => {
             pendingConnection.off('connected', delFunc)
@@ -280,7 +280,7 @@ export class WebsocketServerConnector {
         await Promise.allSettled(requests.map((ongoingConnectRequest) => ongoingConnectRequest.pendingConnection.close(true)))
 
         await this.websocketServer?.stop()
-        await this.geoIpLocator?.stop()
+        this.geoIpLocator?.stop()
     }
 
 }

package/src/dht/DhtNode.ts

@@ -15,8 +15,8 @@ import { DefaultConnectorFacade, DefaultConnectorFacadeOptions } from '../connec
 import { IceServer } from '../connection/webrtc/WebrtcConnector'
 import { isBrowserEnvironment } from '../helpers/browser/isBrowserEnvironment'
 import { createPeerDescriptor } from '../helpers/createPeerDescriptor'
-import { DhtAddress, KADEMLIA_ID_LENGTH_IN_BYTES, getNodeIdFromPeerDescriptor } from '../identifiers'
-import { Any } from '../proto/google/protobuf/any'
+import { DhtAddress, KADEMLIA_ID_LENGTH_IN_BYTES, toNodeId } from '../identifiers'
+import { Any } from '../../generated/google/protobuf/any'
 import {
     ClosestPeersRequest,
     ClosestPeersResponse,
@@ -34,8 +34,8 @@ import {
     PingRequest,
     PingResponse,
     RecursiveOperation
-} from '../proto/packages/dht/protos/DhtRpc'
-import { ExternalApiRpcClient, StoreRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
+} from '../../generated/packages/dht/protos/DhtRpc'
+import { ExternalApiRpcClient, StoreRpcClient } from '../../generated/packages/dht/protos/DhtRpc.client'
 import { ITransport, TransportEvents } from '../transport/ITransport'
 import { RoutingRpcCommunicator } from '../transport/RoutingRpcCommunicator'
 import { ServiceID } from '../types/ServiceID'
@@ -104,6 +104,7 @@ export interface DhtNodeOptions {
     autoCertifierUrl?: string
     autoCertifierConfigFile?: string
     geoIpDatabaseFolder?: string
+    allowIncomingPrivateConnections?: boolean
 }
 
 type StrictDhtNodeOptions = MarkRequired<DhtNodeOptions,
@@ -242,7 +243,8 @@ export class DhtNode extends EventEmitter<Events> implements ITransport {
             const connectionManager = new ConnectionManager({
                 createConnectorFacade: () => new DefaultConnectorFacade(connectorFacadeOptions),
                 maxConnections: this.options.maxConnections,
-                metricsContext: this.options.metricsContext
+                metricsContext: this.options.metricsContext,
+                allowIncomingPrivateConnections: this.options.allowIncomingPrivateConnections ?? false
             })
             await connectionManager.start()
             this.connectionsView = connectionManager
@@ -381,7 +383,7 @@ export class DhtNode extends EventEmitter<Events> implements ITransport {
         this.transport!.on('disconnected', (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => {
             const isControlLayerNode = (this.connectionLocker !== undefined)
             if (isControlLayerNode) {
-                const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+                const nodeId = toNodeId(peerDescriptor)
                 if (gracefulLeave) {
                     this.peerManager!.removeContact(nodeId)
                 } else {
@@ -500,7 +502,7 @@ export class DhtNode extends EventEmitter<Events> implements ITransport {
     }
 
     public getNodeId(): DhtAddress {
-        return getNodeIdFromPeerDescriptor(this.localPeerDescriptor!)
+        return toNodeId(this.localPeerDescriptor!)
     }
 
     public getNeighborCount(): number {
@@ -524,7 +526,7 @@ export class DhtNode extends EventEmitter<Events> implements ITransport {
 
     private getConnectedEntryPoints(): PeerDescriptor[] {
         return this.options.entryPoints !== undefined ? this.options.entryPoints.filter((entryPoint) =>
-            this.connectionsView!.hasConnection(getNodeIdFromPeerDescriptor(entryPoint))
+            this.connectionsView!.hasConnection(toNodeId(entryPoint))
         ) : []
     }
 
@@ -631,6 +633,17 @@ export class DhtNode extends EventEmitter<Events> implements ITransport {
         return this.peerDiscovery!.isJoinCalled()
     }
 
+    public getDiagnosticInfo(): Record<string, unknown> {
+        return {
+            localPeerDescriptor: this.localPeerDescriptor,
+            transport: this.transport!.getDiagnosticInfo(),
+            router: this.router!.getDiagnosticInfo(),
+            neighborCount: this.getNeighborCount(),
+            nearbyContactCount: Array.from(this.peerManager!.getNearbyContacts().getAllContactsInUndefinedOrder()).length,
+            randomContactCount: this.peerManager!.getRandomContacts().getSize()
+        }
+    }
+
     public async stop(): Promise<void> {
         if (this.abortController.signal.aborted || !this.started) {
             return

package/src/dht/DhtNodeRpcLocal.ts

@@ -1,7 +1,7 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Logger } from '@streamr/utils'
-import { DhtAddress, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../identifiers'
-import { Empty } from '../proto/google/protobuf/empty'
+import { DhtAddress, toDhtAddress, toNodeId } from '../identifiers'
+import { Empty } from '../../generated/google/protobuf/empty'
 import {
     ClosestPeersRequest,
     ClosestPeersResponse,
@@ -10,8 +10,8 @@ import {
     PeerDescriptor,
     PingRequest,
     PingResponse
-} from '../proto/packages/dht/protos/DhtRpc'
-import { IDhtNodeRpc } from '../proto/packages/dht/protos/DhtRpc.server'
+} from '../../generated/packages/dht/protos/DhtRpc'
+import { IDhtNodeRpc } from '../../generated/packages/dht/protos/DhtRpc.server'
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
 import { RingContacts } from './contact/RingContactList'
 import { getClosestNodes } from './contact/getClosestNodes'
@@ -39,7 +39,7 @@ export class DhtNodeRpcLocal implements IDhtNodeRpc {
     async getClosestPeers(request: ClosestPeersRequest, context: ServerCallContext): Promise<ClosestPeersResponse> {
         this.options.addContact((context as DhtCallContext).incomingSourceDescriptor!)
         const peers = getClosestNodes(
-            getDhtAddressFromRaw(request.nodeId), 
+            toDhtAddress(request.nodeId), 
             this.options.getNeighbors(),
             { maxCount: this.options.peerDiscoveryQueryBatchSize }
         )
@@ -63,7 +63,7 @@ export class DhtNodeRpcLocal implements IDhtNodeRpc {
     }
 
     async ping(request: PingRequest, context: ServerCallContext): Promise<PingResponse> {
-        logger.trace('received ping request: ' + getNodeIdFromPeerDescriptor((context as DhtCallContext).incomingSourceDescriptor!))
+        logger.trace('received ping request: ' + toNodeId((context as DhtCallContext).incomingSourceDescriptor!))
         setImmediate(() => {
             this.options.addContact((context as DhtCallContext).incomingSourceDescriptor!)
         })
@@ -76,7 +76,7 @@ export class DhtNodeRpcLocal implements IDhtNodeRpc {
     async leaveNotice(context: ServerCallContext): Promise<Empty> {
         // TODO check signature??
         const sender = (context as DhtCallContext).incomingSourceDescriptor!
-        const senderNodeId = getNodeIdFromPeerDescriptor(sender)
+        const senderNodeId = toNodeId(sender)
         logger.trace('received leave notice: ' + senderNodeId)
         this.options.removeContact(senderNodeId)
         return {}

package/src/dht/DhtNodeRpcRemote.ts

@@ -1,14 +1,14 @@
 import { RpcCommunicator } from '@streamr/proto-rpc'
 import { Logger } from '@streamr/utils'
 import { v4 } from 'uuid'
-import { DhtAddress, DhtAddressRaw, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../identifiers'
+import { DhtAddress, DhtAddressRaw, toNodeId, toDhtAddressRaw } from '../identifiers'
 import {
     ClosestPeersRequest,
     ClosestRingPeersRequest,
     PeerDescriptor,
     PingRequest
-} from '../proto/packages/dht/protos/DhtRpc'
-import { DhtNodeRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
+} from '../../generated/packages/dht/protos/DhtRpc'
+import { DhtNodeRpcClient } from '../../generated/packages/dht/protos/DhtRpc.client'
 import { ServiceID } from '../types/ServiceID'
 import { RpcRemote } from './contact/RpcRemote'
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
@@ -46,7 +46,7 @@ export class DhtNodeRpcRemote extends RpcRemote<DhtNodeRpcClient> implements KBu
     async getClosestPeers(nodeId: DhtAddress): Promise<PeerDescriptor[]> {
         logger.trace(`Requesting getClosestPeers on ${this.serviceId} from ${this.getNodeId()}`)
         const request: ClosestPeersRequest = {
-            nodeId: getRawFromDhtAddress(nodeId),
+            nodeId: toDhtAddressRaw(nodeId),
             requestId: v4()
         }
         try {
@@ -102,6 +102,6 @@ export class DhtNodeRpcRemote extends RpcRemote<DhtNodeRpcClient> implements KBu
     }
 
     getNodeId(): DhtAddress {
-        return getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
+        return toNodeId(this.getPeerDescriptor())
     }
 }

package/src/dht/ExternalApiRpcLocal.ts

@@ -1,4 +1,4 @@
-import { IExternalApiRpc } from '../proto/packages/dht/protos/DhtRpc.server'
+import { IExternalApiRpc } from '../../generated/packages/dht/protos/DhtRpc.server'
 import {
     ExternalFetchDataRequest,
     ExternalFetchDataResponse,
@@ -6,12 +6,12 @@ import {
     ExternalStoreDataResponse,
     RecursiveOperation,
     PeerDescriptor
-} from '../proto/packages/dht/protos/DhtRpc'
+} from '../../generated/packages/dht/protos/DhtRpc'
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
 import { RecursiveOperationResult } from './recursive-operation/RecursiveOperationManager'
-import { Any } from '../proto/google/protobuf/any'
-import { DhtAddress, getNodeIdFromPeerDescriptor, getDhtAddressFromRaw } from '../identifiers'
+import { Any } from '../../generated/google/protobuf/any'
+import { DhtAddress, toNodeId, toDhtAddress } from '../identifiers'
 
 interface ExternalApiRpcLocalOptions {
     executeRecursiveOperation: (
@@ -37,9 +37,9 @@ export class ExternalApiRpcLocal implements IExternalApiRpc {
     async externalFetchData(request: ExternalFetchDataRequest, context: ServerCallContext): Promise<ExternalFetchDataResponse> {
         const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
         const result = await this.options.executeRecursiveOperation(
-            getDhtAddressFromRaw(request.key),
+            toDhtAddress(request.key),
             RecursiveOperation.FETCH_DATA,
-            getNodeIdFromPeerDescriptor(senderPeerDescriptor)
+            toNodeId(senderPeerDescriptor)
         )
         return ExternalFetchDataResponse.create({ entries: result.dataEntries ?? [] })
     }
@@ -47,9 +47,9 @@ export class ExternalApiRpcLocal implements IExternalApiRpc {
     async externalStoreData(request: ExternalStoreDataRequest, context: ServerCallContext): Promise<ExternalStoreDataResponse> {
         const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
         const result = await this.options.storeDataToDht(
-            getDhtAddressFromRaw(request.key),
+            toDhtAddress(request.key),
             request.data!,
-            getNodeIdFromPeerDescriptor(senderPeerDescriptor)
+            toNodeId(senderPeerDescriptor)
         )
         return ExternalStoreDataResponse.create({
             storers: result

package/src/dht/ExternalApiRpcRemote.ts

@@ -1,14 +1,14 @@
-import { DhtAddress, getRawFromDhtAddress } from '../identifiers'
-import { Any } from '../proto/google/protobuf/any'
-import { DataEntry, ExternalFetchDataRequest, ExternalStoreDataRequest, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc'
-import { ExternalApiRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
+import { DhtAddress, toDhtAddressRaw } from '../identifiers'
+import { Any } from '../../generated/google/protobuf/any'
+import { DataEntry, ExternalFetchDataRequest, ExternalStoreDataRequest, PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc'
+import { ExternalApiRpcClient } from '../../generated/packages/dht/protos/DhtRpc.client'
 import { RpcRemote } from './contact/RpcRemote'
 
 export class ExternalApiRpcRemote extends RpcRemote<ExternalApiRpcClient> {
 
     async externalFetchData(key: DhtAddress): Promise<DataEntry[]> {
         const request: ExternalFetchDataRequest = {
-            key: getRawFromDhtAddress(key)
+            key: toDhtAddressRaw(key)
         }
         const options = this.formDhtRpcOptions({
             // TODO use options option or named constant?
@@ -24,7 +24,7 @@ export class ExternalApiRpcRemote extends RpcRemote<ExternalApiRpcClient> {
 
     async storeData(key: DhtAddress, data: Any): Promise<PeerDescriptor[]> {
         const request: ExternalStoreDataRequest = {
-            key: getRawFromDhtAddress(key),
+            key: toDhtAddressRaw(key),
             data
         }
         const options = this.formDhtRpcOptions({

package/src/dht/PeerManager.ts

@@ -5,10 +5,10 @@ import EventEmitter from 'eventemitter3'
 import KBucket from 'k-bucket'
 import { LockID } from '../connection/ConnectionLockStates'
 import { ConnectionLocker } from '../connection/ConnectionManager'
-import { DhtAddress, DhtAddressRaw, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../identifiers'
+import { DhtAddress, DhtAddressRaw, toNodeId, toDhtAddressRaw } from '../identifiers'
 import {
     PeerDescriptor
-} from '../proto/packages/dht/protos/DhtRpc'
+} from '../../generated/packages/dht/protos/DhtRpc'
 import { DhtNodeRpcRemote } from './DhtNodeRpcRemote'
 import { RandomContactList } from './contact/RandomContactList'
 import { RingContactList } from './contact/RingContactList'
@@ -77,7 +77,7 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
         super()
         this.options = options
         this.neighbors = new KBucket<DhtNodeRpcRemote>({
-            localNodeId: getRawFromDhtAddress(this.options.localNodeId),
+            localNodeId: toDhtAddressRaw(this.options.localNodeId),
             numberOfNodesPerKBucket: this.options.numberOfNodesPerKBucket,
             numberOfNodesToPing: this.options.numberOfNodesPerKBucket
         })
@@ -89,7 +89,7 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
             this.emit('ringContactRemoved', contact.getPeerDescriptor())
         })
         this.neighbors.on('ping', (oldContacts: DhtNodeRpcRemote[], newContact: DhtNodeRpcRemote) => this.onKBucketPing(oldContacts, newContact))
-        this.neighbors.on('removed', (contact: DhtNodeRpcRemote) => this.onKBucketRemoved(getNodeIdFromPeerDescriptor(contact.getPeerDescriptor())))
+        this.neighbors.on('removed', (contact: DhtNodeRpcRemote) => this.onKBucketRemoved(toNodeId(contact.getPeerDescriptor())))
         this.neighbors.on('added', (contact: DhtNodeRpcRemote) => this.onKBucketAdded(contact))
         this.neighbors.on('updated', () => {
             // TODO: Update contact info to the connection manager and reconnect
@@ -130,7 +130,7 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
         sortingList.addContacts(oldContacts)
         const removableNodeId = sortingList.getFurthestContacts(1)[0].getNodeId()
         this.options.connectionLocker?.weakUnlockConnection(removableNodeId, this.options.lockId)
-        this.neighbors.remove(getRawFromDhtAddress(removableNodeId))
+        this.neighbors.remove(toDhtAddressRaw(removableNodeId))
         this.neighbors.add(newContact)
     }
 
@@ -151,7 +151,7 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
         }
         if (contact.getNodeId() !== this.options.localNodeId) {
             const peerDescriptor = contact.getPeerDescriptor()
-            const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+            const nodeId = toNodeId(peerDescriptor)
             // Important to lock here, before the ping result is known
             this.options.connectionLocker?.weakLockConnection(nodeId, this.options.lockId)
             if (this.options.hasConnection(contact.getNodeId())) {
@@ -188,7 +188,7 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
 
     private getNearbyActiveContactNotInNeighbors(): DhtNodeRpcRemote | undefined {
         for (const contactId of this.nearbyContacts.getContactIds()) {
-            if (!this.neighbors.get(getRawFromDhtAddress(contactId)) && this.activeContacts.has(contactId)) {
+            if (!this.neighbors.get(toDhtAddressRaw(contactId)) && this.activeContacts.has(contactId)) {
                 return this.nearbyContacts.getContact(contactId)!
             }
         }
@@ -201,22 +201,22 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
         }
         logger.trace(`Removing contact ${nodeId}`)
         this.ringContacts.removeContact(this.nearbyContacts.getContact(nodeId))
-        this.neighbors.remove(getRawFromDhtAddress(nodeId))
+        this.neighbors.remove(toDhtAddressRaw(nodeId))
         this.nearbyContacts.removeContact(nodeId)
         this.activeContacts.delete(nodeId)
         this.randomContacts.removeContact(nodeId)
     }
 
     removeNeighbor(nodeId: DhtAddress): void {
-        this.neighbors.remove(getRawFromDhtAddress(nodeId))
+        this.neighbors.remove(toDhtAddressRaw(nodeId))
     }
 
     async pruneOfflineNodes(nodes: DhtNodeRpcRemote[]): Promise<void> {
         logger.trace('Pruning offline nodes', { nodes: nodes.length })
         const offlineNeighbors = await pingNodes(nodes, this.activeContacts)
         offlineNeighbors.forEach((offlineNeighbor) => {
-            logger.trace('Removing offline node', { node: getNodeIdFromPeerDescriptor(offlineNeighbor) })
-            this.removeContact(getNodeIdFromPeerDescriptor(offlineNeighbor))
+            logger.trace('Removing offline node', { node: toNodeId(offlineNeighbor) })
+            this.removeContact(toNodeId(offlineNeighbor))
         }) 
     }
 
@@ -278,7 +278,7 @@ export class PeerManager extends EventEmitter<PeerManagerEvents> {
         if (this.stopped) {
             return
         }
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+        const nodeId = toNodeId(peerDescriptor)
         if (nodeId !== this.options.localNodeId) {
             logger.trace(`Adding new contact ${nodeId}`)
             const remote = this.options.createDhtNodeRpcRemote(peerDescriptor)

package/src/dht/contact/Contact.ts

@@ -1,5 +1,5 @@
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
-import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
+import { DhtAddress, toNodeId } from '../../identifiers'
 
 export class Contact {
 
@@ -14,6 +14,6 @@ export class Contact {
     }
 
     public getNodeId(): DhtAddress {
-        return getNodeIdFromPeerDescriptor(this.peerDescriptor)
+        return toNodeId(this.peerDescriptor)
     }
 }

package/src/dht/contact/RingContactList.ts

@@ -1,7 +1,7 @@
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { OrderedMap } from '@js-sdsl/ordered-map'
 import { RingDistance, RingId, RingIdRaw, getLeftDistance, getRightDistance, getRingIdFromPeerDescriptor, getRingIdFromRaw } from './ringIdentifiers'
-import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { DhtAddress, toNodeId } from '../../identifiers'
 import EventEmitter from 'eventemitter3'
 import { Events } from './ContactList'
 
@@ -28,7 +28,7 @@ export class RingContactList<C extends { getPeerDescriptor(): PeerDescriptor }>
 
     addContact(contact: C): void {
         const id = getRingIdFromPeerDescriptor(contact.getPeerDescriptor())
-        if (id === this.referenceId || this.excludedIds.has(getNodeIdFromPeerDescriptor(contact.getPeerDescriptor()))) {
+        if (id === this.referenceId || this.excludedIds.has(toNodeId(contact.getPeerDescriptor()))) {
             return
         }
         let elementAdded = false

package/src/dht/contact/RpcRemote.ts

@@ -2,7 +2,7 @@ import type { ServiceInfo } from '@protobuf-ts/runtime-rpc'
 import { ClassType, ClientTransport, ProtoRpcClient, RpcCommunicator, toProtoRpcClient } from '@streamr/proto-rpc'
 import { ConnectionType } from '../../connection/IConnection'
 import { expectedConnectionType } from '../../helpers/Connectivity'
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { DhtRpcOptions } from '../../rpc-protocol/DhtRpcOptions'
 import { DhtCallContext } from '../../rpc-protocol/DhtCallContext' 
 

package/src/dht/contact/SortedContactList.ts

@@ -2,7 +2,7 @@ import { Events } from './ContactList'
 import { sortedIndexBy } from 'lodash'
 import EventEmitter from 'eventemitter3'
 import { getDistance } from '../PeerManager'
-import { DhtAddress, getRawFromDhtAddress } from '../../identifiers'
+import { DhtAddress, toDhtAddressRaw } from '../../identifiers'
 
 // add other getters in the future if needed
 export type ReadonlySortedContactList<C extends { getNodeId: () => DhtAddress }> =
@@ -120,7 +120,7 @@ export class SortedContactList<C extends { getNodeId: () => DhtAddress }> extend
     // TODO inline this method?
     private distanceToReferenceId(id: DhtAddress): number {
         // TODO maybe this class should store the referenceId also as DhtAddressRaw so that we don't need to convert it here?
-        return getDistance(getRawFromDhtAddress(this.options.referenceId), getRawFromDhtAddress(id))
+        return getDistance(toDhtAddressRaw(this.options.referenceId), toDhtAddressRaw(id))
     }
 
     public removeContact(id: DhtAddress): boolean {

package/src/dht/contact/ringIdentifiers.ts

@@ -1,4 +1,4 @@
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 
 // Notice: you cannot convert RingId to RingIdRaw, because 
 // RingId is only an approximation of the actual value.

package/src/dht/discovery/DiscoverySession.ts

@@ -1,7 +1,7 @@
 import { Gate, Logger, withTimeout } from '@streamr/utils'
 import { v4 } from 'uuid'
-import { DhtAddress, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../identifiers'
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { DhtAddress, toNodeId, toDhtAddressRaw } from '../../identifiers'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote'
 import { PeerManager, getDistance } from '../PeerManager'
 import { getClosestNodes } from '../contact/getClosestNodes'
@@ -44,7 +44,7 @@ export class DiscoverySession {
         if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
             return []
         }
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+        const nodeId = toNodeId(peerDescriptor)
         logger.trace(`Getting closest neighbors from remote: ${nodeId}`)
         this.options.contactedPeers.add(nodeId)
         const remote = this.options.createDhtNodeRpcRemote(peerDescriptor)
@@ -58,7 +58,7 @@ export class DiscoverySession {
             return
         }
         this.ongoingRequests.delete(nodeId)
-        const targetId = getRawFromDhtAddress(this.options.targetId)
+        const targetId = toDhtAddressRaw(this.options.targetId)
         const oldClosestNeighbor = this.getClosestNeighbor()
         const oldClosestDistance = getDistance(targetId, oldClosestNeighbor.nodeId)
         this.addContacts(contacts)
@@ -105,7 +105,7 @@ export class DiscoverySession {
             if (this.ongoingRequests.size >= this.options.parallelism) {
                 break
             }
-            const nodeId = getNodeIdFromPeerDescriptor(node)
+            const nodeId = toNodeId(node)
             this.ongoingRequests.add(nodeId)
             // eslint-disable-next-line promise/catch-or-return
             this.fetchClosestNeighborsFromRemote(node)

package/src/dht/discovery/PeerDiscovery.ts

@@ -3,12 +3,12 @@ import { ConnectionLocker } from '../../connection/ConnectionManager'
 import {
     DhtAddress,
     areEqualPeerDescriptors,
-    createRandomDhtAddress,
-    getDhtAddressFromRaw,
-    getNodeIdFromPeerDescriptor,
-    getRawFromDhtAddress
+    randomDhtAddress,
+    toDhtAddress,
+    toNodeId,
+    toDhtAddressRaw
 } from '../../identifiers'
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { ServiceID } from '../../types/ServiceID'
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote'
 import { PeerManager } from '../PeerManager'
@@ -31,9 +31,9 @@ interface PeerDiscoveryOptions {
 }
 
 export const createDistantDhtAddress = (address: DhtAddress): DhtAddress => {
-    const raw = getRawFromDhtAddress(address)
+    const raw = toDhtAddressRaw(address)
     const flipped = raw.map((val) => ~val)
-    return getDhtAddressFromRaw(flipped)
+    return toDhtAddress(flipped)
 }
 
 const logger = new Logger(module)
@@ -82,14 +82,14 @@ export class PeerDiscovery {
         logger.debug(
             `Joining ${this.options.serviceId === CONTROL_LAYER_NODE_SERVICE_ID
                 ? 'The Streamr Network' : `Control Layer for ${this.options.serviceId}`}`
-            + ` via entrypoint ${getNodeIdFromPeerDescriptor(entryPointDescriptor)}`
+            + ` via entrypoint ${toNodeId(entryPointDescriptor)}`
         )
         if (areEqualPeerDescriptors(entryPointDescriptor, this.options.localPeerDescriptor)) {
             return
         }
         this.options.connectionLocker?.lockConnection(entryPointDescriptor, `${this.options.serviceId}::joinDht`)
         this.options.peerManager.addContact(entryPointDescriptor)
-        const targetId = getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor)
+        const targetId = toNodeId(this.options.localPeerDescriptor)
         const sessions = [this.createSession(targetId, contactedPeers)]
         if (additionalDistantJoin.enabled) {
             sessions.push(this.createSession(createDistantDhtAddress(targetId), additionalDistantJoin.contactedPeers))
@@ -205,9 +205,9 @@ export class PeerDiscovery {
         if (this.isStopped()) {
             return
         }
-        const localNodeId = getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor)
+        const localNodeId = toNodeId(this.options.localPeerDescriptor)
         const nodes = this.getClosestNeighbors(localNodeId, this.options.parallelism)
-        const randomNodes = this.getClosestNeighbors(createRandomDhtAddress(), 1)
+        const randomNodes = this.getClosestNeighbors(randomDhtAddress(), 1)
         await Promise.allSettled([
             ...nodes.map(async (node: PeerDescriptor) => {
                 const remote = this.options.createDhtNodeRpcRemote(node)
@@ -218,7 +218,7 @@ export class PeerDiscovery {
             }),
             ...randomNodes.map(async (node: PeerDescriptor) => {
                 const remote = this.options.createDhtNodeRpcRemote(node)
-                const contacts = await remote.getClosestPeers(createRandomDhtAddress())
+                const contacts = await remote.getClosestPeers(randomDhtAddress())
                 for (const contact of contacts) {
                     this.options.peerManager.addContact(contact)
                 }

package/src/dht/discovery/RingDiscoverySession.ts

@@ -1,7 +1,7 @@
 import { Gate, Logger, withTimeout } from '@streamr/utils'
 import { v4 } from 'uuid'
-import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { DhtAddress, toNodeId } from '../../identifiers'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote'
 import { PeerManager } from '../PeerManager'
 import { RingContacts } from '../contact/RingContactList'
@@ -47,7 +47,7 @@ export class RingDiscoverySession {
         if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
             return { left: [], right: [] }
         }
-        logger.trace(`Getting closest ring peers from contact: ${getNodeIdFromPeerDescriptor(contact.getPeerDescriptor())}`)
+        logger.trace(`Getting closest ring peers from contact: ${toNodeId(contact.getPeerDescriptor())}`)
         this.numContactedPeers++
         this.options.contactedPeers.add(contact.getNodeId())
         const returnedContacts = await contact.getClosestRingPeers(this.options.targetId)