@streamr/dht 100.0.0-pretestnet.3 → 100.0.0-pretestnet.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/connection/ConnectionLockRpcLocal.js +1 -1
- package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js +3 -3
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +4 -8
- package/dist/src/connection/ConnectionManager.js +30 -31
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectivityChecker.d.ts +0 -4
- package/dist/src/connection/ConnectivityChecker.js +13 -18
- package/dist/src/connection/ConnectivityChecker.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +6 -3
- package/dist/src/connection/ConnectorFacade.js +33 -23
- package/dist/src/connection/ConnectorFacade.js.map +1 -1
- package/dist/src/connection/Handshaker.d.ts +6 -6
- package/dist/src/connection/Handshaker.js +10 -13
- package/dist/src/connection/Handshaker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +7 -10
- package/dist/src/connection/ManagedConnection.js +43 -79
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/ManagedWebrtcConnection.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnection.js +16 -15
- package/dist/src/connection/simulator/SimulatorConnection.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnector.d.ts +2 -2
- package/dist/src/connection/simulator/SimulatorConnector.js +10 -11
- package/dist/src/connection/simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js +8 -9
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnector.d.ts +1 -1
- package/dist/src/connection/webrtc/WebrtcConnector.js +6 -6
- package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +4 -4
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/websocket/ClientWebsocket.js +3 -0
- package/dist/src/connection/websocket/ClientWebsocket.js.map +1 -1
- package/dist/src/connection/websocket/ServerWebsocket.js +2 -0
- package/dist/src/connection/websocket/ServerWebsocket.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnector.d.ts +5 -5
- package/dist/src/connection/websocket/WebsocketConnector.js +37 -35
- package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js.map +1 -1
- package/dist/src/dht/DhtNode.js +18 -15
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.js +2 -2
- package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcRemote.js +4 -4
- package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
- package/dist/src/dht/discovery/DiscoverySession.js +1 -1
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.js +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/find/FindRpcLocal.js +2 -2
- package/dist/src/dht/find/FindRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/FindRpcRemote.js +3 -3
- package/dist/src/dht/routing/FindRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/Router.js +3 -3
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcLocal.js +4 -4
- package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcRemote.js +6 -6
- package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.js +1 -1
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/StoreRpcLocal.js +1 -1
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
- package/dist/src/dht/store/StoreRpcRemote.js +3 -3
- package/dist/src/dht/store/StoreRpcRemote.js.map +1 -1
- package/dist/src/helpers/peerIdFromPeerDescriptor.d.ts +1 -0
- package/dist/src/helpers/peerIdFromPeerDescriptor.js +7 -1
- package/dist/src/helpers/peerIdFromPeerDescriptor.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +21 -12
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +20 -7
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/package.json +5 -5
- package/protos/DhtRpc.proto +9 -5
- package/src/connection/ConnectionLockRpcLocal.ts +2 -2
- package/src/connection/ConnectionLockRpcRemote.ts +4 -5
- package/src/connection/ConnectionManager.ts +30 -36
- package/src/connection/ConnectivityChecker.ts +13 -15
- package/src/connection/ConnectorFacade.ts +36 -25
- package/src/connection/Handshaker.ts +15 -18
- package/src/connection/ManagedConnection.ts +63 -87
- package/src/connection/ManagedWebrtcConnection.ts +4 -2
- package/src/connection/simulator/SimulatorConnection.ts +17 -16
- package/src/connection/simulator/SimulatorConnector.ts +12 -13
- package/src/connection/webrtc/BrowserWebrtcConnection.ts +2 -2
- package/src/connection/webrtc/NodeWebrtcConnection.ts +9 -10
- package/src/connection/webrtc/WebrtcConnector.ts +7 -6
- package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +5 -5
- package/src/connection/websocket/ClientWebsocket.ts +3 -0
- package/src/connection/websocket/ServerWebsocket.ts +2 -0
- package/src/connection/websocket/WebsocketConnector.ts +63 -39
- package/src/connection/websocket/WebsocketConnectorRpcLocal.ts +2 -2
- package/src/connection/websocket/WebsocketConnectorRpcRemote.ts +2 -2
- package/src/dht/DhtNode.ts +24 -16
- package/src/dht/DhtNodeRpcLocal.ts +3 -3
- package/src/dht/DhtNodeRpcRemote.ts +5 -5
- package/src/dht/discovery/DiscoverySession.ts +2 -2
- package/src/dht/discovery/PeerDiscovery.ts +2 -2
- package/src/dht/find/FindRpcLocal.ts +3 -3
- package/src/dht/routing/FindRpcRemote.ts +4 -4
- package/src/dht/routing/Router.ts +10 -5
- package/src/dht/routing/RouterRpcLocal.ts +5 -5
- package/src/dht/routing/RouterRpcRemote.ts +7 -8
- package/src/dht/routing/RoutingSession.ts +2 -2
- package/src/dht/store/StoreRpcLocal.ts +2 -2
- package/src/dht/store/StoreRpcRemote.ts +4 -4
- package/src/helpers/peerIdFromPeerDescriptor.ts +6 -0
- package/src/proto/packages/dht/protos/DhtRpc.ts +25 -17
- package/test/benchmark/Find.test.ts +2 -2
- package/test/benchmark/KademliaCorrectness.test.ts +2 -2
- package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +4 -3
- package/test/integration/ConnectionLocking.test.ts +7 -4
- package/test/integration/ConnectionManager.test.ts +72 -4
- package/test/integration/Find.test.ts +3 -6
- package/test/integration/MigrateData.test.ts +4 -4
- package/test/integration/MultipleEntryPointJoining.test.ts +2 -2
- package/test/integration/ScaleDownDht.test.ts +4 -4
- package/test/integration/Store.test.ts +3 -6
- package/test/integration/StoreAndDelete.test.ts +3 -6
- package/test/integration/WebrtcConnectionManagement.test.ts +1 -1
- package/test/utils/utils.ts +8 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
|
|
2
2
|
import { DhtNode } from '../../src/dht/DhtNode'
|
|
3
|
-
import {
|
|
3
|
+
import { PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
|
|
4
4
|
import { createMockConnectionDhtNode, waitConnectionManagersReadyForTesting } from '../utils/utils'
|
|
5
5
|
import { PeerID } from '../../src/helpers/PeerID'
|
|
6
6
|
import { areEqualPeerDescriptors } from '../../src/helpers/peerIdFromPeerDescriptor'
|
|
@@ -10,7 +10,7 @@ describe('Storing data in DHT', () => {
|
|
|
10
10
|
let entryPoint: DhtNode
|
|
11
11
|
let nodes: DhtNode[]
|
|
12
12
|
let entrypointDescriptor: PeerDescriptor
|
|
13
|
-
const simulator = new Simulator(LatencyType.
|
|
13
|
+
const simulator = new Simulator(LatencyType.REAL)
|
|
14
14
|
const NUM_NODES = 5
|
|
15
15
|
const MAX_CONNECTIONS = 5
|
|
16
16
|
const K = 4
|
|
@@ -27,10 +27,7 @@ describe('Storing data in DHT', () => {
|
|
|
27
27
|
undefined, K, MAX_CONNECTIONS)
|
|
28
28
|
nodes.push(entryPoint)
|
|
29
29
|
nodeIndicesById[entryPoint.getNodeId().toKey()] = 0
|
|
30
|
-
entrypointDescriptor =
|
|
31
|
-
kademliaId: entryPoint.getNodeId().value,
|
|
32
|
-
type: NodeType.NODEJS
|
|
33
|
-
}
|
|
30
|
+
entrypointDescriptor = entryPoint.getLocalPeerDescriptor()
|
|
34
31
|
nodes.push(entryPoint)
|
|
35
32
|
for (let i = 1; i < NUM_NODES; i++) {
|
|
36
33
|
const nodeId = `${i}`
|
|
@@ -200,7 +200,7 @@ describe('WebRTC Connection Management', () => {
|
|
|
200
200
|
|
|
201
201
|
msg.targetDescriptor = peerDescriptor2
|
|
202
202
|
manager1.send(msg).catch((e) => {
|
|
203
|
-
expect(e.code).toEqual('
|
|
203
|
+
expect(e.code).toEqual('SEND_FAILED')
|
|
204
204
|
})
|
|
205
205
|
|
|
206
206
|
// @ts-expect-error private field
|
package/test/utils/utils.ts
CHANGED
|
@@ -57,14 +57,20 @@ export const createMockConnectionDhtNode = async (
|
|
|
57
57
|
}
|
|
58
58
|
const mockConnectionManager = new SimulatorTransport(peerDescriptor, simulator)
|
|
59
59
|
await mockConnectionManager.start()
|
|
60
|
-
const
|
|
60
|
+
const opts = {
|
|
61
61
|
peerDescriptor: peerDescriptor,
|
|
62
62
|
transport: mockConnectionManager,
|
|
63
63
|
numberOfNodesPerKBucket,
|
|
64
64
|
maxConnections: maxConnections,
|
|
65
65
|
dhtJoinTimeout,
|
|
66
66
|
rpcRequestTimeout: 5000
|
|
67
|
-
}
|
|
67
|
+
}
|
|
68
|
+
const node = new class extends DhtNode {
|
|
69
|
+
async stop(): Promise<void> {
|
|
70
|
+
await super.stop()
|
|
71
|
+
await mockConnectionManager.stop()
|
|
72
|
+
}
|
|
73
|
+
}(opts)
|
|
68
74
|
await node.start()
|
|
69
75
|
return node
|
|
70
76
|
}
|