@streamr/dht 100.0.0 → 100.1.0

package/src/dht/discovery/DiscoverySession.ts

@@ -38,7 +38,9 @@ export class DiscoverySession {
         if (this.stopped) {
             return
         }
-        this.config.peerManager.addContact(contacts)
+        for (const contact of contacts) {
+            this.config.peerManager.addContact(contact)
+        }
     }
 
     private async getClosestPeersFromContact(contact: DhtNodeRpcRemote): Promise<PeerDescriptor[]> {

package/src/dht/discovery/PeerDiscovery.ts

@@ -2,7 +2,7 @@ import { DiscoverySession } from './DiscoverySession'
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote'
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
 import { Logger, scheduleAtInterval, setAbortableTimeout } from '@streamr/utils'
-import { ConnectionManager } from '../../connection/ConnectionManager'
+import { ConnectionLocker } from '../../connection/ConnectionManager'
 import { PeerManager } from '../PeerManager'
 import { DhtAddress, areEqualPeerDescriptors, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../identifiers'
 import { ServiceID } from '../../types/ServiceID'
@@ -16,7 +16,7 @@ interface PeerDiscoveryConfig {
     serviceId: ServiceID
     parallelism: number
     joinTimeout: number
-    connectionManager?: ConnectionManager
+    connectionLocker?: ConnectionLocker
     peerManager: PeerManager
 }
 
@@ -78,15 +78,15 @@ export class PeerDiscovery {
         if (areEqualPeerDescriptors(entryPointDescriptor, this.config.localPeerDescriptor)) {
             return
         }
-        this.config.connectionManager?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`)
-        this.config.peerManager.addContact([entryPointDescriptor])
+        this.config.connectionLocker?.lockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`)
+        this.config.peerManager.addContact(entryPointDescriptor)
         const targetId = getNodeIdFromPeerDescriptor(this.config.localPeerDescriptor)
         const sessions = [this.createSession(targetId, contactedPeers)]
         if (additionalDistantJoin.enabled) {
             sessions.push(this.createSession(createDistantDhtAddress(targetId), additionalDistantJoin.contactedPeers))
         }
         await this.runSessions(sessions, entryPointDescriptor, retry)
-        this.config.connectionManager?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`)
+        this.config.connectionLocker?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`)
 
     }
 
@@ -196,7 +196,9 @@ export class PeerDiscovery {
         await Promise.allSettled(
             nodes.map(async (peer: DhtNodeRpcRemote) => {
                 const contacts = await peer.getClosestPeers(localNodeId)
-                this.config.peerManager.addContact(contacts)
+                for (const contact of contacts) {
+                    this.config.peerManager.addContact(contact)
+                }
             })
         )
     }

package/src/dht/discovery/RingDiscoverySession.ts

@@ -43,7 +43,9 @@ export class RingDiscoverySession {
         if (this.stopped) {
             return
         }
-        this.config.peerManager.addContact(contacts)
+        for (const contact of contacts) {
+            this.config.peerManager.addContact(contact)
+        }
     }
 
     private async getClosestPeersFromContact(contact: DhtNodeRpcRemote): Promise<RingContacts> {

package/src/dht/recursive-operation/RecursiveOperationManager.ts

@@ -115,7 +115,7 @@ export class RecursiveOperationManager {
                     15000
                 )
             } catch (err) {
-                logger.debug(`start failed with error ${err}`)
+                logger.debug('start failed', { err })
             }
         } else {
             session.start(this.config.serviceId)

package/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts

@@ -35,7 +35,7 @@ export class RecursiveOperationRpcRemote extends RpcRemote<RecursiveOperationRpc
                 ? getNodeIdFromPeerDescriptor(previousPeer)
                 : getNodeIdFromPeerDescriptor(params.sourcePeer!)
             const toNode = getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
-            logger.debug(`Failed to send routeRequest message from ${fromNode} to ${toNode} with: ${err}`)
+            logger.debug(`Failed to send routeRequest message from ${fromNode} to ${toNode}`, { err })
             return false
         }
         return true

package/src/dht/routing/Router.ts

@@ -13,7 +13,6 @@ export interface RouterConfig {
     rpcCommunicator: RoutingRpcCommunicator
     localPeerDescriptor: PeerDescriptor
     connections: Map<DhtAddress, DhtNodeRpcRemote>
-    addContact: (contact: PeerDescriptor, setActive?: boolean) => void
     handleMessage: (message: Message) => void
 }
 
@@ -42,7 +41,6 @@ export class Router {
     private registerLocalRpcMethods() {
         const rpcLocal = new RouterRpcLocal({
             doRouteMessage: (routedMessage: RouteMessageWrapper, mode?: RoutingMode) => this.doRouteMessage(routedMessage, mode),
-            addContact: (contact: PeerDescriptor, setActive: boolean) => this.config.addContact(contact, setActive),
             setForwardingEntries: (routedMessage: RouteMessageWrapper) => this.setForwardingEntries(routedMessage),
             duplicateRequestDetector: this.duplicateRequestDetector,
             localPeerDescriptor: this.config.localPeerDescriptor,

package/src/dht/routing/RouterRpcLocal.ts

@@ -8,7 +8,6 @@ import { v4 } from 'uuid'
 
 interface RouterRpcLocalConfig {
     doRouteMessage: (routedMessage: RouteMessageWrapper, mode?: RoutingMode) => RouteMessageAck
-    addContact: (contact: PeerDescriptor, setActive: boolean) => void
     setForwardingEntries: (routedMessage: RouteMessageWrapper) => void
     handleMessage: (message: Message) => void
     duplicateRequestDetector: DuplicateDetector

package/src/dht/routing/RouterRpcRemote.ts

@@ -39,7 +39,7 @@ export class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
                 ? getNodeIdFromPeerDescriptor(previousPeer)
                 : getNodeIdFromPeerDescriptor(params.sourcePeer!)
             const toNode = getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
-            logger.trace(`Failed to send routeMessage from ${fromNode} to ${toNode} with: ${err}`)
+            logger.trace(`Failed to send routeMessage from ${fromNode} to ${toNode}`, { err })
             return false
         }
         return true
@@ -69,7 +69,7 @@ export class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
                 ? getNodeIdFromPeerDescriptor(previousPeer)
                 : getNodeIdFromPeerDescriptor(params.sourcePeer!)
             const toNode = getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
-            logger.trace(`Failed to send forwardMessage from ${fromNode} to ${toNode} with: ${err}`)
+            logger.trace(`Failed to send forwardMessage from ${fromNode} to ${toNode}`, { err })
             return false
         }
         return true

package/src/dht/routing/RoutingSession.ts

@@ -212,8 +212,8 @@ export class RoutingSession extends EventEmitter<RoutingSessionEvents> {
                     } else {
                         this.onRequestFailed(nextPeer!.getNodeId())
                     }
-                } catch (e) {
-                    logger.debug('Unable to route message ', { error: e })
+                } catch (err) {
+                    logger.debug('Unable to route message ', { err })
                 } finally {
                     logger.trace('sendRouteMessageRequest returned')
                 }

package/src/dht/store/LocalDataStore.ts

@@ -1,6 +1,6 @@
 import { DataEntry } from '../../proto/packages/dht/protos/DhtRpc'
-import { MapWithTtl } from '../../helpers/MapWithTtl'
 import { DhtAddress, getDhtAddressFromRaw } from '../../identifiers'
+import { MapWithTtl } from '@streamr/utils'
 
 export class LocalDataStore {
 

package/src/dht/store/StoreManager.ts

@@ -158,7 +158,7 @@ export class StoreManager {
                 try {
                     await rpcRemote.replicateData({ entry: dataEntry })
                 } catch (err) {
-                    logger.trace('Failed to replicate data in replicateDataToClosestNodes', { error: err })
+                    logger.trace('Failed to replicate data in replicateDataToClosestNodes', { err })
                 }
             }))
         }))

package/src/exports.ts

@@ -7,13 +7,13 @@ export { getRandomRegion, getRegionDelayMatrix } from './connection/simulator/pi
 export { PeerDescriptor, Message, NodeType, DataEntry } from './proto/packages/dht/protos/DhtRpc'
 export { ITransport } from './transport/ITransport'
 export { ConnectionManager, ConnectionLocker, PortRange, TlsCertificate } from './connection/ConnectionManager'
-export { LockID } from './connection/ConnectionLockHandler'
+export { LockID } from './connection/ConnectionLockStates'
 export { DefaultConnectorFacade } from './connection/ConnectorFacade'
 export { DhtRpcOptions } from './rpc-protocol/DhtRpcOptions'
 export { RpcRemote, EXISTING_CONNECTION_TIMEOUT } from './dht/contact/RpcRemote'
 export { IceServer } from './connection/webrtc/WebrtcConnector'
 export { DhtCallContext } from './rpc-protocol/DhtCallContext'
-export { ClientWebsocket } from './connection/websocket/ClientWebsocket'
+export { WebsocketClientConnection } from './connection/websocket/NodeWebsocketClientConnection'
 export { ManagedConnection } from './connection/ManagedConnection'
 export { ConnectionType } from './connection/IConnection'
 export { ServiceID } from './types/ServiceID'

package/test/benchmark/WebsocketServerMemoryLeak.test.ts

@@ -2,7 +2,7 @@
 
 import { wait } from '@streamr/utils'
 import { WebsocketServer } from '../../src/connection/websocket/WebsocketServer'
-import { ClientWebsocket } from '../../src/connection/websocket/ClientWebsocket'
+import { WebsocketClientConnection } from '../../src/connection/websocket/NodeWebsocketClientConnection'
 
 // This 'test' is meant to be run manually using the following command:
 // node --inspect ../../../../node_modules/.bin/jest WebsocketServerMemoryLeak.test.ts
@@ -26,7 +26,7 @@ describe('WebsocketServermemoryLeak', () => {
         expect(port).toEqual(19792)
         
         for (let i = 0; i < 10000; i++) {
-            const clientWebsocket: ClientWebsocket = new ClientWebsocket()
+            const clientWebsocket: WebsocketClientConnection = new WebsocketClientConnection()
             clientWebsocket.on('connected', () => {
                 console.log('clientWebsocket connected ' + i)
             })

package/test/integration/Find.test.ts

@@ -1,7 +1,7 @@
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
 import { PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { createMockConnectionDhtNode, waitConnectionManagersReadyForTesting } from '../utils/utils'
+import { createMockConnectionDhtNode, waitForStableTopology } from '../utils/utils'
 import { getDhtAddressFromRaw, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../src/identifiers'
 
 const NUM_NODES = 100
@@ -25,7 +25,7 @@ describe('Find correctness', () => {
         }
         await entryPoint.joinDht([entrypointDescriptor])
         await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
-        await waitConnectionManagersReadyForTesting(nodes.map((node) => node.connectionManager!), 20)
+        await waitForStableTopology(nodes, 20)
     }, 90000)
 
     afterEach(async () => {

package/test/integration/ReplicateData.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
-import { createMockConnectionDhtNode, waitNodesReadyForTesting } from '../utils/utils'
+import { createMockConnectionDhtNode, waitForStableTopology } from '../utils/utils'
 import { SortedContactList } from '../../src/dht/contact/SortedContactList'
 import { createMockDataEntry, expectEqualData } from '../utils/mock/mockDataEntry'
 import { DhtAddress, createRandomDhtAddress, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../src/identifiers'
@@ -72,7 +72,7 @@ describe('Replicate data from node to node in DHT', () => {
                 }
             })
         )
-        await waitNodesReadyForTesting(nodes)
+        await waitForStableTopology(nodes)
 
         const data = getDataEntries(closest[0])
         expect(data).toHaveLength(1)
@@ -87,7 +87,7 @@ describe('Replicate data from node to node in DHT', () => {
                 }
             })
         )
-        await waitNodesReadyForTesting(nodes)
+        await waitForStableTopology(nodes)
 
         const randomIndex = Math.floor(Math.random() * nodes.length)
         const storerDescriptors = await nodes[randomIndex].storeDataToDht(getDhtAddressFromRaw(DATA.key), DATA.data!)

package/test/integration/Store.test.ts

@@ -3,7 +3,7 @@ import { DhtNode } from '../../src/dht/DhtNode'
 import { getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../src/identifiers'
 import { PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createMockDataEntry, expectEqualData } from '../utils/mock/mockDataEntry'
-import { createMockConnectionDhtNode, createMockPeerDescriptor, waitConnectionManagersReadyForTesting } from '../utils/utils'
+import { createMockConnectionDhtNode, createMockPeerDescriptor, waitForStableTopology } from '../utils/utils'
 
 const NUM_NODES = 100
 const MAX_CONNECTIONS = 20
@@ -33,7 +33,7 @@ describe('Storing data in DHT', () => {
             nodes.push(node)
         }
         await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
-        await waitConnectionManagersReadyForTesting(nodes.map((node) => node.connectionManager!), MAX_CONNECTIONS)
+        await waitForStableTopology(nodes, MAX_CONNECTIONS)
     }, 90000)
 
     afterEach(async () => {

package/test/integration/StoreAndDelete.test.ts

@@ -1,6 +1,6 @@
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
-import { createMockConnectionDhtNode, waitConnectionManagersReadyForTesting } from '../utils/utils'
+import { createMockConnectionDhtNode, waitForStableTopology } from '../utils/utils'
 import { createMockDataEntry, expectEqualData } from '../utils/mock/mockDataEntry'
 import { createRandomDhtAddress } from '../../src/identifiers'
 import { getDhtAddressFromRaw } from '../../src/identifiers'
@@ -30,7 +30,7 @@ describe('Storing data in DHT', () => {
             nodes.push(node)
         }
         await Promise.all(nodes.map((node) => node.joinDht([entryPoint.getLocalPeerDescriptor()])))
-        await waitConnectionManagersReadyForTesting(nodes.map((node) => node.connectionManager!), MAX_CONNECTIONS)
+        await waitForStableTopology(nodes, MAX_CONNECTIONS)
     }, 90000)
 
     afterEach(async () => {

package/test/integration/Websocket.test.ts

@@ -2,7 +2,7 @@
 
 import { WebsocketServer } from '../../src/connection/websocket/WebsocketServer'
 import { IConnection } from '../../src/connection/IConnection'
-import { ClientWebsocket } from '../../src/connection/websocket/ClientWebsocket'
+import { WebsocketClientConnection } from '../../src/connection/websocket/NodeWebsocketClientConnection'
 import { Logger } from '@streamr/utils'
 
 const logger = new Logger(module)
@@ -13,7 +13,7 @@ describe('Websocket', () => {
         portRange: { min: 9977, max: 9977 },
         enableTls: false
     })
-    const clientWebsocket = new ClientWebsocket()
+    const clientWebsocket = new WebsocketClientConnection()
 
     beforeAll(async () => {
         await websocketServer.start()

package/test/unit/PeerManager.test.ts

@@ -1,27 +1,35 @@
 import { PeerManager, getDistance } from '../../src/dht/PeerManager'
 import { DhtAddress, createRandomDhtAddress, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../src/identifiers'
 import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { range, sampleSize, sortBy, without } from 'lodash'
+import { range, sample, sampleSize, sortBy, without } from 'lodash'
 import { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
 import { MockRpcCommunicator } from '../utils/mock/MockRpcCommunicator'
 import { createMockPeerDescriptor } from '../utils/utils'
 
+const createPeerManager = (nodeIds: DhtAddress[]) => {
+    const peerDescriptor = createMockPeerDescriptor()
+    const manager = new PeerManager({
+        localNodeId: getNodeIdFromPeerDescriptor(peerDescriptor),
+        localPeerDescriptor: peerDescriptor,
+        createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => {
+            return new DhtNodeRpcRemote(undefined as any, peerDescriptor, undefined as any, new MockRpcCommunicator())
+        }
+    } as any)
+    const contacts = nodeIds.map((n) => ({ nodeId: getRawFromDhtAddress(n), type: NodeType.NODEJS }))
+    for (const contact of contacts) {
+        manager.addContact(contact)
+    }
+    return manager
+}
+
 describe('PeerManager', () => {
 
     it('getClosestContactsTo', () => {
         const nodeIds = range(10).map(() => createRandomDhtAddress())
-        const peerDescriptor = createMockPeerDescriptor()
-        const manager = new PeerManager({
-            localNodeId: getNodeIdFromPeerDescriptor(peerDescriptor),
-            localPeerDescriptor: peerDescriptor,
-            createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => {
-                return new DhtNodeRpcRemote(undefined as any, peerDescriptor, undefined as any, new MockRpcCommunicator())
-            }
-        } as any)
-        manager.addContact(nodeIds.map((n) => ({ nodeId: getRawFromDhtAddress(n), type: NodeType.NODEJS })))
-
+        const manager = createPeerManager(nodeIds)
         const referenceId = createRandomDhtAddress()
         const excluded = new Set<DhtAddress>(sampleSize(nodeIds, 2))
+
         const actual = manager.getClosestContactsTo(referenceId, 5, excluded)
 
         const expected = sortBy(
@@ -30,4 +38,27 @@ describe('PeerManager', () => {
         ).slice(0, 5)
         expect(actual.map((n) => n.getNodeId())).toEqual(expected)
     })
+
+    it('getClosestNeighborsTo', () => {
+        const nodeIds = range(10).map(() => createRandomDhtAddress())
+        const manager = createPeerManager(nodeIds)
+        const referenceId = createRandomDhtAddress()
+        const excluded = new Set<DhtAddress>(sampleSize(nodeIds, 2))
+
+        const actual = manager.getClosestNeighborsTo(referenceId, 5, excluded)
+
+        const expected = sortBy(
+            without(manager.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n)), ...Array.from(excluded.values())),
+            (n: DhtAddress) => getDistance(getRawFromDhtAddress(n), getRawFromDhtAddress(referenceId))
+        ).slice(0, 5)
+        expect(actual.map((n) => n.getNodeId())).toEqual(expected)
+    })
+
+    it('getContactCount', () => {
+        const nodeIds = range(10).map(() => createRandomDhtAddress())
+        const manager = createPeerManager(nodeIds)
+        expect(manager.getContactCount()).toBe(10)
+        expect(manager.getContactCount(new Set(sampleSize(nodeIds, 2)))).toBe(8)
+        expect(manager.getContactCount(new Set([sample(nodeIds)!, createRandomDhtAddress()]))).toBe(9)
+    })
 })

package/test/unit/Router.test.ts

@@ -50,7 +50,6 @@ describe('Router', () => {
         router = new Router({
             localPeerDescriptor: peerDescriptor1,
             rpcCommunicator: rpcCommunicator as any,
-            addContact: (_contact) => {},
             connections,
             handleMessage: () => {}
         })

package/test/utils/utils.ts

@@ -242,42 +242,22 @@ export const createMockPeers = (): PeerDescriptor[] => {
     ]
 }
 
-export const waitConnectionManagersReadyForTesting = async (connectionManagers: ConnectionManager[], limit: number): Promise<void> => {
-    connectionManagers.forEach((connectionManager) => garbageCollectConnections(connectionManager, limit))
-    try {
-        await Promise.all(connectionManagers.map((connectionManager) => waitReadyForTesting(connectionManager, limit)))
-    } catch (_err) {
-        // did not successfully meet condition but network should be in a stable non-star state
-    }
-}
-
-export const waitNodesReadyForTesting = async (nodes: DhtNode[], limit: number = 10000): Promise<void> => {
-    return waitConnectionManagersReadyForTesting(
-        nodes.map((node) => {
-            return (node.getTransport() as ConnectionManager)
-        }), limit)
-}
-
-function garbageCollectConnections(connectionManager: ConnectionManager, limit: number): void {
-    const LAST_USED_LIMIT = 100
-    connectionManager.garbageCollectConnections(limit, LAST_USED_LIMIT)
-}
-
-async function waitReadyForTesting(connectionManager: ConnectionManager, limit: number): Promise<void> {
-    const LAST_USED_LIMIT = 100
-    connectionManager.garbageCollectConnections(limit, LAST_USED_LIMIT)
-    try {
-        await waitForCondition(() => {
-            return (connectionManager.getLocalLockedConnectionCount() === 0 &&
-                connectionManager.getRemoteLockedConnectionCount() === 0 &&
-                connectionManager.getConnections().length <= limit)
-        }, 20000)
-    } catch (err) {
-        if (connectionManager.getLocalLockedConnectionCount() > 0
-            && connectionManager.getRemoteLockedConnectionCount() > 0) {
-            throw new Error('Connections are still locked')
-        } else if (connectionManager.getConnections().length > limit) {
-            throw new Error(`ConnectionManager has more than ${limit}`)
+/*
+ * When we start multiple nodes, most of the nodes have unlocked connections. This promise will resolve when some of those 
+ * unlocked connections have been garbage collected, i.e. we typically have connections only to the nodes which
+ * are neighbors.
+ */
+export const waitForStableTopology = async (nodes: DhtNode[], maxConnectionCount: number = 10000): Promise<void> => {
+    const MAX_IDLE_TIME = 100
+    const connectionManagers = nodes.map((n) => n.getTransport() as ConnectionManager)
+    await Promise.all(connectionManagers.map(async (connectionManager) => {
+        connectionManager.garbageCollectConnections(maxConnectionCount, MAX_IDLE_TIME)
+        try {
+            await waitForCondition(() => connectionManager.getConnections().length <= maxConnectionCount, 20000)
+        } catch (err) {
+            // the topology is very likely stable, but we can't be sure (maybe the node has more than maxConnectionCount
+            // locked connections and therefore it is ok to that garbage collector was not able to remove any of those
+            // connections
         }
-    }
+    }))
 }

package/tsconfig.browser.json

@@ -11,6 +11,7 @@
     "package.json"
   ],
   "exclude": [
-    "src/connection/webrtc/NodeWebrtcConnection.ts"
+    "src/connection/webrtc/NodeWebrtcConnection.ts",
+    "src/connection/websocket/NodeWebsocketClientConnection.ts"
   ]
 }

package/tsconfig.jest.json

@@ -10,7 +10,8 @@
         "package.json"
     ],
     "exclude": [
-        "src/connection/webrtc/BrowserWebrtcConnection.ts"
+        "src/connection/webrtc/BrowserWebrtcConnection.ts",
+        "src/connection/websocket/BrowserWebsocketClientConnection.ts"
     ],  
     "references": [
         { "path": "../utils/tsconfig.node.json" },

package/tsconfig.node.json

@@ -9,7 +9,8 @@
         "package.json"
     ],
     "exclude": [
-        "src/connection/webrtc/BrowserWebrtcConnection.ts"
+        "src/connection/webrtc/BrowserWebrtcConnection.ts",
+        "src/connection/websocket/BrowserWebsocketClientConnection.ts"
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },

package/dist/src/connection/ConnectionLockHandler.js.map

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

package/dist/src/connection/websocket/ClientWebsocket.d.ts

@@ -1,17 +0,0 @@
-import EventEmitter from 'eventemitter3';
-import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from '../IConnection';
-export declare const GOING_AWAY = 1001;
-export declare const CUSTOM_GOING_AWAY = 3001;
-export declare class ClientWebsocket extends EventEmitter<ConnectionEvents> implements IConnection {
-    readonly connectionId: ConnectionID;
-    private socket?;
-    connectionType: ConnectionType;
-    private destroyed;
-    constructor();
-    connect(address: string, selfSigned?: boolean): void;
-    private doDisconnect;
-    send(data: Uint8Array): void;
-    close(gracefulLeave: boolean): Promise<void>;
-    private stopListening;
-    destroy(): void;
-}

package/dist/src/connection/websocket/ClientWebsocket.js.map

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

package/dist/src/helpers/MapWithTtl.d.ts

@@ -1,14 +0,0 @@
-export declare class MapWithTtl<K, V> {
-    private readonly delegate;
-    private readonly getTtl;
-    constructor(getTtl: (value: V) => number);
-    set(key: K, value: V): void;
-    get(key: K): V | undefined;
-    has(key: K): boolean;
-    delete(key: K): void;
-    clear(): void;
-    size(): number;
-    values(): IterableIterator<V>;
-    forEach(cb: (value: V, key: K) => void): void;
-    private createTimeout;
-}

package/dist/src/helpers/MapWithTtl.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapWithTtl = void 0;
-class MapWithTtl {
-    delegate = new Map();
-    getTtl;
-    constructor(getTtl) {
-        this.getTtl = getTtl;
-    }
-    set(key, value) {
-        const existing = this.delegate.get(key);
-        if (existing !== undefined) {
-            clearTimeout(existing.timeout);
-        }
-        this.delegate.set(key, {
-            value,
-            timeout: this.createTimeout(key, value)
-        });
-    }
-    get(key) {
-        const wrapper = this.delegate.get(key);
-        return wrapper?.value;
-    }
-    has(key) {
-        return this.delegate.has(key);
-    }
-    delete(key) {
-        const existing = this.delegate.get(key);
-        if (existing !== undefined) {
-            clearTimeout(existing.timeout);
-            this.delegate.delete(key);
-        }
-    }
-    clear() {
-        this.delegate.forEach((value) => {
-            clearTimeout(value.timeout);
-        });
-        this.delegate.clear();
-    }
-    size() {
-        return this.delegate.size;
-    }
-    *values() {
-        for (const v of this.delegate.values()) {
-            yield v.value;
-        }
-    }
-    forEach(cb) {
-        this.delegate.forEach((valueWrapper, key) => {
-            cb(valueWrapper.value, key);
-        });
-    }
-    createTimeout(key, value) {
-        return setTimeout(() => {
-            this.delete(key);
-        }, this.getTtl(value));
-    }
-}
-exports.MapWithTtl = MapWithTtl;
-//# sourceMappingURL=MapWithTtl.js.map

package/dist/src/helpers/MapWithTtl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MapWithTtl.js","sourceRoot":"","sources":["../../../src/helpers/MapWithTtl.ts"],"names":[],"mappings":";;;AAKA,MAAa,UAAU;IAEF,QAAQ,GAA4B,IAAI,GAAG,EAAE,CAAA;IAC7C,MAAM,CAAsB;IAE7C,YAAY,MAA4B;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAClC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE;YACnB,KAAK;YACL,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC;SAC1C,CAAC,CAAA;IACN,CAAC;IAED,GAAG,CAAC,GAAM;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtC,OAAO,OAAO,EAAE,KAAK,CAAA;IACzB,CAAC;IAED,GAAG,CAAC,GAAM;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,CAAC,GAAM;QACT,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC9B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5B,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAA;IAC7B,CAAC;IAED,CAAC,MAAM;QACH,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,MAAM,CAAC,CAAC,KAAK,CAAA;QACjB,CAAC;IACL,CAAC;IAED,OAAO,CAAC,EAA8B;QAClC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,YAA6B,EAAE,GAAM,EAAE,EAAE;YAC5D,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,aAAa,CAAC,GAAM,EAAE,KAAQ;QAClC,OAAO,UAAU,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1B,CAAC;CACJ;AAjED,gCAiEC"}