@dxos/messaging 0.1.58-main.0fabfcd → 0.1.58-main.31dfb10
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.
- package/dist/lib/browser/index.mjs +71 -17
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +71 -17
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/types/src/messenger.d.ts +4 -0
- package/dist/types/src/messenger.d.ts.map +1 -1
- package/package.json +13 -12
- package/src/messenger.ts +41 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/core/mesh/messaging/src/timeouts.ts":{"bytes":656,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/messenger.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/core/mesh/messaging/src/timeouts.ts":{"bytes":656,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/messenger.ts":{"bytes":34784,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/timeouts.ts","kind":"import-statement","original":"./timeouts"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytes":20028,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytes":52172,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/mesh/signal","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts","kind":"import-statement","original":"./signal-rpc-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/index.ts":{"bytes":499,"imports":[{"path":"packages/core/mesh/messaging/src/signal-client/signal-client.ts","kind":"import-statement","original":"./signal-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytes":24541,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts":{"bytes":1268,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytes":18581,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-client/index.ts","kind":"import-statement","original":"../signal-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytes":750,"imports":[{"path":"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts","kind":"import-statement","original":"./memory-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts","kind":"import-statement","original":"./signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts","kind":"import-statement","original":"./websocket-signal-manager"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-methods.ts":{"bytes":1621,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/index.ts":{"bytes":782,"imports":[{"path":"packages/core/mesh/messaging/src/messenger.ts","kind":"import-statement","original":"./messenger"},{"path":"packages/core/mesh/messaging/src/signal-client/index.ts","kind":"import-statement","original":"./signal-client"},{"path":"packages/core/mesh/messaging/src/signal-manager/index.ts","kind":"import-statement","original":"./signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"./signal-methods"}],"format":"esm"}},"outputs":{"packages/core/mesh/messaging/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":69070},"packages/core/mesh/messaging/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/mesh/signal","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true}],"exports":["MemorySignalManager","MemorySignalManagerContext","Messenger","SignalClient","WebsocketSignalManager"],"entryPoint":"packages/core/mesh/messaging/src/index.ts","inputs":{"packages/core/mesh/messaging/src/messenger.ts":{"bytesInOutput":10112},"packages/core/mesh/messaging/src/timeouts.ts":{"bytesInOutput":27},"packages/core/mesh/messaging/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytesInOutput":13561},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytesInOutput":6017},"packages/core/mesh/messaging/src/signal-client/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytesInOutput":6682},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytesInOutput":6027}},"bytes":43127}}}
|
package/dist/lib/node/index.cjs
CHANGED
|
@@ -41,6 +41,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
41
41
|
// packages/core/mesh/messaging/src/messenger.ts
|
|
42
42
|
var import_async = require("@dxos/async");
|
|
43
43
|
var import_context = require("@dxos/context");
|
|
44
|
+
var import_errors = require("@dxos/errors");
|
|
44
45
|
var import_invariant = require("@dxos/invariant");
|
|
45
46
|
var import_keys = require("@dxos/keys");
|
|
46
47
|
var import_log = require("@dxos/log");
|
|
@@ -54,6 +55,8 @@ var MESSAGE_TIMEOUT = 1e4;
|
|
|
54
55
|
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
|
|
55
56
|
var ReliablePayload = import_protocols.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
|
|
56
57
|
var Acknowledgement = import_protocols.schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
|
|
58
|
+
var ERROR_LIMIT = 5;
|
|
59
|
+
var NETWORK_REBOOT_DELAY = 3e3;
|
|
57
60
|
var Messenger = class {
|
|
58
61
|
constructor({ signalManager, retryDelay = 300 }) {
|
|
59
62
|
// { peerId, payloadType } => listeners set
|
|
@@ -63,6 +66,8 @@ var Messenger = class {
|
|
|
63
66
|
this._onAckCallbacks = new import_util.ComplexMap(import_keys.PublicKey.hash);
|
|
64
67
|
this._receivedMessages = new import_util.ComplexSet((key) => key.toHex());
|
|
65
68
|
this._closed = true;
|
|
69
|
+
this._errorCount = 0;
|
|
70
|
+
this._rebooting = false;
|
|
66
71
|
this._signalManager = signalManager;
|
|
67
72
|
this._retryDelay = retryDelay;
|
|
68
73
|
this.open();
|
|
@@ -76,14 +81,14 @@ var Messenger = class {
|
|
|
76
81
|
id: traceId
|
|
77
82
|
}), {
|
|
78
83
|
F: __dxlog_file,
|
|
79
|
-
L:
|
|
84
|
+
L: 68,
|
|
80
85
|
S: this,
|
|
81
86
|
C: (f, a) => f(...a)
|
|
82
87
|
});
|
|
83
88
|
this._ctx = new import_context.Context({
|
|
84
89
|
onError: (err) => import_log.log.catch(err, void 0, {
|
|
85
90
|
F: __dxlog_file,
|
|
86
|
-
L:
|
|
91
|
+
L: 70,
|
|
87
92
|
S: this,
|
|
88
93
|
C: (f, a) => f(...a)
|
|
89
94
|
})
|
|
@@ -93,7 +98,7 @@ var Messenger = class {
|
|
|
93
98
|
from: message.author
|
|
94
99
|
}, {
|
|
95
100
|
F: __dxlog_file,
|
|
96
|
-
L:
|
|
101
|
+
L: 74,
|
|
97
102
|
S: this,
|
|
98
103
|
C: (f, a) => f(...a)
|
|
99
104
|
});
|
|
@@ -104,7 +109,7 @@ var Messenger = class {
|
|
|
104
109
|
id: traceId
|
|
105
110
|
}), {
|
|
106
111
|
F: __dxlog_file,
|
|
107
|
-
L:
|
|
112
|
+
L: 79,
|
|
108
113
|
S: this,
|
|
109
114
|
C: (f, a) => f(...a)
|
|
110
115
|
});
|
|
@@ -119,7 +124,7 @@ var Messenger = class {
|
|
|
119
124
|
async sendMessage({ author, recipient, payload }) {
|
|
120
125
|
(0, import_invariant.invariant)(!this._closed, "Closed", {
|
|
121
126
|
F: __dxlog_file,
|
|
122
|
-
L:
|
|
127
|
+
L: 91,
|
|
123
128
|
S: this,
|
|
124
129
|
A: [
|
|
125
130
|
"!this._closed",
|
|
@@ -133,7 +138,7 @@ var Messenger = class {
|
|
|
133
138
|
};
|
|
134
139
|
(0, import_invariant.invariant)(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
|
|
135
140
|
F: __dxlog_file,
|
|
136
|
-
L:
|
|
141
|
+
L: 98,
|
|
137
142
|
S: this,
|
|
138
143
|
A: [
|
|
139
144
|
"!this._onAckCallbacks.has(reliablePayload.messageId!)",
|
|
@@ -146,7 +151,7 @@ var Messenger = class {
|
|
|
146
151
|
recipient
|
|
147
152
|
}, {
|
|
148
153
|
F: __dxlog_file,
|
|
149
|
-
L:
|
|
154
|
+
L: 99,
|
|
150
155
|
S: this,
|
|
151
156
|
C: (f, a) => f(...a)
|
|
152
157
|
});
|
|
@@ -161,7 +166,7 @@ var Messenger = class {
|
|
|
161
166
|
messageId: reliablePayload.messageId
|
|
162
167
|
}, {
|
|
163
168
|
F: __dxlog_file,
|
|
164
|
-
L:
|
|
169
|
+
L: 113,
|
|
165
170
|
S: this,
|
|
166
171
|
C: (f, a) => f(...a)
|
|
167
172
|
});
|
|
@@ -173,22 +178,23 @@ var Messenger = class {
|
|
|
173
178
|
err
|
|
174
179
|
}, {
|
|
175
180
|
F: __dxlog_file,
|
|
176
|
-
L:
|
|
181
|
+
L: 115,
|
|
177
182
|
S: this,
|
|
178
183
|
C: (f, a) => f(...a)
|
|
179
184
|
}));
|
|
180
185
|
}, this._retryDelay);
|
|
181
|
-
(0, import_async.scheduleTask)(messageContext, () => {
|
|
186
|
+
(0, import_async.scheduleTask)(messageContext, async () => {
|
|
182
187
|
(0, import_log.log)("message not delivered", {
|
|
183
188
|
messageId: reliablePayload.messageId
|
|
184
189
|
}, {
|
|
185
190
|
F: __dxlog_file,
|
|
186
|
-
L:
|
|
191
|
+
L: 124,
|
|
187
192
|
S: this,
|
|
188
193
|
C: (f, a) => f(...a)
|
|
189
194
|
});
|
|
190
195
|
this._onAckCallbacks.delete(reliablePayload.messageId);
|
|
191
|
-
|
|
196
|
+
await this.errorLimitCheck();
|
|
197
|
+
timeoutHit(new import_errors.TimeoutError("signaling message not delivered", new import_async.TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")));
|
|
192
198
|
void messageContext.dispose();
|
|
193
199
|
}, MESSAGE_TIMEOUT);
|
|
194
200
|
this._onAckCallbacks.set(reliablePayload.messageId, () => {
|
|
@@ -203,6 +209,54 @@ var Messenger = class {
|
|
|
203
209
|
});
|
|
204
210
|
return promise;
|
|
205
211
|
}
|
|
212
|
+
async errorLimitCheck() {
|
|
213
|
+
(0, import_log.log)(`checking error limit ${this._errorCount}`, void 0, {
|
|
214
|
+
F: __dxlog_file,
|
|
215
|
+
L: 149,
|
|
216
|
+
S: this,
|
|
217
|
+
C: (f, a) => f(...a)
|
|
218
|
+
});
|
|
219
|
+
if (this._errorCount++ > ERROR_LIMIT) {
|
|
220
|
+
await this.rebootNetwork();
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
async rebootNetwork() {
|
|
224
|
+
if (this._rebooting) {
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
this._rebooting = true;
|
|
228
|
+
(0, import_log.log)("rebooting Messenger/SignalManager", void 0, {
|
|
229
|
+
F: __dxlog_file,
|
|
230
|
+
L: 161,
|
|
231
|
+
S: this,
|
|
232
|
+
C: (f, a) => f(...a)
|
|
233
|
+
});
|
|
234
|
+
await this.close();
|
|
235
|
+
await this._signalManager.close();
|
|
236
|
+
(0, import_log.log)("pausing", void 0, {
|
|
237
|
+
F: __dxlog_file,
|
|
238
|
+
L: 164,
|
|
239
|
+
S: this,
|
|
240
|
+
C: (f, a) => f(...a)
|
|
241
|
+
});
|
|
242
|
+
await new Promise((resolve) => setTimeout(resolve, NETWORK_REBOOT_DELAY));
|
|
243
|
+
(0, import_log.log)("done pausing", void 0, {
|
|
244
|
+
F: __dxlog_file,
|
|
245
|
+
L: 166,
|
|
246
|
+
S: this,
|
|
247
|
+
C: (f, a) => f(...a)
|
|
248
|
+
});
|
|
249
|
+
await this.open();
|
|
250
|
+
await this._signalManager.open();
|
|
251
|
+
(0, import_log.log)("done rebooting", void 0, {
|
|
252
|
+
F: __dxlog_file,
|
|
253
|
+
L: 169,
|
|
254
|
+
S: this,
|
|
255
|
+
C: (f, a) => f(...a)
|
|
256
|
+
});
|
|
257
|
+
this._errorCount = 0;
|
|
258
|
+
this._rebooting = false;
|
|
259
|
+
}
|
|
206
260
|
/**
|
|
207
261
|
* Subscribes onMessage function to messages that contains payload with payloadType.
|
|
208
262
|
* @param payloadType if not specified, onMessage will be subscribed to all types of messages.
|
|
@@ -210,7 +264,7 @@ var Messenger = class {
|
|
|
210
264
|
async listen({ peerId, payloadType, onMessage }) {
|
|
211
265
|
(0, import_invariant.invariant)(!this._closed, "Closed", {
|
|
212
266
|
F: __dxlog_file,
|
|
213
|
-
L:
|
|
267
|
+
L: 188,
|
|
214
268
|
S: this,
|
|
215
269
|
A: [
|
|
216
270
|
"!this._closed",
|
|
@@ -274,7 +328,7 @@ var Messenger = class {
|
|
|
274
328
|
async _handleReliablePayload({ author, recipient, payload }) {
|
|
275
329
|
(0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
|
|
276
330
|
F: __dxlog_file,
|
|
277
|
-
L:
|
|
331
|
+
L: 249,
|
|
278
332
|
S: this,
|
|
279
333
|
A: [
|
|
280
334
|
"payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
|
|
@@ -288,7 +342,7 @@ var Messenger = class {
|
|
|
288
342
|
messageId: reliablePayload.messageId
|
|
289
343
|
}, {
|
|
290
344
|
F: __dxlog_file,
|
|
291
|
-
L:
|
|
345
|
+
L: 252,
|
|
292
346
|
S: this,
|
|
293
347
|
C: (f, a) => f(...a)
|
|
294
348
|
});
|
|
@@ -310,7 +364,7 @@ var Messenger = class {
|
|
|
310
364
|
async _handleAcknowledgement({ payload }) {
|
|
311
365
|
(0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
|
|
312
366
|
F: __dxlog_file,
|
|
313
|
-
L:
|
|
367
|
+
L: 274,
|
|
314
368
|
S: this,
|
|
315
369
|
A: [
|
|
316
370
|
"payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
|
|
@@ -326,7 +380,7 @@ var Messenger = class {
|
|
|
326
380
|
to: author
|
|
327
381
|
}, {
|
|
328
382
|
F: __dxlog_file,
|
|
329
|
-
L:
|
|
383
|
+
L: 287,
|
|
330
384
|
S: this,
|
|
331
385
|
C: (f, a) => f(...a)
|
|
332
386
|
});
|