@dxos/network-manager 2.33.9-dev.7c8c6a09 → 2.33.9-dev.d9963f00

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 (38) hide show
  1. package/dist/browser-mocha/bundle.js +514 -381
  2. package/dist/src/network-manager.d.ts.map +1 -1
  3. package/dist/src/network-manager.js +1 -0
  4. package/dist/src/network-manager.js.map +1 -1
  5. package/dist/src/proto/gen/dxos/mesh/signal.d.ts +21 -0
  6. package/dist/src/proto/gen/dxos/mesh/signal.d.ts.map +1 -1
  7. package/dist/src/proto/gen/index.d.ts +1 -0
  8. package/dist/src/proto/gen/index.d.ts.map +1 -1
  9. package/dist/src/proto/gen/index.js +1 -1
  10. package/dist/src/proto/gen/index.js.map +1 -1
  11. package/dist/src/signal/message-router.d.ts +16 -4
  12. package/dist/src/signal/message-router.d.ts.map +1 -1
  13. package/dist/src/signal/message-router.js +91 -17
  14. package/dist/src/signal/message-router.js.map +1 -1
  15. package/dist/src/signal/message-router.test.js +120 -13
  16. package/dist/src/signal/message-router.test.js.map +1 -1
  17. package/dist/src/signal/signal-client.d.ts +2 -1
  18. package/dist/src/signal/signal-client.d.ts.map +1 -1
  19. package/dist/src/signal/signal-client.js +26 -16
  20. package/dist/src/signal/signal-client.js.map +1 -1
  21. package/dist/src/signal/signal-client.test.js +4 -2
  22. package/dist/src/signal/signal-client.test.js.map +1 -1
  23. package/dist/src/swarm/swarm.js +1 -1
  24. package/dist/src/swarm/swarm.js.map +1 -1
  25. package/dist/src/swarm/swarm.test.js +2 -0
  26. package/dist/src/swarm/swarm.test.js.map +1 -1
  27. package/dist/tsconfig.tsbuildinfo +1 -1
  28. package/package.json +11 -11
  29. package/src/network-manager.ts +1 -0
  30. package/src/proto/defs/dxos/mesh/signal.proto +13 -0
  31. package/src/proto/gen/dxos/mesh/signal.ts +21 -0
  32. package/src/proto/gen/index.ts +2 -1
  33. package/src/signal/message-router.test.ts +154 -38
  34. package/src/signal/message-router.ts +107 -18
  35. package/src/signal/signal-client.test.ts +4 -2
  36. package/src/signal/signal-client.ts +42 -15
  37. package/src/swarm/swarm.test.ts +2 -0
  38. package/src/swarm/swarm.ts +1 -1
package/dist/src/network-manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../src/network-manager.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAiC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAyB,aAAa,EAA0B,MAAM,UAAU,CAAC;AAExF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,oBAAY,gBAAgB,GAAG,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,KAAK,QAAQ,CAAC;AAE1F,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;IACZ;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;CACd;AAID;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwD;IAChF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8D;IACpF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAgB;IAEhD,SAAgB,aAAa,cAAqB;gBAErC,OAAO,GAAE,qBAA0B;IA0BhD,IAAI,MAAM,kBAET;IAGD,IAAI,MAAM,gBAET;IAED,IAAI,aAAa,8BAEhB;IAED,WAAW,CAAE,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS;IAIvD,QAAQ,CAAE,KAAK,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS;IAI9C,iBAAiB,CAAE,OAAO,EAAE,YAAY;IA8ClC,kBAAkB,CAAE,KAAK,EAAE,SAAS;IAuB1C;;OAEG;IAEG,KAAK;IAIL,OAAO;CAUd;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,SAAS,CAAC;IAElB;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,CAAA;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf"}
1
+ {"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../src/network-manager.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAiC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAyB,aAAa,EAA0B,MAAM,UAAU,CAAC;AAExF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,oBAAY,gBAAgB,GAAG,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,KAAK,QAAQ,CAAC;AAE1F,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;IACZ;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;CACd;AAID;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwD;IAChF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8D;IACpF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAgB;IAEhD,SAAgB,aAAa,cAAqB;gBAErC,OAAO,GAAE,qBAA0B;IA0BhD,IAAI,MAAM,kBAET;IAGD,IAAI,MAAM,gBAET;IAED,IAAI,aAAa,8BAEhB;IAED,WAAW,CAAE,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS;IAIvD,QAAQ,CAAE,KAAK,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS;IAI9C,iBAAiB,CAAE,OAAO,EAAE,YAAY;IA8ClC,kBAAkB,CAAE,KAAK,EAAE,SAAS;IAuB1C;;OAEG;IAEG,KAAK;IAIL,OAAO;CAWd;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,SAAS,CAAC;IAElB;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,CAAA;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf"}
package/dist/src/network-manager.js CHANGED
@@ -120,6 +120,7 @@ class NetworkManager {
120
120
  log(err);
121
121
  });
122
122
  }
123
+ await this._messageRouter.destroy();
123
124
  await this._signalManager.destroy();
124
125
  }
125
126
  }
package/dist/src/network-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"network-manager.js","sourceRoot":"","sources":["../../src/network-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"network-manager.js","sourceRoot":"","sources":["../../src/network-manager.ts"],"names":[],"mappings":"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"}
package/dist/src/proto/gen/dxos/mesh/signal.d.ts CHANGED
@@ -8,21 +8,42 @@ export interface Message {
8
8
  * Receiver`s public key.
9
9
  */
10
10
  remoteId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
11
+ /**
12
+ * Swarm identefier.
13
+ */
11
14
  topic?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
15
+ /**
16
+ * Unique connection identifier.
17
+ */
12
18
  sessionId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
19
+ /**
20
+ * Message payload.
21
+ */
13
22
  data?: MessageData;
23
+ /**
24
+ * Unique message identifier. Used for Acknolegment and matching Anwers to Offers.
25
+ */
26
+ messageId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
14
27
  }
15
28
  export interface MessageData {
16
29
  offer?: Offer;
17
30
  answer?: Answer;
18
31
  signal?: Signal;
32
+ ack?: Acknowledgement;
19
33
  }
20
34
  export interface Offer {
21
35
  }
22
36
  export interface Answer {
23
37
  accept?: boolean;
38
+ /**
39
+ * MessageId of the Offer being answered.
40
+ */
41
+ offerMessageId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
24
42
  }
25
43
  export interface Signal {
26
44
  json?: string;
27
45
  }
46
+ export interface Acknowledgement {
47
+ messageId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
48
+ }
28
49
  //# sourceMappingURL=signal.d.ts.map
package/dist/src/proto/gen/dxos/mesh/signal.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../../../../../src/proto/gen/dxos/mesh/signal.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,wBAAwB,CAAC;AAInD,MAAM,WAAW,OAAO;IACpB;;OAEG;IACH,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E;;OAEG;IACH,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjF,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClF,IAAI,CAAC,EAAE,WAAW,CAAC;CACtB;AACD,MAAM,WAAW,WAAW;IACxB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,KAAK;CACrB;AACD,MAAM,WAAW,MAAM;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,MAAM;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB"}
1
+ {"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../../../../../src/proto/gen/dxos/mesh/signal.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,wBAAwB,CAAC;AAInD,MAAM,WAAW,OAAO;IACpB;;OAEG;IACH,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E;;OAEG;IACH,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjF;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClF;;OAEG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CACrF;AACD,MAAM,WAAW,WAAW;IACxB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,eAAe,CAAC;CACzB;AACD,MAAM,WAAW,KAAK;CACrB;AACD,MAAM,WAAW,MAAM;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CAC1F;AACD,MAAM,WAAW,MAAM;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC5B,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CACrF"}
package/dist/src/proto/gen/index.d.ts CHANGED
@@ -14,6 +14,7 @@ export interface TYPES {
14
14
  "dxos.halo.keys.KeyType": dxos_halo_keys.KeyType;
15
15
  "dxos.halo.keys.PrivKey": dxos_halo_keys.PrivKey;
16
16
  "dxos.halo.keys.PubKey": dxos_halo_keys.PubKey;
17
+ "dxos.mesh.signal.Acknowledgement": dxos_mesh_signal.Acknowledgement;
17
18
  "dxos.mesh.signal.Answer": dxos_mesh_signal.Answer;
18
19
  "dxos.mesh.signal.Message": dxos_mesh_signal.Message;
19
20
  "dxos.mesh.signal.MessageData": dxos_mesh_signal.MessageData;
package/dist/src/proto/gen/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,KAAK;IAClB,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,gCAAgC,EAAE,gBAAgB,CAAC,aAAa,CAAC;IACjE,0CAA0C,EAAE,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC;IACrF,uCAAuC,EAAE,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC;IAC/E,yBAAyB,EAAE,cAAc,CAAC,QAAQ,CAAC;IACnD,0BAA0B,EAAE,cAAc,CAAC,SAAS,CAAC;IACrD,8BAA8B,EAAE,cAAc,CAAC,aAAa,CAAC;IAC7D,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,uBAAuB,EAAE,cAAc,CAAC,MAAM,CAAC;IAC/C,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;IACnD,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,8BAA8B,EAAE,gBAAgB,CAAC,WAAW,CAAC;IAC7D,wBAAwB,EAAE,gBAAgB,CAAC,KAAK,CAAC;IACjD,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;IACnD,qBAAqB,EAAE,eAAe,CAAC,GAAG,CAAC;CAC9C;AACD,MAAM,WAAW,QAAQ;CACxB;AACD,eAAO,MAAM,UAAU,KAA+rI,CAAC;AACvtI,eAAO,MAAM,MAAM,yBAA8D,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,KAAK;IAClB,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,gCAAgC,EAAE,gBAAgB,CAAC,aAAa,CAAC;IACjE,0CAA0C,EAAE,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC;IACrF,uCAAuC,EAAE,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC;IAC/E,yBAAyB,EAAE,cAAc,CAAC,QAAQ,CAAC;IACnD,0BAA0B,EAAE,cAAc,CAAC,SAAS,CAAC;IACrD,8BAA8B,EAAE,cAAc,CAAC,aAAa,CAAC;IAC7D,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,uBAAuB,EAAE,cAAc,CAAC,MAAM,CAAC;IAC/C,kCAAkC,EAAE,gBAAgB,CAAC,eAAe,CAAC;IACrE,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;IACnD,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,8BAA8B,EAAE,gBAAgB,CAAC,WAAW,CAAC;IAC7D,wBAAwB,EAAE,gBAAgB,CAAC,KAAK,CAAC;IACjD,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;IACnD,qBAAqB,EAAE,eAAe,CAAC,GAAG,CAAC;CAC9C;AACD,MAAM,WAAW,QAAQ;CACxB;AACD,eAAO,MAAM,UAAU,KAA8qJ,CAAC;AACtsJ,eAAO,MAAM,MAAM,yBAA8D,CAAC"}
package/dist/src/proto/gen/index.js CHANGED
@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.schema = exports.schemaJson = void 0;
7
7
  const codec_protobuf_1 = require("@dxos/codec-protobuf");
8
8
  const substitutions_1 = __importDefault(require("../substitutions"));
9
- exports.schemaJson = JSON.parse("{\"nested\":{\"dxos\":{\"nested\":{\"credentials\":{\"nested\":{\"Message\":{\"fields\":{\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"SignedMessage\":{\"fields\":{\"signed\":{\"rule\":\"required\",\"type\":\"Signed\",\"id\":1,\"comment\":null},\"signatures\":{\"rule\":\"repeated\",\"type\":\"Signature\",\"id\":2,\"comment\":null}},\"nested\":{\"Signature\":{\"fields\":{\"key\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"signature\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"keyChain\":{\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"Signed\":{\"fields\":{\"created\":{\"rule\":\"required\",\"type\":\"string\",\"id\":1,\"comment\":null},\"nonce\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"comment\":null}},\"comment\":\"A generic container message used whenever messages are signed (e.g. PartyCredential)\"}}},\"halo\":{\"nested\":{\"keys\":{\"nested\":{\"KeyChain\":{\"fields\":{\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"rule\":\"required\",\"type\":\"SignedMessage\",\"id\":2,\"comment\":null},\"parents\":{\"rule\":\"repeated\",\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"KeyRecord\":{\"fields\":{\"type\":{\"rule\":\"required\",\"type\":\"KeyType\",\"id\":1,\"comment\":\"The `KeyType` type of the key. This is often unknown for keys from other sources.\"},\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":2,\"comment\":\"The public key as a Buffer (required).\"},\"secretKey\":{\"type\":\"PrivKey\",\"id\":3,\"comment\":\"The secret key as a Buffer (this will never be visible outside the Keyring).\"},\"hint\":{\"type\":\"bool\",\"id\":4,\"comment\":\"Is this key from a Greeting \\\"hint\\\"?\"},\"own\":{\"type\":\"bool\",\"id\":5,\"comment\":\"Determines if this is our key?\\nUsually true if `secretKey` is present; may be false for \\\"inception keys\\\" such as the Party key.\"},\"trusted\":{\"type\":\"bool\",\"id\":6,\"comment\":\"Is this key to be trusted?\"},\"added\":{\"type\":\"string\",\"id\":7,\"comment\":\"An RFC-3339 date/time string for when the key was added to the Keyring.\"},\"created\":{\"type\":\"string\",\"id\":8,\"comment\":\"An RFC-3339 date/time string for when the key was created.\"}},\"comment\":null},\"KeyRecordList\":{\"fields\":{\"keys\":{\"rule\":\"repeated\",\"type\":\"KeyRecord\",\"id\":1,\"comment\":null}},\"comment\":null},\"KeyType\":{\"values\":{\"UNKNOWN\":0,\"IDENTITY\":1,\"DEVICE\":2,\"PARTY\":3,\"FEED\":4,\"DXNS_ADDRESS\":5},\"comment\":null,\"comments\":{\"UNKNOWN\":null,\"IDENTITY\":null,\"DEVICE\":null,\"PARTY\":null,\"FEED\":null,\"DXNS_ADDRESS\":null}},\"PrivKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"PubKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}}}}},\"mesh\":{\"nested\":{\"signal\":{\"nested\":{\"Answer\":{\"fields\":{\"accept\":{\"type\":\"bool\",\"id\":1,\"comment\":null}},\"comment\":null},\"Message\":{\"fields\":{\"id\":{\"type\":\"PubKey\",\"id\":1,\"comment\":\"Sender's public key.\"},\"remoteId\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"Receiver`s public key.\"},\"topic\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null},\"sessionId\":{\"type\":\"PubKey\",\"id\":4,\"comment\":null},\"data\":{\"type\":\"MessageData\",\"id\":5,\"comment\":null}},\"comment\":null},\"MessageData\":{\"oneofs\":{\"payload\":{\"oneof\":[\"offer\",\"answer\",\"signal\"],\"comment\":null}},\"fields\":{\"offer\":{\"type\":\"Offer\",\"id\":1,\"comment\":null},\"answer\":{\"type\":\"Answer\",\"id\":2,\"comment\":null},\"signal\":{\"type\":\"Signal\",\"id\":3,\"comment\":null}},\"comment\":null},\"Offer\":{\"fields\":{},\"comment\":null},\"Signal\":{\"fields\":{\"json\":{\"type\":\"string\",\"id\":1,\"comment\":null}},\"comment\":null}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null}}}}}}}");
9
+ exports.schemaJson = JSON.parse("{\"nested\":{\"dxos\":{\"nested\":{\"credentials\":{\"nested\":{\"Message\":{\"fields\":{\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"SignedMessage\":{\"fields\":{\"signed\":{\"rule\":\"required\",\"type\":\"Signed\",\"id\":1,\"comment\":null},\"signatures\":{\"rule\":\"repeated\",\"type\":\"Signature\",\"id\":2,\"comment\":null}},\"nested\":{\"Signature\":{\"fields\":{\"key\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"signature\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"keyChain\":{\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"Signed\":{\"fields\":{\"created\":{\"rule\":\"required\",\"type\":\"string\",\"id\":1,\"comment\":null},\"nonce\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"comment\":null}},\"comment\":\"A generic container message used whenever messages are signed (e.g. PartyCredential)\"}}},\"halo\":{\"nested\":{\"keys\":{\"nested\":{\"KeyChain\":{\"fields\":{\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"rule\":\"required\",\"type\":\"SignedMessage\",\"id\":2,\"comment\":null},\"parents\":{\"rule\":\"repeated\",\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"KeyRecord\":{\"fields\":{\"type\":{\"rule\":\"required\",\"type\":\"KeyType\",\"id\":1,\"comment\":\"The `KeyType` type of the key. This is often unknown for keys from other sources.\"},\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":2,\"comment\":\"The public key as a Buffer (required).\"},\"secretKey\":{\"type\":\"PrivKey\",\"id\":3,\"comment\":\"The secret key as a Buffer (this will never be visible outside the Keyring).\"},\"hint\":{\"type\":\"bool\",\"id\":4,\"comment\":\"Is this key from a Greeting \\\"hint\\\"?\"},\"own\":{\"type\":\"bool\",\"id\":5,\"comment\":\"Determines if this is our key?\\nUsually true if `secretKey` is present; may be false for \\\"inception keys\\\" such as the Party key.\"},\"trusted\":{\"type\":\"bool\",\"id\":6,\"comment\":\"Is this key to be trusted?\"},\"added\":{\"type\":\"string\",\"id\":7,\"comment\":\"An RFC-3339 date/time string for when the key was added to the Keyring.\"},\"created\":{\"type\":\"string\",\"id\":8,\"comment\":\"An RFC-3339 date/time string for when the key was created.\"}},\"comment\":null},\"KeyRecordList\":{\"fields\":{\"keys\":{\"rule\":\"repeated\",\"type\":\"KeyRecord\",\"id\":1,\"comment\":null}},\"comment\":null},\"KeyType\":{\"values\":{\"UNKNOWN\":0,\"IDENTITY\":1,\"DEVICE\":2,\"PARTY\":3,\"FEED\":4,\"DXNS_ADDRESS\":5},\"comment\":null,\"comments\":{\"UNKNOWN\":null,\"IDENTITY\":null,\"DEVICE\":null,\"PARTY\":null,\"FEED\":null,\"DXNS_ADDRESS\":null}},\"PrivKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"PubKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}}}}},\"mesh\":{\"nested\":{\"signal\":{\"nested\":{\"Acknowledgement\":{\"fields\":{\"messageId\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null}},\"comment\":null},\"Answer\":{\"fields\":{\"accept\":{\"type\":\"bool\",\"id\":1,\"comment\":null},\"offerMessageId\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"MessageId of the Offer being answered.\"}},\"comment\":null},\"Message\":{\"fields\":{\"id\":{\"type\":\"PubKey\",\"id\":1,\"comment\":\"Sender's public key.\"},\"remoteId\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"Receiver`s public key.\"},\"topic\":{\"type\":\"PubKey\",\"id\":3,\"comment\":\"Swarm identefier.\"},\"sessionId\":{\"type\":\"PubKey\",\"id\":4,\"comment\":\"Unique connection identifier.\"},\"data\":{\"type\":\"MessageData\",\"id\":5,\"comment\":\"Message payload.\"},\"messageId\":{\"type\":\"PubKey\",\"id\":6,\"comment\":\"Unique message identifier. Used for Acknolegment and matching Anwers to Offers.\"}},\"comment\":null},\"MessageData\":{\"oneofs\":{\"payload\":{\"oneof\":[\"offer\",\"answer\",\"signal\",\"ack\"],\"comment\":null}},\"fields\":{\"offer\":{\"type\":\"Offer\",\"id\":1,\"comment\":null},\"answer\":{\"type\":\"Answer\",\"id\":2,\"comment\":null},\"signal\":{\"type\":\"Signal\",\"id\":3,\"comment\":null},\"ack\":{\"type\":\"Acknowledgement\",\"id\":4,\"comment\":null}},\"comment\":null},\"Offer\":{\"fields\":{},\"comment\":null},\"Signal\":{\"fields\":{\"json\":{\"type\":\"string\",\"id\":1,\"comment\":null}},\"comment\":null}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null}}}}}}}");
10
10
  exports.schema = codec_protobuf_1.Schema.fromJson(exports.schemaJson, substitutions_1.default);
11
11
  //# sourceMappingURL=index.js.map
package/dist/src/proto/gen/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA8C;AAK9C,qEAA6C;AAqBhC,QAAA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,grIAAgrI,CAAC,CAAC;AAC1sI,QAAA,MAAM,GAAG,uBAAM,CAAC,QAAQ,CAAkB,kBAAU,EAAE,uBAAa,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA8C;AAK9C,qEAA6C;AAsBhC,QAAA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,+pJAA+pJ,CAAC,CAAC;AACzrJ,QAAA,MAAM,GAAG,uBAAM,CAAC,QAAQ,CAAkB,kBAAU,EAAE,uBAAa,CAAC,CAAC"}
package/dist/src/signal/message-router.d.ts CHANGED
@@ -1,9 +1,11 @@
1
1
  import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
2
2
  import { SignalMessaging } from './signal-manager';
3
3
  interface MessageRouterOptions {
4
- onSignal: (message: Message) => Promise<void>;
5
- sendMessage: (message: Message) => Promise<void>;
6
- onOffer: (message: Message) => Promise<Answer>;
4
+ onSignal?: (message: Message) => Promise<void>;
5
+ sendMessage?: (message: Message) => Promise<void>;
6
+ onOffer?: (message: Message) => Promise<Answer>;
7
+ retryDelay?: number;
8
+ timeout?: number;
7
9
  }
8
10
  /**
9
11
  * Adds offer/answer RPC and reliable messaging.
@@ -13,12 +15,22 @@ export declare class MessageRouter implements SignalMessaging {
13
15
  private readonly _onSignal;
14
16
  private readonly _sendMessage;
15
17
  private readonly _onOffer;
16
- constructor({ sendMessage, onSignal, onOffer }: MessageRouterOptions);
18
+ private readonly _onAckCallbacks;
19
+ private readonly _receivedMessages;
20
+ private readonly _retryDelay;
21
+ private readonly _timeout;
22
+ private readonly _subscriptions;
23
+ constructor({ sendMessage, onSignal, onOffer, retryDelay, timeout }?: MessageRouterOptions);
17
24
  receiveMessage(message: Message): Promise<void>;
18
25
  signal(message: Message): Promise<void>;
19
26
  offer(message: Message): Promise<Answer>;
27
+ private _sendReliableMessage;
20
28
  private _resolveAnswers;
21
29
  private _handleOffer;
30
+ private _handleSignal;
31
+ private _handleAcknowledgement;
32
+ private _sendAcknowledgement;
33
+ destroy(): void;
22
34
  }
23
35
  export {};
24
36
  //# sourceMappingURL=message-router.d.ts.map
package/dist/src/signal/message-router.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message-router.d.ts","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOnD,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD;AAED;;GAEG;AAEH,qBAAa,aAAc,YAAW,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0E;IACxG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;gBAEpD,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACR,EAAE,oBAAoB;IAMjB,cAAc,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUhD,MAAM,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,KAAK,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YASjC,eAAe;YAUf,YAAY;CAW3B"}
1
+ {"version":3,"file":"message-router.d.ts","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOnD,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAGD;;GAEG;AAEH,qBAAa,aAAc,YAAW,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0E;IACxG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IAEjE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6D;IAC7F,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;IACnF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;gBAE7C,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACP,UAAgB,EAChB,OAAc,EACf,GAAE,oBAAyB;IAWtB,cAAc,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBhD,MAAM,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,KAAK,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YASjC,oBAAoB;YA8BpB,eAAe;YAWf,YAAY;YAaZ,aAAa;YAKb,sBAAsB;YAKtB,oBAAoB;IAalC,OAAO,IAAK,IAAI;CAGjB"}
package/dist/src/signal/message-router.js CHANGED
@@ -8,63 +8,137 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.MessageRouter = void 0;
10
10
  const assert_1 = __importDefault(require("assert"));
11
+ const debug_1 = __importDefault(require("debug"));
12
+ const protocols_1 = require("@dxos/protocols");
11
13
  const util_1 = require("@dxos/util");
14
+ const log = (0, debug_1.default)('dxos:network-manager:message-router');
12
15
  /**
13
16
  * Adds offer/answer RPC and reliable messaging.
14
17
  */
15
18
  // TODO(mykola): https://github.com/dxos/protocols/issues/1316
16
19
  class MessageRouter {
17
- constructor({ sendMessage, onSignal, onOffer }) {
20
+ constructor({ sendMessage, onSignal, onOffer, retryDelay = 100, timeout = 3000 } = {}) {
18
21
  this._offerRecords = new util_1.ComplexMap(key => key.toHex());
22
+ this._onAckCallbacks = new util_1.ComplexMap(key => key.toHex());
23
+ this._receivedMessages = new util_1.ComplexSet(key => key.toHex());
24
+ this._subscriptions = new util_1.SubscriptionGroup();
25
+ (0, assert_1.default)(sendMessage);
19
26
  this._sendMessage = sendMessage;
27
+ (0, assert_1.default)(onSignal);
20
28
  this._onSignal = onSignal;
29
+ (0, assert_1.default)(onOffer);
21
30
  this._onOffer = onOffer;
31
+ this._retryDelay = retryDelay;
32
+ this._timeout = timeout;
22
33
  }
23
34
  async receiveMessage(message) {
24
- var _a, _b, _c;
25
- if ((_a = message.data) === null || _a === void 0 ? void 0 : _a.offer) {
35
+ var _a, _b, _c, _d, _e;
36
+ log(`receive message: ${JSON.stringify(message)}`);
37
+ if (!((_a = message.data) === null || _a === void 0 ? void 0 : _a.ack)) {
38
+ if (this._receivedMessages.has(message.messageId)) {
39
+ return;
40
+ }
41
+ this._receivedMessages.add(message.messageId);
42
+ await this._sendAcknowledgement(message);
43
+ }
44
+ if ((_b = message.data) === null || _b === void 0 ? void 0 : _b.offer) {
26
45
  await this._handleOffer(message);
27
46
  }
28
- else if ((_b = message.data) === null || _b === void 0 ? void 0 : _b.answer) {
47
+ else if ((_c = message.data) === null || _c === void 0 ? void 0 : _c.answer) {
29
48
  await this._resolveAnswers(message);
30
49
  }
31
- else if ((_c = message.data) === null || _c === void 0 ? void 0 : _c.signal) {
32
- await this._onSignal(message);
50
+ else if ((_d = message.data) === null || _d === void 0 ? void 0 : _d.signal) {
51
+ await this._handleSignal(message);
52
+ }
53
+ else if ((_e = message.data) === null || _e === void 0 ? void 0 : _e.ack) {
54
+ await this._handleAcknowledgement(message);
33
55
  }
34
56
  }
35
57
  async signal(message) {
36
58
  var _a;
37
59
  (0, assert_1.default)((_a = message.data) === null || _a === void 0 ? void 0 : _a.signal);
38
- await this._sendMessage(message);
60
+ await this._sendReliableMessage(message);
39
61
  }
40
62
  async offer(message) {
63
+ message.messageId = protocols_1.PublicKey.random();
41
64
  const promise = new Promise((resolve, reject) => {
42
- (0, assert_1.default)(message.sessionId);
43
- this._offerRecords.set(message.sessionId, { resolve, reject });
65
+ this._offerRecords.set(message.messageId, { resolve, reject });
66
+ return this._sendReliableMessage(message);
44
67
  });
45
- await this._sendMessage(message);
46
68
  return promise;
47
69
  }
48
- async _resolveAnswers(message) {
70
+ async _sendReliableMessage(message) {
49
71
  var _a;
50
- (0, assert_1.default)(message.sessionId);
51
- const offerRecord = this._offerRecords.get(message.sessionId);
72
+ // Setting unique messageId if it not specified yet.
73
+ message.messageId = (_a = message.messageId) !== null && _a !== void 0 ? _a : protocols_1.PublicKey.random();
74
+ log(`sent message: ${JSON.stringify(message)}`);
75
+ // Setting retry interval if signal was not acknowledged.
76
+ const cancelRetry = (0, util_1.exponentialBackoffInterval)(async () => {
77
+ log(`retrying message: ${JSON.stringify(message)}`);
78
+ await this._sendMessage(message);
79
+ }, this._retryDelay);
80
+ const timeout = setTimeout(() => {
81
+ log('Signal was not delivered!');
82
+ this._onAckCallbacks.delete(message.messageId);
83
+ cancelRetry();
84
+ }, this._timeout);
85
+ (0, assert_1.default)(!this._onAckCallbacks.has(message.messageId));
86
+ this._onAckCallbacks.set(message.messageId, () => {
87
+ this._onAckCallbacks.delete(message.messageId);
88
+ cancelRetry();
89
+ clearTimeout(timeout);
90
+ });
91
+ this._subscriptions.push(cancelRetry);
92
+ this._subscriptions.push(() => clearTimeout(timeout));
93
+ await this._sendMessage(message);
94
+ return message.messageId;
95
+ }
96
+ async _resolveAnswers(message) {
97
+ var _a, _b, _c;
98
+ (0, assert_1.default)((_b = (_a = message.data) === null || _a === void 0 ? void 0 : _a.answer) === null || _b === void 0 ? void 0 : _b.offerMessageId, 'No offerMessageId');
99
+ const offerRecord = this._offerRecords.get(message.data.answer.offerMessageId);
52
100
  if (offerRecord) {
53
- this._offerRecords.delete(message.sessionId);
54
- (0, assert_1.default)((_a = message.data) === null || _a === void 0 ? void 0 : _a.answer);
101
+ this._offerRecords.delete(message.data.answer.offerMessageId);
102
+ (0, assert_1.default)((_c = message.data) === null || _c === void 0 ? void 0 : _c.answer, 'No Answer');
103
+ log(`resolving answer with ${message.data.answer}`);
55
104
  offerRecord.resolve(message.data.answer);
56
105
  }
57
106
  }
58
107
  async _handleOffer(message) {
59
108
  const answer = await this._onOffer(message);
109
+ answer.offerMessageId = message.messageId;
60
110
  const answerMessage = {
61
111
  id: message.remoteId,
62
112
  remoteId: message.id,
63
113
  topic: message.topic,
64
114
  sessionId: message.sessionId,
65
- data: { answer: answer }
115
+ data: { answer }
66
116
  };
67
- await this._sendMessage(answerMessage);
117
+ await this._sendReliableMessage(answerMessage);
118
+ }
119
+ async _handleSignal(message) {
120
+ (0, assert_1.default)(message.messageId);
121
+ await this._onSignal(message);
122
+ }
123
+ async _handleAcknowledgement(message) {
124
+ var _a, _b, _c;
125
+ (0, assert_1.default)((_b = (_a = message.data) === null || _a === void 0 ? void 0 : _a.ack) === null || _b === void 0 ? void 0 : _b.messageId);
126
+ (_c = this._onAckCallbacks.get(message.data.ack.messageId)) === null || _c === void 0 ? void 0 : _c();
127
+ }
128
+ async _sendAcknowledgement(message) {
129
+ (0, assert_1.default)(message.messageId);
130
+ const ackMessage = {
131
+ id: message.remoteId,
132
+ remoteId: message.id,
133
+ topic: message.topic,
134
+ sessionId: message.sessionId,
135
+ data: { ack: { messageId: message.messageId } }
136
+ };
137
+ log(`sent ack: ${JSON.stringify(ackMessage)}`);
138
+ await this._sendMessage(ackMessage);
139
+ }
140
+ destroy() {
141
+ this._subscriptions.unsubscribe();
68
142
  }
69
143
  }
70
144
  exports.MessageRouter = MessageRouter;
package/dist/src/signal/message-router.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message-router.js","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAG5B,qCAAwC;AAgBxC;;GAEG;AACH,8DAA8D;AAC9D,MAAa,aAAa;IAMxB,YAAa,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACc;QATN,kBAAa,GAAuC,IAAI,iBAAU,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAUtG,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,cAAc,CAAE,OAAgB;;QACpC,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,EAAE;YACvB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SAClC;aAAM,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,EAAE;YAC/B,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACrC;aAAM,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,EAAE;YAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;SAC/B;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,OAAgB;;QAC5B,IAAA,gBAAM,EAAC,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,OAAgB;QAC3B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtD,IAAA,gBAAM,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC1B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAE,OAAgB;;QAC7C,IAAA,gBAAM,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9D,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC7C,IAAA,gBAAM,EAAC,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,CAAC,CAAC;YAC7B,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1C;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAE,OAAgB;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG;YACpB,EAAE,EAAE,OAAO,CAAC,QAAQ;YACpB,QAAQ,EAAE,OAAO,CAAC,EAAE;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;SACzB,CAAC;QACF,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;CACF;AA7DD,sCA6DC"}
1
+ {"version":3,"file":"message-router.js","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,+CAA4C;AAC5C,qCAAmG;AAkBnG,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,qCAAqC,CAAC,CAAC;AACzD;;GAEG;AACH,8DAA8D;AAC9D,MAAa,aAAa;IAaxB,YAAa,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACP,UAAU,GAAG,GAAG,EAChB,OAAO,GAAG,IAAI,KACU,EAAE;QAlBX,kBAAa,GAAuC,IAAI,iBAAU,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAKvF,oBAAe,GAAG,IAAI,iBAAU,CAAwB,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5E,sBAAiB,GAAG,IAAI,iBAAU,CAAY,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAIlE,mBAAc,GAAG,IAAI,wBAAiB,EAAE,CAAC;QASxD,IAAA,gBAAM,EAAC,WAAW,CAAC,CAAC;QACpB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAA,gBAAM,EAAC,OAAO,CAAC,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,cAAc,CAAE,OAAgB;;QACpC,GAAG,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,GAAG,CAAA,EAAE;YACtB,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAU,CAAC,EAAE;gBAClD,OAAO;aACR;YAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;SAC1C;QAED,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,EAAE;YACvB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SAClC;aAAM,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,EAAE;YAC/B,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACrC;aAAM,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,EAAE;YAC/B,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;SACnC;aAAM,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,GAAG,EAAE;YAC5B,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;SAC5C;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,OAAgB;;QAC5B,IAAA,gBAAM,EAAC,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,OAAgB;QAC3B,OAAO,CAAC,SAAS,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,SAAU,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAE,OAAgB;;QAClD,oDAAoD;QACpD,OAAO,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC5D,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAEhD,yDAAyD;QACzD,MAAM,WAAW,GAAG,IAAA,iCAA0B,EAAC,KAAK,IAAI,EAAE;YACxD,GAAG,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAErB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACjC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;YAChD,WAAW,EAAE,CAAC;QAChB,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElB,IAAA,gBAAM,EAAC,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE;YAC/C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;YAChD,WAAW,EAAE,CAAC;YACd,YAAY,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC,SAAS,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,eAAe,CAAE,OAAgB;;QAC7C,IAAA,gBAAM,EAAC,MAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,0CAAE,cAAc,EAAE,mBAAmB,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC/E,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC9D,IAAA,gBAAM,EAAC,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YAC1C,GAAG,CAAC,yBAAyB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YACpD,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1C;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAE,OAAgB;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;QAC1C,MAAM,aAAa,GAAY;YAC7B,EAAE,EAAE,OAAO,CAAC,QAAQ;YACpB,QAAQ,EAAE,OAAO,CAAC,EAAE;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,EAAE,MAAM,EAAE;SACjB,CAAC;QACF,MAAM,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAE,OAAgB;QAC3C,IAAA,gBAAM,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAE,OAAgB;;QACpD,IAAA,gBAAM,EAAC,MAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,GAAG,0CAAE,SAAS,CAAC,CAAC;QACrC,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,2CAAI,CAAC;IAC3D,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAE,OAAgB;QAClD,IAAA,gBAAM,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1B,MAAM,UAAU,GAAG;YACjB,EAAE,EAAE,OAAO,CAAC,QAAQ;YACpB,QAAQ,EAAE,OAAO,CAAC,EAAE;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE;SAChD,CAAC;QACF,GAAG,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;CACF;AAlJD,sCAkJC"}
package/dist/src/signal/message-router.test.js CHANGED
@@ -34,7 +34,7 @@ const signal_client_1 = require("./signal-client");
34
34
  this.timeout(0);
35
35
  await broker1.stop();
36
36
  });
37
- const createSignalClientAndMessageRouter = async (signalApiUrl, onSignal = (async () => { }), onOffer = async () => ({ accept: true })) => {
37
+ const createSignalClientAndMessageRouter = async ({ signalApiUrl, onSignal = (async () => { }), onOffer = async () => ({ accept: true }) }) => {
38
38
  // eslint-disable-next-line prefer-const
39
39
  let api;
40
40
  const router = new message_router_1.MessageRouter({
@@ -43,6 +43,7 @@ const signal_client_1 = require("./signal-client");
43
43
  onSignal: onSignal,
44
44
  onOffer: onOffer
45
45
  });
46
+ (0, testutils_1.afterTest)(() => router.destroy());
46
47
  api = new signal_client_1.SignalClient(signalApiUrl, (async () => { }), async (msg) => router.receiveMessage(msg));
47
48
  (0, testutils_1.afterTest)(() => api.close());
48
49
  return {
@@ -52,8 +53,8 @@ const signal_client_1 = require("./signal-client");
52
53
  };
53
54
  (0, mocha_1.it)('signaling between 2 clients', async () => {
54
55
  const signalMock1 = (0, earljs_1.mockFn)().resolvesTo();
55
- const { api: api1 } = await createSignalClientAndMessageRouter(signalApiUrl1, signalMock1);
56
- const { api: api2, router: router2 } = await createSignalClientAndMessageRouter(signalApiUrl1);
56
+ const { api: api1 } = await createSignalClientAndMessageRouter({ signalApiUrl: signalApiUrl1, onSignal: signalMock1 });
57
+ const { api: api2, router: router2 } = await createSignalClientAndMessageRouter({ signalApiUrl: signalApiUrl1 });
57
58
  await api1.join(topic, peer1);
58
59
  await api2.join(topic, peer2);
59
60
  const msg = {
@@ -69,8 +70,16 @@ const signal_client_1 = require("./signal-client");
69
70
  }, 4000);
70
71
  }).timeout(5000);
71
72
  (0, mocha_1.it)('offer/answer', async () => {
72
- const { api: api1, router: router1 } = await createSignalClientAndMessageRouter(signalApiUrl1, (async () => { }), async () => ({ accept: true }));
73
- const { api: api2 } = await createSignalClientAndMessageRouter(signalApiUrl1, (async () => { }), async () => ({ accept: true }));
73
+ const { api: api1, router: router1 } = await createSignalClientAndMessageRouter({
74
+ signalApiUrl: signalApiUrl1,
75
+ onSignal: (async () => { }),
76
+ onOffer: async () => ({ accept: true })
77
+ });
78
+ const { api: api2 } = await createSignalClientAndMessageRouter({
79
+ signalApiUrl: signalApiUrl1,
80
+ onSignal: (async () => { }),
81
+ onOffer: async () => ({ accept: true })
82
+ });
74
83
  await api1.join(topic, peer1);
75
84
  await api2.join(topic, peer2);
76
85
  const answer = await router1.offer({
@@ -80,15 +89,27 @@ const signal_client_1 = require("./signal-client");
80
89
  topic,
81
90
  data: { offer: {} }
82
91
  });
83
- (0, earljs_1.expect)(answer).toEqual({ accept: true });
92
+ (0, earljs_1.expect)(answer.accept).toEqual(true);
84
93
  }).timeout(5000);
85
94
  (0, mocha_1.it)('signaling between 3 clients', async () => {
86
95
  const signalMock1 = (0, earljs_1.mockFn)().resolvesTo();
87
- const { api: api1, router: router1 } = await createSignalClientAndMessageRouter(signalApiUrl1, signalMock1, async () => ({ accept: true }));
96
+ const { api: api1, router: router1 } = await createSignalClientAndMessageRouter({
97
+ signalApiUrl: signalApiUrl1,
98
+ onSignal: signalMock1,
99
+ onOffer: async () => ({ accept: true })
100
+ });
88
101
  const signalMock2 = (0, earljs_1.mockFn)().resolvesTo();
89
- const { api: api2, router: router2 } = await createSignalClientAndMessageRouter(signalApiUrl1, signalMock2, async () => ({ accept: true }));
102
+ const { api: api2, router: router2 } = await createSignalClientAndMessageRouter({
103
+ signalApiUrl: signalApiUrl1,
104
+ onSignal: signalMock2,
105
+ onOffer: async () => ({ accept: true })
106
+ });
90
107
  const signalMock3 = (0, earljs_1.mockFn)().resolvesTo();
91
- const { api: api3, router: router3 } = await createSignalClientAndMessageRouter(signalApiUrl1, signalMock3, async () => ({ accept: true }));
108
+ const { api: api3, router: router3 } = await createSignalClientAndMessageRouter({
109
+ signalApiUrl: signalApiUrl1,
110
+ onSignal: signalMock3,
111
+ onOffer: async () => ({ accept: true })
112
+ });
92
113
  await api1.join(topic, peer1);
93
114
  await api2.join(topic, peer2);
94
115
  const peer3 = protocols_1.PublicKey.random();
@@ -131,8 +152,16 @@ const signal_client_1 = require("./signal-client");
131
152
  }, 4000);
132
153
  }).timeout(5000);
133
154
  (0, mocha_1.it)('two offers', async () => {
134
- const { api: api1, router: router1 } = await createSignalClientAndMessageRouter(signalApiUrl1, (async () => { }), async () => ({ accept: true }));
135
- const { api: api2, router: router2 } = await createSignalClientAndMessageRouter(signalApiUrl1, (async () => { }), async () => ({ accept: true }));
155
+ const { api: api1, router: router1 } = await createSignalClientAndMessageRouter({
156
+ signalApiUrl: signalApiUrl1,
157
+ onSignal: (async () => { }),
158
+ onOffer: async () => ({ accept: true })
159
+ });
160
+ const { api: api2, router: router2 } = await createSignalClientAndMessageRouter({
161
+ signalApiUrl: signalApiUrl1,
162
+ onSignal: (async () => { }),
163
+ onOffer: async () => ({ accept: true })
164
+ });
136
165
  await api1.join(topic, peer1);
137
166
  await api2.join(topic, peer2);
138
167
  // sending offer from peer1 to peer2.
@@ -143,7 +172,7 @@ const signal_client_1 = require("./signal-client");
143
172
  topic,
144
173
  data: { offer: {} }
145
174
  });
146
- (0, earljs_1.expect)(answer1).toEqual({ accept: true });
175
+ (0, earljs_1.expect)(answer1.accept).toEqual(true);
147
176
  // sending offer from peer2 to peer1.
148
177
  const answer2 = await router2.offer({
149
178
  id: peer2,
@@ -152,7 +181,85 @@ const signal_client_1 = require("./signal-client");
152
181
  topic,
153
182
  data: { offer: {} }
154
183
  });
155
- (0, earljs_1.expect)(answer2).toEqual({ accept: true });
184
+ (0, earljs_1.expect)(answer2.accept).toEqual(true);
156
185
  }).timeout(5000);
186
+ (0, mocha_1.describe)('Reliability', () => {
187
+ const setup = ({ onSignal1 = async () => { }, onSignal2 = async () => { },
188
+ // Imitates signal network disruptions (e. g. message doubling, ).
189
+ messageDisruption = msg => [msg] }) => {
190
+ const mr1 = new message_router_1.MessageRouter({
191
+ sendMessage: async (msg) => messageDisruption(msg).forEach(msg => mr2.receiveMessage(msg)),
192
+ onOffer: async () => ({ accept: true }),
193
+ onSignal: onSignal1
194
+ });
195
+ (0, testutils_1.afterTest)(() => mr1.destroy());
196
+ const mr2 = new message_router_1.MessageRouter({
197
+ sendMessage: async (msg) => messageDisruption(msg).forEach(msg => mr1.receiveMessage(msg)),
198
+ onOffer: async () => ({ accept: true }),
199
+ onSignal: onSignal2
200
+ });
201
+ (0, testutils_1.afterTest)(() => mr1.destroy());
202
+ return { mr1, mr2 };
203
+ };
204
+ (0, mocha_1.it)('signaling with non reliable connection', async () => {
205
+ // Simulate unreliable connection.
206
+ // Only each 3rd message is sent.
207
+ let i = 0;
208
+ const unreliableConnection = (msg) => {
209
+ i++;
210
+ if (i % 3 !== 0) {
211
+ return [msg];
212
+ }
213
+ return [];
214
+ };
215
+ const received = [];
216
+ const signalMock1 = async (msg) => {
217
+ received.push(msg);
218
+ };
219
+ const { mr2 } = await setup({
220
+ onSignal1: signalMock1,
221
+ messageDisruption: unreliableConnection
222
+ });
223
+ // Sending 3 messages.
224
+ // Setup sends messages directly to between. So we don`t need to specify any ids.
225
+ Array(3).fill(0).forEach(async () => {
226
+ await mr2.signal({
227
+ id: protocols_1.PublicKey.random(),
228
+ remoteId: protocols_1.PublicKey.random(),
229
+ sessionId: protocols_1.PublicKey.random(),
230
+ topic: protocols_1.PublicKey.random(),
231
+ data: { signal: { json: 'asd' } }
232
+ });
233
+ });
234
+ // expect to receive 3 messages.
235
+ await (0, wait_for_expect_1.default)(() => {
236
+ (0, earljs_1.expect)(received.length).toEqual(3);
237
+ }, 4000);
238
+ }).timeout(5000);
239
+ (0, mocha_1.it)('ignoring doubled messages', async () => {
240
+ // Message got doubled going through signal network.
241
+ const doublingMessage = (msg) => [msg, msg];
242
+ const received = [];
243
+ const signalMock1 = async (msg) => {
244
+ received.push(msg);
245
+ };
246
+ const { mr2 } = setup({
247
+ onSignal1: signalMock1,
248
+ messageDisruption: doublingMessage
249
+ });
250
+ // sending message.
251
+ await mr2.signal({
252
+ id: protocols_1.PublicKey.random(),
253
+ remoteId: protocols_1.PublicKey.random(),
254
+ sessionId: protocols_1.PublicKey.random(),
255
+ topic: protocols_1.PublicKey.random(),
256
+ data: { signal: { json: 'asd' } }
257
+ });
258
+ // expect to receive 1 message.
259
+ await (0, wait_for_expect_1.default)(() => {
260
+ (0, earljs_1.expect)(received.length).toEqual(1);
261
+ }, 4000);
262
+ }).timeout(5000);
263
+ });
157
264
  });
158
265
  //# sourceMappingURL=message-router.test.js.map
package/dist/src/signal/message-router.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message-router.test.js","sourceRoot":"","sources":["../../../src/signal/message-router.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,mCAAwC;AACxC,iCAA6C;AAC7C,sEAA4C;AAG5C,+CAA4C;AAC5C,yCAAgD;AAChD,+CAA4C;AAC5C,qCAAuC;AAGvC,qDAAiD;AACjD,mDAA+C;AAE/C,IAAA,gBAAQ,EAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,KAAgB,CAAC;IACrB,IAAI,KAAgB,CAAC;IACrB,IAAI,KAAgB,CAAC;IAErB,IAAI,OAAqD,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,iBAAiB,GAAG,cAAc,CAAC;IAEzD,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,OAAO,GAAG,MAAM,IAAA,yBAAgB,EAAC,cAAc,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,kCAAkC,GAAG,KAAK,EAC9C,YAAoB,EACpB,WAA4C,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EACnE,UAA6C,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAC3E,EAAE;QAEF,wCAAwC;QACxC,IAAI,GAAiB,CAAC;QACtB,MAAM,MAAM,GAAkB,IAAI,8BAAa,CAAC;YAC9C,2DAA2D;YAC3D,WAAW,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YAChE,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,GAAG,GAAG,IAAI,4BAAY,CACpB,YAAY,EACZ,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EACvB,KAAK,EAAE,GAAY,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CACnD,CAAC;QAEF,IAAA,qBAAS,EAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7B,OAAO;YACL,GAAG;YACH,MAAM;SACP,CAAC;IACJ,CAAC,CAAC;IAEF,IAAA,UAAI,EAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,WAAW,GAAG,IAAA,eAAM,GAAmC,CAAC,UAAU,EAAE,CAAC;QAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,kCAAkC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAC3F,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAAC,aAAa,CAAC,CAAC;QAE/F,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,GAAG,GAAY;YACnB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE;SAC7C,CAAC;QACF,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1B,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClD,CAAC,EAAE,IAAK,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAC7E,aAAa,EACb,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EACvB,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QACF,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,kCAAkC,CAC5D,aAAa,EACb,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EACvB,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QAEF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;YACjC,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,KAAK,EAAE,EAAG,EAAE;SACrB,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,WAAW,GAAG,IAAA,eAAM,GAAmC,CAAC,UAAU,EAAE,CAAC;QAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAC7E,aAAa,EACb,WAAW,EACX,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QACF,MAAM,WAAW,GAAG,IAAA,eAAM,GAAmC,CAAC,UAAU,EAAE,CAAC;QAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAC7E,aAAa,EACb,WAAW,EACX,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QACF,MAAM,WAAW,GAAG,IAAA,eAAM,GAAmC,CAAC,UAAU,EAAE,CAAC;QAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAC7E,aAAa,EACb,WAAW,EACX,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QAEF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,sCAAsC;QACtC,MAAM,OAAO,GAAY;YACvB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;SACnC,CAAC;QACF,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC,EAAE,IAAK,CAAC,CAAC;QAEV,sCAAsC;QACtC,MAAM,OAAO,GAAY;YACvB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;SACnC,CAAC;QACF,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC,EAAE,IAAK,CAAC,CAAC;QAEV,sCAAsC;QACtC,MAAM,OAAO,GAAY;YACvB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;SACnC,CAAC;QACF,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC,EAAE,IAAK,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAC7E,aAAa,EACb,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EACvB,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QACF,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kCAAkC,CAC7E,aAAa,EACb,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EACvB,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAC/B,CAAC;QAEF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,qCAAqC;QACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;YAClC,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;SACpB,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1C,qCAAqC;QACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;YAClC,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;SACpB,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"message-router.test.js","sourceRoot":"","sources":["../../../src/signal/message-router.test.ts"],"names":[],"mappings":"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"}