@dxos/network-manager 2.33.8-dev.c77ba621 → 2.33.9-dev.2637427f

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 (119) hide show
  1. package/dist/browser-mocha/bundle.js +41836 -38304
  2. package/dist/src/network-manager.d.ts +1 -0
  3. package/dist/src/network-manager.d.ts.map +1 -1
  4. package/dist/src/network-manager.js +15 -9
  5. package/dist/src/network-manager.js.map +1 -1
  6. package/dist/src/proto/gen/dxos/credentials.d.ts +26 -0
  7. package/dist/src/proto/gen/dxos/credentials.d.ts.map +1 -0
  8. package/dist/src/proto/gen/dxos/credentials.js +3 -0
  9. package/dist/src/proto/gen/dxos/credentials.js.map +1 -0
  10. package/dist/src/proto/gen/dxos/halo/keys.d.ts +60 -0
  11. package/dist/src/proto/gen/dxos/halo/keys.d.ts.map +1 -0
  12. package/dist/src/proto/gen/dxos/halo/keys.js +13 -0
  13. package/dist/src/proto/gen/dxos/halo/keys.js.map +1 -0
  14. package/dist/src/proto/gen/dxos/mesh/signal.d.ts +49 -0
  15. package/dist/src/proto/gen/dxos/mesh/signal.d.ts.map +1 -0
  16. package/dist/src/proto/gen/dxos/mesh/signal.js +3 -0
  17. package/dist/src/proto/gen/dxos/mesh/signal.js.map +1 -0
  18. package/dist/src/proto/gen/google/protobuf.d.ts +5 -0
  19. package/dist/src/proto/gen/google/protobuf.d.ts.map +1 -0
  20. package/dist/src/proto/gen/google/protobuf.js +3 -0
  21. package/dist/src/proto/gen/google/protobuf.js.map +1 -0
  22. package/dist/src/proto/gen/index.d.ts +29 -0
  23. package/dist/src/proto/gen/index.d.ts.map +1 -0
  24. package/dist/src/proto/gen/index.js +11 -0
  25. package/dist/src/proto/gen/index.js.map +1 -0
  26. package/dist/src/proto/substitutions.d.ts +17 -0
  27. package/dist/src/proto/substitutions.d.ts.map +1 -0
  28. package/dist/src/proto/substitutions.js +10 -0
  29. package/dist/src/proto/substitutions.js.map +1 -0
  30. package/dist/src/protocol-factory.js +7 -6
  31. package/dist/src/protocol-factory.js.map +1 -1
  32. package/dist/src/signal/in-memory-signal-manager.d.ts +5 -4
  33. package/dist/src/signal/in-memory-signal-manager.d.ts.map +1 -1
  34. package/dist/src/signal/in-memory-signal-manager.js +5 -3
  35. package/dist/src/signal/in-memory-signal-manager.js.map +1 -1
  36. package/dist/src/signal/message-router.d.ts +36 -0
  37. package/dist/src/signal/message-router.d.ts.map +1 -0
  38. package/dist/src/signal/message-router.js +145 -0
  39. package/dist/src/signal/message-router.js.map +1 -0
  40. package/dist/src/signal/message-router.test.d.ts +2 -0
  41. package/dist/src/signal/message-router.test.d.ts.map +1 -0
  42. package/dist/src/signal/message-router.test.js +265 -0
  43. package/dist/src/signal/message-router.test.js.map +1 -0
  44. package/dist/src/signal/signal-api.d.ts +6 -0
  45. package/dist/src/signal/signal-api.d.ts.map +1 -1
  46. package/dist/src/signal/signal-api.js.map +1 -1
  47. package/dist/src/signal/signal-client.d.ts +5 -3
  48. package/dist/src/signal/signal-client.d.ts.map +1 -1
  49. package/dist/src/signal/signal-client.js +33 -21
  50. package/dist/src/signal/signal-client.js.map +1 -1
  51. package/dist/src/signal/signal-client.test.js +25 -4
  52. package/dist/src/signal/signal-client.test.js.map +1 -1
  53. package/dist/src/signal/signal-manager.d.ts +22 -7
  54. package/dist/src/signal/signal-manager.d.ts.map +1 -1
  55. package/dist/src/signal/websocket-rpc.js +3 -3
  56. package/dist/src/signal/websocket-rpc.js.map +1 -1
  57. package/dist/src/signal/websocket-signal-manager.d.ts +5 -4
  58. package/dist/src/signal/websocket-signal-manager.d.ts.map +1 -1
  59. package/dist/src/signal/websocket-signal-manager.js +2 -2
  60. package/dist/src/signal/websocket-signal-manager.js.map +1 -1
  61. package/dist/src/swarm/connection.d.ts +3 -3
  62. package/dist/src/swarm/connection.d.ts.map +1 -1
  63. package/dist/src/swarm/connection.js +12 -9
  64. package/dist/src/swarm/connection.js.map +1 -1
  65. package/dist/src/swarm/swarm.d.ts +7 -5
  66. package/dist/src/swarm/swarm.d.ts.map +1 -1
  67. package/dist/src/swarm/swarm.js +19 -13
  68. package/dist/src/swarm/swarm.js.map +1 -1
  69. package/dist/src/swarm/swarm.test.js +44 -4
  70. package/dist/src/swarm/swarm.test.js.map +1 -1
  71. package/dist/src/testing/test-protocol.d.ts.map +1 -1
  72. package/dist/src/testing/test-protocol.js +10 -10
  73. package/dist/src/testing/test-protocol.js.map +1 -1
  74. package/dist/src/topology/fully-connected-topology.js +3 -3
  75. package/dist/src/topology/fully-connected-topology.js.map +1 -1
  76. package/dist/src/topology/mmst-topology.js +5 -5
  77. package/dist/src/topology/mmst-topology.js.map +1 -1
  78. package/dist/src/topology/star-topology.js +4 -4
  79. package/dist/src/topology/star-topology.js.map +1 -1
  80. package/dist/src/transport/in-memory-transport.d.ts +2 -2
  81. package/dist/src/transport/in-memory-transport.d.ts.map +1 -1
  82. package/dist/src/transport/in-memory-transport.js +2 -2
  83. package/dist/src/transport/in-memory-transport.js.map +1 -1
  84. package/dist/src/transport/transport.d.ts +3 -3
  85. package/dist/src/transport/transport.d.ts.map +1 -1
  86. package/dist/src/transport/webrtc-transport.d.ts +3 -3
  87. package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
  88. package/dist/src/transport/webrtc-transport.js +6 -4
  89. package/dist/src/transport/webrtc-transport.js.map +1 -1
  90. package/dist/tsconfig.tsbuildinfo +1 -1
  91. package/package.json +17 -13
  92. package/src/network-manager.ts +18 -7
  93. package/src/proto/defs/dxos/mesh/signal.proto +51 -0
  94. package/src/proto/gen/dxos/credentials.ts +27 -0
  95. package/src/proto/gen/dxos/halo/keys.ts +62 -0
  96. package/src/proto/gen/dxos/mesh/signal.ts +52 -0
  97. package/src/proto/gen/google/protobuf.ts +9 -0
  98. package/src/proto/gen/index.ts +29 -0
  99. package/src/proto/substitutions.ts +9 -0
  100. package/src/protocol-factory.ts +5 -5
  101. package/src/signal/in-memory-signal-manager.ts +8 -5
  102. package/src/signal/message-router.test.ts +334 -0
  103. package/src/signal/message-router.ts +178 -0
  104. package/src/signal/signal-api.ts +6 -0
  105. package/src/signal/signal-client.test.ts +37 -12
  106. package/src/signal/signal-client.ts +51 -23
  107. package/src/signal/signal-manager.ts +24 -9
  108. package/src/signal/websocket-rpc.ts +1 -1
  109. package/src/signal/websocket-signal-manager.ts +6 -5
  110. package/src/swarm/connection.ts +12 -10
  111. package/src/swarm/swarm.test.ts +63 -11
  112. package/src/swarm/swarm.ts +19 -14
  113. package/src/testing/test-protocol.ts +8 -8
  114. package/src/topology/fully-connected-topology.ts +1 -1
  115. package/src/topology/mmst-topology.ts +1 -1
  116. package/src/topology/star-topology.ts +1 -1
  117. package/src/transport/in-memory-transport.ts +3 -3
  118. package/src/transport/transport.ts +3 -3
  119. package/src/transport/webrtc-transport.ts +7 -6
@@ -0,0 +1,145 @@
1
+ "use strict";
2
+ //
3
+ // Copyright 2020 DXOS.org
4
+ //
5
+ var __importDefault = (this && this.__importDefault) || function (mod) {
6
+ return (mod && mod.__esModule) ? mod : { "default": mod };
7
+ };
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ exports.MessageRouter = void 0;
10
+ const assert_1 = __importDefault(require("assert"));
11
+ const debug_1 = __importDefault(require("debug"));
12
+ const protocols_1 = require("@dxos/protocols");
13
+ const util_1 = require("@dxos/util");
14
+ const log = (0, debug_1.default)('dxos:network-manager:message-router');
15
+ /**
16
+ * Adds offer/answer RPC and reliable messaging.
17
+ */
18
+ // TODO(mykola): https://github.com/dxos/protocols/issues/1316
19
+ class MessageRouter {
20
+ constructor({ sendMessage, onSignal, onOffer, retryDelay = 100, timeout = 3000 } = {}) {
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);
26
+ this._sendMessage = sendMessage;
27
+ (0, assert_1.default)(onSignal);
28
+ this._onSignal = onSignal;
29
+ (0, assert_1.default)(onOffer);
30
+ this._onOffer = onOffer;
31
+ this._retryDelay = retryDelay;
32
+ this._timeout = timeout;
33
+ }
34
+ async receiveMessage(message) {
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) {
45
+ await this._handleOffer(message);
46
+ }
47
+ else if ((_c = message.data) === null || _c === void 0 ? void 0 : _c.answer) {
48
+ await this._resolveAnswers(message);
49
+ }
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);
55
+ }
56
+ }
57
+ async signal(message) {
58
+ var _a;
59
+ (0, assert_1.default)((_a = message.data) === null || _a === void 0 ? void 0 : _a.signal);
60
+ await this._sendReliableMessage(message);
61
+ }
62
+ async offer(message) {
63
+ message.messageId = protocols_1.PublicKey.random();
64
+ const promise = new Promise((resolve, reject) => {
65
+ this._offerRecords.set(message.messageId, { resolve, reject });
66
+ return this._sendReliableMessage(message);
67
+ });
68
+ return promise;
69
+ }
70
+ async _sendReliableMessage(message) {
71
+ var _a;
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);
100
+ if (offerRecord) {
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}`);
104
+ offerRecord.resolve(message.data.answer);
105
+ }
106
+ }
107
+ async _handleOffer(message) {
108
+ const answer = await this._onOffer(message);
109
+ answer.offerMessageId = message.messageId;
110
+ const answerMessage = {
111
+ id: message.remoteId,
112
+ remoteId: message.id,
113
+ topic: message.topic,
114
+ sessionId: message.sessionId,
115
+ data: { answer }
116
+ };
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();
142
+ }
143
+ }
144
+ exports.MessageRouter = MessageRouter;
145
+ //# sourceMappingURL=message-router.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"message-router.js","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=message-router.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"message-router.test.d.ts","sourceRoot":"","sources":["../../../src/signal/message-router.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,265 @@
1
+ "use strict";
2
+ //
3
+ // Copyright 2022 DXOS.org
4
+ //
5
+ var __importDefault = (this && this.__importDefault) || function (mod) {
6
+ return (mod && mod.__esModule) ? mod : { "default": mod };
7
+ };
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ const earljs_1 = require("earljs");
10
+ const mocha_1 = require("mocha");
11
+ const wait_for_expect_1 = __importDefault(require("wait-for-expect"));
12
+ const protocols_1 = require("@dxos/protocols");
13
+ const signal_1 = require("@dxos/signal");
14
+ const testutils_1 = require("@dxos/testutils");
15
+ const util_1 = require("@dxos/util");
16
+ const message_router_1 = require("./message-router");
17
+ const signal_client_1 = require("./signal-client");
18
+ (0, mocha_1.describe)('MessageRouter', () => {
19
+ let topic;
20
+ let peer1;
21
+ let peer2;
22
+ let broker1;
23
+ const signalApiPort1 = (0, util_1.randomInt)(10000, 50000);
24
+ const signalApiUrl1 = 'http://0.0.0.0:' + signalApiPort1;
25
+ before(async () => {
26
+ broker1 = await (0, signal_1.createTestBroker)(signalApiPort1);
27
+ });
28
+ beforeEach(() => {
29
+ topic = protocols_1.PublicKey.random();
30
+ peer1 = protocols_1.PublicKey.random();
31
+ peer2 = protocols_1.PublicKey.random();
32
+ });
33
+ after(async function () {
34
+ this.timeout(0);
35
+ await broker1.stop();
36
+ });
37
+ const createSignalClientAndMessageRouter = async ({ signalApiUrl, onSignal = (async () => { }), onOffer = async () => ({ accept: true }) }) => {
38
+ // eslint-disable-next-line prefer-const
39
+ let api;
40
+ const router = new message_router_1.MessageRouter({
41
+ // todo(mykola): added catch to avoid not finished request.
42
+ sendMessage: (msg) => api.signal(msg).catch((_) => { }),
43
+ onSignal: onSignal,
44
+ onOffer: onOffer
45
+ });
46
+ (0, testutils_1.afterTest)(() => router.destroy());
47
+ api = new signal_client_1.SignalClient(signalApiUrl, (async () => { }), async (msg) => router.receiveMessage(msg));
48
+ (0, testutils_1.afterTest)(() => api.close());
49
+ return {
50
+ api,
51
+ router
52
+ };
53
+ };
54
+ (0, mocha_1.it)('signaling between 2 clients', async () => {
55
+ const signalMock1 = (0, earljs_1.mockFn)().resolvesTo();
56
+ const { api: api1 } = await createSignalClientAndMessageRouter({ signalApiUrl: signalApiUrl1, onSignal: signalMock1 });
57
+ const { api: api2, router: router2 } = await createSignalClientAndMessageRouter({ signalApiUrl: signalApiUrl1 });
58
+ await api1.join(topic, peer1);
59
+ await api2.join(topic, peer2);
60
+ const msg = {
61
+ id: peer2,
62
+ remoteId: peer1,
63
+ sessionId: protocols_1.PublicKey.random(),
64
+ topic,
65
+ data: { signal: { json: '{"asd": "asd"}' } }
66
+ };
67
+ await router2.signal(msg);
68
+ await (0, wait_for_expect_1.default)(() => {
69
+ (0, earljs_1.expect)(signalMock1).toHaveBeenCalledWith([msg]);
70
+ }, 4000);
71
+ }).timeout(5000);
72
+ (0, mocha_1.it)('offer/answer', async () => {
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
+ });
83
+ await api1.join(topic, peer1);
84
+ await api2.join(topic, peer2);
85
+ const answer = await router1.offer({
86
+ id: peer1,
87
+ remoteId: peer2,
88
+ sessionId: protocols_1.PublicKey.random(),
89
+ topic,
90
+ data: { offer: {} }
91
+ });
92
+ (0, earljs_1.expect)(answer.accept).toEqual(true);
93
+ }).timeout(5000);
94
+ (0, mocha_1.it)('signaling between 3 clients', async () => {
95
+ const signalMock1 = (0, earljs_1.mockFn)().resolvesTo();
96
+ const { api: api1, router: router1 } = await createSignalClientAndMessageRouter({
97
+ signalApiUrl: signalApiUrl1,
98
+ onSignal: signalMock1,
99
+ onOffer: async () => ({ accept: true })
100
+ });
101
+ const signalMock2 = (0, earljs_1.mockFn)().resolvesTo();
102
+ const { api: api2, router: router2 } = await createSignalClientAndMessageRouter({
103
+ signalApiUrl: signalApiUrl1,
104
+ onSignal: signalMock2,
105
+ onOffer: async () => ({ accept: true })
106
+ });
107
+ const signalMock3 = (0, earljs_1.mockFn)().resolvesTo();
108
+ const { api: api3, router: router3 } = await createSignalClientAndMessageRouter({
109
+ signalApiUrl: signalApiUrl1,
110
+ onSignal: signalMock3,
111
+ onOffer: async () => ({ accept: true })
112
+ });
113
+ await api1.join(topic, peer1);
114
+ await api2.join(topic, peer2);
115
+ const peer3 = protocols_1.PublicKey.random();
116
+ await api3.join(topic, peer3);
117
+ // sending signal from peer1 to peer3.
118
+ const msg1to3 = {
119
+ id: peer1,
120
+ remoteId: peer3,
121
+ sessionId: protocols_1.PublicKey.random(),
122
+ topic,
123
+ data: { signal: { json: '1to3' } }
124
+ };
125
+ await router1.signal(msg1to3);
126
+ await (0, wait_for_expect_1.default)(() => {
127
+ (0, earljs_1.expect)(signalMock3).toHaveBeenCalledWith([msg1to3]);
128
+ }, 4000);
129
+ // sending signal from peer2 to peer3.
130
+ const msg2to3 = {
131
+ id: peer2,
132
+ remoteId: peer3,
133
+ sessionId: protocols_1.PublicKey.random(),
134
+ topic,
135
+ data: { signal: { json: '2to3' } }
136
+ };
137
+ await router2.signal(msg2to3);
138
+ await (0, wait_for_expect_1.default)(() => {
139
+ (0, earljs_1.expect)(signalMock3).toHaveBeenCalledWith([msg2to3]);
140
+ }, 4000);
141
+ // sending signal from peer3 to peer1.
142
+ const msg3to1 = {
143
+ id: peer3,
144
+ remoteId: peer1,
145
+ sessionId: protocols_1.PublicKey.random(),
146
+ topic,
147
+ data: { signal: { json: '3to1' } }
148
+ };
149
+ await router3.signal(msg3to1);
150
+ await (0, wait_for_expect_1.default)(() => {
151
+ (0, earljs_1.expect)(signalMock1).toHaveBeenCalledWith([msg3to1]);
152
+ }, 4000);
153
+ }).timeout(5000);
154
+ (0, mocha_1.it)('two offers', async () => {
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
+ });
165
+ await api1.join(topic, peer1);
166
+ await api2.join(topic, peer2);
167
+ // sending offer from peer1 to peer2.
168
+ const answer1 = await router1.offer({
169
+ id: peer1,
170
+ remoteId: peer2,
171
+ sessionId: protocols_1.PublicKey.random(),
172
+ topic,
173
+ data: { offer: {} }
174
+ });
175
+ (0, earljs_1.expect)(answer1.accept).toEqual(true);
176
+ // sending offer from peer2 to peer1.
177
+ const answer2 = await router2.offer({
178
+ id: peer2,
179
+ remoteId: peer1,
180
+ sessionId: protocols_1.PublicKey.random(),
181
+ topic,
182
+ data: { offer: {} }
183
+ });
184
+ (0, earljs_1.expect)(answer2.accept).toEqual(true);
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
+ });
264
+ });
265
+ //# sourceMappingURL=message-router.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"message-router.test.js","sourceRoot":"","sources":["../../../src/signal/message-router.test.ts"],"names":[],"mappings":"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"}
@@ -32,7 +32,13 @@ export declare namespace SignalApi {
32
32
  error?: string;
33
33
  };
34
34
  type SignalMessage = {
35
+ /**
36
+ * Sender's public key.
37
+ */
35
38
  id: PublicKey;
39
+ /**
40
+ * Receiver`s public key.
41
+ */
36
42
  remoteId: PublicKey;
37
43
  topic: PublicKey;
38
44
  sessionId: PublicKey;
@@ -1 +1 @@
1
- {"version":3,"file":"signal-api.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-api.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,yBAAiB,SAAS,CAAC;IACzB,KAAY,KAAK;QACf,uCAAuC;QACvC,UAAU,eAAe;QAEzB,0CAA0C;QAC1C,aAAa,kBAAkB;QAE/B,iBAAiB;QACjB,SAAS,cAAc;QAEvB,oEAAoE;QACpE,YAAY,iBAAiB;QAE7B,yBAAyB;QACzB,MAAM,WAAW;KAClB;IAED,KAAY,MAAM,GAAG;QACnB,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,KAAK,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,WAAW,EAAE,MAAM,CAAA;QACnB,iBAAiB,EAAE,MAAM,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;KACxB,CAAA;IAED,KAAY,YAAY,GAAG;QACzB,SAAS,EAAE,MAAM,CAAA;QACjB,IAAI,EAAE,MAAM,CAAA;QACZ,QAAQ,EAAE,OAAO,CAAA;QACjB,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,GAAG,CAAA;QACZ,QAAQ,CAAC,EAAE,GAAG,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;IAED,KAAY,aAAa,GAAG;QAC1B,EAAE,EAAE,SAAS,CAAA;QACb,QAAQ,EAAE,SAAS,CAAA;QACnB,KAAK,EAAE,SAAS,CAAA;QAChB,SAAS,EAAE,SAAS,CAAA;QACpB,IAAI,EAAE,UAAU,CAAA;KACjB,CAAA;IAED,KAAY,MAAM,GAAG;QACnB,MAAM,EAAE,OAAO,CAAA;KAChB,CAAA;CACF"}
1
+ {"version":3,"file":"signal-api.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-api.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,yBAAiB,SAAS,CAAC;IACzB,KAAY,KAAK;QACf,uCAAuC;QACvC,UAAU,eAAe;QAEzB,0CAA0C;QAC1C,aAAa,kBAAkB;QAE/B,iBAAiB;QACjB,SAAS,cAAc;QAEvB,oEAAoE;QACpE,YAAY,iBAAiB;QAE7B,yBAAyB;QACzB,MAAM,WAAW;KAClB;IAED,KAAY,MAAM,GAAG;QACnB,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,KAAK,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,WAAW,EAAE,MAAM,CAAA;QACnB,iBAAiB,EAAE,MAAM,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;KACxB,CAAA;IAED,KAAY,YAAY,GAAG;QACzB,SAAS,EAAE,MAAM,CAAA;QACjB,IAAI,EAAE,MAAM,CAAA;QACZ,QAAQ,EAAE,OAAO,CAAA;QACjB,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,GAAG,CAAA;QACZ,QAAQ,CAAC,EAAE,GAAG,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;IAED,KAAY,aAAa,GAAG;QAC1B;;WAEG;QACH,EAAE,EAAE,SAAS,CAAA;QACb;;WAEG;QACH,QAAQ,EAAE,SAAS,CAAA;QACnB,KAAK,EAAE,SAAS,CAAA;QAChB,SAAS,EAAE,SAAS,CAAA;QACpB,IAAI,EAAE,UAAU,CAAA;KACjB,CAAA;IAED,KAAY,MAAM,GAAG;QACnB,MAAM,EAAE,OAAO,CAAA;KAChB,CAAA;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"signal-api.js","sourceRoot":"","sources":["../../../src/signal/signal-api.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAMF,kDAAkD;AAElD,IAAiB,SAAS,CAiDzB;AAjDD,WAAiB,SAAS;IACxB,IAAY,KAeX;IAfD,WAAY,KAAK;QACf,uCAAuC;QACvC,kCAAyB,CAAA;QAEzB,0CAA0C;QAC1C,wCAA+B,CAAA;QAE/B,iBAAiB;QACjB,gCAAuB,CAAA;QAEvB,oEAAoE;QACpE,sCAA6B,CAAA;QAE7B,yBAAyB;QACzB,0BAAiB,CAAA;IACnB,CAAC,EAfW,KAAK,GAAL,eAAK,KAAL,eAAK,QAehB;AAiCH,CAAC,EAjDgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAiDzB"}
1
+ {"version":3,"file":"signal-api.js","sourceRoot":"","sources":["../../../src/signal/signal-api.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAMF,kDAAkD;AAElD,IAAiB,SAAS,CAuDzB;AAvDD,WAAiB,SAAS;IACxB,IAAY,KAeX;IAfD,WAAY,KAAK;QACf,uCAAuC;QACvC,kCAAyB,CAAA;QAEzB,0CAA0C;QAC1C,wCAA+B,CAAA;QAE/B,iBAAiB;QACjB,gCAAuB,CAAA;QAEvB,oEAAoE;QACpE,sCAA6B,CAAA;QAE7B,yBAAyB;QACzB,0BAAiB,CAAA;IACnB,CAAC,EAfW,KAAK,GAAL,eAAK,KAAL,eAAK,QAehB;AAuCH,CAAC,EAvDgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAuDzB"}
@@ -1,5 +1,6 @@
1
1
  import { Event } from '@dxos/async';
2
2
  import { PublicKey } from '@dxos/protocols';
3
+ import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
3
4
  import { SignalApi } from './signal-api';
4
5
  /**
5
6
  * Establishes a websocket connection to signal server and provides RPC methods.
@@ -32,7 +33,7 @@ export declare class SignalClient {
32
33
  * @param _onOffer See `SignalApi.offer`.
33
34
  * @param _onSignal See `SignalApi.signal`.
34
35
  */
35
- constructor(_host: string, _onOffer: (message: SignalApi.SignalMessage) => Promise<SignalApi.Answer>, _onSignal: (message: SignalApi.SignalMessage) => Promise<void>);
36
+ constructor(_host: string, _onOffer: (message: Message) => Promise<Answer>, _onSignal: (message: Message) => Promise<void>);
36
37
  private _setState;
37
38
  private _createClient;
38
39
  private _reconnect;
@@ -44,11 +45,12 @@ export declare class SignalClient {
44
45
  /**
45
46
  * Routes an offer to the other peer's _onOffer callback.
46
47
  * @returns Other peer's _onOffer callback return value.
48
+ * @deprecated
47
49
  */
48
- offer(payload: SignalApi.SignalMessage): Promise<SignalApi.Answer>;
50
+ offer(msg: Message): Promise<Answer>;
49
51
  /**
50
52
  * Routes an offer to the other peer's _onSignal callback.
51
53
  */
52
- signal(payload: SignalApi.SignalMessage): Promise<void>;
54
+ signal(message: Message): Promise<void>;
53
55
  }
54
56
  //# sourceMappingURL=signal-client.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"signal-client.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-client.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzC;;GAEG;AACH,qBAAa,YAAY;IAmCrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IApC5B,OAAO,CAAC,MAAM,CAA8B;IAE5C,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B;;OAEG;IACH,OAAO,CAAC,eAAe,CAA6B;IAEpD;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAc;IAExC;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAAc;IAEtC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAE9C,OAAO,CAAC,OAAO,CAAgB;IAE/B,OAAO,CAAC,cAAc,CAAsB;IAE5C,QAAQ,CAAC,aAAa,0BAAiC;IACvD,QAAQ,CAAC,YAAY,gCAAuC;IAE5D;;;;OAIG;gBAEgB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,EACzE,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC;IAMjF,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,aAAa;IAuErB,OAAO,CAAC,UAAU;IAuBZ,KAAK;IAYX,SAAS,IAAK,SAAS,CAAC,MAAM;IAWxB,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAQhE,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1D,MAAM,CAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAOrD;;;OAGG;IACG,KAAK,CAAE,OAAO,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;IAUzE;;OAEG;IACG,MAAM,CAAE,OAAO,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAS/D"}
1
+ {"version":3,"file":"signal-client.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-client.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzC;;GAEG;AACH,qBAAa,YAAY;IAmCrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IApC5B,OAAO,CAAC,MAAM,CAA8B;IAE5C,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B;;OAEG;IACH,OAAO,CAAC,eAAe,CAA6B;IAEpD;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAc;IAExC;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAAc;IAEtC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAE9C,OAAO,CAAC,OAAO,CAAgB;IAE/B,OAAO,CAAC,cAAc,CAAsB;IAE5C,QAAQ,CAAC,aAAa,0BAAiC;IACvD,QAAQ,CAAC,YAAY,gCAAuC;IAE5D;;;;OAIG;gBAEgB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC/C,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC;IAMjE,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,aAAa;IA2ErB,OAAO,CAAC,UAAU;IAuBZ,KAAK;IAYX,SAAS,IAAK,SAAS,CAAC,MAAM;IAWxB,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAQhE,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1D,MAAM,CAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAOrD;;;;OAIG;IACG,KAAK,CAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAU3C;;OAEG;IACG,MAAM,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAW/C"}
@@ -9,7 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.SignalClient = void 0;
10
10
  const debug_1 = __importDefault(require("debug"));
11
11
  const async_1 = require("@dxos/async");
12
+ const debug_2 = require("@dxos/debug");
12
13
  const protocols_1 = require("@dxos/protocols");
14
+ const gen_1 = require("../proto/gen");
13
15
  const signal_api_1 = require("./signal-api");
14
16
  const websocket_rpc_1 = require("./websocket-rpc");
15
17
  const log = (0, debug_1.default)('dxos:network-manager:signal-client');
@@ -72,13 +74,18 @@ class SignalClient {
72
74
  sessionId: protocols_1.PublicKey.from(message.sessionId),
73
75
  data: message.data
74
76
  }));
75
- this._client.subscribe('signal', (msg) => this._onSignal({
76
- id: protocols_1.PublicKey.from(msg.id),
77
- remoteId: protocols_1.PublicKey.from(msg.remoteId),
78
- topic: protocols_1.PublicKey.from(msg.topic),
79
- sessionId: protocols_1.PublicKey.from(msg.sessionId),
80
- data: msg.data
81
- }));
77
+ this._client.subscribe('signal', (msg) => {
78
+ var _a;
79
+ return this._onSignal({
80
+ id: protocols_1.PublicKey.from(msg.id),
81
+ remoteId: protocols_1.PublicKey.from(msg.remoteId),
82
+ topic: protocols_1.PublicKey.from(msg.topic),
83
+ sessionId: protocols_1.PublicKey.from(msg.sessionId),
84
+ data: gen_1.schema.getCodecForType('dxos.mesh.signal.MessageData').decode((_a = msg.data) !== null && _a !== void 0 ? _a : (0, debug_2.failUndefined)()),
85
+ // Field that MessageRouter adds, so on lower level it not always defined.
86
+ messageId: msg.messageId ? protocols_1.PublicKey.from(msg.messageId) : undefined
87
+ });
88
+ });
82
89
  this._clientCleanup.push(this._client.connected.on(() => {
83
90
  log('Socket connected');
84
91
  this._lastError = undefined;
@@ -171,27 +178,32 @@ class SignalClient {
171
178
  /**
172
179
  * Routes an offer to the other peer's _onOffer callback.
173
180
  * @returns Other peer's _onOffer callback return value.
181
+ * @deprecated
174
182
  */
175
- async offer(payload) {
183
+ async offer(msg) {
184
+ var _a, _b, _c, _d;
176
185
  return this._client.call('offer', {
177
- id: payload.id.asBuffer(),
178
- remoteId: payload.remoteId.asBuffer(),
179
- topic: payload.topic.asBuffer(),
180
- sessionId: payload.sessionId.asBuffer(),
181
- data: payload.data
186
+ id: (_a = msg.id) === null || _a === void 0 ? void 0 : _a.asBuffer(),
187
+ remoteId: (_b = msg.remoteId) === null || _b === void 0 ? void 0 : _b.asBuffer(),
188
+ topic: (_c = msg.topic) === null || _c === void 0 ? void 0 : _c.asBuffer(),
189
+ sessionId: (_d = msg.sessionId) === null || _d === void 0 ? void 0 : _d.asBuffer(),
190
+ data: msg.data
182
191
  });
183
192
  }
184
193
  /**
185
194
  * Routes an offer to the other peer's _onSignal callback.
186
195
  */
187
- async signal(payload) {
188
- return this._client.emit('signal', {
189
- id: payload.id.asBuffer(),
190
- remoteId: payload.remoteId.asBuffer(),
191
- topic: payload.topic.asBuffer(),
192
- sessionId: payload.sessionId.asBuffer(),
193
- data: payload.data
194
- });
196
+ async signal(message) {
197
+ var _a, _b, _c, _d, _e, _f;
198
+ const signalMessage = {
199
+ messageId: (_a = message.messageId) === null || _a === void 0 ? void 0 : _a.asBuffer(),
200
+ id: (_b = message.id) === null || _b === void 0 ? void 0 : _b.asBuffer(),
201
+ remoteId: (_c = message.remoteId) === null || _c === void 0 ? void 0 : _c.asBuffer(),
202
+ topic: (_d = message.topic) === null || _d === void 0 ? void 0 : _d.asBuffer(),
203
+ sessionId: (_e = message.sessionId) === null || _e === void 0 ? void 0 : _e.asBuffer(),
204
+ data: Buffer.from(gen_1.schema.getCodecForType('dxos.mesh.signal.MessageData').encode((_f = message.data) !== null && _f !== void 0 ? _f : (0, debug_2.failUndefined)()))
205
+ };
206
+ return this._client.emit('signal', signalMessage);
195
207
  }
196
208
  }
197
209
  exports.SignalClient = SignalClient;
@@ -1 +1 @@
1
- {"version":3,"file":"signal-client.js","sourceRoot":"","sources":["../../../src/signal/signal-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signal-client.js","sourceRoot":"","sources":["../../../src/signal/signal-client.ts"],"names":[],"mappings":"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"}