@dxos/network-manager 0.1.9 → 0.1.11

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 (155) hide show
  1. package/dist/src/index.d.ts +2 -2
  2. package/dist/src/index.d.ts.map +1 -1
  3. package/dist/src/index.js +2 -2
  4. package/dist/src/index.js.map +1 -1
  5. package/dist/src/network-manager.d.ts +10 -14
  6. package/dist/src/network-manager.d.ts.map +1 -1
  7. package/dist/src/network-manager.js +28 -33
  8. package/dist/src/network-manager.js.map +1 -1
  9. package/dist/src/protocol-factory.d.ts.map +1 -1
  10. package/dist/src/protocol-factory.js +8 -6
  11. package/dist/src/protocol-factory.js.map +1 -1
  12. package/dist/src/signal/index.d.ts +2 -2
  13. package/dist/src/signal/index.d.ts.map +1 -1
  14. package/dist/src/signal/index.js +2 -2
  15. package/dist/src/signal/index.js.map +1 -1
  16. package/dist/src/signal/message-router.d.ts +2 -2
  17. package/dist/src/signal/message-router.js +3 -3
  18. package/dist/src/signal/message-router.js.map +1 -1
  19. package/dist/src/signal/{signal-messaging.d.ts → signal-messenger.d.ts} +2 -2
  20. package/dist/src/signal/{signal-messaging.d.ts.map → signal-messenger.d.ts.map} +1 -1
  21. package/dist/src/signal/{signal-messaging.js → signal-messenger.js} +1 -1
  22. package/dist/src/signal/signal-messenger.js.map +1 -0
  23. package/dist/src/swarm/connection.d.ts +6 -3
  24. package/dist/src/swarm/connection.d.ts.map +1 -1
  25. package/dist/src/swarm/connection.js +28 -15
  26. package/dist/src/swarm/connection.js.map +1 -1
  27. package/dist/src/swarm/peer.d.ts +45 -0
  28. package/dist/src/swarm/peer.d.ts.map +1 -0
  29. package/dist/src/swarm/peer.js +113 -0
  30. package/dist/src/swarm/peer.js.map +1 -0
  31. package/dist/src/swarm/swarm-mapper.d.ts +2 -2
  32. package/dist/src/swarm/swarm-mapper.d.ts.map +1 -1
  33. package/dist/src/swarm/swarm-mapper.js +12 -10
  34. package/dist/src/swarm/swarm-mapper.js.map +1 -1
  35. package/dist/src/swarm/swarm.d.ts +13 -18
  36. package/dist/src/swarm/swarm.d.ts.map +1 -1
  37. package/dist/src/swarm/swarm.js +126 -97
  38. package/dist/src/swarm/swarm.js.map +1 -1
  39. package/dist/src/swarm/swarm.test.js +2 -2
  40. package/dist/src/swarm/swarm.test.js.map +1 -1
  41. package/dist/src/testing/test-builder.d.ts +31 -18
  42. package/dist/src/testing/test-builder.d.ts.map +1 -1
  43. package/dist/src/testing/test-builder.js +120 -48
  44. package/dist/src/testing/test-builder.js.map +1 -1
  45. package/dist/src/testing/test-protocol.d.ts +5 -5
  46. package/dist/src/testing/test-protocol.d.ts.map +1 -1
  47. package/dist/src/testing/test-protocol.js +28 -24
  48. package/dist/src/testing/test-protocol.js.map +1 -1
  49. package/dist/src/tests/basic-test-suite.d.ts +6 -0
  50. package/dist/src/tests/basic-test-suite.d.ts.map +1 -0
  51. package/dist/src/tests/basic-test-suite.js +142 -0
  52. package/dist/src/tests/basic-test-suite.js.map +1 -0
  53. package/dist/src/tests/memory-transport.test.d.ts +2 -0
  54. package/dist/src/tests/memory-transport.test.d.ts.map +1 -0
  55. package/dist/src/tests/memory-transport.test.js +12 -0
  56. package/dist/src/tests/memory-transport.test.js.map +1 -0
  57. package/dist/src/{presence.test.d.ts → tests/presence.test.d.ts} +0 -0
  58. package/dist/src/tests/presence.test.d.ts.map +1 -0
  59. package/dist/src/{presence.test.js → tests/presence.test.js} +21 -20
  60. package/dist/src/tests/presence.test.js.map +1 -0
  61. package/dist/src/tests/property-test-suite.d.ts +5 -0
  62. package/dist/src/tests/property-test-suite.d.ts.map +1 -0
  63. package/dist/src/tests/property-test-suite.js +203 -0
  64. package/dist/src/tests/property-test-suite.js.map +1 -0
  65. package/dist/src/tests/utils.d.ts +21 -0
  66. package/dist/src/tests/utils.d.ts.map +1 -0
  67. package/dist/src/tests/utils.js +76 -0
  68. package/dist/src/tests/utils.js.map +1 -0
  69. package/dist/src/tests/webrtc-transport.test.d.ts +2 -0
  70. package/dist/src/tests/webrtc-transport.test.d.ts.map +1 -0
  71. package/dist/src/tests/webrtc-transport.test.js +16 -0
  72. package/dist/src/tests/webrtc-transport.test.js.map +1 -0
  73. package/dist/src/topology/fully-connected-topology.d.ts +1 -1
  74. package/dist/src/topology/fully-connected-topology.d.ts.map +1 -1
  75. package/dist/src/topology/fully-connected-topology.js +4 -3
  76. package/dist/src/topology/fully-connected-topology.js.map +1 -1
  77. package/dist/src/topology/mmst-topology.js +4 -4
  78. package/dist/src/topology/mmst-topology.js.map +1 -1
  79. package/dist/src/topology/star-topology.js +4 -4
  80. package/dist/src/topology/star-topology.js.map +1 -1
  81. package/dist/src/topology/topology.d.ts +0 -5
  82. package/dist/src/topology/topology.d.ts.map +1 -1
  83. package/dist/src/transport/memory-transport.d.ts +8 -7
  84. package/dist/src/transport/memory-transport.d.ts.map +1 -1
  85. package/dist/src/transport/memory-transport.js +79 -45
  86. package/dist/src/transport/memory-transport.js.map +1 -1
  87. package/dist/src/transport/memory-transport.test.js +3 -2
  88. package/dist/src/transport/memory-transport.test.js.map +1 -1
  89. package/dist/src/transport/transport.d.ts +8 -4
  90. package/dist/src/transport/transport.d.ts.map +1 -1
  91. package/dist/src/transport/webrtc-simple-peer.test.d.ts +2 -0
  92. package/dist/src/transport/webrtc-simple-peer.test.d.ts.map +1 -0
  93. package/dist/src/transport/{wrtc-simple-peer.test.js → webrtc-simple-peer.test.js} +2 -2
  94. package/dist/src/transport/webrtc-simple-peer.test.js.map +1 -0
  95. package/dist/src/transport/webrtc-transport-proxy.d.ts +4 -4
  96. package/dist/src/transport/webrtc-transport-proxy.d.ts.map +1 -1
  97. package/dist/src/transport/webrtc-transport-proxy.js +15 -10
  98. package/dist/src/transport/webrtc-transport-proxy.js.map +1 -1
  99. package/dist/src/transport/webrtc-transport-proxy.test.js +2 -2
  100. package/dist/src/transport/webrtc-transport-proxy.test.js.map +1 -1
  101. package/dist/src/transport/webrtc-transport-service.js +2 -2
  102. package/dist/src/transport/webrtc-transport-service.js.map +1 -1
  103. package/dist/src/transport/webrtc-transport.d.ts +3 -3
  104. package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
  105. package/dist/src/transport/webrtc-transport.js +10 -10
  106. package/dist/src/transport/webrtc-transport.js.map +1 -1
  107. package/dist/src/transport/webrtc-transport.test.js +3 -3
  108. package/dist/src/transport/webrtc-transport.test.js.map +1 -1
  109. package/dist/src/types.d.ts +1 -1
  110. package/dist/src/types.d.ts.map +1 -1
  111. package/package.json +27 -22
  112. package/src/index.ts +2 -2
  113. package/src/network-manager.ts +31 -46
  114. package/src/protocol-factory.ts +5 -3
  115. package/src/signal/index.ts +2 -2
  116. package/src/signal/integration.test.ts +1 -1
  117. package/src/signal/message-router.test.ts +1 -1
  118. package/src/signal/message-router.ts +2 -2
  119. package/src/signal/{signal-messaging.ts → signal-messenger.ts} +2 -2
  120. package/src/swarm/connection.ts +23 -12
  121. package/src/swarm/peer.ts +156 -0
  122. package/src/swarm/swarm-mapper.ts +21 -10
  123. package/src/swarm/swarm.ts +142 -111
  124. package/src/testing/test-builder.ts +143 -63
  125. package/src/testing/test-protocol.ts +31 -23
  126. package/src/tests/basic-test-suite.ts +168 -0
  127. package/src/tests/memory-transport.test.ts +11 -0
  128. package/src/{presence.test.ts → tests/presence.test.ts} +24 -23
  129. package/src/tests/property-test-suite.ts +221 -0
  130. package/src/tests/utils.ts +85 -0
  131. package/src/tests/webrtc-transport.test.ts +16 -0
  132. package/src/topology/fully-connected-topology.ts +5 -4
  133. package/src/topology/topology.ts +0 -5
  134. package/src/transport/memory-transport.test.ts +3 -2
  135. package/src/transport/memory-transport.ts +79 -49
  136. package/src/transport/transport.ts +9 -3
  137. package/src/transport/{wrtc-simple-peer.test.ts → webrtc-simple-peer.test.ts} +1 -1
  138. package/src/transport/webrtc-transport-proxy.test.ts +2 -2
  139. package/src/transport/webrtc-transport-proxy.ts +17 -8
  140. package/src/transport/webrtc-transport-service.ts +1 -1
  141. package/src/transport/webrtc-transport.test.ts +4 -6
  142. package/src/transport/webrtc-transport.ts +4 -4
  143. package/testing.d.ts +11 -0
  144. package/testing.js +5 -0
  145. package/dist/src/network-manager.test.d.ts +0 -2
  146. package/dist/src/network-manager.test.d.ts.map +0 -1
  147. package/dist/src/network-manager.test.js +0 -596
  148. package/dist/src/network-manager.test.js.map +0 -1
  149. package/dist/src/presence.test.d.ts.map +0 -1
  150. package/dist/src/presence.test.js.map +0 -1
  151. package/dist/src/signal/signal-messaging.js.map +0 -1
  152. package/dist/src/transport/wrtc-simple-peer.test.d.ts +0 -2
  153. package/dist/src/transport/wrtc-simple-peer.test.d.ts.map +0 -1
  154. package/dist/src/transport/wrtc-simple-peer.test.js.map +0 -1
  155. package/src/network-manager.test.ts +0 -707
@@ -1 +1 @@
1
- {"version":3,"file":"topology.d.ts","sourceRoot":"","sources":["../../../src/topology/topology.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,QAAQ,IAAI,UAAU,CAAC;IAEvB;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAE/B;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,SAAS,EAAE,SAAS,EAAE,CAAC;IAEvB;;OAEG;IACH,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,QAAQ;IACvB;;;;;;OAMG;IACH,IAAI,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IAExC;;OAEG;IACH,MAAM,IAAI,IAAI,CAAC;IAEf;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
1
+ {"version":3,"file":"topology.d.ts","sourceRoot":"","sources":["../../../src/topology/topology.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,QAAQ,IAAI,UAAU,CAAC;IAEvB;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAE/B;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,SAAS,EAAE,SAAS,EAAE,CAAC;IAEvB;;OAEG;IACH,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,QAAQ;IACvB;;;OAGG;IACH,IAAI,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IAExC;;OAEG;IACH,MAAM,IAAI,IAAI,CAAC;IAEf;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
@@ -2,24 +2,25 @@ import { Event } from '@dxos/async';
2
2
  import { ErrorStream } from '@dxos/debug';
3
3
  import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
4
4
  import { Transport, TransportFactory, TransportOptions } from './transport';
5
+ export declare const MemoryTransportFactory: TransportFactory;
5
6
  /**
6
7
  * Fake transport.
7
8
  */
8
9
  export declare class MemoryTransport implements Transport {
9
- private readonly params;
10
+ private readonly options;
10
11
  private static readonly _connections;
11
12
  readonly closed: Event<void>;
12
13
  readonly connected: Event<void>;
13
14
  readonly errors: ErrorStream;
14
- private readonly _ownId;
15
- private _remoteId;
15
+ private readonly _id;
16
16
  private readonly _remote;
17
17
  private readonly _outgoingDelay;
18
18
  private readonly _incomingDelay;
19
+ private _destroyed;
20
+ private _remoteId;
19
21
  private _remoteConnection?;
20
- constructor(params: TransportOptions);
21
- signal(signal: Signal): Promise<void>;
22
- close(): Promise<void>;
22
+ constructor(options: TransportOptions);
23
+ destroy(): Promise<void>;
24
+ signal(signal: Signal): void;
23
25
  }
24
- export declare const MemoryTransportFactory: TransportFactory;
25
26
  //# sourceMappingURL=memory-transport.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"memory-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAgB5E;;GAEG;AAEH,qBAAa,eAAgB,YAAW,SAAS;IAiBnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAfnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA8D;IAElG,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAE3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAE5E,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAEf,MAAM,EAAE,gBAAgB;IAmC/C,MAAM,CAAC,MAAM,EAAE,MAAM;IAUrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B7B;AAED,eAAO,MAAM,sBAAsB,EAAE,gBAEpC,CAAC"}
1
+ {"version":3,"file":"memory-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAkB5E,eAAO,MAAM,sBAAsB,EAAE,gBAEpC,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAkBnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhBpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA8D;IAElG,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAE3C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAE5E,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAEf,OAAO,EAAE,gBAAgB;IAwDhD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+B9B,MAAM,CAAC,MAAM,EAAE,MAAM;CAYtB"}
@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
6
6
  return (mod && mod.__esModule) ? mod : { "default": mod };
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.MemoryTransportFactory = exports.MemoryTransport = void 0;
9
+ exports.MemoryTransport = exports.MemoryTransportFactory = void 0;
10
10
  const node_assert_1 = __importDefault(require("node:assert"));
11
11
  const stream_1 = require("stream");
12
12
  const async_1 = require("@dxos/async");
@@ -14,69 +14,93 @@ const debug_1 = require("@dxos/debug");
14
14
  const keys_1 = require("@dxos/keys");
15
15
  const log_1 = require("@dxos/log");
16
16
  const util_1 = require("@dxos/util");
17
+ // TODO(burdon): Make configurable.
17
18
  // Delay (in milliseconds) for data being sent through in-memory connections to simulate network latency.
18
19
  const MEMORY_TRANSPORT_DELAY = 1;
19
20
  /**
20
21
  * Creates a binary stream that delays data being sent through the stream by the specified amount of time.
21
22
  */
22
- const createStreamDelay = (delay) => new stream_1.Transform({
23
- objectMode: true,
24
- transform: (chunk, _, cb) => {
25
- setTimeout(() => cb(null, chunk), delay); // TODO(burdon): Randomize.
26
- }
27
- });
23
+ const createStreamDelay = (delay) => {
24
+ return new stream_1.Transform({
25
+ objectMode: true,
26
+ transform: (chunk, _, cb) => {
27
+ setTimeout(() => cb(null, chunk), delay); // TODO(burdon): Randomize.
28
+ }
29
+ });
30
+ };
31
+ exports.MemoryTransportFactory = {
32
+ createTransport: (params) => new MemoryTransport(params)
33
+ };
28
34
  /**
29
35
  * Fake transport.
30
36
  */
31
- // TODO(burdon): Remove static variables.
32
37
  class MemoryTransport {
33
- constructor(params) {
34
- this.params = params;
38
+ constructor(options) {
39
+ var _a;
40
+ this.options = options;
35
41
  this.closed = new async_1.Event();
36
42
  this.connected = new async_1.Event();
37
43
  this.errors = new debug_1.ErrorStream();
38
- this._ownId = keys_1.PublicKey.random();
44
+ this._id = keys_1.PublicKey.random(); // TODO(burdon): Rename peerId? (Use local/remote labels in logs).
39
45
  this._remote = new async_1.Trigger();
40
46
  this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
41
47
  this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
42
- (0, log_1.log)('creating', this._ownId, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 53 });
43
- if (this.params.initiator) {
44
- setTimeout(async () => this.params.sendSignal({ json: JSON.stringify({ transportId: this._ownId.toHex() }) }));
48
+ this._destroyed = false;
49
+ (0, log_1.log)('creating', { id: this._id }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 59, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
50
+ (0, node_assert_1.default)(!MemoryTransport._connections.has(this._id), 'Duplicate memory connection');
51
+ MemoryTransport._connections.set(this._id, this);
52
+ // Initiator will send a signal, the receiver will receive the unique ID and connect the streams.
53
+ if (this.options.initiator) {
54
+ // prettier-ignore
55
+ setTimeout(async () => {
56
+ (0, log_1.log)('sending signal', { transportId: this._id }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 68, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
57
+ void this.options.sendSignal({
58
+ json: JSON.stringify({ transportId: this._id.toHex() })
59
+ });
60
+ });
45
61
  }
46
- (0, node_assert_1.default)(!MemoryTransport._connections.has(this._ownId), 'Duplicate memory connection');
47
- MemoryTransport._connections.set(this._ownId, this);
48
- this._remote.wait().then((remoteId) => {
49
- this._remoteId = remoteId;
50
- this._remoteConnection = MemoryTransport._connections.get(this._remoteId);
51
- if (this._remoteConnection) {
62
+ else {
63
+ this._remote
64
+ .wait({ timeout: (_a = this.options.timeout) !== null && _a !== void 0 ? _a : 1000 })
65
+ .then((remoteId) => {
66
+ if (this._destroyed) {
67
+ return;
68
+ }
69
+ this._remoteId = remoteId;
70
+ this._remoteConnection = MemoryTransport._connections.get(this._remoteId);
71
+ if (!this._remoteConnection) {
72
+ // Remote connection was destroyed before we could connect.
73
+ this._destroyed = true;
74
+ this.closed.emit();
75
+ return;
76
+ }
77
+ (0, node_assert_1.default)(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteId}`));
52
78
  this._remoteConnection._remoteConnection = this;
53
- this._remoteConnection._remoteId = this._ownId;
54
- (0, log_1.log)('connected', { ownId: this._ownId, remoteId: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 70 });
55
- this.params.stream
79
+ this._remoteConnection._remoteId = this._id;
80
+ (0, log_1.log)('connected', { id: this._id, remote: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 94, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
81
+ this.options.stream
56
82
  .pipe(this._outgoingDelay)
57
- .pipe(this._remoteConnection.params.stream)
83
+ .pipe(this._remoteConnection.options.stream)
58
84
  .pipe(this._incomingDelay)
59
- .pipe(this.params.stream);
85
+ .pipe(this.options.stream);
60
86
  this.connected.emit();
61
87
  this._remoteConnection.connected.emit();
62
- }
63
- }, async (err) => {
64
- log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 82 });
65
- });
66
- }
67
- async signal(signal) {
68
- const { json } = signal;
69
- if (json) {
70
- const { transportId } = JSON.parse(json);
71
- if (transportId) {
72
- this._remote.wake(keys_1.PublicKey.from(transportId));
73
- }
88
+ })
89
+ .catch((err) => {
90
+ if (this._destroyed) {
91
+ return;
92
+ }
93
+ this.errors.raise(err);
94
+ });
74
95
  }
75
96
  }
76
- async close() {
77
- (0, log_1.log)('closing', this._ownId, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 98 });
78
- MemoryTransport._connections.delete(this._ownId);
97
+ async destroy() {
98
+ (0, log_1.log)('closing', { id: this._id }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 115, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
99
+ this._destroyed = true;
100
+ MemoryTransport._connections.delete(this._id);
79
101
  if (this._remoteConnection) {
102
+ (0, log_1.log)('closing', { id: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 120, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
103
+ this._remoteConnection._destroyed = true;
80
104
  MemoryTransport._connections.delete(this._remoteId);
81
105
  // TODO(dmaretskyi): Hypercore streams do not seem to have the unpipe method.
82
106
  // NOTE(burdon): Using readable-stream.wrap() might help (see feed-store).
@@ -90,15 +114,25 @@ class MemoryTransport {
90
114
  this._remoteConnection.closed.emit();
91
115
  this._remoteConnection._remoteConnection = undefined;
92
116
  this._remoteConnection = undefined;
117
+ (0, log_1.log)('closed', { id: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 138, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
93
118
  }
94
119
  this.closed.emit();
95
- (0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 121 });
120
+ (0, log_1.log)('closed', { id: this._id }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 142, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
121
+ }
122
+ signal(signal) {
123
+ const { json } = signal;
124
+ if (json) {
125
+ // TODO(burdon): Check open?
126
+ const { transportId } = JSON.parse(json);
127
+ if (transportId) {
128
+ const remoteId = keys_1.PublicKey.fromHex(transportId);
129
+ (0, log_1.log)('received signal', { id: this._id, remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 152, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
130
+ this._remote.wake(remoteId);
131
+ }
132
+ }
96
133
  }
97
134
  }
98
135
  exports.MemoryTransport = MemoryTransport;
99
- // TODO(burdon): Remove global properties.
136
+ // TODO(burdon): Remove static properties (inject context into constructor).
100
137
  MemoryTransport._connections = new util_1.ComplexMap(keys_1.PublicKey.hash);
101
- exports.MemoryTransportFactory = {
102
- create: (params) => new MemoryTransport(params)
103
- };
104
138
  //# sourceMappingURL=memory-transport.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"memory-transport.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory-transport.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,8DAAiC;AACjC,mCAAmC;AAEnC,uCAA6C;AAC7C,uCAA0C;AAC1C,qCAAuC;AACvC,mCAAgC;AAEhC,qCAAwC;AAIxC,mCAAmC;AACnC,yGAAyG;AACzG,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAEjC;;GAEG;AACH,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAA0B,EAAE;IAClE,OAAO,IAAI,kBAAS,CAAC;QACnB,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC1B,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,2BAA2B;QACvE,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEW,QAAA,sBAAsB,GAAqB;IACtD,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC;CACzD,CAAC;AAEF;;GAEG;AACH,MAAa,eAAe;IAkB1B,YAA6B,OAAyB;;QAAzB,YAAO,GAAP,OAAO,CAAkB;QAdtC,WAAM,GAAG,IAAI,aAAK,EAAQ,CAAC;QAC3B,cAAS,GAAG,IAAI,aAAK,EAAQ,CAAC;QAC9B,WAAM,GAAG,IAAI,mBAAW,EAAE,CAAC;QAE1B,QAAG,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC,CAAC,kEAAkE;QAC5F,YAAO,GAAG,IAAI,eAAO,EAAa,CAAC;QAEnC,mBAAc,GAAG,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QAC3D,mBAAc,GAAG,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QAEpE,eAAU,GAAG,KAAK,CAAC;QAKzB,IAAA,SAAG,EAAC,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,uUAAC,CAAC;QAElC,IAAA,qBAAM,EAAC,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,6BAA6B,CAAC,CAAC;QACnF,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEjD,iGAAiG;QACjG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC1B,kBAAkB;YAClB,UAAU,CAAC,KAAK,IAAI,EAAE;gBACpB,IAAA,SAAG,EAAC,gBAAgB,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,uUAAC,CAAC;gBACjD,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;oBAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;iBACxD,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACF;aAAM;YACL,IAAI,CAAC,OAAO;iBACT,IAAI,CAAC,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,mCAAI,IAAI,EAAE,CAAC;iBAC/C,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjB,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,OAAO;iBACR;gBAED,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;gBAC1B,IAAI,CAAC,iBAAiB,GAAG,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC1E,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;oBAC3B,2DAA2D;oBAC3D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;oBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACnB,OAAO;iBACR;gBAED,IAAA,qBAAM,EAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBAC5G,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,GAAG,IAAI,CAAC;gBAChD,IAAI,CAAC,iBAAiB,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;gBAE5C,IAAA,SAAG,EAAC,WAAW,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,uUAAC,CAAC;gBAC3D,IAAI,CAAC,OAAO,CAAC,MAAM;qBAChB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;qBACzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC;qBAC3C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;qBACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAE7B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAC1C,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,OAAO;iBACR;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;SACN;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAA,SAAG,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,wUAAC,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,IAAA,SAAG,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,wUAAC,CAAC;YACvC,IAAI,CAAC,iBAAiB,CAAC,UAAU,GAAG,IAAI,CAAC;YACzC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEpD,6EAA6E;YAC7E,2EAA2E;YAC3E,oBAAoB;YACpB,sCAAsC;YACtC,iDAAiD;YACjD,sCAAsC;YACtC,gCAAgC;YAEhC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAE7B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACrC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,GAAG,SAAS,CAAC;YACrD,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;YACnC,IAAA,SAAG,EAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,wUAAC,CAAC;SACvC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,IAAA,SAAG,EAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,wUAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QACxB,IAAI,IAAI,EAAE;YACR,4BAA4B;YAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,WAAW,EAAE;gBACf,MAAM,QAAQ,GAAG,gBAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAChD,IAAA,SAAG,EAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,wUAAC,CAAC;gBACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC7B;SACF;IACH,CAAC;;AApHH,0CAqHC;AApHC,4EAA4E;AACpD,4BAAY,GAAG,IAAI,iBAAU,CAA6B,gBAAS,CAAC,IAAI,CAAC,CAAC"}
@@ -18,6 +18,7 @@ const memory_transport_1 = require("./memory-transport");
18
18
  // TODO(burdon): Flaky test.
19
19
  // Cannot log after tests are done. Did you forget to wait for something async in your test?
20
20
  // Attempted to log "Ignoring unsupported ICE candidate.".
21
+ // TODO(burdon): Move to TestBuilder.
21
22
  const createPair = () => {
22
23
  const topic = keys_1.PublicKey.random();
23
24
  const peer1Id = keys_1.PublicKey.random();
@@ -31,7 +32,7 @@ const createPair = () => {
31
32
  },
32
33
  initiator: true
33
34
  });
34
- (0, testutils_1.afterTest)(() => connection1.close());
35
+ (0, testutils_1.afterTest)(() => connection1.destroy());
35
36
  (0, testutils_1.afterTest)(() => connection1.errors.assertNoUnhandledErrors());
36
37
  const plugin2 = new testing_1.TestProtocolPlugin(peer2Id.asBuffer());
37
38
  const protocolProvider2 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer2Id, plugin2);
@@ -42,7 +43,7 @@ const createPair = () => {
42
43
  },
43
44
  initiator: false
44
45
  });
45
- (0, testutils_1.afterTest)(() => connection2.close());
46
+ (0, testutils_1.afterTest)(() => connection2.destroy());
46
47
  (0, testutils_1.afterTest)(() => connection2.errors.assertNoUnhandledErrors());
47
48
  return {
48
49
  connection1,
@@ -1 +1 @@
1
- {"version":3,"file":"memory-transport.test.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory-transport.test.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.test.ts"],"names":[],"mappings":"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"}
@@ -9,10 +9,10 @@ export interface Transport {
9
9
  closed: Event;
10
10
  connected: Event;
11
11
  errors: ErrorStream;
12
- signal(signal: Signal): Promise<void>;
13
- close(): Promise<void>;
12
+ destroy(): Promise<void>;
13
+ signal(signal: Signal): void;
14
14
  }
15
- export declare type TransportOptions = {
15
+ export type TransportOptions = {
16
16
  /**
17
17
  * Did local node initiate this connection.
18
18
  */
@@ -25,8 +25,12 @@ export declare type TransportOptions = {
25
25
  * Send a signal message to remote peer.
26
26
  */
27
27
  sendSignal: (signal: Signal) => Promise<void>;
28
+ timeout?: number;
28
29
  };
30
+ /**
31
+ *
32
+ */
29
33
  export interface TransportFactory {
30
- create(options: TransportOptions): Transport;
34
+ createTransport(options: TransportOptions): Transport;
31
35
  }
32
36
  //# sourceMappingURL=transport.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,oBAAY,gBAAgB,GAAG;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC9C"}
1
+ {"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IAEpB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvD"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=webrtc-simple-peer.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"webrtc-simple-peer.test.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-simple-peer.test.ts"],"names":[],"mappings":""}
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
10
10
  const wrtc_1 = __importDefault(require("@koush/wrtc"));
11
11
  const simple_peer_1 = __importDefault(require("simple-peer"));
12
12
  const async_1 = require("@dxos/async");
13
- describe('node wrtc and simple-peer', function () {
13
+ describe('Node WebRTC and simple-peer', function () {
14
14
  // Simplest test that reproduces SIGABRT (mac) and SIGSEGV (linux) in wrtc.
15
15
  it.skip('open and close', async function () {
16
16
  const peer = new simple_peer_1.default({
@@ -21,4 +21,4 @@ describe('node wrtc and simple-peer', function () {
21
21
  await peer.destroy();
22
22
  }).timeout(3000);
23
23
  });
24
- //# sourceMappingURL=wrtc-simple-peer.test.js.map
24
+ //# sourceMappingURL=webrtc-simple-peer.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"webrtc-simple-peer.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-simple-peer.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,8BAA8B;AAE9B,uDAA+B;AAC/B,8DAAgD;AAEhD,uCAAoC;AAEpC,QAAQ,CAAC,6BAA6B,EAAE;IACtC,2EAA2E;IAC3E,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK;QAC7B,MAAM,IAAI,GAAG,IAAI,qBAAqB,CAAC;YACrC,SAAS,EAAE,IAAI;YACf,IAAI,EAAJ,cAAI;SACL,CAAC,CAAC;QAEH,MAAM,IAAA,aAAK,EAAC,CAAC,CAAC,CAAC;QAEf,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}
@@ -4,7 +4,7 @@ import { ErrorStream } from '@dxos/debug';
4
4
  import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
5
5
  import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
6
6
  import { Transport, TransportFactory, TransportOptions } from './transport';
7
- export declare type WebRTCTransportProxyParams = {
7
+ export type WebRTCTransportProxyParams = {
8
8
  initiator: boolean;
9
9
  stream: NodeJS.ReadWriteStream;
10
10
  bridgeService: BridgeService;
@@ -22,8 +22,8 @@ export declare class WebRTCTransportProxy implements Transport {
22
22
  private _handleConnection;
23
23
  private _handleData;
24
24
  private _handleSignal;
25
- signal(signal: Signal): Promise<void>;
26
- close(): Promise<void>;
25
+ signal(signal: Signal): void;
26
+ destroy(): Promise<void>;
27
27
  /**
28
28
  * Called when underlying proxy service becomes unavailable.
29
29
  */
@@ -37,6 +37,6 @@ export declare class WebRTCTransportProxyFactory implements TransportFactory {
37
37
  * Calling this method will close any existing connections.
38
38
  */
39
39
  setBridgeService(bridgeService: BridgeService | undefined): this;
40
- create(options: TransportOptions): Transport;
40
+ createTransport(options: TransportOptions): Transport;
41
41
  }
42
42
  //# sourceMappingURL=webrtc-transport-proxy.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webrtc-transport-proxy.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAgC,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE5E,oBAAY,0BAA0B,GAAG;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,qBAAa,oBAAqB,YAAW,SAAS;IAYlD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,QAAQ,CAAC,MAAM,cAAe;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,QAAQ,CAAC,SAAS,cAAe;IAEjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;gBAI5B,OAAO,EAAE,0BAA0B;YAkCxC,iBAAiB;IAiB/B,OAAO,CAAC,WAAW;YAKL,aAAa;IAIrB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOrC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAc5B;;OAEG;IACH,UAAU;CAKX;AAED,qBAAa,2BAA4B,YAAW,gBAAgB;IAClE,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAmC;IAEvD;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAShE,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS;CAa7C"}
1
+ {"version":3,"file":"webrtc-transport-proxy.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAgC,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE5E,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,qBAAa,oBAAqB,YAAW,SAAS;IAYlD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,QAAQ,CAAC,MAAM,cAAe;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,QAAQ,CAAC,SAAS,cAAe;IAEjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;gBAI5B,OAAO,EAAE,0BAA0B;YAmCxC,iBAAiB;IAiB/B,OAAO,CAAC,WAAW;YAKL,aAAa;IAI3B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAUtB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB9B;;OAEG;IAEH,UAAU;CAKX;AAGD,qBAAa,2BAA4B,YAAW,gBAAgB;IAClE,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAmC;IAEvD;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAShE,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS;CAatD"}
@@ -28,7 +28,7 @@ class WebRTCTransportProxy {
28
28
  });
29
29
  this._serviceStream.waitUntilReady().then(() => {
30
30
  this._serviceStream.subscribe(async (event) => {
31
- (0, log_1.log)('WebRTCTransportProxy: event', event, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 45 });
31
+ (0, log_1.log)('WebRTCTransportProxy: event', event, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 46, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
32
32
  if (event.connection) {
33
33
  await this._handleConnection(event.connection);
34
34
  }
@@ -47,10 +47,10 @@ class WebRTCTransportProxy {
47
47
  });
48
48
  }
49
49
  catch (err) {
50
- log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 62 });
50
+ log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 63, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
51
51
  }
52
52
  });
53
- }, (error) => log_1.log.catch(error, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 66 }));
53
+ }, (error) => log_1.log.catch(error, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 67, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) }));
54
54
  }
55
55
  async _handleConnection(connectionEvent) {
56
56
  if (connectionEvent.error) {
@@ -62,7 +62,7 @@ class WebRTCTransportProxy {
62
62
  break;
63
63
  }
64
64
  case bridge_1.ConnectionState.CLOSED: {
65
- await this.close();
65
+ await this.destroy();
66
66
  break;
67
67
  }
68
68
  }
@@ -74,13 +74,16 @@ class WebRTCTransportProxy {
74
74
  async _handleSignal(signalEvent) {
75
75
  await this._params.sendSignal(signalEvent.payload);
76
76
  }
77
- async signal(signal) {
78
- await this._params.bridgeService.sendSignal({
77
+ signal(signal) {
78
+ this._params.bridgeService
79
+ .sendSignal({
79
80
  proxyId: this._proxyId,
80
81
  signal
81
- });
82
+ })
83
+ .catch((err) => this.errors.raise(err));
82
84
  }
83
- async close() {
85
+ // TODO(burdon): Move open from constructor.
86
+ async destroy() {
84
87
  if (this._closed) {
85
88
  return;
86
89
  }
@@ -89,7 +92,7 @@ class WebRTCTransportProxy {
89
92
  await this._params.bridgeService.close({ proxyId: this._proxyId });
90
93
  }
91
94
  catch (err) {
92
- log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 111 });
95
+ log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 117, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
93
96
  }
94
97
  this.closed.emit();
95
98
  this._closed = true;
@@ -97,6 +100,7 @@ class WebRTCTransportProxy {
97
100
  /**
98
101
  * Called when underlying proxy service becomes unavailable.
99
102
  */
103
+ // TODO(burdon): Option on close method.
100
104
  forceClose() {
101
105
  this._serviceStream.close();
102
106
  this.closed.emit();
@@ -104,6 +108,7 @@ class WebRTCTransportProxy {
104
108
  }
105
109
  }
106
110
  exports.WebRTCTransportProxy = WebRTCTransportProxy;
111
+ // TODO(burdon): Why is this named Proxy?
107
112
  class WebRTCTransportProxyFactory {
108
113
  constructor() {
109
114
  this._connections = new Set();
@@ -119,7 +124,7 @@ class WebRTCTransportProxyFactory {
119
124
  }
120
125
  return this;
121
126
  }
122
- create(options) {
127
+ createTransport(options) {
123
128
  (0, assert_1.default)(this._bridgeService, 'WebRTCTransportProxyFactory is not ready to open connections');
124
129
  const transport = new WebRTCTransportProxy({
125
130
  ...options,
@@ -1 +1 @@
1
- {"version":3,"file":"webrtc-transport-proxy.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webrtc-transport-proxy.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":"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"}
@@ -59,7 +59,7 @@ describe('WebRTCTransportProxy', function () {
59
59
  sendSignal,
60
60
  bridgeService: rpcClient.rpc.BridgeService
61
61
  });
62
- (0, testutils_1.afterTest)(async () => await webRTCTransportProxy.close());
62
+ (0, testutils_1.afterTest)(async () => await webRTCTransportProxy.destroy());
63
63
  return { webRTCService: rpcService, webRTCTransportProxy };
64
64
  };
65
65
  // This doesn't clean up correctly and crashes with SIGSEGV / SIGABRT at the end. Probably an issue with wrtc package.
@@ -71,7 +71,7 @@ describe('WebRTCTransportProxy', function () {
71
71
  };
72
72
  connection.closed.once(closedCb);
73
73
  await (0, async_1.sleep)(10); // Let simple-peer process events.
74
- await connection.close();
74
+ await connection.destroy();
75
75
  await (0, async_1.sleep)(1); // Process events.
76
76
  (0, expect_1.default)(callsCounter).toEqual(1);
77
77
  })
@@ -1 +1 @@
1
- {"version":3,"file":"webrtc-transport-proxy.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webrtc-transport-proxy.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.test.ts"],"names":[],"mappings":"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"}
@@ -83,10 +83,10 @@ class WebRTCTransportService {
83
83
  }
84
84
  async close({ proxyId }) {
85
85
  var _a, _b;
86
- await ((_a = this.transports.get(proxyId)) === null || _a === void 0 ? void 0 : _a.transport.close());
86
+ await ((_a = this.transports.get(proxyId)) === null || _a === void 0 ? void 0 : _a.transport.destroy());
87
87
  await ((_b = this.transports.get(proxyId)) === null || _b === void 0 ? void 0 : _b.stream.end());
88
88
  this.transports.delete(proxyId);
89
- (0, log_1.log)('Closed.', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts", line: 108 });
89
+ (0, log_1.log)('Closed.', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts", line: 108, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
90
90
  }
91
91
  }
92
92
  exports.WebRTCTransportService = WebRTCTransportService;
@@ -1 +1 @@
1
- {"version":3,"file":"webrtc-transport-service.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webrtc-transport-service.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-service.ts"],"names":[],"mappings":"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"}