@streamr/dht 100.0.0-testnet-three.6 → 100.1.0

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.
Files changed (215) hide show
  1. package/README.md +1 -1
  2. package/dist/package.json +12 -8
  3. package/dist/src/connection/ConnectionLockRpcLocal.d.ts +1 -1
  4. package/dist/src/connection/ConnectionLockRpcRemote.d.ts +1 -1
  5. package/dist/src/connection/ConnectionLockRpcRemote.js +1 -1
  6. package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
  7. package/dist/src/connection/{ConnectionLockHandler.d.ts → ConnectionLockStates.d.ts} +3 -3
  8. package/dist/src/connection/{ConnectionLockHandler.js → ConnectionLockStates.js} +17 -9
  9. package/dist/src/connection/ConnectionLockStates.js.map +1 -0
  10. package/dist/src/connection/ConnectionManager.d.ts +9 -7
  11. package/dist/src/connection/ConnectionManager.js +16 -18
  12. package/dist/src/connection/ConnectionManager.js.map +1 -1
  13. package/dist/src/connection/ConnectorFacade.js +1 -1
  14. package/dist/src/connection/ConnectorFacade.js.map +1 -1
  15. package/dist/src/connection/Handshaker.js +6 -13
  16. package/dist/src/connection/Handshaker.js.map +1 -1
  17. package/dist/src/connection/ManagedConnection.d.ts +2 -2
  18. package/dist/src/connection/ManagedConnection.js +8 -8
  19. package/dist/src/connection/ManagedConnection.js.map +1 -1
  20. package/dist/src/connection/connectivityChecker.d.ts +1 -1
  21. package/dist/src/connection/connectivityChecker.js +8 -8
  22. package/dist/src/connection/connectivityChecker.js.map +1 -1
  23. package/dist/src/connection/connectivityRequestHandler.d.ts +2 -2
  24. package/dist/src/connection/connectivityRequestHandler.js +10 -11
  25. package/dist/src/connection/connectivityRequestHandler.js.map +1 -1
  26. package/dist/src/connection/webrtc/WebrtcConnector.d.ts +1 -0
  27. package/dist/src/connection/webrtc/WebrtcConnector.js +13 -8
  28. package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
  29. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +2 -0
  30. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +4 -6
  31. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
  32. package/dist/src/connection/websocket/AbstractWebsocketClientConnection.d.ts +28 -0
  33. package/dist/src/connection/websocket/{ClientWebsocket.js → AbstractWebsocketClientConnection.js} +42 -68
  34. package/dist/src/connection/websocket/AbstractWebsocketClientConnection.js.map +1 -0
  35. package/dist/src/connection/websocket/NodeWebsocketClientConnection.d.ts +7 -0
  36. package/dist/src/connection/websocket/NodeWebsocketClientConnection.js +39 -0
  37. package/dist/src/connection/websocket/NodeWebsocketClientConnection.js.map +1 -0
  38. package/dist/src/connection/websocket/WebsocketConnector.js +26 -23
  39. package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
  40. package/dist/src/connection/websocket/WebsocketServer.js +25 -35
  41. package/dist/src/connection/websocket/WebsocketServer.js.map +1 -1
  42. package/dist/src/connection/websocket/{ServerWebsocket.d.ts → WebsocketServerConnection.d.ts} +4 -5
  43. package/dist/src/connection/websocket/{ServerWebsocket.js → WebsocketServerConnection.js} +18 -51
  44. package/dist/src/connection/websocket/WebsocketServerConnection.js.map +1 -0
  45. package/dist/src/dht/DhtNode.d.ts +15 -8
  46. package/dist/src/dht/DhtNode.js +62 -31
  47. package/dist/src/dht/DhtNode.js.map +1 -1
  48. package/dist/src/dht/DhtNodeRpcLocal.d.ts +5 -1
  49. package/dist/src/dht/DhtNodeRpcLocal.js +10 -0
  50. package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
  51. package/dist/src/dht/DhtNodeRpcRemote.d.ts +3 -0
  52. package/dist/src/dht/DhtNodeRpcRemote.js +16 -1
  53. package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
  54. package/dist/src/dht/ExternalApiRpcLocal.d.ts +2 -2
  55. package/dist/src/dht/ExternalApiRpcLocal.js +3 -3
  56. package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -1
  57. package/dist/src/dht/ExternalApiRpcRemote.d.ts +1 -1
  58. package/dist/src/dht/ExternalApiRpcRemote.js +2 -2
  59. package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
  60. package/dist/src/dht/PeerManager.d.ts +15 -3
  61. package/dist/src/dht/PeerManager.js +54 -40
  62. package/dist/src/dht/PeerManager.js.map +1 -1
  63. package/dist/src/dht/contact/RingContactList.d.ts +31 -0
  64. package/dist/src/dht/contact/RingContactList.js +133 -0
  65. package/dist/src/dht/contact/RingContactList.js.map +1 -0
  66. package/dist/src/dht/contact/SortedContactList.d.ts +2 -1
  67. package/dist/src/dht/contact/SortedContactList.js +19 -17
  68. package/dist/src/dht/contact/SortedContactList.js.map +1 -1
  69. package/dist/src/dht/contact/ringIdentifiers.d.ts +16 -0
  70. package/dist/src/dht/contact/ringIdentifiers.js +54 -0
  71. package/dist/src/dht/contact/ringIdentifiers.js.map +1 -0
  72. package/dist/src/dht/discovery/DiscoverySession.js +3 -1
  73. package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
  74. package/dist/src/dht/discovery/PeerDiscovery.d.ts +6 -2
  75. package/dist/src/dht/discovery/PeerDiscovery.js +41 -4
  76. package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
  77. package/dist/src/dht/discovery/RingDiscoverySession.d.ts +29 -0
  78. package/dist/src/dht/discovery/RingDiscoverySession.js +125 -0
  79. package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -0
  80. package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +1 -1
  81. package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
  82. package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js +1 -1
  83. package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js.map +1 -1
  84. package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +0 -1
  85. package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
  86. package/dist/src/dht/routing/Router.d.ts +0 -1
  87. package/dist/src/dht/routing/Router.js +0 -1
  88. package/dist/src/dht/routing/Router.js.map +1 -1
  89. package/dist/src/dht/routing/RouterRpcLocal.d.ts +0 -1
  90. package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
  91. package/dist/src/dht/routing/RouterRpcRemote.js +2 -2
  92. package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
  93. package/dist/src/dht/routing/RoutingSession.js +2 -2
  94. package/dist/src/dht/routing/RoutingSession.js.map +1 -1
  95. package/dist/src/dht/store/LocalDataStore.js +2 -2
  96. package/dist/src/dht/store/LocalDataStore.js.map +1 -1
  97. package/dist/src/dht/store/StoreManager.js +2 -2
  98. package/dist/src/dht/store/StoreManager.js.map +1 -1
  99. package/dist/src/exports.d.ts +3 -2
  100. package/dist/src/exports.js +3 -3
  101. package/dist/src/exports.js.map +1 -1
  102. package/dist/src/helpers/createPeerDescriptor.d.ts +1 -1
  103. package/dist/src/helpers/createPeerDescriptor.js +2 -1
  104. package/dist/src/helpers/createPeerDescriptor.js.map +1 -1
  105. package/dist/src/helpers/version.d.ts +6 -0
  106. package/dist/src/helpers/version.js +38 -0
  107. package/dist/src/helpers/version.js.map +1 -0
  108. package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +16 -6
  109. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +11 -4
  110. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
  111. package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +98 -87
  112. package/dist/src/proto/packages/dht/protos/DhtRpc.js +45 -49
  113. package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
  114. package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +10 -4
  115. package/dist/src/transport/RoutingRpcCommunicator.js +0 -2
  116. package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
  117. package/karma.config.js +4 -1
  118. package/package.json +12 -8
  119. package/protos/DhtRpc.proto +21 -21
  120. package/src/connection/ConnectionLockRpcLocal.ts +1 -1
  121. package/src/connection/ConnectionLockRpcRemote.ts +2 -2
  122. package/src/connection/{ConnectionLockHandler.ts → ConnectionLockStates.ts} +14 -6
  123. package/src/connection/ConnectionManager.ts +21 -22
  124. package/src/connection/ConnectorFacade.ts +1 -2
  125. package/src/connection/Handshaker.ts +7 -15
  126. package/src/connection/ManagedConnection.ts +8 -8
  127. package/src/connection/connectivityChecker.ts +9 -10
  128. package/src/connection/connectivityRequestHandler.ts +16 -16
  129. package/src/connection/webrtc/BrowserWebrtcConnection.ts +18 -0
  130. package/src/connection/webrtc/NodeWebrtcConnection.ts +1 -1
  131. package/src/connection/webrtc/WebrtcConnector.ts +14 -8
  132. package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +5 -5
  133. package/src/connection/websocket/{ClientWebsocket.ts → AbstractWebsocketClientConnection.ts} +57 -70
  134. package/src/connection/websocket/BrowserWebsocketClientConnection.ts +44 -0
  135. package/src/connection/websocket/NodeWebsocketClientConnection.ts +39 -0
  136. package/src/connection/websocket/WebsocketConnector.ts +27 -28
  137. package/src/connection/websocket/WebsocketServer.ts +27 -42
  138. package/src/connection/websocket/{ServerWebsocket.ts → WebsocketServerConnection.ts} +15 -56
  139. package/src/dht/DhtNode.ts +85 -50
  140. package/src/dht/DhtNodeRpcLocal.ts +16 -0
  141. package/src/dht/DhtNodeRpcRemote.ts +19 -1
  142. package/src/dht/ExternalApiRpcLocal.ts +5 -5
  143. package/src/dht/ExternalApiRpcRemote.ts +4 -4
  144. package/src/dht/PeerManager.ts +70 -44
  145. package/src/dht/contact/RingContactList.ts +151 -0
  146. package/src/dht/contact/SortedContactList.ts +22 -18
  147. package/src/dht/contact/ringIdentifiers.ts +62 -0
  148. package/src/dht/discovery/DiscoverySession.ts +3 -1
  149. package/src/dht/discovery/PeerDiscovery.ts +45 -6
  150. package/src/dht/discovery/RingDiscoverySession.ts +162 -0
  151. package/src/dht/recursive-operation/RecursiveOperationManager.ts +1 -1
  152. package/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts +1 -1
  153. package/src/dht/recursive-operation/RecursiveOperationSession.ts +1 -3
  154. package/src/dht/routing/Router.ts +0 -2
  155. package/src/dht/routing/RouterRpcLocal.ts +0 -1
  156. package/src/dht/routing/RouterRpcRemote.ts +2 -2
  157. package/src/dht/routing/RoutingSession.ts +2 -2
  158. package/src/dht/store/LocalDataStore.ts +1 -1
  159. package/src/dht/store/StoreManager.ts +2 -2
  160. package/src/exports.ts +3 -2
  161. package/src/helpers/createPeerDescriptor.ts +2 -1
  162. package/src/helpers/version.ts +32 -0
  163. package/src/proto/packages/dht/protos/DhtRpc.client.ts +22 -9
  164. package/src/proto/packages/dht/protos/DhtRpc.server.ts +10 -4
  165. package/src/proto/packages/dht/protos/DhtRpc.ts +122 -100
  166. package/src/transport/RoutingRpcCommunicator.ts +1 -2
  167. package/test/benchmark/Find.test.ts +3 -4
  168. package/test/benchmark/KademliaCorrectness.test.ts +14 -8
  169. package/test/benchmark/RingCorrectness.test.ts +157 -0
  170. package/test/benchmark/WebsocketServerMemoryLeak.test.ts +2 -2
  171. package/test/benchmark/hybrid-network-simulation/RingContactList.test.ts +72 -0
  172. package/test/data/generateGroundTruthData.ts +2 -2
  173. package/test/end-to-end/memory-leak.test.ts +1 -2
  174. package/test/integration/ConnectionManager.test.ts +28 -10
  175. package/test/integration/ConnectivityChecking.test.ts +3 -15
  176. package/test/integration/DhtNodeExternalAPI.test.ts +6 -6
  177. package/test/integration/Find.test.ts +6 -6
  178. package/test/integration/Layer1-scale.test.ts +0 -1
  179. package/test/integration/ReplicateData.test.ts +4 -4
  180. package/test/integration/RouteMessage.test.ts +1 -6
  181. package/test/integration/RouterRpcRemote.test.ts +1 -3
  182. package/test/integration/SimultaneousConnections.test.ts +9 -10
  183. package/test/integration/Store.test.ts +4 -4
  184. package/test/integration/StoreAndDelete.test.ts +5 -5
  185. package/test/integration/StoreOnDhtWithThreeNodes.test.ts +5 -5
  186. package/test/integration/StoreOnDhtWithTwoNodes.test.ts +3 -3
  187. package/test/integration/WebrtcConnectionManagement.test.ts +3 -9
  188. package/test/integration/Websocket.test.ts +2 -2
  189. package/test/integration/WebsocketConnectionManagement.test.ts +1 -6
  190. package/test/integration/rpc-connections-over-webrpc.test.ts +1 -2
  191. package/test/unit/PeerManager.test.ts +44 -10
  192. package/test/unit/RecursiveOperationManager.test.ts +14 -8
  193. package/test/unit/RecursiveOperationSession.test.ts +1 -1
  194. package/test/unit/Router.test.ts +0 -3
  195. package/test/unit/RoutingSession.test.ts +1 -2
  196. package/test/unit/connectivityRequestHandler.test.ts +5 -9
  197. package/test/unit/createPeerDescriptor.test.ts +12 -6
  198. package/test/unit/version.test.ts +18 -0
  199. package/test/utils/utils.ts +60 -47
  200. package/tsconfig.browser.json +2 -1
  201. package/tsconfig.jest.json +4 -2
  202. package/tsconfig.node.json +4 -2
  203. package/dist/src/connection/ConnectionLockHandler.js.map +0 -1
  204. package/dist/src/connection/websocket/ClientWebsocket.d.ts +0 -17
  205. package/dist/src/connection/websocket/ClientWebsocket.js.map +0 -1
  206. package/dist/src/connection/websocket/ServerWebsocket.js.map +0 -1
  207. package/dist/src/helpers/MapWithTtl.d.ts +0 -14
  208. package/dist/src/helpers/MapWithTtl.js +0 -60
  209. package/dist/src/helpers/MapWithTtl.js.map +0 -1
  210. package/dist/src/helpers/versionCompatibility.d.ts +0 -2
  211. package/dist/src/helpers/versionCompatibility.js +0 -18
  212. package/dist/src/helpers/versionCompatibility.js.map +0 -1
  213. package/src/helpers/MapWithTtl.ts +0 -71
  214. package/src/helpers/versionCompatibility.ts +0 -13
  215. package/test/unit/versionCompatibility.test.ts +0 -16
@@ -3,22 +3,26 @@ import { createPeerDescriptor } from '../../src/helpers/createPeerDescriptor'
3
3
  import { isBrowserEnvironment } from '../../src/helpers/browser/isBrowserEnvironment'
4
4
  import { NodeType } from '../../src/proto/packages/dht/protos/DhtRpc'
5
5
  import { createRandomDhtAddress, getRawFromDhtAddress } from '../../src/identifiers'
6
+ import { getRandomRegion } from '../../dist/src/connection/simulator/pings'
6
7
 
7
8
  const IP_ADDRESS = '1.2.3.4'
8
9
 
9
10
  describe('createPeerDescriptor', () => {
10
11
 
12
+ const region = getRandomRegion()
13
+
11
14
  it('without websocket', () => {
12
15
  const connectivityResponse = {
13
16
  ipAddress: ipv4ToNumber(IP_ADDRESS)
14
17
  } as any
15
- const peerDescriptor = createPeerDescriptor(connectivityResponse)
18
+ const peerDescriptor = createPeerDescriptor(connectivityResponse, region)
16
19
  expect(peerDescriptor).toEqual({
17
20
  nodeId: expect.any(Uint8Array),
18
21
  type: isBrowserEnvironment() ? NodeType.BROWSER : NodeType.NODEJS,
19
22
  ipAddress: ipv4ToNumber(IP_ADDRESS),
20
23
  publicKey: expect.any(Uint8Array),
21
- signature: expect.any(Uint8Array)
24
+ signature: expect.any(Uint8Array),
25
+ region
22
26
  })
23
27
  })
24
28
 
@@ -31,7 +35,7 @@ describe('createPeerDescriptor', () => {
31
35
  tls: true
32
36
  }
33
37
  } as any
34
- const peerDescriptor = createPeerDescriptor(connectivityResponse)
38
+ const peerDescriptor = createPeerDescriptor(connectivityResponse, region)
35
39
  expect(peerDescriptor).toEqual({
36
40
  nodeId: expect.any(Uint8Array),
37
41
  type: isBrowserEnvironment() ? NodeType.BROWSER : NodeType.NODEJS,
@@ -42,7 +46,8 @@ describe('createPeerDescriptor', () => {
42
46
  host: 'bar.com',
43
47
  port: 123,
44
48
  tls: true
45
- }
49
+ },
50
+ region
46
51
  })
47
52
  })
48
53
 
@@ -51,13 +56,14 @@ describe('createPeerDescriptor', () => {
51
56
  const connectivityResponse = {
52
57
  ipAddress: ipv4ToNumber(IP_ADDRESS)
53
58
  } as any
54
- const peerDescriptor = createPeerDescriptor(connectivityResponse, nodeId)
59
+ const peerDescriptor = createPeerDescriptor(connectivityResponse, region, nodeId)
55
60
  expect(peerDescriptor).toEqual({
56
61
  nodeId: getRawFromDhtAddress(nodeId),
57
62
  type: isBrowserEnvironment() ? NodeType.BROWSER : NodeType.NODEJS,
58
63
  ipAddress: ipv4ToNumber(IP_ADDRESS),
59
64
  publicKey: expect.any(Uint8Array),
60
- signature: expect.any(Uint8Array)
65
+ signature: expect.any(Uint8Array),
66
+ region
61
67
  })
62
68
  })
63
69
  })
@@ -0,0 +1,18 @@
1
+ import { isMaybeSupportedVersion } from '../../src/helpers/version'
2
+
3
+ describe('version', () => {
4
+
5
+ it('supported', () => {
6
+ expect(isMaybeSupportedVersion('1.0')).toBe(true)
7
+ expect(isMaybeSupportedVersion('1.1')).toBe(true)
8
+ expect(isMaybeSupportedVersion('2.0')).toBe(true)
9
+ expect(isMaybeSupportedVersion('3.5')).toBe(true)
10
+ })
11
+
12
+ it('not supported', () => {
13
+ expect(isMaybeSupportedVersion('')).toBe(false)
14
+ expect(isMaybeSupportedVersion('100.0.0-testnet-three.3')).toBe(false)
15
+ expect(isMaybeSupportedVersion('0.0')).toBe(false)
16
+ expect(isMaybeSupportedVersion('0.1')).toBe(false)
17
+ })
18
+ })
@@ -10,8 +10,7 @@ import {
10
10
  RouteMessageWrapper,
11
11
  StoreDataRequest,
12
12
  StoreDataResponse,
13
- RecursiveOperationRequest,
14
- RecursiveOperation
13
+ ClosestRingPeersResponse
15
14
  } from '../../src/proto/packages/dht/protos/DhtRpc'
16
15
  import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
17
16
  import {
@@ -38,6 +37,40 @@ export const createMockPeerDescriptor = (opts?: Partial<Omit<PeerDescriptor, 'no
38
37
  }
39
38
  }
40
39
 
40
+ export const createMockRingNode = async (
41
+ simulator: Simulator,
42
+ nodeId: DhtAddress,
43
+ region: number
44
+ ): Promise<DhtNode> => {
45
+ const maxConnections = 80
46
+ const dhtJoinTimeout = 45000
47
+
48
+ const peerDescriptor: PeerDescriptor = {
49
+ nodeId: getRawFromDhtAddress(nodeId ?? createRandomDhtAddress()),
50
+ type: NodeType.NODEJS,
51
+ region
52
+ //ipAddress: ipv4ToNumber(ipAddress)
53
+ }
54
+ const mockConnectionManager = new SimulatorTransport(peerDescriptor, simulator)
55
+ await mockConnectionManager.start()
56
+ const opts = {
57
+ peerDescriptor: peerDescriptor,
58
+ transport: mockConnectionManager,
59
+ numberOfNodesPerKBucket: 8,
60
+ maxConnections: maxConnections,
61
+ dhtJoinTimeout,
62
+ rpcRequestTimeout: 5000
63
+ }
64
+ const node = new class extends DhtNode {
65
+ async stop(): Promise<void> {
66
+ await super.stop()
67
+ await mockConnectionManager.stop()
68
+ }
69
+ }(opts)
70
+ await node.start()
71
+ return node
72
+ }
73
+
41
74
  export const createMockConnectionDhtNode = async (
42
75
  simulator: Simulator,
43
76
  nodeId?: DhtAddress,
@@ -107,14 +140,6 @@ export const createWrappedClosestPeersRequest = (
107
140
  return rpcWrapper
108
141
  }
109
142
 
110
- export const createFindRequest = (): RecursiveOperationRequest => {
111
- const request: RecursiveOperationRequest = {
112
- operation: RecursiveOperation.FIND_NODE,
113
- sessionId: v4()
114
- }
115
- return request
116
- }
117
-
118
143
  interface IDhtRpcWithError extends IDhtNodeRpc {
119
144
  throwPingError: (request: PingRequest) => Promise<PingResponse>
120
145
  respondPingWithTimeout: (request: PingRequest) => Promise<PingResponse>
@@ -130,6 +155,14 @@ export const createMockDhtRpc = (neighbors: PeerDescriptor[]): IDhtRpcWithError
130
155
  }
131
156
  return response
132
157
  },
158
+ async getClosestRingPeers(): Promise<ClosestRingPeersResponse> {
159
+ const response: ClosestRingPeersResponse = {
160
+ leftPeers: neighbors,
161
+ rightPeers: neighbors,
162
+ requestId: 'why am i still here'
163
+ }
164
+ return response
165
+ },
133
166
  async ping(request: PingRequest): Promise<PingResponse> {
134
167
  const response: PingResponse = {
135
168
  requestId: request.requestId
@@ -209,42 +242,22 @@ export const createMockPeers = (): PeerDescriptor[] => {
209
242
  ]
210
243
  }
211
244
 
212
- export const waitConnectionManagersReadyForTesting = async (connectionManagers: ConnectionManager[], limit: number): Promise<void> => {
213
- connectionManagers.forEach((connectionManager) => garbageCollectConnections(connectionManager, limit))
214
- try {
215
- await Promise.all(connectionManagers.map((connectionManager) => waitReadyForTesting(connectionManager, limit)))
216
- } catch (_err) {
217
- // did not successfully meet condition but network should be in a stable non-star state
218
- }
219
- }
220
-
221
- export const waitNodesReadyForTesting = async (nodes: DhtNode[], limit: number = 10000): Promise<void> => {
222
- return waitConnectionManagersReadyForTesting(
223
- nodes.map((node) => {
224
- return (node.getTransport() as ConnectionManager)
225
- }), limit)
226
- }
227
-
228
- function garbageCollectConnections(connectionManager: ConnectionManager, limit: number): void {
229
- const LAST_USED_LIMIT = 100
230
- connectionManager.garbageCollectConnections(limit, LAST_USED_LIMIT)
231
- }
232
-
233
- async function waitReadyForTesting(connectionManager: ConnectionManager, limit: number): Promise<void> {
234
- const LAST_USED_LIMIT = 100
235
- connectionManager.garbageCollectConnections(limit, LAST_USED_LIMIT)
236
- try {
237
- await waitForCondition(() => {
238
- return (connectionManager.getLocalLockedConnectionCount() === 0 &&
239
- connectionManager.getRemoteLockedConnectionCount() === 0 &&
240
- connectionManager.getConnections().length <= limit)
241
- }, 20000)
242
- } catch (err) {
243
- if (connectionManager.getLocalLockedConnectionCount() > 0
244
- && connectionManager.getRemoteLockedConnectionCount() > 0) {
245
- throw new Error('Connections are still locked')
246
- } else if (connectionManager.getConnections().length > limit) {
247
- throw new Error(`ConnectionManager has more than ${limit}`)
245
+ /*
246
+ * When we start multiple nodes, most of the nodes have unlocked connections. This promise will resolve when some of those
247
+ * unlocked connections have been garbage collected, i.e. we typically have connections only to the nodes which
248
+ * are neighbors.
249
+ */
250
+ export const waitForStableTopology = async (nodes: DhtNode[], maxConnectionCount: number = 10000): Promise<void> => {
251
+ const MAX_IDLE_TIME = 100
252
+ const connectionManagers = nodes.map((n) => n.getTransport() as ConnectionManager)
253
+ await Promise.all(connectionManagers.map(async (connectionManager) => {
254
+ connectionManager.garbageCollectConnections(maxConnectionCount, MAX_IDLE_TIME)
255
+ try {
256
+ await waitForCondition(() => connectionManager.getConnections().length <= maxConnectionCount, 20000)
257
+ } catch (err) {
258
+ // the topology is very likely stable, but we can't be sure (maybe the node has more than maxConnectionCount
259
+ // locked connections and therefore it is ok to that garbage collector was not able to remove any of those
260
+ // connections
248
261
  }
249
- }
262
+ }))
250
263
  }
@@ -11,6 +11,7 @@
11
11
  "package.json"
12
12
  ],
13
13
  "exclude": [
14
- "src/connection/webrtc/NodeWebrtcConnection.ts"
14
+ "src/connection/webrtc/NodeWebrtcConnection.ts",
15
+ "src/connection/websocket/NodeWebsocketClientConnection.ts"
15
16
  ]
16
17
  }
@@ -10,12 +10,14 @@
10
10
  "package.json"
11
11
  ],
12
12
  "exclude": [
13
- "src/connection/webrtc/BrowserWebrtcConnection.ts"
13
+ "src/connection/webrtc/BrowserWebrtcConnection.ts",
14
+ "src/connection/websocket/BrowserWebsocketClientConnection.ts"
14
15
  ],
15
16
  "references": [
16
17
  { "path": "../utils/tsconfig.node.json" },
17
18
  { "path": "../test-utils/tsconfig.node.json" },
18
19
  { "path": "../proto-rpc/tsconfig.node.json" },
19
- { "path": "../autocertifier-client/tsconfig.node.json" }
20
+ { "path": "../autocertifier-client/tsconfig.node.json" },
21
+ { "path": "../cdn-location/tsconfig.node.json" }
20
22
  ]
21
23
  }
@@ -9,12 +9,14 @@
9
9
  "package.json"
10
10
  ],
11
11
  "exclude": [
12
- "src/connection/webrtc/BrowserWebrtcConnection.ts"
12
+ "src/connection/webrtc/BrowserWebrtcConnection.ts",
13
+ "src/connection/websocket/BrowserWebsocketClientConnection.ts"
13
14
  ],
14
15
  "references": [
15
16
  { "path": "../utils/tsconfig.node.json" },
16
17
  { "path": "../test-utils/tsconfig.node.json" },
17
18
  { "path": "../proto-rpc/tsconfig.node.json" },
18
- { "path": "../autocertifier-client/tsconfig.node.json" }
19
+ { "path": "../autocertifier-client/tsconfig.node.json" },
20
+ { "path": "../cdn-location/tsconfig.node.json" }
19
21
  ]
20
22
  }
@@ -1 +0,0 @@
1
- {"version":3,"file":"ConnectionLockHandler.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockHandler.ts"],"names":[],"mappings":"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"}
@@ -1,17 +0,0 @@
1
- import EventEmitter from 'eventemitter3';
2
- import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from '../IConnection';
3
- export declare const GOING_AWAY = 1001;
4
- export declare const CUSTOM_GOING_AWAY = 3001;
5
- export declare class ClientWebsocket extends EventEmitter<ConnectionEvents> implements IConnection {
6
- readonly connectionId: ConnectionID;
7
- private socket?;
8
- connectionType: ConnectionType;
9
- private destroyed;
10
- constructor();
11
- connect(address: string, selfSigned?: boolean): void;
12
- private doDisconnect;
13
- send(data: Uint8Array): void;
14
- close(gracefulLeave: boolean): Promise<void>;
15
- private stopListening;
16
- destroy(): void;
17
- }
@@ -1 +0,0 @@
1
- {"version":3,"file":"ClientWebsocket.js","sourceRoot":"","sources":["../../../../src/connection/websocket/ClientWebsocket.ts"],"names":[],"mappings":"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"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"ServerWebsocket.js","sourceRoot":"","sources":["../../../../src/connection/websocket/ServerWebsocket.ts"],"names":[],"mappings":"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"}
@@ -1,14 +0,0 @@
1
- export declare class MapWithTtl<K, V> {
2
- private readonly delegate;
3
- private readonly getTtl;
4
- constructor(getTtl: (value: V) => number);
5
- set(key: K, value: V): void;
6
- get(key: K): V | undefined;
7
- has(key: K): boolean;
8
- delete(key: K): void;
9
- clear(): void;
10
- size(): number;
11
- values(): IterableIterator<V>;
12
- forEach(cb: (value: V, key: K) => void): void;
13
- private createTimeout;
14
- }
@@ -1,60 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MapWithTtl = void 0;
4
- class MapWithTtl {
5
- delegate = new Map();
6
- getTtl;
7
- constructor(getTtl) {
8
- this.getTtl = getTtl;
9
- }
10
- set(key, value) {
11
- const existing = this.delegate.get(key);
12
- if (existing !== undefined) {
13
- clearTimeout(existing.timeout);
14
- }
15
- this.delegate.set(key, {
16
- value,
17
- timeout: this.createTimeout(key, value)
18
- });
19
- }
20
- get(key) {
21
- const wrapper = this.delegate.get(key);
22
- return wrapper?.value;
23
- }
24
- has(key) {
25
- return this.delegate.has(key);
26
- }
27
- delete(key) {
28
- const existing = this.delegate.get(key);
29
- if (existing !== undefined) {
30
- clearTimeout(existing.timeout);
31
- this.delegate.delete(key);
32
- }
33
- }
34
- clear() {
35
- this.delegate.forEach((value) => {
36
- clearTimeout(value.timeout);
37
- });
38
- this.delegate.clear();
39
- }
40
- size() {
41
- return this.delegate.size;
42
- }
43
- *values() {
44
- for (const v of this.delegate.values()) {
45
- yield v.value;
46
- }
47
- }
48
- forEach(cb) {
49
- this.delegate.forEach((valueWrapper, key) => {
50
- cb(valueWrapper.value, key);
51
- });
52
- }
53
- createTimeout(key, value) {
54
- return setTimeout(() => {
55
- this.delete(key);
56
- }, this.getTtl(value));
57
- }
58
- }
59
- exports.MapWithTtl = MapWithTtl;
60
- //# sourceMappingURL=MapWithTtl.js.map
@@ -1 +0,0 @@
1
- {"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"}
@@ -1,2 +0,0 @@
1
- export declare const isCompatibleVersion: (version1: string, version2: string) => boolean;
2
- export declare const excludePatchVersion: (version: string) => string;
@@ -1,18 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.excludePatchVersion = exports.isCompatibleVersion = void 0;
4
- // Is able to compare versions such as 1.2.3 and 1.2.4
5
- // can also compare versions such as 100.0.0-pretestnet.0 and 100.0.0-pretestnet.40
6
- const isCompatibleVersion = (version1, version2) => {
7
- const minorVersion1 = (0, exports.excludePatchVersion)(version1);
8
- const minorVersion2 = (0, exports.excludePatchVersion)(version2);
9
- return minorVersion1 === minorVersion2;
10
- };
11
- exports.isCompatibleVersion = isCompatibleVersion;
12
- const excludePatchVersion = (version) => {
13
- const versionParts = version.split('.');
14
- versionParts.pop();
15
- return versionParts.join('.');
16
- };
17
- exports.excludePatchVersion = excludePatchVersion;
18
- //# sourceMappingURL=versionCompatibility.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"versionCompatibility.js","sourceRoot":"","sources":["../../../src/helpers/versionCompatibility.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,mFAAmF;AAC5E,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAW,EAAE;IAC/E,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAA;IACnD,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAA;IACnD,OAAO,aAAa,KAAK,aAAa,CAAA;AAC1C,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;IAC3D,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACvC,YAAY,CAAC,GAAG,EAAE,CAAA;IAClB,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B"}
@@ -1,71 +0,0 @@
1
- interface ValueWrapper<V> {
2
- value: V
3
- timeout: NodeJS.Timeout
4
- }
5
-
6
- export class MapWithTtl<K, V> {
7
-
8
- private readonly delegate: Map<K, ValueWrapper<V>> = new Map()
9
- private readonly getTtl: (value: V) => number
10
-
11
- constructor(getTtl: (value: V) => number) {
12
- this.getTtl = getTtl
13
- }
14
-
15
- set(key: K, value: V): void {
16
- const existing = this.delegate.get(key)
17
- if (existing !== undefined) {
18
- clearTimeout(existing.timeout)
19
- }
20
- this.delegate.set(key, {
21
- value,
22
- timeout: this.createTimeout(key, value)
23
- })
24
- }
25
-
26
- get(key: K): V | undefined {
27
- const wrapper = this.delegate.get(key)
28
- return wrapper?.value
29
- }
30
-
31
- has(key: K): boolean {
32
- return this.delegate.has(key)
33
- }
34
-
35
- delete(key: K): void {
36
- const existing = this.delegate.get(key)
37
- if (existing !== undefined) {
38
- clearTimeout(existing.timeout)
39
- this.delegate.delete(key)
40
- }
41
- }
42
-
43
- clear(): void {
44
- this.delegate.forEach((value) => {
45
- clearTimeout(value.timeout)
46
- })
47
- this.delegate.clear()
48
- }
49
-
50
- size(): number {
51
- return this.delegate.size
52
- }
53
-
54
- *values(): IterableIterator<V> {
55
- for (const v of this.delegate.values()) {
56
- yield v.value
57
- }
58
- }
59
-
60
- forEach(cb: (value: V, key: K) => void): void {
61
- this.delegate.forEach((valueWrapper: ValueWrapper<V>, key: K) => {
62
- cb(valueWrapper.value, key)
63
- })
64
- }
65
-
66
- private createTimeout(key: K, value: V): NodeJS.Timeout {
67
- return setTimeout(() => {
68
- this.delete(key)
69
- }, this.getTtl(value))
70
- }
71
- }
@@ -1,13 +0,0 @@
1
- // Is able to compare versions such as 1.2.3 and 1.2.4
2
- // can also compare versions such as 100.0.0-pretestnet.0 and 100.0.0-pretestnet.40
3
- export const isCompatibleVersion = (version1: string, version2: string): boolean => {
4
- const minorVersion1 = excludePatchVersion(version1)
5
- const minorVersion2 = excludePatchVersion(version2)
6
- return minorVersion1 === minorVersion2
7
- }
8
-
9
- export const excludePatchVersion = (version: string): string => {
10
- const versionParts = version.split('.')
11
- versionParts.pop()
12
- return versionParts.join('.')
13
- }
@@ -1,16 +0,0 @@
1
- import { isCompatibleVersion } from '../../src/helpers/versionCompatibility'
2
-
3
- describe('version compatibility', () => {
4
-
5
- it('same minor versions should be compatible', () => {
6
- expect(isCompatibleVersion('1.2.3', '1.2.4')).toBe(true)
7
- expect(isCompatibleVersion('100.0.0-pretestnet.0', '100.0.0-pretestnet.40')).toBe(true)
8
- })
9
-
10
- it('different minor versions should not be compatible', () => {
11
- expect(isCompatibleVersion('1.2.3', '2.2.4')).toBe(false)
12
- expect(isCompatibleVersion('1.2.3', '1.3.4')).toBe(false)
13
- expect(isCompatibleVersion('100.0.0-testnet.0', '101.0.0-pretestnet.40')).toBe(false)
14
- })
15
-
16
- })