@streamr/dht 100.0.0-pretestnet.0 → 100.0.0-pretestnet.3

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 (317) hide show
  1. package/dist/src/connection/ConnectionLockHandler.d.ts +7 -8
  2. package/dist/src/connection/ConnectionLockHandler.js +16 -14
  3. package/dist/src/connection/ConnectionLockHandler.js.map +1 -1
  4. package/dist/src/connection/ConnectionLockRpcLocal.d.ts +20 -0
  5. package/dist/src/connection/ConnectionLockRpcLocal.js +47 -0
  6. package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -0
  7. package/dist/src/connection/ConnectionLockRpcRemote.d.ts +4 -3
  8. package/dist/src/connection/ConnectionLockRpcRemote.js +6 -6
  9. package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
  10. package/dist/src/connection/ConnectionManager.d.ts +5 -8
  11. package/dist/src/connection/ConnectionManager.js +77 -107
  12. package/dist/src/connection/ConnectionManager.js.map +1 -1
  13. package/dist/src/connection/ConnectivityChecker.d.ts +7 -6
  14. package/dist/src/connection/ConnectivityChecker.js +23 -20
  15. package/dist/src/connection/ConnectivityChecker.js.map +1 -1
  16. package/dist/src/connection/ConnectorFacade.d.ts +15 -12
  17. package/dist/src/connection/ConnectorFacade.js +61 -26
  18. package/dist/src/connection/ConnectorFacade.js.map +1 -1
  19. package/dist/src/connection/Handshaker.d.ts +2 -2
  20. package/dist/src/connection/Handshaker.js +28 -28
  21. package/dist/src/connection/Handshaker.js.map +1 -1
  22. package/dist/src/connection/IConnection.d.ts +5 -6
  23. package/dist/src/connection/IConnection.js.map +1 -1
  24. package/dist/src/connection/ManagedConnection.d.ts +3 -4
  25. package/dist/src/connection/ManagedConnection.js +30 -30
  26. package/dist/src/connection/ManagedConnection.js.map +1 -1
  27. package/dist/src/connection/ManagedWebrtcConnection.d.ts +7 -0
  28. package/dist/src/connection/ManagedWebrtcConnection.js +20 -0
  29. package/dist/src/connection/ManagedWebrtcConnection.js.map +1 -0
  30. package/dist/src/connection/{Simulator → simulator}/Simulator.js +3 -3
  31. package/dist/src/connection/{Simulator → simulator}/Simulator.js.map +1 -1
  32. package/dist/src/connection/{Simulator → simulator}/SimulatorConnection.d.ts +3 -4
  33. package/dist/src/connection/{Simulator → simulator}/SimulatorConnection.js +22 -22
  34. package/dist/src/connection/simulator/SimulatorConnection.js.map +1 -0
  35. package/dist/src/connection/{Simulator → simulator}/SimulatorConnector.d.ts +2 -2
  36. package/dist/src/connection/{Simulator → simulator}/SimulatorConnector.js +11 -11
  37. package/dist/src/connection/{Simulator → simulator}/SimulatorConnector.js.map +1 -1
  38. package/dist/src/connection/{Simulator → simulator}/SimulatorTransport.d.ts +1 -1
  39. package/dist/src/connection/{Simulator → simulator}/SimulatorTransport.js +2 -2
  40. package/dist/src/connection/simulator/SimulatorTransport.js.map +1 -0
  41. package/dist/src/connection/{Simulator → simulator}/pings.js.map +1 -1
  42. package/dist/src/connection/{WebRTC/IWebRtcConnection.d.ts → webrtc/IWebrtcConnection.d.ts} +2 -2
  43. package/dist/src/connection/{WebRTC/IWebRtcConnection.js → webrtc/IWebrtcConnection.js} +1 -1
  44. package/dist/src/connection/webrtc/IWebrtcConnection.js.map +1 -0
  45. package/dist/src/connection/{WebRTC/NodeWebRtcConnection.d.ts → webrtc/NodeWebrtcConnection.d.ts} +6 -7
  46. package/dist/src/connection/{WebRTC/NodeWebRtcConnection.js → webrtc/NodeWebrtcConnection.js} +36 -36
  47. package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -0
  48. package/dist/src/connection/webrtc/WebrtcConnector.d.ts +38 -0
  49. package/dist/src/connection/webrtc/WebrtcConnector.js +178 -0
  50. package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -0
  51. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +26 -0
  52. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +99 -0
  53. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -0
  54. package/dist/src/connection/{WebRTC/WebRtcConnectorRpcRemote.d.ts → webrtc/WebrtcConnectorRpcRemote.d.ts} +4 -4
  55. package/dist/src/connection/{WebRTC/WebRtcConnectorRpcRemote.js → webrtc/WebrtcConnectorRpcRemote.js} +6 -8
  56. package/dist/src/connection/webrtc/WebrtcConnectorRpcRemote.js.map +1 -0
  57. package/dist/src/connection/{WebRTC → webrtc}/iceServerAsString.d.ts +1 -1
  58. package/dist/src/connection/{WebRTC → webrtc}/iceServerAsString.js.map +1 -1
  59. package/dist/src/connection/websocket/AutoCertifierClientFacade.d.ts +26 -0
  60. package/dist/src/connection/websocket/AutoCertifierClientFacade.js +37 -0
  61. package/dist/src/connection/websocket/AutoCertifierClientFacade.js.map +1 -0
  62. package/dist/src/connection/{WebSocket/ClientWebSocket.d.ts → websocket/ClientWebsocket.d.ts} +5 -4
  63. package/dist/src/connection/{WebSocket/ClientWebSocket.js → websocket/ClientWebsocket.js} +20 -16
  64. package/dist/src/connection/websocket/ClientWebsocket.js.map +1 -0
  65. package/dist/src/connection/{WebSocket/ServerWebSocket.d.ts → websocket/ServerWebsocket.d.ts} +2 -2
  66. package/dist/src/connection/{WebSocket/ServerWebSocket.js → websocket/ServerWebsocket.js} +23 -27
  67. package/dist/src/connection/websocket/ServerWebsocket.js.map +1 -0
  68. package/dist/src/connection/{WebSocket/WebSocketConnectorRpcLocal.d.ts → websocket/WebsocketConnector.d.ts} +23 -15
  69. package/dist/src/connection/{WebSocket/WebSocketConnectorRpcLocal.js → websocket/WebsocketConnector.js} +108 -102
  70. package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -0
  71. package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts +17 -0
  72. package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js +26 -0
  73. package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map +1 -0
  74. package/dist/src/connection/{WebSocket/WebSocketConnectorRpcRemote.d.ts → websocket/WebsocketConnectorRpcRemote.d.ts} +3 -3
  75. package/dist/src/connection/{WebSocket/WebSocketConnectorRpcRemote.js → websocket/WebsocketConnectorRpcRemote.js} +5 -10
  76. package/dist/src/connection/{WebSocket/WebSocketConnectorRpcRemote.js.map → websocket/WebsocketConnectorRpcRemote.js.map} +1 -1
  77. package/dist/src/connection/{WebSocket/WebSocketServer.d.ts → websocket/WebsocketServer.d.ts} +6 -3
  78. package/dist/src/connection/{WebSocket/WebSocketServer.js → websocket/WebsocketServer.js} +39 -19
  79. package/dist/src/connection/websocket/WebsocketServer.js.map +1 -0
  80. package/dist/src/dht/DhtNode.d.ts +11 -19
  81. package/dist/src/dht/DhtNode.js +119 -150
  82. package/dist/src/dht/DhtNode.js.map +1 -1
  83. package/dist/src/dht/DhtNodeRpcLocal.d.ts +22 -0
  84. package/dist/src/dht/DhtNodeRpcLocal.js +42 -0
  85. package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -0
  86. package/dist/src/dht/{RemoteDhtNode.d.ts → DhtNodeRpcRemote.d.ts} +5 -3
  87. package/dist/src/dht/{RemoteDhtNode.js → DhtNodeRpcRemote.js} +17 -21
  88. package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -0
  89. package/dist/src/dht/ExternalApiRpcLocal.d.ts +16 -0
  90. package/dist/src/dht/ExternalApiRpcLocal.js +30 -0
  91. package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -0
  92. package/dist/src/dht/ExternalApiRpcRemote.d.ts +1 -1
  93. package/dist/src/dht/ExternalApiRpcRemote.js +2 -2
  94. package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
  95. package/dist/src/dht/contact/Remote.d.ts +4 -1
  96. package/dist/src/dht/contact/Remote.js +28 -2
  97. package/dist/src/dht/contact/Remote.js.map +1 -1
  98. package/dist/src/dht/contact/SortedContactList.d.ts +2 -2
  99. package/dist/src/dht/contact/SortedContactList.js +3 -3
  100. package/dist/src/dht/contact/SortedContactList.js.map +1 -1
  101. package/dist/src/dht/discovery/DiscoverySession.d.ts +9 -7
  102. package/dist/src/dht/discovery/DiscoverySession.js +8 -8
  103. package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
  104. package/dist/src/dht/discovery/PeerDiscovery.d.ts +7 -10
  105. package/dist/src/dht/discovery/PeerDiscovery.js +5 -5
  106. package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
  107. package/dist/src/dht/find/FindRpcLocal.d.ts +14 -0
  108. package/dist/src/dht/find/FindRpcLocal.js +25 -0
  109. package/dist/src/dht/find/FindRpcLocal.js.map +1 -0
  110. package/dist/src/dht/find/{RecursiveFindSession.d.ts → FindSession.d.ts} +12 -13
  111. package/dist/src/dht/find/{RecursiveFindSession.js → FindSession.js} +18 -15
  112. package/dist/src/dht/find/FindSession.js.map +1 -0
  113. package/dist/src/dht/find/FindSessionRpcLocal.d.ts +12 -0
  114. package/dist/src/dht/find/FindSessionRpcLocal.js +17 -0
  115. package/dist/src/dht/find/FindSessionRpcLocal.js.map +1 -0
  116. package/dist/src/dht/find/{RemoteRecursiveFindSession.d.ts → FindSessionRpcRemote.d.ts} +2 -2
  117. package/dist/src/dht/find/{RemoteRecursiveFindSession.js → FindSessionRpcRemote.js} +5 -5
  118. package/dist/src/dht/find/FindSessionRpcRemote.js.map +1 -0
  119. package/dist/src/dht/find/{RecursiveFinder.d.ts → Finder.d.ts} +16 -19
  120. package/dist/src/dht/find/{RecursiveFinder.js → Finder.js} +51 -46
  121. package/dist/src/dht/find/Finder.js.map +1 -0
  122. package/dist/src/dht/routing/FindRpcRemote.d.ts +6 -0
  123. package/dist/src/dht/routing/FindRpcRemote.js +41 -0
  124. package/dist/src/dht/routing/FindRpcRemote.js.map +1 -0
  125. package/dist/src/dht/routing/Router.d.ts +10 -17
  126. package/dist/src/dht/routing/Router.js +48 -90
  127. package/dist/src/dht/routing/Router.js.map +1 -1
  128. package/dist/src/dht/routing/RouterRpcLocal.d.ts +22 -0
  129. package/dist/src/dht/routing/RouterRpcLocal.js +66 -0
  130. package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -0
  131. package/dist/src/dht/routing/RouterRpcRemote.d.ts +0 -1
  132. package/dist/src/dht/routing/RouterRpcRemote.js +15 -43
  133. package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
  134. package/dist/src/dht/routing/RoutingSession.d.ts +17 -8
  135. package/dist/src/dht/routing/RoutingSession.js +124 -131
  136. package/dist/src/dht/routing/RoutingSession.js.map +1 -1
  137. package/dist/src/dht/routing/getPreviousPeer.d.ts +2 -0
  138. package/dist/src/dht/routing/getPreviousPeer.js +9 -0
  139. package/dist/src/dht/routing/getPreviousPeer.js.map +1 -0
  140. package/dist/src/dht/store/StoreRpcLocal.d.ts +11 -8
  141. package/dist/src/dht/store/StoreRpcLocal.js +25 -24
  142. package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
  143. package/dist/src/dht/store/StoreRpcRemote.js +3 -7
  144. package/dist/src/dht/store/StoreRpcRemote.js.map +1 -1
  145. package/dist/src/exports.d.ts +11 -5
  146. package/dist/src/exports.js +17 -4
  147. package/dist/src/exports.js.map +1 -1
  148. package/dist/src/helpers/Connectivity.d.ts +4 -0
  149. package/dist/src/helpers/Connectivity.js +24 -0
  150. package/dist/src/helpers/Connectivity.js.map +1 -0
  151. package/dist/src/helpers/errors.d.ts +3 -3
  152. package/dist/src/helpers/errors.js +7 -7
  153. package/dist/src/helpers/protoClasses.js +3 -3
  154. package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +56 -39
  155. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +49 -36
  156. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
  157. package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +64 -84
  158. package/dist/src/proto/packages/dht/protos/DhtRpc.js +64 -66
  159. package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
  160. package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +26 -21
  161. package/dist/src/rpc-protocol/DhtCallContext.d.ts +0 -1
  162. package/dist/src/rpc-protocol/DhtCallContext.js.map +1 -1
  163. package/dist/src/transport/ITransport.d.ts +5 -6
  164. package/dist/src/transport/ListeningRpcCommunicator.d.ts +5 -1
  165. package/dist/src/transport/ListeningRpcCommunicator.js +8 -2
  166. package/dist/src/transport/ListeningRpcCommunicator.js.map +1 -1
  167. package/dist/src/transport/RoutingRpcCommunicator.d.ts +2 -1
  168. package/dist/src/transport/RoutingRpcCommunicator.js +0 -1
  169. package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
  170. package/dist/src/types/ServiceID.d.ts +1 -0
  171. package/dist/src/types/ServiceID.js +3 -0
  172. package/dist/src/types/ServiceID.js.map +1 -0
  173. package/karma.config.js +4 -4
  174. package/package.json +10 -8
  175. package/protos/DhtRpc.proto +32 -35
  176. package/src/connection/ConnectionLockHandler.ts +19 -17
  177. package/src/connection/ConnectionLockRpcLocal.ts +74 -0
  178. package/src/connection/ConnectionLockRpcRemote.ts +7 -6
  179. package/src/connection/ConnectionManager.ts +59 -95
  180. package/src/connection/ConnectivityChecker.ts +30 -26
  181. package/src/connection/ConnectorFacade.ts +74 -34
  182. package/src/connection/Handshaker.ts +9 -9
  183. package/src/connection/IConnection.ts +5 -6
  184. package/src/connection/ManagedConnection.ts +21 -22
  185. package/src/connection/{ManagedWebRtcConnection.ts → ManagedWebrtcConnection.ts} +9 -9
  186. package/src/connection/{Simulator → simulator}/Simulator.ts +4 -4
  187. package/src/connection/{Simulator → simulator}/SimulatorConnection.ts +23 -24
  188. package/src/connection/{Simulator → simulator}/SimulatorConnector.ts +13 -13
  189. package/src/connection/{Simulator → simulator}/SimulatorTransport.ts +2 -2
  190. package/src/connection/{WebRTC/BrowserWebRtcConnection.ts → webrtc/BrowserWebrtcConnection.ts} +12 -13
  191. package/src/connection/{WebRTC/IWebRtcConnection.ts → webrtc/IWebrtcConnection.ts} +2 -2
  192. package/src/connection/{WebRTC/NodeWebRtcConnection.ts → webrtc/NodeWebrtcConnection.ts} +32 -33
  193. package/src/connection/webrtc/WebrtcConnector.ts +225 -0
  194. package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +132 -0
  195. package/src/connection/{WebRTC/WebRtcConnectorRpcRemote.ts → webrtc/WebrtcConnectorRpcRemote.ts} +6 -7
  196. package/src/connection/{WebRTC → webrtc}/iceServerAsString.ts +1 -1
  197. package/src/connection/websocket/AutoCertifierClientFacade.ts +91 -0
  198. package/src/connection/{WebSocket/ClientWebSocket.ts → websocket/ClientWebsocket.ts} +19 -17
  199. package/src/connection/{WebSocket/ServerWebSocket.ts → websocket/ServerWebsocket.ts} +21 -27
  200. package/src/connection/{WebSocket/WebSocketConnectorRpcLocal.ts → websocket/WebsocketConnector.ts} +110 -101
  201. package/src/connection/websocket/WebsocketConnectorRpcLocal.ts +41 -0
  202. package/src/connection/{WebSocket/WebSocketConnectorRpcRemote.ts → websocket/WebsocketConnectorRpcRemote.ts} +6 -12
  203. package/src/connection/{WebSocket/WebSocketServer.ts → websocket/WebsocketServer.ts} +40 -22
  204. package/src/dht/DhtNode.ts +144 -179
  205. package/src/dht/DhtNodeRpcLocal.ts +68 -0
  206. package/src/dht/{RemoteDhtNode.ts → DhtNodeRpcRemote.ts} +12 -13
  207. package/src/dht/ExternalApiRpcLocal.ts +46 -0
  208. package/src/dht/ExternalApiRpcRemote.ts +4 -4
  209. package/src/dht/contact/Remote.ts +32 -4
  210. package/src/dht/contact/SortedContactList.ts +4 -4
  211. package/src/dht/discovery/DiscoverySession.ts +23 -20
  212. package/src/dht/discovery/PeerDiscovery.ts +14 -17
  213. package/src/dht/find/FindRpcLocal.ts +35 -0
  214. package/src/dht/find/{RecursiveFindSession.ts → FindSession.ts} +26 -25
  215. package/src/dht/find/FindSessionRpcLocal.ts +25 -0
  216. package/src/dht/find/{RemoteRecursiveFindSession.ts → FindSessionRpcRemote.ts} +9 -5
  217. package/src/dht/find/{RecursiveFinder.ts → Finder.ts} +78 -71
  218. package/src/dht/routing/FindRpcRemote.ts +40 -0
  219. package/src/dht/routing/Router.ts +70 -105
  220. package/src/dht/routing/RouterRpcLocal.ts +81 -0
  221. package/src/dht/routing/RouterRpcRemote.ts +15 -45
  222. package/src/dht/routing/RoutingSession.ts +56 -61
  223. package/src/dht/routing/getPreviousPeer.ts +6 -0
  224. package/src/dht/store/StoreRpcLocal.ts +44 -37
  225. package/src/dht/store/StoreRpcRemote.ts +4 -8
  226. package/src/exports.ts +11 -5
  227. package/src/helpers/Connectivity.ts +19 -0
  228. package/src/helpers/errors.ts +3 -3
  229. package/src/helpers/protoClasses.ts +6 -6
  230. package/src/proto/packages/dht/protos/DhtRpc.client.ts +75 -59
  231. package/src/proto/packages/dht/protos/DhtRpc.server.ts +26 -21
  232. package/src/proto/packages/dht/protos/DhtRpc.ts +87 -114
  233. package/src/rpc-protocol/DhtCallContext.ts +0 -1
  234. package/src/transport/ITransport.ts +5 -8
  235. package/src/transport/ListeningRpcCommunicator.ts +14 -4
  236. package/src/transport/RoutingRpcCommunicator.ts +3 -4
  237. package/src/types/ServiceID.ts +1 -0
  238. package/test/benchmark/{RecursiveFind.test.ts → Find.test.ts} +6 -6
  239. package/test/benchmark/KademliaCorrectness.test.ts +2 -2
  240. package/test/benchmark/kademlia-simulation/SimulationNode.ts +3 -3
  241. package/test/end-to-end/Layer0-Layer1.test.ts +13 -5
  242. package/test/end-to-end/Layer0.test.ts +35 -17
  243. package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +24 -6
  244. package/test/end-to-end/{Layer0WebRTC-Layer1.test.ts → Layer0Webrtc-Layer1.test.ts} +1 -1
  245. package/test/end-to-end/{Layer0WebRTC.test.ts → Layer0Webrtc.test.ts} +14 -10
  246. package/test/end-to-end/Layer1-Scale-WebSocket.test.ts +8 -4
  247. package/test/end-to-end/{Layer1-Scale-WebRTC.test.ts → Layer1-Scale-Webrtc.test.ts} +2 -2
  248. package/test/end-to-end/RecoveryFromFailedAutoCertification.test.ts +52 -0
  249. package/test/end-to-end/{WebSocketConnectionRequest.test.ts → WebsocketConnectionRequest.test.ts} +16 -8
  250. package/test/end-to-end/memory-leak.test.ts +85 -0
  251. package/test/integration/ConnectionLocking.test.ts +4 -4
  252. package/test/integration/ConnectionManager.test.ts +37 -28
  253. package/test/integration/DhtJoinPeerDiscovery.test.ts +2 -2
  254. package/test/integration/DhtNodeExternalAPI.test.ts +10 -10
  255. package/test/integration/{RemoteDhtNode.test.ts → DhtNodeRpcRemote.test.ts} +10 -10
  256. package/test/integration/DhtRpc.test.ts +5 -5
  257. package/test/integration/{RecursiveFind.test.ts → Find.test.ts} +3 -3
  258. package/test/integration/Layer1-scale.test.ts +1 -1
  259. package/test/integration/MigrateData.test.ts +6 -5
  260. package/test/integration/Mock-Layer1-Layer0.test.ts +1 -1
  261. package/test/integration/MultipleEntryPointJoining.test.ts +6 -6
  262. package/test/integration/RouteMessage.test.ts +26 -26
  263. package/test/integration/RpcErrors.test.ts +10 -10
  264. package/test/integration/ScaleDownDht.test.ts +3 -3
  265. package/test/integration/SimultaneousConnections.test.ts +10 -7
  266. package/test/integration/Store.test.ts +1 -1
  267. package/test/integration/StoreAndDelete.test.ts +1 -1
  268. package/test/integration/StoreOnDhtWithTwoNodes.test.ts +12 -12
  269. package/test/integration/{WebRtcConnectionManagement.test.ts → WebrtcConnectionManagement.test.ts} +4 -4
  270. package/test/integration/{WebRtcConnectorRpc.test.ts → WebrtcConnectorRpc.test.ts} +7 -8
  271. package/test/integration/{WebSocket.test.ts → Websocket.test.ts} +14 -13
  272. package/test/integration/{WebSocketConnectionManagement.test.ts → WebsocketConnectionManagement.test.ts} +4 -4
  273. package/test/integration/{WebSocketConnectorRpc.test.ts → WebsocketConnectorRpc.test.ts} +15 -15
  274. package/test/unit/AutoCertifierClientFacade.test.ts +58 -0
  275. package/test/unit/ConnectivityHelpers.test.ts +69 -0
  276. package/test/unit/{RecursiveFinder.test.ts → Finder.test.ts} +19 -17
  277. package/test/unit/Router.test.ts +26 -26
  278. package/test/unit/UUID.test.ts +1 -1
  279. package/test/unit/{WebSocketConnectorRpcLocal.test.ts → WebsocketConnector.test.ts} +8 -8
  280. package/test/unit/{WebSocketServer.test.ts → WebsocketServer.test.ts} +20 -14
  281. package/test/unit/webrtcReplaceInternalIpWithExternalIp.test.ts +1 -1
  282. package/test/utils/FakeRpcCommunicator.ts +23 -0
  283. package/test/utils/mock/Transport.ts +1 -1
  284. package/test/utils/utils.ts +14 -24
  285. package/tsconfig.browser.json +1 -1
  286. package/tsconfig.jest.json +3 -2
  287. package/tsconfig.node.json +3 -2
  288. package/dist/src/connection/ManagedWebRtcConnection.d.ts +0 -7
  289. package/dist/src/connection/ManagedWebRtcConnection.js +0 -20
  290. package/dist/src/connection/ManagedWebRtcConnection.js.map +0 -1
  291. package/dist/src/connection/Simulator/SimulatorConnection.js.map +0 -1
  292. package/dist/src/connection/Simulator/SimulatorTransport.js.map +0 -1
  293. package/dist/src/connection/WebRTC/IWebRtcConnection.js.map +0 -1
  294. package/dist/src/connection/WebRTC/NodeWebRtcConnection.js.map +0 -1
  295. package/dist/src/connection/WebRTC/WebRtcConnectorRpcLocal.d.ts +0 -51
  296. package/dist/src/connection/WebRTC/WebRtcConnectorRpcLocal.js +0 -249
  297. package/dist/src/connection/WebRTC/WebRtcConnectorRpcLocal.js.map +0 -1
  298. package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.js.map +0 -1
  299. package/dist/src/connection/WebSocket/ClientWebSocket.js.map +0 -1
  300. package/dist/src/connection/WebSocket/ServerWebSocket.js.map +0 -1
  301. package/dist/src/connection/WebSocket/WebSocketConnectorRpcLocal.js.map +0 -1
  302. package/dist/src/connection/WebSocket/WebSocketServer.js.map +0 -1
  303. package/dist/src/dht/RemoteDhtNode.js.map +0 -1
  304. package/dist/src/dht/find/RecursiveFindSession.js.map +0 -1
  305. package/dist/src/dht/find/RecursiveFinder.js.map +0 -1
  306. package/dist/src/dht/find/RemoteRecursiveFindSession.js.map +0 -1
  307. package/dist/src/dht/registerExternalApiRpcMethods.d.ts +0 -2
  308. package/dist/src/dht/registerExternalApiRpcMethods.js +0 -32
  309. package/dist/src/dht/registerExternalApiRpcMethods.js.map +0 -1
  310. package/src/connection/WebRTC/WebRtcConnectorRpcLocal.ts +0 -335
  311. package/src/dht/registerExternalApiRpcMethods.ts +0 -44
  312. package/test/utils/mock/RecursiveFinder.ts +0 -19
  313. /package/dist/src/connection/{Simulator → simulator}/Simulator.d.ts +0 -0
  314. /package/dist/src/connection/{Simulator → simulator}/pings.d.ts +0 -0
  315. /package/dist/src/connection/{Simulator → simulator}/pings.js +0 -0
  316. /package/dist/src/connection/{WebRTC → webrtc}/iceServerAsString.js +0 -0
  317. /package/src/connection/{Simulator → simulator}/pings.ts +0 -0
@@ -2,12 +2,12 @@ import { ConnectivityResponse, PeerDescriptor } from '../proto/packages/dht/prot
2
2
  import { ITransport } from '../transport/ITransport';
3
3
  import { PortRange, TlsCertificate } from './ConnectionManager';
4
4
  import { ManagedConnection } from './ManagedConnection';
5
- import { Simulator } from './Simulator/Simulator';
6
- import { IceServer } from './WebRTC/WebRtcConnectorRpcLocal';
5
+ import { Simulator } from './simulator/Simulator';
6
+ import { IceServer } from './webrtc/WebrtcConnector';
7
7
  export interface ConnectorFacade {
8
8
  createConnection: (peerDescriptor: PeerDescriptor) => ManagedConnection;
9
- getOwnPeerDescriptor: () => PeerDescriptor | undefined;
10
- start: (onIncomingConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean) => Promise<void>;
9
+ getLocalPeerDescriptor: () => PeerDescriptor | undefined;
10
+ start: (onIncomingConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean, autoCertifierTransport: ITransport) => Promise<void>;
11
11
  stop: () => Promise<void>;
12
12
  }
13
13
  export interface DefaultConnectorFacadeConfig {
@@ -24,26 +24,29 @@ export interface DefaultConnectorFacadeConfig {
24
24
  webrtcPortRange?: PortRange;
25
25
  maxMessageSize?: number;
26
26
  tlsCertificate?: TlsCertificate;
27
- createOwnPeerDescriptor: (connectivityResponse: ConnectivityResponse) => PeerDescriptor;
27
+ websocketServerEnableTls?: boolean;
28
+ autoCertifierUrl?: string;
29
+ autoCertifierConfigFile?: string;
30
+ createLocalPeerDescriptor: (connectivityResponse: ConnectivityResponse) => PeerDescriptor;
28
31
  }
29
32
  export declare class DefaultConnectorFacade implements ConnectorFacade {
30
33
  private readonly config;
31
- private ownPeerDescriptor?;
32
- private webSocketConnector?;
34
+ private localPeerDescriptor?;
35
+ private websocketConnector?;
33
36
  private webrtcConnector?;
34
37
  constructor(config: DefaultConnectorFacadeConfig);
35
- start(onIncomingConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean): Promise<void>;
38
+ start(onIncomingConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean, autoCertifierTransport: ITransport): Promise<void>;
36
39
  createConnection(peerDescriptor: PeerDescriptor): ManagedConnection;
37
- getOwnPeerDescriptor(): PeerDescriptor | undefined;
40
+ getLocalPeerDescriptor(): PeerDescriptor | undefined;
38
41
  stop(): Promise<void>;
39
42
  }
40
43
  export declare class SimulatorConnectorFacade implements ConnectorFacade {
41
- private readonly ownPeerDescriptor;
44
+ private readonly localPeerDescriptor;
42
45
  private simulatorConnector?;
43
46
  private simulator;
44
- constructor(ownPeerDescriptor: PeerDescriptor, simulator: Simulator);
47
+ constructor(localPeerDescriptor: PeerDescriptor, simulator: Simulator);
45
48
  start(onIncomingConnection: (connection: ManagedConnection) => boolean): Promise<void>;
46
49
  createConnection(peerDescriptor: PeerDescriptor): ManagedConnection;
47
- getOwnPeerDescriptor(): PeerDescriptor;
50
+ getLocalPeerDescriptor(): PeerDescriptor;
48
51
  stop(): Promise<void>;
49
52
  }
@@ -2,29 +2,34 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SimulatorConnectorFacade = exports.DefaultConnectorFacade = void 0;
4
4
  const utils_1 = require("@streamr/utils");
5
- const SimulatorConnector_1 = require("./Simulator/SimulatorConnector");
6
- const WebRtcConnectorRpcLocal_1 = require("./WebRTC/WebRtcConnectorRpcLocal");
7
- const WebSocketConnectorRpcLocal_1 = require("./WebSocket/WebSocketConnectorRpcLocal");
5
+ const SimulatorConnector_1 = require("./simulator/SimulatorConnector");
6
+ const WebrtcConnector_1 = require("./webrtc/WebrtcConnector");
7
+ const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
8
8
  const logger = new utils_1.Logger(module);
9
9
  class DefaultConnectorFacade {
10
10
  constructor(config) {
11
11
  this.config = config;
12
12
  }
13
- async start(onIncomingConnection, canConnect) {
14
- logger.trace(`Creating WebSocketConnector`);
15
- this.webSocketConnector = new WebSocketConnectorRpcLocal_1.WebSocketConnectorRpcLocal({
13
+ async start(onIncomingConnection, canConnect, autoCertifierTransport) {
14
+ logger.trace(`Creating WebsocketConnectorRpcLocal`);
15
+ const webSocketConnectorConfig = {
16
16
  transport: this.config.transport,
17
- // TODO should we use canConnect also for WebRtcConnector? (NET-1142)
17
+ // TODO should we use canConnect also for WebrtcConnector? (NET-1142)
18
18
  canConnect: (peerDescriptor) => canConnect(peerDescriptor),
19
19
  onIncomingConnection,
20
20
  portRange: this.config.websocketPortRange,
21
21
  host: this.config.websocketHost,
22
22
  entrypoints: this.config.entryPoints,
23
23
  tlsCertificate: this.config.tlsCertificate,
24
+ serverEnableTls: this.config.websocketServerEnableTls,
25
+ autoCertifierUrl: this.config.autoCertifierUrl,
26
+ autoCertifierConfigFile: this.config.autoCertifierConfigFile,
27
+ autoCertifierTransport,
24
28
  maxMessageSize: this.config.maxMessageSize
25
- });
26
- logger.trace(`Creating WebRTCConnector`);
27
- this.webrtcConnector = new WebRtcConnectorRpcLocal_1.WebRtcConnectorRpcLocal({
29
+ };
30
+ this.websocketConnector = new WebsocketConnector_1.WebsocketConnector(webSocketConnectorConfig);
31
+ logger.trace(`Creating WebRtcConnectorRpcLocal`);
32
+ this.webrtcConnector = new WebrtcConnector_1.WebrtcConnector({
28
33
  transport: this.config.transport,
29
34
  iceServers: this.config.iceServers,
30
35
  allowPrivateAddresses: this.config.webrtcAllowPrivateAddresses,
@@ -35,45 +40,75 @@ class DefaultConnectorFacade {
35
40
  portRange: this.config.webrtcPortRange,
36
41
  maxMessageSize: this.config.maxMessageSize
37
42
  }, onIncomingConnection);
38
- await this.webSocketConnector.start();
39
- const connectivityResponse = await this.webSocketConnector.checkConnectivity();
40
- const ownPeerDescriptor = this.config.createOwnPeerDescriptor(connectivityResponse);
41
- this.ownPeerDescriptor = ownPeerDescriptor;
42
- this.webSocketConnector.setOwnPeerDescriptor(ownPeerDescriptor);
43
- this.webrtcConnector.setOwnPeerDescriptor(ownPeerDescriptor);
43
+ await this.websocketConnector.start();
44
+ // TODO: generate a PeerDescriptor in a single function. Requires changes to the createOwnPeerDescriptor
45
+ // function in the config. Currently it's given by the DhtNode and it sets the PeerDescriptor for the
46
+ // DhtNode in each call.
47
+ // LocalPeerDescriptor could be stored in one place and passed from there to the connectors
48
+ const temporarilySelfSigned = (!this.config.tlsCertificate && this.config.websocketServerEnableTls === true);
49
+ const connectivityResponse = await this.websocketConnector.checkConnectivity(temporarilySelfSigned);
50
+ let localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
51
+ this.localPeerDescriptor = localPeerDescriptor;
52
+ this.websocketConnector.setLocalPeerDescriptor(localPeerDescriptor);
53
+ if (localPeerDescriptor.websocket && !this.config.tlsCertificate && this.config.websocketServerEnableTls) {
54
+ try {
55
+ await this.websocketConnector.autoCertify();
56
+ const connectivityResponse = await this.websocketConnector.checkConnectivity(false);
57
+ localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
58
+ this.localPeerDescriptor = localPeerDescriptor;
59
+ if (localPeerDescriptor.websocket === undefined) {
60
+ logger.warn('ConnectivityCheck failed after autocertification, websocket server connectivity disabled');
61
+ }
62
+ this.websocketConnector.setLocalPeerDescriptor(localPeerDescriptor);
63
+ }
64
+ catch (err) {
65
+ logger.warn('Failed to autocertify, disabling websocket server TLS');
66
+ await this.websocketConnector.destroy();
67
+ this.websocketConnector = new WebsocketConnector_1.WebsocketConnector({
68
+ ...webSocketConnectorConfig,
69
+ serverEnableTls: false,
70
+ });
71
+ await this.websocketConnector.start();
72
+ const connectivityResponse = await this.websocketConnector.checkConnectivity(false);
73
+ localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
74
+ this.localPeerDescriptor = localPeerDescriptor;
75
+ this.websocketConnector.setLocalPeerDescriptor(localPeerDescriptor);
76
+ }
77
+ }
78
+ this.webrtcConnector.setLocalPeerDescriptor(localPeerDescriptor);
44
79
  }
45
80
  createConnection(peerDescriptor) {
46
- if (this.webSocketConnector.isPossibleToFormConnection(peerDescriptor)) {
47
- return this.webSocketConnector.connect(peerDescriptor);
81
+ if (this.websocketConnector.isPossibleToFormConnection(peerDescriptor)) {
82
+ return this.websocketConnector.connect(peerDescriptor);
48
83
  }
49
84
  else {
50
85
  return this.webrtcConnector.connect(peerDescriptor);
51
86
  }
52
87
  }
53
- getOwnPeerDescriptor() {
54
- return this.ownPeerDescriptor;
88
+ getLocalPeerDescriptor() {
89
+ return this.localPeerDescriptor;
55
90
  }
56
91
  async stop() {
57
- await this.webSocketConnector.destroy();
92
+ await this.websocketConnector.destroy();
58
93
  await this.webrtcConnector.stop();
59
94
  }
60
95
  }
61
96
  exports.DefaultConnectorFacade = DefaultConnectorFacade;
62
97
  class SimulatorConnectorFacade {
63
- constructor(ownPeerDescriptor, simulator) {
64
- this.ownPeerDescriptor = ownPeerDescriptor;
98
+ constructor(localPeerDescriptor, simulator) {
99
+ this.localPeerDescriptor = localPeerDescriptor;
65
100
  this.simulator = simulator;
66
101
  }
67
102
  async start(onIncomingConnection) {
68
103
  logger.trace(`Creating SimulatorConnector`);
69
- this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.ownPeerDescriptor, this.simulator, onIncomingConnection);
104
+ this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.localPeerDescriptor, this.simulator, onIncomingConnection);
70
105
  this.simulator.addConnector(this.simulatorConnector);
71
106
  }
72
107
  createConnection(peerDescriptor) {
73
108
  return this.simulatorConnector.connect(peerDescriptor);
74
109
  }
75
- getOwnPeerDescriptor() {
76
- return this.ownPeerDescriptor;
110
+ getLocalPeerDescriptor() {
111
+ return this.localPeerDescriptor;
77
112
  }
78
113
  async stop() {
79
114
  await this.simulatorConnector.stop();
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectorFacade.js","sourceRoot":"","sources":["../../../src/connection/ConnectorFacade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConnectorFacade.js","sourceRoot":"","sources":["../../../src/connection/ConnectorFacade.ts"],"names":[],"mappings":"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"}
@@ -8,9 +8,9 @@ interface HandshakerEvents {
8
8
  }
9
9
  export declare class Handshaker extends EventEmitter<HandshakerEvents> {
10
10
  private static readonly HANDSHAKER_SERVICE_ID;
11
- private ownPeerDescriptor;
11
+ private localPeerDescriptor;
12
12
  private connection;
13
- constructor(ownPeerDescriptor: PeerDescriptor, connection: IConnection);
13
+ constructor(localPeerDescriptor: PeerDescriptor, connection: IConnection);
14
14
  private onData;
15
15
  sendHandshakeRequest(): void;
16
16
  sendHandshakeResponse(error?: string): void;
@@ -7,39 +7,39 @@ const uuid_1 = require("uuid");
7
7
  const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
8
8
  const logger = new utils_1.Logger(module);
9
9
  class Handshaker extends eventemitter3_1.EventEmitter {
10
- constructor(ownPeerDescriptor, connection) {
10
+ constructor(localPeerDescriptor, connection) {
11
11
  super();
12
- this.onData = (data) => {
13
- try {
14
- const message = DhtRpc_1.Message.fromBinary(data);
15
- if (message.body.oneofKind === 'handshakeRequest') {
16
- logger.trace('handshake request received');
17
- const handshake = message.body.handshakeRequest;
18
- this.emit('handshakeRequest', handshake.peerDescriptor);
12
+ this.localPeerDescriptor = localPeerDescriptor;
13
+ this.connection = connection;
14
+ this.connection.on('data', (data) => this.onData(data));
15
+ }
16
+ onData(data) {
17
+ try {
18
+ const message = DhtRpc_1.Message.fromBinary(data);
19
+ if (message.body.oneofKind === 'handshakeRequest') {
20
+ logger.trace('handshake request received');
21
+ const handshake = message.body.handshakeRequest;
22
+ this.emit('handshakeRequest', handshake.peerDescriptor);
23
+ }
24
+ if (message.body.oneofKind === 'handshakeResponse') {
25
+ logger.trace('handshake response received');
26
+ const handshake = message.body.handshakeResponse;
27
+ if (handshake.responseError) {
28
+ this.emit('handshakeFailed', handshake.responseError);
19
29
  }
20
- if (message.body.oneofKind === 'handshakeResponse') {
21
- logger.trace('handshake response received');
22
- const handshake = message.body.handshakeResponse;
23
- if (handshake.responseError) {
24
- this.emit('handshakeFailed', handshake.responseError);
25
- }
26
- else {
27
- this.emit('handshakeCompleted', handshake.peerDescriptor);
28
- }
30
+ else {
31
+ this.emit('handshakeCompleted', handshake.peerDescriptor);
29
32
  }
30
33
  }
31
- catch (err) {
32
- logger.error('error while parsing handshake message', err);
33
- }
34
- };
35
- this.ownPeerDescriptor = ownPeerDescriptor;
36
- this.connection = connection;
37
- this.connection.on('data', this.onData);
34
+ }
35
+ catch (err) {
36
+ logger.error('error while parsing handshake message', err);
37
+ }
38
38
  }
39
39
  sendHandshakeRequest() {
40
40
  const outgoingHandshake = {
41
- sourceId: this.ownPeerDescriptor.kademliaId,
42
- peerDescriptor: this.ownPeerDescriptor
41
+ sourceId: this.localPeerDescriptor.kademliaId,
42
+ peerDescriptor: this.localPeerDescriptor
43
43
  };
44
44
  const msg = {
45
45
  serviceId: Handshaker.HANDSHAKER_SERVICE_ID,
@@ -55,8 +55,8 @@ class Handshaker extends eventemitter3_1.EventEmitter {
55
55
  }
56
56
  sendHandshakeResponse(error) {
57
57
  const outgoingHandshakeResponse = {
58
- sourceId: this.ownPeerDescriptor.kademliaId,
59
- peerDescriptor: this.ownPeerDescriptor
58
+ sourceId: this.localPeerDescriptor.kademliaId,
59
+ peerDescriptor: this.localPeerDescriptor
60
60
  };
61
61
  if (error) {
62
62
  outgoingHandshakeResponse.responseError = error;
@@ -1 +1 @@
1
- {"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../src/connection/Handshaker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../src/connection/Handshaker.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,8 @@
1
1
  import { UUID } from '../helpers/UUID';
2
- import { DisconnectionType } from '../transport/ITransport';
3
2
  export interface ConnectionEvents {
4
3
  data: (bytes: Uint8Array) => void;
5
4
  connected: () => void;
6
- disconnected: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void;
5
+ disconnected: (gracefulLeave: boolean, code?: number, reason?: string) => void;
7
6
  error: (name: string) => void;
8
7
  }
9
8
  export declare enum ConnectionType {
@@ -23,16 +22,16 @@ export interface IConnection {
23
22
  on(event: 'data', listener: (bytes: Uint8Array) => void): this;
24
23
  on(event: 'error', listener: (name: string) => void): this;
25
24
  on(event: 'connected', listener: () => void): this;
26
- on(event: 'disconnected', listener: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void): this;
25
+ on(event: 'disconnected', listener: (gracefulLeave: boolean, code?: number, reason?: string) => void): this;
27
26
  once(event: 'data', listener: (bytes: Uint8Array) => void): this;
28
27
  once(event: 'error', listener: (name: string) => void): this;
29
28
  once(event: 'connected', listener: () => void): this;
30
- once(event: 'disconnected', listener: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void): this;
29
+ once(event: 'disconnected', listener: (gracefulLeave: boolean, code?: number, reason?: string) => void): this;
31
30
  off(event: 'data', listener: (bytes: Uint8Array) => void): void;
32
31
  off(event: 'error', listener: (name: string) => void): void;
33
32
  off(event: 'connected', listener: () => void): void;
34
- off(event: 'disconnected', listener: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void): void;
33
+ off(event: 'disconnected', listener: (gracefulLeave: boolean, code?: number, reason?: string) => void): void;
35
34
  send(data: Uint8Array): void;
36
- close(disconnectionType: DisconnectionType): Promise<void>;
35
+ close(gracefulLeave: boolean): Promise<void>;
37
36
  destroy(): void;
38
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"IConnection.js","sourceRoot":"","sources":["../../../src/connection/IConnection.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AAUtC,IAAY,cAMX;AAND,WAAY,cAAc;IACtB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;IACrC,mCAAiB,CAAA;IACjB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;AACzC,CAAC,EANW,cAAc,8BAAd,cAAc,QAMzB;AAID,MAAa,YAAa,SAAQ,WAAI;IAClC,QAAQ;QACJ,OAAO,IAAI,CAAC,QAAQ,EAAqB,CAAA;IAC7C,CAAC;CACJ;AAJD,oCAIC"}
1
+ {"version":3,"file":"IConnection.js","sourceRoot":"","sources":["../../../src/connection/IConnection.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AAStC,IAAY,cAMX;AAND,WAAY,cAAc;IACtB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;IACrC,mCAAiB,CAAA;IACjB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;AACzC,CAAC,EANW,cAAc,8BAAd,cAAc,QAMzB;AAID,MAAa,YAAa,SAAQ,WAAI;IAClC,QAAQ;QACJ,OAAO,IAAI,CAAC,QAAQ,EAAqB,CAAA;IAC7C,CAAC;CACJ;AAJD,oCAIC"}
@@ -2,7 +2,6 @@ import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from './I
2
2
  import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
3
3
  import EventEmitter from 'eventemitter3';
4
4
  import { PeerIDKey } from '../helpers/PeerID';
5
- import { DisconnectionType } from '../transport/ITransport';
6
5
  export interface ManagedConnectionEvents {
7
6
  managedData: (bytes: Uint8Array, remotePeerDescriptor: PeerDescriptor) => void;
8
7
  handshakeRequest: (peerDescriptor: PeerDescriptor) => void;
@@ -30,10 +29,10 @@ export declare class ManagedConnection extends EventEmitter<Events> {
30
29
  private bufferSentbyOtherConnection;
31
30
  private closing;
32
31
  replacedByOtherConnection: boolean;
33
- private ownPeerDescriptor;
32
+ private localPeerDescriptor;
34
33
  protected outgoingConnection?: IConnection;
35
34
  protected incomingConnection?: IConnection;
36
- constructor(ownPeerDescriptor: PeerDescriptor, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection);
35
+ constructor(localPeerDescriptor: PeerDescriptor, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection);
37
36
  on(event: keyof Events, fn: (...args: any) => void, context?: any): this;
38
37
  once(event: keyof Events, fn: (...args: any) => void, context?: any): this;
39
38
  get peerIdKey(): PeerIDKey;
@@ -49,7 +48,7 @@ export declare class ManagedConnection extends EventEmitter<Events> {
49
48
  acceptHandshake(): void;
50
49
  rejectHandshake(errorMessage: string): void;
51
50
  private doDisconnect;
52
- close(disconnectionType: DisconnectionType): Promise<void>;
51
+ close(gracefulLeave: boolean): Promise<void>;
53
52
  destroy(): void;
54
53
  isHandshakeCompleted(): boolean;
55
54
  stealOutputBuffer(): Uint8Array[];
@@ -36,7 +36,7 @@ const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor"
36
36
  const ConnectionManager_1 = require("./ConnectionManager");
37
37
  const logger = new utils_1.Logger(module);
38
38
  class ManagedConnection extends eventemitter3_1.default {
39
- constructor(ownPeerDescriptor, connectionType, outgoingConnection, incomingConnection) {
39
+ constructor(localPeerDescriptor, connectionType, outgoingConnection, incomingConnection) {
40
40
  super();
41
41
  this.outputBuffer = [];
42
42
  this.inputBuffer = [];
@@ -49,19 +49,8 @@ class ManagedConnection extends eventemitter3_1.default {
49
49
  this.bufferSentbyOtherConnection = false;
50
50
  this.closing = false;
51
51
  this.replacedByOtherConnection = false;
52
- this.onHandshakeCompleted = (peerDescriptor) => {
53
- this.lastUsed = Date.now();
54
- this.setPeerDescriptor(peerDescriptor);
55
- this.handshakeCompleted = true;
56
- while (this.outputBuffer.length > 0) {
57
- logger.trace('emptying outputBuffer');
58
- this.implementation.send(this.outputBuffer.shift());
59
- }
60
- logger.trace('emitting handshake_completed');
61
- this.emit('handshakeCompleted', peerDescriptor);
62
- };
63
52
  this.send = this.send.bind(this);
64
- this.ownPeerDescriptor = ownPeerDescriptor;
53
+ this.localPeerDescriptor = localPeerDescriptor;
65
54
  this.outgoingConnection = outgoingConnection;
66
55
  this.incomingConnection = incomingConnection;
67
56
  this.connectionType = connectionType;
@@ -72,7 +61,7 @@ class ManagedConnection extends eventemitter3_1.default {
72
61
  throw new Err.IllegalArguments('Managed connection constructor only accepts either an incoming connection OR a outgoing connection');
73
62
  }
74
63
  if (outgoingConnection) {
75
- this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, outgoingConnection);
64
+ this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, outgoingConnection);
76
65
  this.handshaker.once('handshakeFailed', (errorMessage) => {
77
66
  logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed: ' + errorMessage);
78
67
  this.emit('handshakeFailed');
@@ -92,7 +81,7 @@ class ManagedConnection extends eventemitter3_1.default {
92
81
  }
93
82
  else {
94
83
  if (incomingConnection) {
95
- this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, incomingConnection);
84
+ this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, incomingConnection);
96
85
  this.handshaker.on('handshakeRequest', (peerDescriptor) => {
97
86
  this.setPeerDescriptor(peerDescriptor);
98
87
  this.emit('handshakeRequest', peerDescriptor);
@@ -147,12 +136,23 @@ class ManagedConnection extends eventemitter3_1.default {
147
136
  getPeerDescriptor() {
148
137
  return this.peerDescriptor;
149
138
  }
139
+ onHandshakeCompleted(peerDescriptor) {
140
+ this.lastUsed = Date.now();
141
+ this.setPeerDescriptor(peerDescriptor);
142
+ this.handshakeCompleted = true;
143
+ while (this.outputBuffer.length > 0) {
144
+ logger.trace('emptying outputBuffer');
145
+ this.implementation.send(this.outputBuffer.shift());
146
+ }
147
+ logger.trace('emitting handshake_completed');
148
+ this.emit('handshakeCompleted', peerDescriptor);
149
+ }
150
150
  attachImplementation(impl) {
151
151
  logger.trace('attachImplementation()');
152
152
  this.implementation = impl;
153
153
  impl.on('data', (bytes) => {
154
154
  this.lastUsed = Date.now();
155
- if (this.listenerCount('managedData') < 1) {
155
+ if (this.listenerCount('managedData') === 0) {
156
156
  this.inputBuffer.push(bytes);
157
157
  }
158
158
  else {
@@ -170,13 +170,13 @@ class ManagedConnection extends eventemitter3_1.default {
170
170
  impl.off('disconnected', this.onDisconnected);
171
171
  impl.on('disconnected', this.onDisconnected);
172
172
  }
173
- onDisconnected(disconnectionType) {
174
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' onDisconnected() ' + disconnectionType);
173
+ onDisconnected(gracefulLeave) {
174
+ logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' onDisconnected() ' + gracefulLeave);
175
175
  if (this.bufferSentbyOtherConnection) {
176
176
  return;
177
177
  }
178
178
  this.emit('internal_disconnected');
179
- this.doDisconnect(disconnectionType);
179
+ this.doDisconnect(gracefulLeave);
180
180
  }
181
181
  async send(data, doNotConnect = false) {
182
182
  if (this.stopped) {
@@ -206,14 +206,14 @@ class ManagedConnection extends eventemitter3_1.default {
206
206
  }
207
207
  if (result.winnerName === 'internal_disconnected') {
208
208
  this.doNotEmitDisconnected = false;
209
- this.doDisconnect('OTHER');
209
+ this.doDisconnect(false);
210
210
  }
211
211
  else if (result.winnerName === 'handshakeFailed') {
212
212
  logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed received');
213
213
  if (this.bufferSentbyOtherConnection) {
214
214
  logger.trace('bufferSentByOtherConnection already true');
215
215
  this.doNotEmitDisconnected = false;
216
- this.doDisconnect('OTHER');
216
+ this.doDisconnect(false);
217
217
  }
218
218
  else {
219
219
  let result2;
@@ -228,7 +228,7 @@ class ManagedConnection extends eventemitter3_1.default {
228
228
  if (result2.winnerName === 'bufferSentByOtherConnection') {
229
229
  logger.trace('bufferSentByOtherConnection received');
230
230
  this.doNotEmitDisconnected = false;
231
- this.doDisconnect('OTHER');
231
+ this.doDisconnect(false);
232
232
  }
233
233
  else if (result2.winnerName === 'closing') {
234
234
  logger.trace('bufferSentByOtherConnection not received, instead received a closing event');
@@ -266,7 +266,7 @@ class ManagedConnection extends eventemitter3_1.default {
266
266
  // This happens when connectionRequest has been made and answered
267
267
  if (this.implementation) {
268
268
  if (!this.handshaker) {
269
- this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.implementation);
269
+ this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, this.implementation);
270
270
  }
271
271
  this.handshaker.sendHandshakeResponse();
272
272
  }
@@ -279,17 +279,17 @@ class ManagedConnection extends eventemitter3_1.default {
279
279
  rejectHandshake(errorMessage) {
280
280
  this.handshaker.sendHandshakeResponse(errorMessage);
281
281
  }
282
- doDisconnect(disconnectionType) {
282
+ doDisconnect(gracefulLeave) {
283
283
  logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' doDisconnect() emitting');
284
284
  if (!this.doNotEmitDisconnected) {
285
285
  logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' emitting disconnected');
286
- this.emit('disconnected', disconnectionType);
286
+ this.emit('disconnected', gracefulLeave);
287
287
  }
288
288
  else {
289
289
  logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' not emitting disconnected because doNotEmitDisconnected flag is set');
290
290
  }
291
291
  }
292
- async close(disconnectionType) {
292
+ async close(gracefulLeave) {
293
293
  if (this.replacedByOtherConnection) {
294
294
  logger.trace('close() called on replaced connection');
295
295
  }
@@ -297,16 +297,16 @@ class ManagedConnection extends eventemitter3_1.default {
297
297
  this.emit('closing');
298
298
  this.doNotEmitDisconnected = false;
299
299
  if (this.implementation) {
300
- await this.implementation?.close(disconnectionType);
300
+ await this.implementation?.close(gracefulLeave);
301
301
  }
302
302
  else if (this.outgoingConnection) {
303
- await this.outgoingConnection?.close(disconnectionType);
303
+ await this.outgoingConnection?.close(gracefulLeave);
304
304
  }
305
305
  else if (this.incomingConnection) {
306
- await this.incomingConnection?.close(disconnectionType);
306
+ await this.incomingConnection?.close(gracefulLeave);
307
307
  }
308
308
  else {
309
- this.doDisconnect(disconnectionType);
309
+ this.doDisconnect(gracefulLeave);
310
310
  }
311
311
  }
312
312
  destroy() {
@@ -1 +1 @@
1
- {"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
2
+ import { ManagedConnection } from './ManagedConnection';
3
+ import { NodeWebrtcConnection } from './webrtc/NodeWebrtcConnection';
4
+ export declare class ManagedWebrtcConnection extends ManagedConnection {
5
+ constructor(localPeerDescriptor: PeerDescriptor, connectingConnection?: NodeWebrtcConnection, connectedConnection?: NodeWebrtcConnection);
6
+ getWebrtcConnection(): NodeWebrtcConnection;
7
+ }
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ManagedWebrtcConnection = void 0;
4
+ const IConnection_1 = require("./IConnection");
5
+ const ManagedConnection_1 = require("./ManagedConnection");
6
+ class ManagedWebrtcConnection extends ManagedConnection_1.ManagedConnection {
7
+ constructor(localPeerDescriptor, connectingConnection, connectedConnection) {
8
+ super(localPeerDescriptor, IConnection_1.ConnectionType.WEBRTC, connectingConnection, connectedConnection);
9
+ }
10
+ getWebrtcConnection() {
11
+ if (this.outgoingConnection) {
12
+ return this.outgoingConnection;
13
+ }
14
+ else {
15
+ return this.incomingConnection;
16
+ }
17
+ }
18
+ }
19
+ exports.ManagedWebrtcConnection = ManagedWebrtcConnection;
20
+ //# sourceMappingURL=ManagedWebrtcConnection.js.map