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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (126) hide show
  1. package/dist/src/connection/ConnectionLockRpcLocal.js +1 -1
  2. package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
  3. package/dist/src/connection/ConnectionLockRpcRemote.js +3 -3
  4. package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
  5. package/dist/src/connection/ConnectionManager.d.ts +4 -8
  6. package/dist/src/connection/ConnectionManager.js +30 -31
  7. package/dist/src/connection/ConnectionManager.js.map +1 -1
  8. package/dist/src/connection/ConnectivityChecker.d.ts +0 -4
  9. package/dist/src/connection/ConnectivityChecker.js +13 -18
  10. package/dist/src/connection/ConnectivityChecker.js.map +1 -1
  11. package/dist/src/connection/ConnectorFacade.d.ts +6 -3
  12. package/dist/src/connection/ConnectorFacade.js +33 -23
  13. package/dist/src/connection/ConnectorFacade.js.map +1 -1
  14. package/dist/src/connection/Handshaker.d.ts +6 -6
  15. package/dist/src/connection/Handshaker.js +10 -13
  16. package/dist/src/connection/Handshaker.js.map +1 -1
  17. package/dist/src/connection/ManagedConnection.d.ts +7 -10
  18. package/dist/src/connection/ManagedConnection.js +43 -79
  19. package/dist/src/connection/ManagedConnection.js.map +1 -1
  20. package/dist/src/connection/ManagedWebrtcConnection.js.map +1 -1
  21. package/dist/src/connection/simulator/SimulatorConnection.js +16 -15
  22. package/dist/src/connection/simulator/SimulatorConnection.js.map +1 -1
  23. package/dist/src/connection/simulator/SimulatorConnector.d.ts +2 -2
  24. package/dist/src/connection/simulator/SimulatorConnector.js +10 -11
  25. package/dist/src/connection/simulator/SimulatorConnector.js.map +1 -1
  26. package/dist/src/connection/webrtc/NodeWebrtcConnection.js +8 -9
  27. package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
  28. package/dist/src/connection/webrtc/WebrtcConnector.d.ts +1 -1
  29. package/dist/src/connection/webrtc/WebrtcConnector.js +6 -6
  30. package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
  31. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +1 -1
  32. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +4 -4
  33. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
  34. package/dist/src/connection/websocket/ClientWebsocket.js +3 -0
  35. package/dist/src/connection/websocket/ClientWebsocket.js.map +1 -1
  36. package/dist/src/connection/websocket/ServerWebsocket.js +2 -0
  37. package/dist/src/connection/websocket/ServerWebsocket.js.map +1 -1
  38. package/dist/src/connection/websocket/WebsocketConnector.d.ts +5 -5
  39. package/dist/src/connection/websocket/WebsocketConnector.js +37 -35
  40. package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
  41. package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts +1 -1
  42. package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js +1 -1
  43. package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map +1 -1
  44. package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js +1 -1
  45. package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js.map +1 -1
  46. package/dist/src/dht/DhtNode.js +18 -15
  47. package/dist/src/dht/DhtNode.js.map +1 -1
  48. package/dist/src/dht/DhtNodeRpcLocal.js +2 -2
  49. package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
  50. package/dist/src/dht/DhtNodeRpcRemote.js +4 -4
  51. package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
  52. package/dist/src/dht/discovery/DiscoverySession.js +1 -1
  53. package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
  54. package/dist/src/dht/discovery/PeerDiscovery.js +1 -1
  55. package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
  56. package/dist/src/dht/find/FindRpcLocal.js +2 -2
  57. package/dist/src/dht/find/FindRpcLocal.js.map +1 -1
  58. package/dist/src/dht/routing/FindRpcRemote.js +3 -3
  59. package/dist/src/dht/routing/FindRpcRemote.js.map +1 -1
  60. package/dist/src/dht/routing/Router.js +3 -3
  61. package/dist/src/dht/routing/Router.js.map +1 -1
  62. package/dist/src/dht/routing/RouterRpcLocal.js +4 -4
  63. package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
  64. package/dist/src/dht/routing/RouterRpcRemote.js +6 -6
  65. package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
  66. package/dist/src/dht/routing/RoutingSession.js +1 -1
  67. package/dist/src/dht/routing/RoutingSession.js.map +1 -1
  68. package/dist/src/dht/store/StoreRpcLocal.js +1 -1
  69. package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
  70. package/dist/src/dht/store/StoreRpcRemote.js +3 -3
  71. package/dist/src/dht/store/StoreRpcRemote.js.map +1 -1
  72. package/dist/src/helpers/peerIdFromPeerDescriptor.d.ts +1 -0
  73. package/dist/src/helpers/peerIdFromPeerDescriptor.js +7 -1
  74. package/dist/src/helpers/peerIdFromPeerDescriptor.js.map +1 -1
  75. package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +21 -12
  76. package/dist/src/proto/packages/dht/protos/DhtRpc.js +20 -7
  77. package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
  78. package/package.json +5 -5
  79. package/protos/DhtRpc.proto +9 -5
  80. package/src/connection/ConnectionLockRpcLocal.ts +2 -2
  81. package/src/connection/ConnectionLockRpcRemote.ts +4 -5
  82. package/src/connection/ConnectionManager.ts +30 -36
  83. package/src/connection/ConnectivityChecker.ts +13 -15
  84. package/src/connection/ConnectorFacade.ts +36 -25
  85. package/src/connection/Handshaker.ts +15 -18
  86. package/src/connection/ManagedConnection.ts +63 -87
  87. package/src/connection/ManagedWebrtcConnection.ts +4 -2
  88. package/src/connection/simulator/SimulatorConnection.ts +17 -16
  89. package/src/connection/simulator/SimulatorConnector.ts +12 -13
  90. package/src/connection/webrtc/BrowserWebrtcConnection.ts +2 -2
  91. package/src/connection/webrtc/NodeWebrtcConnection.ts +9 -10
  92. package/src/connection/webrtc/WebrtcConnector.ts +7 -6
  93. package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +5 -5
  94. package/src/connection/websocket/ClientWebsocket.ts +3 -0
  95. package/src/connection/websocket/ServerWebsocket.ts +2 -0
  96. package/src/connection/websocket/WebsocketConnector.ts +63 -39
  97. package/src/connection/websocket/WebsocketConnectorRpcLocal.ts +2 -2
  98. package/src/connection/websocket/WebsocketConnectorRpcRemote.ts +2 -2
  99. package/src/dht/DhtNode.ts +24 -16
  100. package/src/dht/DhtNodeRpcLocal.ts +3 -3
  101. package/src/dht/DhtNodeRpcRemote.ts +5 -5
  102. package/src/dht/discovery/DiscoverySession.ts +2 -2
  103. package/src/dht/discovery/PeerDiscovery.ts +2 -2
  104. package/src/dht/find/FindRpcLocal.ts +3 -3
  105. package/src/dht/routing/FindRpcRemote.ts +4 -4
  106. package/src/dht/routing/Router.ts +10 -5
  107. package/src/dht/routing/RouterRpcLocal.ts +5 -5
  108. package/src/dht/routing/RouterRpcRemote.ts +7 -8
  109. package/src/dht/routing/RoutingSession.ts +2 -2
  110. package/src/dht/store/StoreRpcLocal.ts +2 -2
  111. package/src/dht/store/StoreRpcRemote.ts +4 -4
  112. package/src/helpers/peerIdFromPeerDescriptor.ts +6 -0
  113. package/src/proto/packages/dht/protos/DhtRpc.ts +25 -17
  114. package/test/benchmark/Find.test.ts +2 -2
  115. package/test/benchmark/KademliaCorrectness.test.ts +2 -2
  116. package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +4 -3
  117. package/test/integration/ConnectionLocking.test.ts +7 -4
  118. package/test/integration/ConnectionManager.test.ts +72 -4
  119. package/test/integration/Find.test.ts +3 -6
  120. package/test/integration/MigrateData.test.ts +4 -4
  121. package/test/integration/MultipleEntryPointJoining.test.ts +2 -2
  122. package/test/integration/ScaleDownDht.test.ts +4 -4
  123. package/test/integration/Store.test.ts +3 -6
  124. package/test/integration/StoreAndDelete.test.ts +3 -6
  125. package/test/integration/WebrtcConnectionManagement.test.ts +1 -1
  126. package/test/utils/utils.ts +8 -2
package/dist/src/connection/ConnectorFacade.js CHANGED
@@ -10,13 +10,13 @@ class DefaultConnectorFacade {
10
10
  constructor(config) {
11
11
  this.config = config;
12
12
  }
13
- async start(onIncomingConnection, canConnect, autoCertifierTransport) {
13
+ async start(onNewConnection, canConnect, autoCertifierTransport) {
14
14
  logger.trace(`Creating WebsocketConnectorRpcLocal`);
15
15
  const webSocketConnectorConfig = {
16
16
  transport: this.config.transport,
17
17
  // TODO should we use canConnect also for WebrtcConnector? (NET-1142)
18
18
  canConnect: (peerDescriptor) => canConnect(peerDescriptor),
19
- onIncomingConnection,
19
+ onNewConnection,
20
20
  portRange: this.config.websocketPortRange,
21
21
  host: this.config.websocketHost,
22
22
  entrypoints: this.config.entryPoints,
@@ -39,7 +39,7 @@ class DefaultConnectorFacade {
39
39
  externalIp: this.config.externalIp,
40
40
  portRange: this.config.webrtcPortRange,
41
41
  maxMessageSize: this.config.maxMessageSize
42
- }, onIncomingConnection);
42
+ }, onNewConnection);
43
43
  await this.websocketConnector.start();
44
44
  // TODO: generate a PeerDescriptor in a single function. Requires changes to the createOwnPeerDescriptor
45
45
  // function in the config. Currently it's given by the DhtNode and it sets the PeerDescriptor for the
@@ -47,35 +47,45 @@ class DefaultConnectorFacade {
47
47
  // LocalPeerDescriptor could be stored in one place and passed from there to the connectors
48
48
  const temporarilySelfSigned = (!this.config.tlsCertificate && this.config.websocketServerEnableTls === true);
49
49
  const connectivityResponse = await this.websocketConnector.checkConnectivity(temporarilySelfSigned);
50
- let localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
51
- this.localPeerDescriptor = localPeerDescriptor;
52
- this.websocketConnector.setLocalPeerDescriptor(localPeerDescriptor);
50
+ const localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
51
+ this.setLocalPeerDescriptor(localPeerDescriptor);
53
52
  if (localPeerDescriptor.websocket && !this.config.tlsCertificate && this.config.websocketServerEnableTls) {
54
53
  try {
55
54
  await this.websocketConnector.autoCertify();
56
55
  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');
56
+ const autocertifiedLocalPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
57
+ if (autocertifiedLocalPeerDescriptor.websocket !== undefined) {
58
+ this.setLocalPeerDescriptor(autocertifiedLocalPeerDescriptor);
59
+ }
60
+ else {
61
+ logger.warn('Connectivity check failed after auto-certification, disabling WebSocket server TLS');
62
+ await this.restartWebsocketConnector({
63
+ ...webSocketConnectorConfig,
64
+ serverEnableTls: false
65
+ });
61
66
  }
62
- this.websocketConnector.setLocalPeerDescriptor(localPeerDescriptor);
63
67
  }
64
68
  catch (err) {
65
- logger.warn('Failed to autocertify, disabling websocket server TLS');
66
- await this.websocketConnector.destroy();
67
- this.websocketConnector = new WebsocketConnector_1.WebsocketConnector({
69
+ logger.warn('Failed to auto-certify, disabling WebSocket server TLS');
70
+ await this.restartWebsocketConnector({
68
71
  ...webSocketConnectorConfig,
69
- serverEnableTls: false,
72
+ serverEnableTls: false
70
73
  });
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
74
  }
77
75
  }
78
- this.webrtcConnector.setLocalPeerDescriptor(localPeerDescriptor);
76
+ }
77
+ setLocalPeerDescriptor(peerDescriptor) {
78
+ this.localPeerDescriptor = peerDescriptor;
79
+ this.websocketConnector.setLocalPeerDescriptor(peerDescriptor);
80
+ this.webrtcConnector.setLocalPeerDescriptor(peerDescriptor);
81
+ }
82
+ async restartWebsocketConnector(webSocketConnectorConfig) {
83
+ await this.websocketConnector.destroy();
84
+ this.websocketConnector = new WebsocketConnector_1.WebsocketConnector(webSocketConnectorConfig);
85
+ await this.websocketConnector.start();
86
+ const connectivityResponse = await this.websocketConnector.checkConnectivity(false);
87
+ const localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
88
+ this.setLocalPeerDescriptor(localPeerDescriptor);
79
89
  }
80
90
  createConnection(peerDescriptor) {
81
91
  if (this.websocketConnector.isPossibleToFormConnection(peerDescriptor)) {
@@ -99,9 +109,9 @@ class SimulatorConnectorFacade {
99
109
  this.localPeerDescriptor = localPeerDescriptor;
100
110
  this.simulator = simulator;
101
111
  }
102
- async start(onIncomingConnection) {
112
+ async start(onNewConnection) {
103
113
  logger.trace(`Creating SimulatorConnector`);
104
- this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.localPeerDescriptor, this.simulator, onIncomingConnection);
114
+ this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.localPeerDescriptor, this.simulator, onNewConnection);
105
115
  this.simulator.addConnector(this.simulatorConnector);
106
116
  }
107
117
  createConnection(peerDescriptor) {
package/dist/src/connection/ConnectorFacade.js.map CHANGED
@@ -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":";;;AAAA,0CAAuC;AASvC,uEAAmE;AACnE,8DAAqE;AACrE,uEAA6F;AAa7F,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAuBjC,MAAa,sBAAsB;IAO/B,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,KAAK,CACP,eAA2D,EAC3D,UAAuD,EACvD,sBAAkC;QAElC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;QACnD,MAAM,wBAAwB,GAAG;YAC7B,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAU;YACjC,qEAAqE;YACrE,UAAU,EAAE,CAAC,cAA8B,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;YAC1E,eAAe;YACf,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACzC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YAC/B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;YAC1C,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,wBAAyB;YACtD,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAiB;YAC/C,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAwB;YAC7D,sBAAsB;YACtB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC7C,CAAA;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,wBAAwB,CAAC,CAAA;QAC1E,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAChD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC;YACvC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAU;YACjC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B;YAC9D,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,mCAAmC;YACnE,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,oCAAoC;YACrE,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B;YACzD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACtC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC7C,EAAE,eAAe,CAAC,CAAA;QACnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QACrC,wGAAwG;QACxG,qGAAqG;QACrG,yBAAyB;QACzB,2FAA2F;QAC3F,MAAM,qBAAqB,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,KAAK,IAAI,CAAC,CAAA;QAC5G,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAA;QACnG,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAA;QACvF,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAA;QAChD,IAAI,mBAAmB,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE;YACtG,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAmB,CAAC,WAAW,EAAE,CAAA;gBAC5C,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAmB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;gBACpF,MAAM,gCAAgC,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAA;gBACpG,IAAI,gCAAgC,CAAC,SAAS,KAAK,SAAS,EAAE;oBAC1D,IAAI,CAAC,sBAAsB,CAAC,gCAAgC,CAAC,CAAA;iBAChE;qBAAM;oBACH,MAAM,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAA;oBACjG,MAAM,IAAI,CAAC,yBAAyB,CAAC;wBACjC,GAAG,wBAAwB;wBAC3B,eAAe,EAAE,KAAK;qBACzB,CAAC,CAAA;iBACL;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;gBACrE,MAAM,IAAI,CAAC,yBAAyB,CAAC;oBACjC,GAAG,wBAAwB;oBAC3B,eAAe,EAAE,KAAK;iBACzB,CAAC,CAAA;aACL;SACJ;IACL,CAAC;IAEO,sBAAsB,CAAC,cAA8B;QACzD,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAA;QACzC,IAAI,CAAC,kBAAmB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAA;QAC/D,IAAI,CAAC,eAAgB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,wBAAkD;QAC9E,MAAM,IAAI,CAAC,kBAAmB,CAAC,OAAO,EAAE,CAAA;QACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,wBAAwB,CAAC,CAAA;QAC1E,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QACrC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;QACnF,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAA;QACvF,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAA;IACpD,CAAC;IAED,gBAAgB,CAAC,cAA8B;QAC3C,IAAI,IAAI,CAAC,kBAAmB,CAAC,0BAA0B,CAAC,cAAc,CAAC,EAAE;YACrE,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;SAC1D;aAAM;YACH,OAAO,IAAI,CAAC,eAAgB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;SACvD;IACL,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,kBAAmB,CAAC,OAAO,EAAE,CAAA;QACxC,MAAM,IAAI,CAAC,eAAgB,CAAC,IAAI,EAAE,CAAA;IACtC,CAAC;CACJ;AA7GD,wDA6GC;AAED,MAAa,wBAAwB;IAMjC,YAAY,mBAAmC,EAAE,SAAoB;QACjE,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,eAA2D;QACnE,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC5C,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,SAAS,EACd,eAAe,CAClB,CAAA;QACD,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;IACxD,CAAC;IAED,gBAAgB,CAAC,cAA8B;QAC3C,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,kBAAmB,CAAC,IAAI,EAAE,CAAA;IACzC,CAAC;CACJ;AAhCD,4DAgCC"}
package/dist/src/connection/Handshaker.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import { EventEmitter } from 'eventemitter3';
2
- import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
2
+ import { PeerDescriptor, HandshakeError } from '../proto/packages/dht/protos/DhtRpc';
3
3
  import { IConnection } from './IConnection';
4
4
  interface HandshakerEvents {
5
- handshakeRequest: (peerDescriptor: PeerDescriptor) => void;
6
- handshakeCompleted: (peerDescriptor: PeerDescriptor) => void;
7
- handshakeFailed: (reason?: string) => void;
5
+ handshakeRequest: (source: PeerDescriptor, target?: PeerDescriptor) => void;
6
+ handshakeCompleted: (remote: PeerDescriptor) => void;
7
+ handshakeFailed: (error?: HandshakeError) => void;
8
8
  }
9
9
  export declare class Handshaker extends EventEmitter<HandshakerEvents> {
10
10
  private static readonly HANDSHAKER_SERVICE_ID;
@@ -12,7 +12,7 @@ export declare class Handshaker extends EventEmitter<HandshakerEvents> {
12
12
  private connection;
13
13
  constructor(localPeerDescriptor: PeerDescriptor, connection: IConnection);
14
14
  private onData;
15
- sendHandshakeRequest(): void;
16
- sendHandshakeResponse(error?: string): void;
15
+ sendHandshakeRequest(remotePeerDescriptor?: PeerDescriptor): void;
16
+ sendHandshakeResponse(error?: HandshakeError): void;
17
17
  }
18
18
  export {};
package/dist/src/connection/Handshaker.js CHANGED
@@ -19,16 +19,16 @@ class Handshaker extends eventemitter3_1.EventEmitter {
19
19
  if (message.body.oneofKind === 'handshakeRequest') {
20
20
  logger.trace('handshake request received');
21
21
  const handshake = message.body.handshakeRequest;
22
- this.emit('handshakeRequest', handshake.peerDescriptor);
22
+ this.emit('handshakeRequest', handshake.sourcePeerDescriptor, handshake.targetPeerDescriptor);
23
23
  }
24
24
  if (message.body.oneofKind === 'handshakeResponse') {
25
25
  logger.trace('handshake response received');
26
26
  const handshake = message.body.handshakeResponse;
27
- if (handshake.responseError) {
28
- this.emit('handshakeFailed', handshake.responseError);
27
+ if (handshake.error !== undefined) {
28
+ this.emit('handshakeFailed', handshake.error);
29
29
  }
30
30
  else {
31
- this.emit('handshakeCompleted', handshake.peerDescriptor);
31
+ this.emit('handshakeCompleted', handshake.sourcePeerDescriptor);
32
32
  }
33
33
  }
34
34
  }
@@ -36,10 +36,10 @@ class Handshaker extends eventemitter3_1.EventEmitter {
36
36
  logger.error('error while parsing handshake message', err);
37
37
  }
38
38
  }
39
- sendHandshakeRequest() {
39
+ sendHandshakeRequest(remotePeerDescriptor) {
40
40
  const outgoingHandshake = {
41
- sourceId: this.localPeerDescriptor.kademliaId,
42
- peerDescriptor: this.localPeerDescriptor
41
+ sourcePeerDescriptor: this.localPeerDescriptor,
42
+ targetPeerDescriptor: remotePeerDescriptor
43
43
  };
44
44
  const msg = {
45
45
  serviceId: Handshaker.HANDSHAKER_SERVICE_ID,
@@ -55,12 +55,9 @@ class Handshaker extends eventemitter3_1.EventEmitter {
55
55
  }
56
56
  sendHandshakeResponse(error) {
57
57
  const outgoingHandshakeResponse = {
58
- sourceId: this.localPeerDescriptor.kademliaId,
59
- peerDescriptor: this.localPeerDescriptor
58
+ sourcePeerDescriptor: this.localPeerDescriptor,
59
+ error
60
60
  };
61
- if (error) {
62
- outgoingHandshakeResponse.responseError = error;
63
- }
64
61
  const msg = {
65
62
  serviceId: Handshaker.HANDSHAKER_SERVICE_ID,
66
63
  messageType: DhtRpc_1.MessageType.HANDSHAKE_RESPONSE,
@@ -71,7 +68,7 @@ class Handshaker extends eventemitter3_1.EventEmitter {
71
68
  }
72
69
  };
73
70
  this.connection.send(DhtRpc_1.Message.toBinary(msg));
74
- logger.trace('handshake request sent');
71
+ logger.trace('handshake response sent');
75
72
  }
76
73
  }
77
74
  exports.Handshaker = Handshaker;
package/dist/src/connection/Handshaker.js.map CHANGED
@@ -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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"}
package/dist/src/connection/ManagedConnection.d.ts CHANGED
@@ -1,43 +1,41 @@
1
1
  import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from './IConnection';
2
- import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
2
+ import { HandshakeError, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
3
3
  import EventEmitter from 'eventemitter3';
4
4
  import { PeerIDKey } from '../helpers/PeerID';
5
5
  export interface ManagedConnectionEvents {
6
6
  managedData: (bytes: Uint8Array, remotePeerDescriptor: PeerDescriptor) => void;
7
- handshakeRequest: (peerDescriptor: PeerDescriptor) => void;
7
+ handshakeRequest: (source: PeerDescriptor, target?: PeerDescriptor) => void;
8
8
  handshakeCompleted: (peerDescriptor: PeerDescriptor) => void;
9
9
  handshakeFailed: () => void;
10
10
  bufferSentByOtherConnection: () => void;
11
11
  closing: () => void;
12
- internal_disconnected: () => void;
13
12
  }
14
13
  export type Events = ManagedConnectionEvents & ConnectionEvents;
15
14
  export declare class ManagedConnection extends EventEmitter<Events> {
16
15
  private implementation?;
16
+ private outputBufferEmitter;
17
17
  private outputBuffer;
18
18
  private inputBuffer;
19
19
  connectionId: ConnectionID;
20
- private peerDescriptor?;
20
+ private remotePeerDescriptor?;
21
21
  connectionType: ConnectionType;
22
22
  private handshaker?;
23
23
  private handshakeCompleted;
24
- private doNotEmitDisconnected;
25
24
  private lastUsed;
26
25
  private stopped;
27
26
  offeredAsIncoming: boolean;
28
- rejectedAsIncoming: boolean;
29
27
  private bufferSentbyOtherConnection;
30
28
  private closing;
31
29
  replacedByOtherConnection: boolean;
32
30
  private localPeerDescriptor;
33
31
  protected outgoingConnection?: IConnection;
34
32
  protected incomingConnection?: IConnection;
35
- constructor(localPeerDescriptor: PeerDescriptor, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection);
33
+ constructor(localPeerDescriptor: PeerDescriptor, connectionType: ConnectionType, outgoingConnection?: IConnection, incomingConnection?: IConnection, targetPeerDescriptor?: PeerDescriptor);
36
34
  on(event: keyof Events, fn: (...args: any) => void, context?: any): this;
37
35
  once(event: keyof Events, fn: (...args: any) => void, context?: any): this;
38
36
  get peerIdKey(): PeerIDKey;
39
37
  getLastUsed(): number;
40
- setPeerDescriptor(peerDescriptor: PeerDescriptor): void;
38
+ setRemotePeerDescriptor(peerDescriptor: PeerDescriptor): void;
41
39
  getPeerDescriptor(): PeerDescriptor | undefined;
42
40
  private onHandshakeCompleted;
43
41
  attachImplementation(impl: IConnection): void;
@@ -46,8 +44,7 @@ export declare class ManagedConnection extends EventEmitter<Events> {
46
44
  sendNoWait(data: Uint8Array): void;
47
45
  reportBufferSentByOtherConnection(): void;
48
46
  acceptHandshake(): void;
49
- rejectHandshake(errorMessage: string): void;
50
- private doDisconnect;
47
+ rejectHandshake(error: HandshakeError): void;
51
48
  close(gracefulLeave: boolean): Promise<void>;
52
49
  destroy(): void;
53
50
  isHandshakeCompleted(): boolean;
package/dist/src/connection/ManagedConnection.js CHANGED
@@ -30,31 +30,31 @@ exports.ManagedConnection = void 0;
30
30
  const IConnection_1 = require("./IConnection");
31
31
  const Err = __importStar(require("../helpers/errors"));
32
32
  const Handshaker_1 = require("./Handshaker");
33
+ const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
33
34
  const utils_1 = require("@streamr/utils");
34
35
  const eventemitter3_1 = __importDefault(require("eventemitter3"));
35
36
  const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
36
37
  const ConnectionManager_1 = require("./ConnectionManager");
37
38
  const logger = new utils_1.Logger(module);
38
39
  class ManagedConnection extends eventemitter3_1.default {
39
- constructor(localPeerDescriptor, connectionType, outgoingConnection, incomingConnection) {
40
+ constructor(localPeerDescriptor, connectionType, outgoingConnection, incomingConnection, targetPeerDescriptor) {
40
41
  super();
42
+ this.outputBufferEmitter = new eventemitter3_1.default();
41
43
  this.outputBuffer = [];
42
44
  this.inputBuffer = [];
43
45
  this.handshakeCompleted = false;
44
- this.doNotEmitDisconnected = false;
45
46
  this.lastUsed = Date.now();
46
47
  this.stopped = false;
47
48
  this.offeredAsIncoming = false;
48
- this.rejectedAsIncoming = false;
49
49
  this.bufferSentbyOtherConnection = false;
50
50
  this.closing = false;
51
51
  this.replacedByOtherConnection = false;
52
- this.send = this.send.bind(this);
53
52
  this.localPeerDescriptor = localPeerDescriptor;
54
53
  this.outgoingConnection = outgoingConnection;
55
54
  this.incomingConnection = incomingConnection;
56
55
  this.connectionType = connectionType;
57
56
  this.connectionId = new IConnection_1.ConnectionID();
57
+ this.send = this.send.bind(this);
58
58
  this.onDisconnected = this.onDisconnected.bind(this);
59
59
  logger.trace('creating ManagedConnection of type: ' + connectionType);
60
60
  if (incomingConnection && outgoingConnection) {
@@ -62,19 +62,24 @@ class ManagedConnection extends eventemitter3_1.default {
62
62
  }
63
63
  if (outgoingConnection) {
64
64
  this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, outgoingConnection);
65
- this.handshaker.once('handshakeFailed', (errorMessage) => {
66
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed: ' + errorMessage);
67
- this.emit('handshakeFailed');
65
+ this.handshaker.once('handshakeFailed', (error) => {
66
+ if (error === DhtRpc_1.HandshakeError.INVALID_TARGET_PEER_DESCRIPTOR) {
67
+ this.close(false);
68
+ }
69
+ else {
70
+ logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' handshakeFailed: ' + error);
71
+ this.emit('handshakeFailed');
72
+ }
68
73
  });
69
74
  this.handshaker.on('handshakeCompleted', (peerDescriptor) => {
70
75
  logger.trace('handshake completed for outgoing connection '
71
- + ', ' + (0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor)
76
+ + ', ' + (0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor)
72
77
  + ' outputBuffer.length: ' + this.outputBuffer.length);
73
78
  this.attachImplementation(outgoingConnection);
74
79
  this.onHandshakeCompleted(peerDescriptor);
75
80
  });
76
81
  outgoingConnection.once('connected', () => {
77
- this.handshaker.sendHandshakeRequest();
82
+ this.handshaker.sendHandshakeRequest(targetPeerDescriptor);
78
83
  this.emit('connected');
79
84
  });
80
85
  outgoingConnection.once('disconnected', this.onDisconnected);
@@ -82,9 +87,9 @@ class ManagedConnection extends eventemitter3_1.default {
82
87
  else {
83
88
  if (incomingConnection) {
84
89
  this.handshaker = new Handshaker_1.Handshaker(this.localPeerDescriptor, incomingConnection);
85
- this.handshaker.on('handshakeRequest', (peerDescriptor) => {
86
- this.setPeerDescriptor(peerDescriptor);
87
- this.emit('handshakeRequest', peerDescriptor);
90
+ this.handshaker.on('handshakeRequest', (sourcePeerDescriptor, targetPeerDescriptor) => {
91
+ this.setRemotePeerDescriptor(sourcePeerDescriptor);
92
+ this.emit('handshakeRequest', sourcePeerDescriptor, targetPeerDescriptor);
88
93
  });
89
94
  incomingConnection.on('disconnected', this.onDisconnected);
90
95
  }
@@ -125,25 +130,26 @@ class ManagedConnection extends eventemitter3_1.default {
125
130
  return this;
126
131
  }
127
132
  get peerIdKey() {
128
- return (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.peerDescriptor);
133
+ return (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor);
129
134
  }
130
135
  getLastUsed() {
131
136
  return this.lastUsed;
132
137
  }
133
- setPeerDescriptor(peerDescriptor) {
134
- this.peerDescriptor = peerDescriptor;
138
+ setRemotePeerDescriptor(peerDescriptor) {
139
+ this.remotePeerDescriptor = peerDescriptor;
135
140
  }
136
141
  getPeerDescriptor() {
137
- return this.peerDescriptor;
142
+ return this.remotePeerDescriptor;
138
143
  }
139
144
  onHandshakeCompleted(peerDescriptor) {
140
145
  this.lastUsed = Date.now();
141
- this.setPeerDescriptor(peerDescriptor);
146
+ this.setRemotePeerDescriptor(peerDescriptor);
142
147
  this.handshakeCompleted = true;
143
148
  while (this.outputBuffer.length > 0) {
144
149
  logger.trace('emptying outputBuffer');
145
150
  this.implementation.send(this.outputBuffer.shift());
146
151
  }
152
+ this.outputBufferEmitter.emit('bufferSent');
147
153
  logger.trace('emitting handshake_completed');
148
154
  this.emit('handshakeCompleted', peerDescriptor);
149
155
  }
@@ -167,23 +173,24 @@ class ManagedConnection extends eventemitter3_1.default {
167
173
  logger.trace('connected emitted');
168
174
  this.emit('connected');
169
175
  });
176
+ //ensure that we have subscribed to the event only once
170
177
  impl.off('disconnected', this.onDisconnected);
171
178
  impl.on('disconnected', this.onDisconnected);
172
179
  }
173
180
  onDisconnected(gracefulLeave) {
174
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' onDisconnected() ' + gracefulLeave);
181
+ logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' onDisconnected() ' + gracefulLeave);
175
182
  if (this.bufferSentbyOtherConnection) {
176
183
  return;
177
184
  }
178
- this.emit('internal_disconnected');
179
- this.doDisconnect(gracefulLeave);
185
+ this.outputBufferEmitter.emit('bufferSendingFailed');
186
+ this.emit('disconnected', gracefulLeave);
180
187
  }
181
188
  async send(data, doNotConnect = false) {
182
189
  if (this.stopped) {
183
- return;
190
+ throw new Err.SendFailed('ManagedConnection is stopped');
184
191
  }
185
192
  if (this.closing) {
186
- return;
193
+ throw new Err.SendFailed('ManagedConnection is closing');
187
194
  }
188
195
  this.lastUsed = Date.now();
189
196
  if (doNotConnect && !this.implementation) {
@@ -195,52 +202,17 @@ class ManagedConnection extends eventemitter3_1.default {
195
202
  else {
196
203
  logger.trace('adding data to outputBuffer');
197
204
  let result;
198
- this.doNotEmitDisconnected = true;
199
205
  try {
200
- result = await (0, utils_1.runAndRaceEvents3)([() => { this.outputBuffer.push(data); }], this, ['handshakeCompleted', 'handshakeFailed',
201
- 'bufferSentByOtherConnection', 'closing', 'internal_disconnected'], 15000);
206
+ result = await (0, utils_1.runAndRaceEvents3)([() => { this.outputBuffer.push(data); }], this.outputBufferEmitter, ['bufferSent', 'bufferSendingFailed'], 15000);
202
207
  }
203
208
  catch (e) {
204
- logger.debug(`Connection to ${(0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor)} timed out`);
205
- throw e;
209
+ logger.debug(`Connection to ${(0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor)} timed out`);
210
+ throw new Err.SendFailed('Sending buffer timed out');
206
211
  }
207
- if (result.winnerName === 'internal_disconnected') {
208
- this.doNotEmitDisconnected = false;
209
- this.doDisconnect(false);
210
- }
211
- else if (result.winnerName === 'handshakeFailed') {
212
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' handshakeFailed received');
213
- if (this.bufferSentbyOtherConnection) {
214
- logger.trace('bufferSentByOtherConnection already true');
215
- this.doNotEmitDisconnected = false;
216
- this.doDisconnect(false);
217
- }
218
- else {
219
- let result2;
220
- try {
221
- result2 = await (0, utils_1.raceEvents3)(this, ['bufferSentByOtherConnection', 'closing', 'disconnected'], 15000);
222
- }
223
- catch (ex) {
224
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor)
225
- + ' Exception from raceEvents3 while waiting bufferSentByOtherConnection or closing ' + ex);
226
- throw ex;
227
- }
228
- if (result2.winnerName === 'bufferSentByOtherConnection') {
229
- logger.trace('bufferSentByOtherConnection received');
230
- this.doNotEmitDisconnected = false;
231
- this.doDisconnect(false);
232
- }
233
- else if (result2.winnerName === 'closing') {
234
- logger.trace('bufferSentByOtherConnection not received, instead received a closing event');
235
- }
236
- else if (result2.winnerName === 'disconnected') {
237
- logger.trace('disconnected while in raceEvents3');
238
- }
239
- }
240
- }
241
- else {
242
- this.doNotEmitDisconnected = false;
212
+ if (result.winnerName === 'bufferSendingFailed') {
213
+ throw new Err.SendFailed('Sending buffer failed');
243
214
  }
215
+ // buffer was sent successfully, return normally
244
216
  }
245
217
  }
246
218
  sendNoWait(data) {
@@ -254,12 +226,13 @@ class ManagedConnection extends eventemitter3_1.default {
254
226
  }
255
227
  }
256
228
  reportBufferSentByOtherConnection() {
257
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' reportBufferSentByOtherConnection');
229
+ logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(this.remotePeerDescriptor) + ' reportBufferSentByOtherConnection');
258
230
  if (this.handshaker) {
259
231
  this.handshaker.removeAllListeners();
260
232
  }
261
233
  logger.trace('bufferSentByOtherConnection reported');
262
234
  this.bufferSentbyOtherConnection = true;
235
+ this.outputBufferEmitter.emit('bufferSent');
263
236
  this.emit('bufferSentByOtherConnection');
264
237
  }
265
238
  acceptHandshake() {
@@ -274,28 +247,19 @@ class ManagedConnection extends eventemitter3_1.default {
274
247
  this.handshaker.sendHandshakeResponse();
275
248
  this.attachImplementation(this.incomingConnection);
276
249
  }
277
- this.onHandshakeCompleted(this.peerDescriptor);
250
+ this.onHandshakeCompleted(this.remotePeerDescriptor);
278
251
  }
279
- rejectHandshake(errorMessage) {
280
- this.handshaker.sendHandshakeResponse(errorMessage);
281
- }
282
- doDisconnect(gracefulLeave) {
283
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' doDisconnect() emitting');
284
- if (!this.doNotEmitDisconnected) {
285
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' emitting disconnected');
286
- this.emit('disconnected', gracefulLeave);
287
- }
288
- else {
289
- logger.trace((0, ConnectionManager_1.keyOrUnknownFromPeerDescriptor)(this.peerDescriptor) + ' not emitting disconnected because doNotEmitDisconnected flag is set');
290
- }
252
+ rejectHandshake(error) {
253
+ this.handshaker.sendHandshakeResponse(error);
254
+ this.destroy();
291
255
  }
292
256
  async close(gracefulLeave) {
293
257
  if (this.replacedByOtherConnection) {
294
258
  logger.trace('close() called on replaced connection');
295
259
  }
296
260
  this.closing = true;
261
+ this.outputBufferEmitter.emit('bufferSendingFailed');
297
262
  this.emit('closing');
298
- this.doNotEmitDisconnected = false;
299
263
  if (this.implementation) {
300
264
  await this.implementation?.close(gracefulLeave);
301
265
  }
@@ -306,7 +270,7 @@ class ManagedConnection extends eventemitter3_1.default {
306
270
  await this.incomingConnection?.close(gracefulLeave);
307
271
  }
308
272
  else {
309
- this.doDisconnect(gracefulLeave);
273
+ this.emit('disconnected', gracefulLeave);
310
274
  }
311
275
  }
312
276
  destroy() {
package/dist/src/connection/ManagedConnection.js.map CHANGED
@@ -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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"}
package/dist/src/connection/ManagedWebrtcConnection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ManagedWebrtcConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedWebrtcConnection.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAC9C,2DAAuD;AAGvD,MAAa,uBAAwB,SAAQ,qCAAiB;IAE1D,YAAY,mBAAmC,EAC3C,oBAA2C,EAC3C,mBAA0C;QAC1C,KAAK,CACD,mBAAmB,EACnB,4BAAc,CAAC,MAAM,EACrB,oBAAoB,EACpB,mBAAmB,CAAC,CAAA;IAC5B,CAAC;IAEM,mBAAmB;QACtB,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;aAAM;YACH,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;IACL,CAAC;CACJ;AAnBD,0DAmBC"}
1
+ {"version":3,"file":"ManagedWebrtcConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedWebrtcConnection.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAC9C,2DAAuD;AAGvD,MAAa,uBAAwB,SAAQ,qCAAiB;IAE1D,YAAY,mBAAmC,EAC3C,oBAA2C,EAC3C,mBAA0C;QAE1C,KAAK,CACD,mBAAmB,EACnB,4BAAc,CAAC,MAAM,EACrB,oBAAoB,EACpB,mBAAmB,CACtB,CAAA;IACL,CAAC;IAEM,mBAAmB;QACtB,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;aAAM;YACH,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;IACL,CAAC;CACJ;AArBD,0DAqBC"}