@streamr/dht 100.0.0-testnet-two.4 → 100.0.0-testnet-three.0

package/protos/DhtRpc.proto

@@ -46,7 +46,7 @@ service WebrtcConnectorRpc {
 service ConnectionLockRpc {
   rpc lockRequest (LockRequest) returns (LockResponse);
   rpc unlockRequest (UnlockRequest) returns (google.protobuf.Empty);
-  rpc gracefulDisconnect (DisconnectNotice) returns (DisconnectNoticeResponse);
+  rpc gracefulDisconnect (DisconnectNotice) returns (google.protobuf.Empty);
 }
 
 service ExternalApiRpc {
@@ -137,6 +137,10 @@ message PeerDescriptor {
   ConnectivityMethod tcp = 4;
   ConnectivityMethod websocket = 5;
   optional uint32 region = 6;
+  optional uint32 ipAddress = 7;
+  optional bytes publicKey = 8;
+  // signature of fields 2-8
+  optional bytes signature = 9; 
 }
 
 message ConnectivityMethod {
@@ -164,6 +168,7 @@ message RouteMessageWrapper {
   Message message = 4;
   repeated PeerDescriptor reachableThrough = 5;
   repeated PeerDescriptor routingPath = 6;
+  repeated string parallelRootNodeIds = 7;
 }
 
 message RouteMessageAck {
@@ -192,6 +197,7 @@ message ConnectivityResponse {
   string host = 1;
   string natType = 2;
   ConnectivityMethod websocket = 3;
+  uint32 ipAddress = 4;
 }
 
 message HandshakeRequest {
@@ -286,9 +292,6 @@ message DisconnectNotice {
   DisconnectMode disconnectMode = 1;
 }
 
-message DisconnectNoticeResponse {
-}
-
 message ExternalFindDataRequest {
   bytes key = 1;
 }

package/src/connection/Connection.ts

@@ -1,6 +1,7 @@
 import EventEmitter from 'eventemitter3'
 import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc'
 import { ConnectionID, ConnectionType, ConnectionEvents } from './IConnection'
+import { v4 as uuid } from 'uuid'
 
 export class Connection extends EventEmitter<ConnectionEvents> {
     public connectionId: ConnectionID
@@ -9,7 +10,7 @@ export class Connection extends EventEmitter<ConnectionEvents> {
     
     constructor(connectionType: ConnectionType) {
         super()
-        this.connectionId = new ConnectionID()
+        this.connectionId = createRandomConnectionId()
         this.connectionType = connectionType
     }
 
@@ -21,3 +22,7 @@ export class Connection extends EventEmitter<ConnectionEvents> {
         return this.peerDescriptor
     }
 }
+
+export const createRandomConnectionId = (): ConnectionID => {
+    return uuid() as ConnectionID
+}

package/src/connection/ConnectionLockHandler.ts

@@ -13,15 +13,15 @@ export class ConnectionLockHandler {
     // simply do not send lock requests.
     private weakLocks: Set<DhtAddress> = new Set()
 
-    public getNumberOfLocalLockedConnections(): number {
+    public getLocalLockedConnectionCount(): number {
         return this.localLocks.size
     }
 
-    public getNumberOfRemoteLockedConnections(): number {
+    public getRemoteLockedConnectionCount(): number {
         return this.remoteLocks.size
     }
 
-    public getNumberOfWeakLockedConnections(): number {
+    public getWeakLockedConnectionCount(): number {
         return this.weakLocks.size
     }
 

package/src/connection/ConnectionLockRpcLocal.ts

@@ -1,9 +1,5 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Logger } from '@streamr/utils'
-import {
-    areEqualPeerDescriptors,
-    getNodeIdFromPeerDescriptor
-} from '../helpers/peerIdFromPeerDescriptor'
 import { Empty } from '../proto/google/protobuf/empty'
 import {
     DisconnectMode,
@@ -17,7 +13,7 @@ import { IConnectionLockRpc } from '../proto/packages/dht/protos/DhtRpc.server'
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
 import { getNodeIdOrUnknownFromPeerDescriptor } from './ConnectionManager'
 import { LockID } from './ConnectionLockHandler'
-import { DhtAddress } from '../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from '../identifiers'
 
 interface ConnectionLockRpcLocalConfig {
     addRemoteLocked: (id: DhtAddress, lockId: LockID) => void

package/src/connection/ConnectionLockRpcRemote.ts

@@ -1,9 +1,9 @@
 import { Logger } from '@streamr/utils'
 import { RpcRemote } from '../dht/contact/RpcRemote'
-import { getNodeIdFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
 import { DisconnectMode, DisconnectNotice, LockRequest, UnlockRequest } from '../proto/packages/dht/protos/DhtRpc'
 import { ConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
 import { LockID } from './ConnectionLockHandler'
+import { getNodeIdFromPeerDescriptor } from '../identifiers'
 
 const logger = new Logger(module)
 

package/src/connection/ConnectionManager.ts

@@ -3,15 +3,9 @@ import { EventEmitter } from 'eventemitter3'
 import { SortedContactList } from '../dht/contact/SortedContactList'
 import { DuplicateDetector } from '../dht/routing/DuplicateDetector'
 import * as Err from '../helpers/errors'
-import {
-    areEqualPeerDescriptors,
-    getNodeIdFromPeerDescriptor,
-    peerIdFromPeerDescriptor
-} from '../helpers/peerIdFromPeerDescriptor'
 import {
     DisconnectMode,
     DisconnectNotice,
-    DisconnectNoticeResponse,
     LockRequest,
     LockResponse,
     Message,
@@ -29,7 +23,8 @@ import { ConnectionLockRpcRemote } from './ConnectionLockRpcRemote'
 import { WEBRTC_CLEANUP } from './webrtc/NodeWebrtcConnection'
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { ConnectionLockRpcLocal } from './ConnectionLockRpcLocal'
-import { DhtAddress } from '../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from '../identifiers'
+import { getOfferer } from '../helpers/offering'
 
 export interface ConnectionManagerConfig {
     maxConnections?: number
@@ -101,7 +96,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
     private config: ConnectionManagerConfig
     private readonly metricsContext: MetricsContext
     // TODO use config option or named constant?
-    private readonly duplicateMessageDetector: DuplicateDetector = new DuplicateDetector(100000, 100)
+    private readonly duplicateMessageDetector: DuplicateDetector = new DuplicateDetector(100000)
     private readonly metrics: ConnectionManagerMetrics
     private locks = new ConnectionLockHandler()
     private connections: Map<DhtAddress, ManagedConnection> = new Map()
@@ -144,7 +139,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
             (req: LockRequest, context: ServerCallContext) => lockRpcLocal.lockRequest(req, context))
         this.rpcCommunicator.registerRpcNotification(UnlockRequest, 'unlockRequest',
             (req: UnlockRequest, context: ServerCallContext) => lockRpcLocal.unlockRequest(req, context))
-        this.rpcCommunicator.registerRpcMethod(DisconnectNotice, DisconnectNoticeResponse, 'gracefulDisconnect',
+        this.rpcCommunicator.registerRpcNotification(DisconnectNotice, 'gracefulDisconnect',
             (req: DisconnectNotice, context: ServerCallContext) => lockRpcLocal.gracefulDisconnect(req, context))
     }
 
@@ -181,7 +176,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         logger.trace(`Starting ConnectionManager...`)
         await this.connectorFacade.start(
             (connection: ManagedConnection) => this.onNewConnection(connection),
-            (peerDescriptor: PeerDescriptor) => this.hasConnection(peerDescriptor),
+            (nodeId: DhtAddress) => this.hasConnection(nodeId),
             this
         )
         // Garbage collection of connections
@@ -236,20 +231,20 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         WEBRTC_CLEANUP.cleanUp()
     }
 
-    public getNumberOfLocalLockedConnections(): number {
-        return this.locks.getNumberOfLocalLockedConnections()
+    public getLocalLockedConnectionCount(): number {
+        return this.locks.getLocalLockedConnectionCount()
     }
 
-    public getNumberOfRemoteLockedConnections(): number {
-        return this.locks.getNumberOfRemoteLockedConnections()
+    public getRemoteLockedConnectionCount(): number {
+        return this.locks.getRemoteLockedConnectionCount()
     }
 
-    public getNumberOfWeakLockedConnections(): number {
-        return this.locks.getNumberOfWeakLockedConnections()
+    public getWeakLockedConnectionCount(): number {
+        return this.locks.getWeakLockedConnectionCount()
     }
 
     public async send(message: Message, opts: SendOptions = DEFAULT_SEND_OPTIONS): Promise<void> {
-        if (this.state === ConnectionManagerState.STOPPED && !opts.sendIfStopped) {
+        if ((this.state === ConnectionManagerState.STOPPED || this.state === ConnectionManagerState.STOPPING) && !opts.sendIfStopped) {
             return
         }
         const peerDescriptor = message.targetDescriptor!
@@ -289,8 +284,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         }
     }
 
-    public getConnection(peerDescriptor: PeerDescriptor): ManagedConnection | undefined {
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+    public getConnection(nodeId: DhtAddress): ManagedConnection | undefined {
         return this.connections.get(nodeId)
     }
 
@@ -298,18 +292,15 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         return this.connectorFacade.getLocalPeerDescriptor()!
     }
 
-    public hasConnection(peerDescriptor: PeerDescriptor): boolean {
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+    public hasConnection(nodeId: DhtAddress): boolean {
         return this.connections.has(nodeId)
     }
 
-    public hasLocalLockedConnection(peerDescriptor: PeerDescriptor): boolean {
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+    public hasLocalLockedConnection(nodeId: DhtAddress): boolean {
         return this.locks.isLocalLocked(nodeId)
     }
 
-    public hasRemoteLockedConnection(peerDescriptor: PeerDescriptor): boolean {
-        const nodeId = getNodeIdFromPeerDescriptor(peerDescriptor)
+    public hasRemoteLockedConnection(nodeId: DhtAddress): boolean {
         return this.locks.isRemoteLocked(nodeId)
     }
 
@@ -366,7 +357,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         const nodeId = getNodeIdFromPeerDescriptor(connection.getPeerDescriptor()!)
         logger.trace(nodeId + ' onDisconnected() gracefulLeave: ' + gracefulLeave)
         const storedConnection = this.connections.get(nodeId)
-        if (storedConnection && storedConnection.connectionId.equals(connection.connectionId)) {
+        if (storedConnection && (storedConnection.connectionId === connection.connectionId)) {
             this.locks.clearAllLocks(nodeId)
             this.connections.delete(nodeId)
             logger.trace(nodeId + ' deleted connection in onDisconnected() gracefulLeave: ' + gracefulLeave)
@@ -375,8 +366,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         } else {
             logger.trace(nodeId + ' onDisconnected() did nothing, no such connection in connectionManager')
             if (storedConnection) {
-                const connectionId = storedConnection.connectionId.toString()
-                logger.trace(nodeId + ' connectionIds do not match ' + connectionId + ' ' + connection.connectionId.toString())
+                logger.trace(nodeId + ' connectionIds do not match ' + storedConnection.connectionId + ' ' + connection.connectionId.toString())
             }
         }
     }
@@ -407,8 +397,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         const nodeId = getNodeIdFromPeerDescriptor(newConnection.getPeerDescriptor()!)
         logger.trace(nodeId + ' acceptIncomingConnection()')
         if (this.connections.has(nodeId)) {
-            const newPeerID = peerIdFromPeerDescriptor(newConnection.getPeerDescriptor()!)
-            if (newPeerID.hasSmallerHashThan(peerIdFromPeerDescriptor(this.getLocalPeerDescriptor()))) {
+            if (getOfferer(getNodeIdFromPeerDescriptor(this.getLocalPeerDescriptor()), nodeId) === 'remote') {
                 logger.trace(nodeId + ' acceptIncomingConnection() replace current connection')
                 // replace the current connection
                 const oldConnection = this.connections.get(nodeId)!
@@ -521,13 +510,10 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
                 })
         })
 
-        this.doGracefullyDisconnectAsync(targetDescriptor, disconnectMode)
-            .then(() => { return })
-            .catch((e) => {
-                logger.error(e)
-            })
-
-        await promise
+        await Promise.all([
+            promise,
+            this.doGracefullyDisconnectAsync(targetDescriptor, disconnectMode)
+        ])
     }
 
     private async doGracefullyDisconnectAsync(targetDescriptor: PeerDescriptor, disconnectMode: DisconnectMode): Promise<void> {
@@ -546,7 +532,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
         }
     }
 
-    public getAllConnectionPeerDescriptors(): PeerDescriptor[] {
+    public getConnections(): PeerDescriptor[] {
         return Array.from(this.connections.values())
             .filter((managedConnection: ManagedConnection) => managedConnection.isHandshakeCompleted())
             .map((managedConnection: ManagedConnection) => managedConnection.getPeerDescriptor()!)

package/src/connection/ConnectorFacade.ts

@@ -10,13 +10,14 @@ import { Simulator } from './simulator/Simulator'
 import { SimulatorConnector } from './simulator/SimulatorConnector'
 import { IceServer, WebrtcConnector } from './webrtc/WebrtcConnector'
 import { WebsocketConnector, WebsocketConnectorConfig } from './websocket/WebsocketConnector'
+import { DhtAddress } from '../identifiers'
 
 export interface ConnectorFacade {
     createConnection: (peerDescriptor: PeerDescriptor) => ManagedConnection
     getLocalPeerDescriptor: () => PeerDescriptor | undefined
     start: (
         onNewConnection: (connection: ManagedConnection) => boolean,
-        hasConnection: (peerDescriptor: PeerDescriptor) => boolean,
+        hasConnection: (nodeId: DhtAddress) => boolean,
         autoCertifierTransport: ITransport
     ) => Promise<void>
     stop: () => Promise<void>
@@ -59,7 +60,7 @@ export class DefaultConnectorFacade implements ConnectorFacade {
 
     async start(
         onNewConnection: (connection: ManagedConnection) => boolean,
-        hasConnection: (peerDescriptor: PeerDescriptor) => boolean,
+        hasConnection: (nodeId: DhtAddress) => boolean,
         autoCertifierTransport: ITransport
     ): Promise<void> {
         logger.trace(`Creating WebsocketConnectorRpcLocal`)

package/src/connection/IConnection.ts

@@ -1,4 +1,4 @@
-import { UUID } from '../helpers/UUID'
+import { BrandedString } from '@streamr/utils'
 
 export interface ConnectionEvents {
     data: (bytes: Uint8Array) => void
@@ -15,13 +15,7 @@ export enum ConnectionType {
     SIMULATOR_CLIENT = 'simulator-client',
 }
 
-export type ConnectionIDKey = string & { readonly __brand: 'connectionIDKey' } // Nominal typing 
-
-export class ConnectionID extends UUID {
-    toMapKey(): ConnectionIDKey {
-        return this.toString() as ConnectionIDKey
-    }
-}
+export type ConnectionID = BrandedString<'ConnectionID'>
 
 export interface IConnection {
     

package/src/connection/ManagedConnection.ts

@@ -4,9 +4,9 @@ import { Handshaker } from './Handshaker'
 import { HandshakeError, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc'
 import { Logger, runAndRaceEvents3, RunAndRaceEventsReturnType } from '@streamr/utils'
 import EventEmitter from 'eventemitter3'
-import { getNodeIdFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
 import { getNodeIdOrUnknownFromPeerDescriptor } from './ConnectionManager'
-import { DhtAddress } from '../identifiers'
+import { DhtAddress, getNodeIdFromPeerDescriptor } from '../identifiers'
+import { createRandomConnectionId } from './Connection'
 
 export interface ManagedConnectionEvents {
     managedData: (bytes: Uint8Array, remotePeerDescriptor: PeerDescriptor) => void
@@ -59,7 +59,7 @@ export class ManagedConnection extends EventEmitter<Events> {
         this.outgoingConnection = outgoingConnection
         this.incomingConnection = incomingConnection
         this.connectionType = connectionType
-        this.connectionId = new ConnectionID()
+        this.connectionId = createRandomConnectionId()
 
         this.send = this.send.bind(this)
         this.onDisconnected = this.onDisconnected.bind(this)

package/src/connection/connectivityRequestHandler.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@streamr/utils'
+import { ipv4ToNumber, Logger } from '@streamr/utils'
 import { v4 } from 'uuid'
 import {
     ConnectivityRequest, ConnectivityResponse,
@@ -36,6 +36,7 @@ const handleIncomingConnectivityRequest = async (connection: ServerWebsocket, co
     let outgoingConnection: IConnection | undefined
     let connectivityResponseMessage: ConnectivityResponse | undefined
     const host = connectivityRequest.host ?? connection.getRemoteAddress()
+    const ipAddress = connection.getRemoteIp()
     try {
         const wsServerInfo = {
             host,
@@ -52,17 +53,20 @@ const handleIncomingConnectivityRequest = async (connection: ServerWebsocket, co
         logger.debug('error', { err })
         connectivityResponseMessage = {
             host,
-            natType: NatType.UNKNOWN
+            natType: NatType.UNKNOWN,
+            ipAddress: ipv4ToNumber(ipAddress)
         }
     }
     if (outgoingConnection) {
         // TODO should we have some handling for this floating promise?
         outgoingConnection.close(false)
         logger.trace('Connectivity test produced positive result, communicating reply to the requester ' + host + ':' + connectivityRequest.port)
+        
         connectivityResponseMessage = {
             host,
             natType: NatType.OPEN_INTERNET,
-            websocket: { host, port: connectivityRequest.port, tls: connectivityRequest.tls }
+            websocket: { host, port: connectivityRequest.port, tls: connectivityRequest.tls },
+            ipAddress: ipv4ToNumber(ipAddress)
         }
     }
     const msg: Message = {

package/src/connection/simulator/Simulator.ts

@@ -7,10 +7,9 @@ import { SimulatorConnection } from './SimulatorConnection'
 import { ConnectionID } from '../IConnection'
 import { Logger } from '@streamr/utils'
 import { getRegionDelayMatrix } from './pings'
-import { getNodeIdFromPeerDescriptor } from '../../helpers/peerIdFromPeerDescriptor'
 import Heap from 'heap'
 import { debugVars } from '../../helpers/debugHelpers'
-import { DhtAddress } from '../../identifiers'
+import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
 
 const logger = new Logger(module)
 

package/src/connection/simulator/SimulatorConnection.ts

@@ -4,7 +4,7 @@ import { Message, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
 import { Connection } from '../Connection'
 import { Logger } from '@streamr/utils'
 import { protoToString } from '../../helpers/protoToString'
-import { getNodeIdFromPeerDescriptor } from '../../helpers/peerIdFromPeerDescriptor'
+import { getNodeIdFromPeerDescriptor } from '../../identifiers'
 
 const logger = new Logger(module)
 

package/src/connection/simulator/SimulatorConnector.ts

@@ -8,8 +8,7 @@ import { Logger } from '@streamr/utils'
 import { ManagedConnection } from '../ManagedConnection'
 import { Simulator } from './Simulator'
 import { SimulatorConnection } from './SimulatorConnection'
-import { getNodeIdFromPeerDescriptor } from '../../helpers/peerIdFromPeerDescriptor'
-import { DhtAddress } from '../../identifiers'
+import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
 
 const logger = new Logger(module)
 

package/src/connection/webrtc/BrowserWebrtcConnection.ts

@@ -3,6 +3,7 @@ import { WebrtcConnectionEvents, IWebrtcConnection, RtcDescription } from './IWe
 import { IConnection, ConnectionID, ConnectionEvents, ConnectionType } from '../IConnection'
 import { Logger } from '@streamr/utils'
 import { IceServer } from './WebrtcConnector'
+import { createRandomConnectionId } from '../Connection'
 
 const logger = new Logger(module)
 
@@ -34,7 +35,7 @@ export class NodeWebrtcConnection extends EventEmitter<Events> implements IWebrt
 
     constructor(params: Params) {
         super()
-        this.connectionId = new ConnectionID()
+        this.connectionId = createRandomConnectionId()
         this.iceServers = params.iceServers ?? []
     }
 
@@ -222,7 +223,7 @@ export class NodeWebrtcConnection extends EventEmitter<Events> implements IWebrt
         this.emit('connected')
     }
 
-    public setConnectionId(connectionID: string): void {
-        this.connectionId = new ConnectionID(connectionID)
+    public setConnectionId(connectionId: ConnectionID): void {
+        this.connectionId = connectionId
     }
 }

package/src/connection/webrtc/NodeWebrtcConnection.ts

@@ -5,10 +5,11 @@ import EventEmitter from 'eventemitter3'
 import nodeDatachannel, { DataChannel, DescriptionType, PeerConnection } from 'node-datachannel'
 import { Logger } from '@streamr/utils'
 import { IllegalRtcPeerConnectionState } from '../../helpers/errors'
-import { getNodeIdFromPeerDescriptor } from '../../helpers/peerIdFromPeerDescriptor'
 import { iceServerAsString } from './iceServerAsString'
 import { IceServer } from './WebrtcConnector'
 import { PortRange } from '../ConnectionManager'
+import { getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { createRandomConnectionId } from '../Connection'
 
 const logger = new Logger(module)
 
@@ -67,7 +68,7 @@ export class NodeWebrtcConnection extends EventEmitter<Events> implements IConne
 
     constructor(params: Params) {
         super()
-        this.connectionId = new ConnectionID()
+        this.connectionId = createRandomConnectionId()
         this.iceServers = params.iceServers ?? []
         // eslint-disable-next-line no-underscore-dangle
         this._bufferThresholdHigh = params.bufferThresholdHigh ?? 2 ** 17
@@ -253,7 +254,7 @@ export class NodeWebrtcConnection extends EventEmitter<Events> implements IConne
         return !this.closed && this.lastState === 'connected' && !!this.dataChannel
     }
 
-    public setConnectionId(connectionID: string): void {
-        this.connectionId = new ConnectionID(connectionID)
+    public setConnectionId(connectionId: ConnectionID): void {
+        this.connectionId = connectionId
     }
 }

package/src/connection/webrtc/WebrtcConnector.ts

@@ -13,15 +13,11 @@ import { ManagedWebrtcConnection } from '../ManagedWebrtcConnection'
 import { Logger } from '@streamr/utils'
 import * as Err from '../../helpers/errors'
 import { ManagedConnection } from '../ManagedConnection'
-import {
-    areEqualPeerDescriptors,
-    getNodeIdFromPeerDescriptor,
-    peerIdFromPeerDescriptor
-} from '../../helpers/peerIdFromPeerDescriptor'
 import { PortRange } from '../ConnectionManager'
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { WebrtcConnectorRpcLocal } from './WebrtcConnectorRpcLocal'
-import { DhtAddress } from '../../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { getOfferer } from '../../helpers/offering'
 
 const logger = new Logger(module)
 
@@ -146,7 +142,9 @@ export class WebrtcConnector {
             portRange: this.config.portRange
         })
 
-        const offering = this.isOffering(targetPeerDescriptor)
+        const localNodeId = getNodeIdFromPeerDescriptor(this.localPeerDescriptor!)
+        const targetNodeId = getNodeIdFromPeerDescriptor(targetPeerDescriptor)
+        const offering = (getOfferer(localNodeId, targetNodeId) === 'local')
         let managedConnection: ManagedWebrtcConnection
 
         if (offering) {
@@ -157,7 +155,7 @@ export class WebrtcConnector {
 
         managedConnection.setRemotePeerDescriptor(targetPeerDescriptor)
 
-        this.ongoingConnectAttempts.set(getNodeIdFromPeerDescriptor(targetPeerDescriptor), managedConnection)
+        this.ongoingConnectAttempts.set(targetNodeId, managedConnection)
 
         const delFunc = () => {
             this.ongoingConnectAttempts.delete(nodeId)
@@ -179,16 +177,16 @@ export class WebrtcConnector {
                 candidate = replaceInternalIpWithExternalIp(candidate, this.config.externalIp)
                 logger.debug(`onLocalCandidate injected external ip ${candidate} ${mid}`)
             }
-            remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString())
+            remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId)
         })
 
         if (offering) {
             connection.once('localDescription', (description: string) => {
-                remoteConnector.sendRtcOffer(description, connection.connectionId.toString())
+                remoteConnector.sendRtcOffer(description, connection.connectionId)
             })
         } else {
             connection.once('localDescription', (description: string) => {
-                remoteConnector.sendRtcAnswer(description, connection.connectionId.toString())
+                remoteConnector.sendRtcAnswer(description, connection.connectionId)
             })
         }
 
@@ -214,10 +212,4 @@ export class WebrtcConnector {
 
         this.rpcCommunicator.destroy()
     }
-
-    public isOffering(targetPeerDescriptor: PeerDescriptor): boolean {
-        const myId = peerIdFromPeerDescriptor(this.localPeerDescriptor!)
-        const theirId = peerIdFromPeerDescriptor(targetPeerDescriptor)
-        return myId.hasSmallerHashThan(theirId)
-    }
 }

package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts

@@ -1,7 +1,6 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Logger } from '@streamr/utils'
 import { getAddressFromIceCandidate, isPrivateIPv4 } from '../../helpers/AddressTools'
-import { getNodeIdFromPeerDescriptor } from '../../helpers/peerIdFromPeerDescriptor'
 import { Empty } from '../../proto/google/protobuf/empty'
 import {
     HandshakeError,
@@ -18,9 +17,10 @@ import { ManagedConnection } from '../ManagedConnection'
 import { ManagedWebrtcConnection } from '../ManagedWebrtcConnection'
 import { NodeWebrtcConnection } from './NodeWebrtcConnection'
 import { WebrtcConnectorRpcRemote } from './WebrtcConnectorRpcRemote'
-import { DhtAddress } from '../../identifiers'
+import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
 import { version } from '../../../package.json'
 import { isCompatibleVersion } from '../../helpers/versionCompatibility'
+import { ConnectionID } from '../IConnection'
 
 const logger = new Logger(module)
 
@@ -72,16 +72,16 @@ export class WebrtcConnectorRpcLocal implements IWebrtcConnectorRpc {
                 WebrtcConnectorRpcClient
             )
             connection.on('localCandidate', (candidate: string, mid: string) => {
-                remoteConnector.sendIceCandidate(candidate, mid, connection!.connectionId.toString())
+                remoteConnector.sendIceCandidate(candidate, mid, connection!.connectionId)
             })
             connection.once('localDescription', (description: string) => {
-                remoteConnector.sendRtcAnswer(description, connection!.connectionId.toString())
+                remoteConnector.sendRtcAnswer(description, connection!.connectionId)
             })
             connection.start(false)
         }
 
         // Always use offerers connectionId
-        connection!.setConnectionId(request.connectionId)
+        connection!.setConnectionId(request.connectionId as ConnectionID)
         connection!.setRemoteDescription(request.description, 'offer')
 
         managedConnection.on('handshakeRequest', (_sourceDescriptor: PeerDescriptor, sourceVersion: string) => {
@@ -103,7 +103,7 @@ export class WebrtcConnectorRpcLocal implements IWebrtcConnectorRpc {
         const connection = this.config.ongoingConnectAttempts.get(nodeId)?.getWebrtcConnection()
         if (!connection) {
             return {}
-        } else if (connection.connectionId.toString() !== request.connectionId) {
+        } else if (connection.connectionId !== request.connectionId) {
             logger.trace(`Ignoring RTC answer due to connectionId mismatch`)
             return {}
         }
@@ -117,7 +117,7 @@ export class WebrtcConnectorRpcLocal implements IWebrtcConnectorRpc {
         const connection = this.config.ongoingConnectAttempts.get(nodeId)?.getWebrtcConnection()
         if (!connection) {
             return {}
-        } else if (connection.connectionId.toString() !== request.connectionId) {
+        } else if (connection.connectionId !== request.connectionId) {
             logger.trace(`Ignoring remote candidate due to connectionId mismatch`)
             return {}
         } else if (this.isIceCandidateAllowed(request.candidate)) {

package/src/connection/websocket/ClientWebsocket.ts

@@ -2,6 +2,7 @@ import { Logger } from '@streamr/utils'
 import EventEmitter from 'eventemitter3'
 import { ICloseEvent, IMessageEvent, w3cwebsocket as Websocket } from 'websocket'
 import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from '../IConnection'
+import { createRandomConnectionId } from '../Connection'
 
 const logger = new Logger(module)
 
@@ -24,7 +25,7 @@ export class ClientWebsocket extends EventEmitter<ConnectionEvents> implements I
 
     constructor() {
         super()
-        this.connectionId = new ConnectionID()
+        this.connectionId = createRandomConnectionId()
     }
 
     // TODO explicit default value for "selfSigned" or make it required
@@ -95,7 +96,7 @@ export class ClientWebsocket extends EventEmitter<ConnectionEvents> implements I
         this.emit('disconnected', gracefulLeave, undefined, 'close() called')
         this.removeAllListeners()
         if (!this.destroyed) {
-            logger.trace(`Closing socket for connection ${this.connectionId.toString()}`)
+            logger.trace(`Closing socket for connection ${this.connectionId}`)
             this.socket?.close(gracefulLeave ? CUSTOM_GOING_AWAY : undefined)
         } else {
             logger.debug('Tried to close() a stopped connection')