@streamr/dht 0.0.1-tatum.7 → 0.0.1-tatum.8

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 (140) hide show
  1. package/dist/src/connection/ConnectionLockRpcRemote.d.ts +10 -0
  2. package/dist/src/connection/{RemoteConnectionLocker.js → ConnectionLockRpcRemote.js} +20 -35
  3. package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -0
  4. package/dist/src/connection/ConnectionManager.d.ts +0 -1
  5. package/dist/src/connection/ConnectionManager.js +27 -25
  6. package/dist/src/connection/ConnectionManager.js.map +1 -1
  7. package/dist/src/connection/ConnectivityChecker.js +4 -4
  8. package/dist/src/connection/ConnectivityChecker.js.map +1 -1
  9. package/dist/src/connection/ConnectorFacade.d.ts +1 -1
  10. package/dist/src/connection/ConnectorFacade.js +5 -8
  11. package/dist/src/connection/ConnectorFacade.js.map +1 -1
  12. package/dist/src/connection/Handshaker.d.ts +1 -2
  13. package/dist/src/connection/Handshaker.js +1 -4
  14. package/dist/src/connection/Handshaker.js.map +1 -1
  15. package/dist/src/connection/ManagedConnection.d.ts +1 -2
  16. package/dist/src/connection/ManagedConnection.js +4 -5
  17. package/dist/src/connection/ManagedConnection.js.map +1 -1
  18. package/dist/src/connection/ManagedWebRtcConnection.d.ts +1 -1
  19. package/dist/src/connection/ManagedWebRtcConnection.js +2 -2
  20. package/dist/src/connection/ManagedWebRtcConnection.js.map +1 -1
  21. package/dist/src/connection/Simulator/SimulatorConnector.d.ts +1 -2
  22. package/dist/src/connection/Simulator/SimulatorConnector.js +3 -4
  23. package/dist/src/connection/Simulator/SimulatorConnector.js.map +1 -1
  24. package/dist/src/connection/WebRTC/NodeWebRtcConnection.d.ts +1 -1
  25. package/dist/src/connection/WebRTC/{WebRtcConnector.d.ts → WebRtcConnectorRpcLocal.d.ts} +9 -9
  26. package/dist/src/connection/WebRTC/{WebRtcConnector.js → WebRtcConnectorRpcLocal.js} +38 -30
  27. package/dist/src/connection/WebRTC/WebRtcConnectorRpcLocal.js.map +1 -0
  28. package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.d.ts +11 -0
  29. package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.js +55 -0
  30. package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.js.map +1 -0
  31. package/dist/src/connection/WebRTC/iceServerAsString.d.ts +1 -1
  32. package/dist/src/connection/WebSocket/{WebSocketConnector.d.ts → WebSocketConnectorRpcLocal.d.ts} +6 -7
  33. package/dist/src/connection/WebSocket/{WebSocketConnector.js → WebSocketConnectorRpcLocal.js} +20 -20
  34. package/dist/src/connection/WebSocket/WebSocketConnectorRpcLocal.js.map +1 -0
  35. package/dist/src/connection/WebSocket/WebSocketConnectorRpcRemote.d.ts +8 -0
  36. package/dist/src/connection/WebSocket/{RemoteWebSocketConnector.js → WebSocketConnectorRpcRemote.js} +11 -16
  37. package/dist/src/connection/WebSocket/WebSocketConnectorRpcRemote.js.map +1 -0
  38. package/dist/src/dht/DhtNode.d.ts +6 -7
  39. package/dist/src/dht/DhtNode.js +22 -23
  40. package/dist/src/dht/DhtNode.js.map +1 -1
  41. package/dist/src/dht/{RemoteExternalApi.d.ts → ExternalApiRpcRemote.d.ts} +2 -2
  42. package/dist/src/dht/{RemoteExternalApi.js → ExternalApiRpcRemote.js} +5 -6
  43. package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -0
  44. package/dist/src/dht/discovery/PeerDiscovery.d.ts +1 -1
  45. package/dist/src/dht/discovery/PeerDiscovery.js +3 -2
  46. package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
  47. package/dist/src/dht/find/RecursiveFindSession.d.ts +5 -5
  48. package/dist/src/dht/find/RecursiveFindSession.js +7 -7
  49. package/dist/src/dht/find/RecursiveFindSession.js.map +1 -1
  50. package/dist/src/dht/find/RecursiveFinder.d.ts +7 -7
  51. package/dist/src/dht/find/RecursiveFinder.js +24 -24
  52. package/dist/src/dht/find/RecursiveFinder.js.map +1 -1
  53. package/dist/src/dht/find/RemoteRecursiveFindSession.d.ts +1 -1
  54. package/dist/src/dht/find/RemoteRecursiveFindSession.js +4 -4
  55. package/dist/src/dht/find/RemoteRecursiveFindSession.js.map +1 -1
  56. package/dist/src/dht/registerExternalApiRpcMethods.js +4 -3
  57. package/dist/src/dht/registerExternalApiRpcMethods.js.map +1 -1
  58. package/dist/src/dht/routing/Router.d.ts +2 -2
  59. package/dist/src/dht/routing/Router.js +2 -4
  60. package/dist/src/dht/routing/Router.js.map +1 -1
  61. package/dist/src/dht/routing/{RemoteRouter.d.ts → RouterRpcRemote.d.ts} +2 -2
  62. package/dist/src/dht/routing/{RemoteRouter.js → RouterRpcRemote.js} +4 -4
  63. package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -0
  64. package/dist/src/dht/routing/RoutingSession.js +2 -2
  65. package/dist/src/dht/routing/RoutingSession.js.map +1 -1
  66. package/dist/src/dht/store/{DataStore.d.ts → StoreRpcLocal.d.ts} +4 -4
  67. package/dist/src/dht/store/{DataStore.js → StoreRpcLocal.js} +27 -27
  68. package/dist/src/dht/store/StoreRpcLocal.js.map +1 -0
  69. package/dist/src/dht/store/{RemoteStore.d.ts → StoreRpcRemote.d.ts} +2 -2
  70. package/dist/src/dht/store/{RemoteStore.js → StoreRpcRemote.js} +4 -4
  71. package/dist/src/dht/store/StoreRpcRemote.js.map +1 -0
  72. package/dist/src/exports.d.ts +1 -1
  73. package/dist/src/helpers/protoClasses.js +2 -2
  74. package/dist/src/helpers/protoClasses.js.map +1 -1
  75. package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +29 -29
  76. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +39 -39
  77. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
  78. package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +49 -158
  79. package/dist/src/proto/packages/dht/protos/DhtRpc.js +46 -86
  80. package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
  81. package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +15 -15
  82. package/dist/src/transport/RoutingRpcCommunicator.js +1 -0
  83. package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
  84. package/package.json +4 -4
  85. package/protos/DhtRpc.proto +30 -59
  86. package/src/connection/ConnectionLockRpcRemote.ts +62 -0
  87. package/src/connection/ConnectionManager.ts +33 -32
  88. package/src/connection/ConnectivityChecker.ts +1 -1
  89. package/src/connection/ConnectorFacade.ts +7 -10
  90. package/src/connection/Handshaker.ts +0 -5
  91. package/src/connection/ManagedConnection.ts +3 -6
  92. package/src/connection/ManagedWebRtcConnection.ts +0 -2
  93. package/src/connection/Simulator/SimulatorConnector.ts +2 -7
  94. package/src/connection/WebRTC/NodeWebRtcConnection.ts +1 -1
  95. package/src/connection/WebRTC/{WebRtcConnector.ts → WebRtcConnectorRpcLocal.ts} +46 -34
  96. package/src/connection/WebRTC/WebRtcConnectorRpcRemote.ts +71 -0
  97. package/src/connection/WebRTC/iceServerAsString.ts +1 -1
  98. package/src/connection/WebSocket/{WebSocketConnector.ts → WebSocketConnectorRpcLocal.ts} +26 -26
  99. package/src/connection/WebSocket/{RemoteWebSocketConnector.ts → WebSocketConnectorRpcRemote.ts} +13 -18
  100. package/src/dht/DhtNode.ts +32 -33
  101. package/src/dht/{RemoteExternalApi.ts → ExternalApiRpcRemote.ts} +3 -4
  102. package/src/dht/discovery/PeerDiscovery.ts +4 -3
  103. package/src/dht/find/RecursiveFindSession.ts +11 -11
  104. package/src/dht/find/RecursiveFinder.ts +29 -30
  105. package/src/dht/find/RemoteRecursiveFindSession.ts +6 -6
  106. package/src/dht/registerExternalApiRpcMethods.ts +7 -4
  107. package/src/dht/routing/Router.ts +4 -6
  108. package/src/dht/routing/{RemoteRouter.ts → RouterRpcRemote.ts} +2 -2
  109. package/src/dht/routing/RoutingSession.ts +6 -6
  110. package/src/dht/store/{DataStore.ts → StoreRpcLocal.ts} +31 -31
  111. package/src/dht/store/{RemoteStore.ts → StoreRpcRemote.ts} +2 -2
  112. package/src/exports.ts +1 -1
  113. package/src/helpers/protoClasses.ts +4 -4
  114. package/src/proto/packages/dht/protos/DhtRpc.client.ts +54 -54
  115. package/src/proto/packages/dht/protos/DhtRpc.server.ts +15 -15
  116. package/src/proto/packages/dht/protos/DhtRpc.ts +76 -210
  117. package/src/transport/RoutingRpcCommunicator.ts +1 -0
  118. package/test/integration/{RemoteRouter.test.ts → RouterRpcRemote.test.ts} +8 -8
  119. package/test/integration/{RemoteStore.test.ts → StoreRpcRemote.test.ts} +13 -13
  120. package/test/integration/WebRtcConnectorRpc.test.ts +11 -24
  121. package/test/integration/WebSocketConnectorRpc.test.ts +8 -12
  122. package/test/unit/RecursiveFinder.test.ts +5 -6
  123. package/test/unit/{WebSocketConnector.test.ts → WebSocketConnectorRpcLocal.test.ts} +3 -3
  124. package/test/unit/webrtcReplaceInternalIpWithExternalIp.test.ts +1 -1
  125. package/test/utils/utils.ts +16 -26
  126. package/dist/src/connection/RemoteConnectionLocker.d.ts +0 -13
  127. package/dist/src/connection/RemoteConnectionLocker.js.map +0 -1
  128. package/dist/src/connection/WebRTC/RemoteWebrtcConnector.d.ts +0 -12
  129. package/dist/src/connection/WebRTC/RemoteWebrtcConnector.js +0 -74
  130. package/dist/src/connection/WebRTC/RemoteWebrtcConnector.js.map +0 -1
  131. package/dist/src/connection/WebRTC/WebRtcConnector.js.map +0 -1
  132. package/dist/src/connection/WebSocket/RemoteWebSocketConnector.d.ts +0 -9
  133. package/dist/src/connection/WebSocket/RemoteWebSocketConnector.js.map +0 -1
  134. package/dist/src/connection/WebSocket/WebSocketConnector.js.map +0 -1
  135. package/dist/src/dht/RemoteExternalApi.js.map +0 -1
  136. package/dist/src/dht/routing/RemoteRouter.js.map +0 -1
  137. package/dist/src/dht/store/DataStore.js.map +0 -1
  138. package/dist/src/dht/store/RemoteStore.js.map +0 -1
  139. package/src/connection/RemoteConnectionLocker.ts +0 -85
  140. package/src/connection/WebRTC/RemoteWebrtcConnector.ts +0 -93
@@ -1 +0,0 @@
1
- {"version":3,"file":"RemoteStore.js","sourceRoot":"","sources":["../../../../src/dht/store/RemoteStore.ts"],"names":[],"mappings":";;;AAAA,8CAA0C;AAU1C,qFAA8E;AAE9E,MAAa,WAAY,SAAQ,eAA2B;IAExD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAC1D,MAAM,IAAI,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAA;YACjE,MAAM,KAAK,CACP,2BAA2B,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CACtD,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC7D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,CACP,iCAAiC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,EAAE,CAC5F,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAA2B,EAAE,eAAwB,KAAK;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,YAAY;SACf,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC;CAEJ;AAtCD,kCAsCC"}
@@ -1,85 +0,0 @@
1
- import { Logger } from '@streamr/utils'
2
- import { ProtoRpcClient } from '@streamr/proto-rpc'
3
- import { IConnectionLockerClient } from '../proto/packages/dht/protos/DhtRpc.client'
4
- import { LockRequest, UnlockRequest, PeerDescriptor, DisconnectNotice, DisconnectMode } from '../proto/packages/dht/protos/DhtRpc'
5
- import { DhtRpcOptions } from '../rpc-protocol/DhtRpcOptions'
6
-
7
- import * as Err from '../helpers/errors'
8
- import { keyFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
9
-
10
- const logger = new Logger(module)
11
-
12
- export class RemoteConnectionLocker {
13
- private ownPeerDescriptor: PeerDescriptor
14
- private targetPeerDescriptor: PeerDescriptor
15
- private protocolVersion: string
16
- private client: ProtoRpcClient<IConnectionLockerClient>
17
-
18
- constructor(
19
- ownPeerDescriptor: PeerDescriptor,
20
- targetPeerDescriptor: PeerDescriptor,
21
- protocolVersion: string,
22
- client: ProtoRpcClient<IConnectionLockerClient>
23
- ) {
24
- this.ownPeerDescriptor = ownPeerDescriptor
25
- this.targetPeerDescriptor = targetPeerDescriptor
26
- this.protocolVersion = protocolVersion
27
- this.client = client
28
- }
29
-
30
- public async lockRequest(serviceId: string): Promise<boolean> {
31
- logger.trace(`Requesting locked connection to ${keyFromPeerDescriptor(this.targetPeerDescriptor)}`)
32
- const request: LockRequest = {
33
- peerDescriptor: this.ownPeerDescriptor,
34
- protocolVersion: this.protocolVersion,
35
- serviceId
36
- }
37
- const options: DhtRpcOptions = {
38
- sourceDescriptor: this.ownPeerDescriptor,
39
- targetDescriptor: this.targetPeerDescriptor
40
- }
41
- try {
42
- const res = await this.client.lockRequest(request, options)
43
- return res.accepted
44
- } catch (err) {
45
- logger.debug(new Err.ConnectionLocker('Connection lock rejected', err).stack!)
46
- return false
47
- }
48
- }
49
-
50
- public unlockRequest(serviceId: string): void {
51
- logger.trace(`Requesting connection to be unlocked from ${keyFromPeerDescriptor(this.targetPeerDescriptor)}`)
52
- const request: UnlockRequest = {
53
- peerDescriptor: this.ownPeerDescriptor,
54
- protocolVersion: this.protocolVersion,
55
- serviceId
56
- }
57
- const options: DhtRpcOptions = {
58
- sourceDescriptor: this.ownPeerDescriptor,
59
- targetDescriptor: this.targetPeerDescriptor,
60
- notification: true
61
- }
62
-
63
- this.client.unlockRequest(request, options).catch((_e) => {
64
- logger.trace('failed to send unlockRequest')
65
- })
66
-
67
- }
68
-
69
- public async gracefulDisconnect(disconnecMode: DisconnectMode): Promise<void> {
70
- logger.trace(`Notifying a graceful disconnect to ${keyFromPeerDescriptor(this.targetPeerDescriptor)}`)
71
- const request: DisconnectNotice = {
72
- peerDescriptor: this.ownPeerDescriptor,
73
- protocolVersion: this.protocolVersion,
74
- disconnecMode
75
- }
76
- const options = {
77
- sourceDescriptor: this.ownPeerDescriptor,
78
- targetDescriptor: this.targetPeerDescriptor,
79
- doNotConnect: true,
80
- doNotMindStopped: true,
81
- timeout: 2000
82
- }
83
- await this.client.gracefulDisconnect(request, options)
84
- }
85
- }
@@ -1,93 +0,0 @@
1
- import {
2
- IceCandidate,
3
- PeerDescriptor,
4
- RtcAnswer,
5
- RtcOffer,
6
- WebRtcConnectionRequest
7
- } from '../../proto/packages/dht/protos/DhtRpc'
8
- import { IWebRtcConnectorServiceClient } from '../../proto/packages/dht/protos/DhtRpc.client'
9
- import { DhtRpcOptions } from '../../rpc-protocol/DhtRpcOptions'
10
- import { ProtoRpcClient } from '@streamr/proto-rpc'
11
- import { Logger } from '@streamr/utils'
12
-
13
- const logger = new Logger(module)
14
-
15
- export class RemoteWebrtcConnector {
16
-
17
- private peerDescriptor: PeerDescriptor
18
- private client: ProtoRpcClient<IWebRtcConnectorServiceClient>
19
-
20
- constructor(peerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebRtcConnectorServiceClient>) {
21
- this.peerDescriptor = peerDescriptor
22
- this.client = client
23
- }
24
-
25
- requestConnection(sourceDescriptor: PeerDescriptor, connectionId: string): void {
26
- const request: WebRtcConnectionRequest = {
27
- target: this.peerDescriptor,
28
- requester: sourceDescriptor,
29
- connectionId
30
- }
31
- const options: DhtRpcOptions = {
32
- sourceDescriptor: sourceDescriptor,
33
- targetDescriptor: this.peerDescriptor,
34
- notification: true
35
- }
36
-
37
- this.client.requestConnection(request, options).catch((_e) => {
38
- logger.trace('Failed to send requestConnection')
39
- })
40
- }
41
-
42
- sendRtcOffer(sourceDescriptor: PeerDescriptor, description: string, connectionId: string): void {
43
- const request: RtcOffer = {
44
- target: this.peerDescriptor,
45
- requester: sourceDescriptor,
46
- connectionId,
47
- description
48
- }
49
- const options: DhtRpcOptions = {
50
- sourceDescriptor: sourceDescriptor,
51
- targetDescriptor: this.peerDescriptor,
52
- }
53
-
54
- this.client.rtcOffer(request, options).catch((_e) => {
55
- logger.trace('Failed to send rtcOffer')
56
- })
57
- }
58
-
59
- sendRtcAnswer(sourceDescriptor: PeerDescriptor, description: string, connectionId: string): void {
60
- const request: RtcAnswer = {
61
- target: this.peerDescriptor,
62
- requester: sourceDescriptor,
63
- connectionId,
64
- description
65
- }
66
- const options: DhtRpcOptions = {
67
- sourceDescriptor: sourceDescriptor,
68
- targetDescriptor: this.peerDescriptor,
69
- }
70
-
71
- this.client.rtcAnswer(request, options).catch((_e) => {
72
- logger.trace('Failed to send rtcAnswer')
73
- })
74
- }
75
-
76
- sendIceCandidate(sourceDescriptor: PeerDescriptor, candidate: string, mid: string, connectionId: string): void {
77
- const request: IceCandidate = {
78
- target: this.peerDescriptor,
79
- requester: sourceDescriptor,
80
- connectionId,
81
- mid,
82
- candidate
83
- }
84
- const options: DhtRpcOptions = {
85
- sourceDescriptor: sourceDescriptor,
86
- targetDescriptor: this.peerDescriptor,
87
- }
88
- this.client.iceCandidate(request, options).catch((_e) => {
89
- logger.trace('Failed to send iceCandidate')
90
- })
91
- }
92
- }
93
-