@dxos/messaging 0.4.6-main.3500f01 → 0.4.6-main.3724cc4
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 +27 -34
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +22 -29
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/types/src/signal-client/signal-rpc-client.d.ts +0 -1
- package/dist/types/src/signal-client/signal-rpc-client.d.ts.map +1 -1
- package/package.json +12 -12
- package/src/signal-client/signal-rpc-client.ts +1 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"inject-globals:@inject-globals":{"bytes":384,"imports":[{"path":"@dxos/node-std/inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/timeouts.ts":{"bytes":656,"imports":[{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/messenger.ts":{"bytes":34092,"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},{"path":"packages/core/mesh/messaging/src/timeouts.ts","kind":"import-statement","original":"./timeouts"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytes":
|
|
1
|
+
{"inputs":{"inject-globals:@inject-globals":{"bytes":384,"imports":[{"path":"@dxos/node-std/inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/timeouts.ts":{"bytes":656,"imports":[{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/messenger.ts":{"bytes":34092,"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},{"path":"packages/core/mesh/messaging/src/timeouts.ts","kind":"import-statement","original":"./timeouts"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytes":20064,"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},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytes":52252,"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"},{"path":"@inject-globals","kind":"import-statement","external":true}],"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"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytes":24506,"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},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts":{"bytes":1339,"imports":[{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytes":25815,"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"},{"path":"@inject-globals","kind":"import-statement","external":true}],"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"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-methods.ts":{"bytes":1633,"imports":[{"path":"@inject-globals","kind":"import-statement","external":true}],"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"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"}},"outputs":{"packages/core/mesh/messaging/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":72228},"packages/core/mesh/messaging/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/node-std/inject-globals","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},{"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":{"inject-globals:@inject-globals":{"bytesInOutput":79},"packages/core/mesh/messaging/src/messenger.ts":{"bytesInOutput":9633},"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":13587},"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":6661},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytesInOutput":8542}},"bytes":45282}}}
|
package/dist/lib/node/index.cjs
CHANGED
|
@@ -52,21 +52,20 @@ var import_signal = require("@dxos/protocols/proto/dxos/mesh/signal");
|
|
|
52
52
|
var import_util2 = require("@dxos/util");
|
|
53
53
|
var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
|
|
54
54
|
var import_async3 = require("@dxos/async");
|
|
55
|
-
var import_context3 = require("@dxos/context");
|
|
56
55
|
var import_invariant3 = require("@dxos/invariant");
|
|
57
56
|
var import_keys3 = require("@dxos/keys");
|
|
58
57
|
var import_log3 = require("@dxos/log");
|
|
59
58
|
var import_protocols3 = require("@dxos/protocols");
|
|
60
59
|
var import_rpc = require("@dxos/rpc");
|
|
61
60
|
var import_async4 = require("@dxos/async");
|
|
62
|
-
var
|
|
61
|
+
var import_context3 = require("@dxos/context");
|
|
63
62
|
var import_invariant4 = require("@dxos/invariant");
|
|
64
63
|
var import_keys4 = require("@dxos/keys");
|
|
65
64
|
var import_log4 = require("@dxos/log");
|
|
66
65
|
var import_protocols4 = require("@dxos/protocols");
|
|
67
66
|
var import_util3 = require("@dxos/util");
|
|
68
67
|
var import_async5 = require("@dxos/async");
|
|
69
|
-
var
|
|
68
|
+
var import_context4 = require("@dxos/context");
|
|
70
69
|
var import_invariant5 = require("@dxos/invariant");
|
|
71
70
|
var import_keys5 = require("@dxos/keys");
|
|
72
71
|
var import_log5 = require("@dxos/log");
|
|
@@ -409,7 +408,6 @@ var Messenger = class {
|
|
|
409
408
|
}
|
|
410
409
|
};
|
|
411
410
|
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
|
|
412
|
-
var SIGNAL_KEEPALIVE_INTERVAL = 1e4;
|
|
413
411
|
var SignalRPCClient = class {
|
|
414
412
|
constructor({ url, callbacks = {} }) {
|
|
415
413
|
this._connectTrigger = new import_async3.Trigger();
|
|
@@ -419,7 +417,7 @@ var SignalRPCClient = class {
|
|
|
419
417
|
id: traceId
|
|
420
418
|
}), {
|
|
421
419
|
F: __dxlog_file2,
|
|
422
|
-
L:
|
|
420
|
+
L: 49,
|
|
423
421
|
S: this,
|
|
424
422
|
C: (f, a) => f(...a)
|
|
425
423
|
});
|
|
@@ -441,7 +439,7 @@ var SignalRPCClient = class {
|
|
|
441
439
|
} catch (err) {
|
|
442
440
|
import_log3.log.warn("send error", err, {
|
|
443
441
|
F: __dxlog_file2,
|
|
444
|
-
L:
|
|
442
|
+
L: 68,
|
|
445
443
|
S: this,
|
|
446
444
|
C: (f, a) => f(...a)
|
|
447
445
|
});
|
|
@@ -466,16 +464,12 @@ var SignalRPCClient = class {
|
|
|
466
464
|
await this._rpc.open();
|
|
467
465
|
(0, import_log3.log)(`RPC open ${this._url}`, void 0, {
|
|
468
466
|
F: __dxlog_file2,
|
|
469
|
-
L:
|
|
467
|
+
L: 89,
|
|
470
468
|
S: this,
|
|
471
469
|
C: (f, a) => f(...a)
|
|
472
470
|
});
|
|
473
471
|
this._callbacks.onConnected?.();
|
|
474
472
|
this._connectTrigger.wake();
|
|
475
|
-
this._keepaliveCtx = new import_context3.Context();
|
|
476
|
-
(0, import_async3.scheduleTaskInterval)(this._keepaliveCtx, async () => {
|
|
477
|
-
this._socket?.send("__ping__");
|
|
478
|
-
}, SIGNAL_KEEPALIVE_INTERVAL);
|
|
479
473
|
} catch (err) {
|
|
480
474
|
this._callbacks.onError?.(err);
|
|
481
475
|
}
|
|
@@ -483,7 +477,7 @@ var SignalRPCClient = class {
|
|
|
483
477
|
this._socket.onclose = async () => {
|
|
484
478
|
(0, import_log3.log)(`Disconnected ${this._url}`, void 0, {
|
|
485
479
|
F: __dxlog_file2,
|
|
486
|
-
L:
|
|
480
|
+
L: 98,
|
|
487
481
|
S: this,
|
|
488
482
|
C: (f, a) => f(...a)
|
|
489
483
|
});
|
|
@@ -501,7 +495,7 @@ var SignalRPCClient = class {
|
|
|
501
495
|
} catch (err) {
|
|
502
496
|
import_log3.log.catch(err, void 0, {
|
|
503
497
|
F: __dxlog_file2,
|
|
504
|
-
L:
|
|
498
|
+
L: 115,
|
|
505
499
|
S: this,
|
|
506
500
|
C: (f, a) => f(...a)
|
|
507
501
|
});
|
|
@@ -511,7 +505,7 @@ var SignalRPCClient = class {
|
|
|
511
505
|
url: this._url
|
|
512
506
|
}, {
|
|
513
507
|
F: __dxlog_file2,
|
|
514
|
-
L:
|
|
508
|
+
L: 119,
|
|
515
509
|
S: this,
|
|
516
510
|
C: (f, a) => f(...a)
|
|
517
511
|
});
|
|
@@ -520,13 +514,12 @@ var SignalRPCClient = class {
|
|
|
520
514
|
id: traceId
|
|
521
515
|
}), {
|
|
522
516
|
F: __dxlog_file2,
|
|
523
|
-
L:
|
|
517
|
+
L: 122,
|
|
524
518
|
S: this,
|
|
525
519
|
C: (f, a) => f(...a)
|
|
526
520
|
});
|
|
527
521
|
}
|
|
528
522
|
async close() {
|
|
529
|
-
await this._keepaliveCtx?.dispose();
|
|
530
523
|
this._closed = true;
|
|
531
524
|
try {
|
|
532
525
|
await this._rpc?.close();
|
|
@@ -534,7 +527,7 @@ var SignalRPCClient = class {
|
|
|
534
527
|
} catch (err) {
|
|
535
528
|
import_log3.log.warn("close error", err, {
|
|
536
529
|
F: __dxlog_file2,
|
|
537
|
-
L:
|
|
530
|
+
L: 131,
|
|
538
531
|
S: this,
|
|
539
532
|
C: (f, a) => f(...a)
|
|
540
533
|
});
|
|
@@ -546,14 +539,14 @@ var SignalRPCClient = class {
|
|
|
546
539
|
peerId
|
|
547
540
|
}, {
|
|
548
541
|
F: __dxlog_file2,
|
|
549
|
-
L:
|
|
542
|
+
L: 136,
|
|
550
543
|
S: this,
|
|
551
544
|
C: (f, a) => f(...a)
|
|
552
545
|
});
|
|
553
546
|
await this._connectTrigger.wait();
|
|
554
547
|
(0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
|
|
555
548
|
F: __dxlog_file2,
|
|
556
|
-
L:
|
|
549
|
+
L: 138,
|
|
557
550
|
S: this,
|
|
558
551
|
A: [
|
|
559
552
|
"!this._closed",
|
|
@@ -562,7 +555,7 @@ var SignalRPCClient = class {
|
|
|
562
555
|
});
|
|
563
556
|
(0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
|
|
564
557
|
F: __dxlog_file2,
|
|
565
|
-
L:
|
|
558
|
+
L: 139,
|
|
566
559
|
S: this,
|
|
567
560
|
A: [
|
|
568
561
|
"this._rpc",
|
|
@@ -581,13 +574,13 @@ var SignalRPCClient = class {
|
|
|
581
574
|
peerId
|
|
582
575
|
}, {
|
|
583
576
|
F: __dxlog_file2,
|
|
584
|
-
L:
|
|
577
|
+
L: 149,
|
|
585
578
|
S: this,
|
|
586
579
|
C: (f, a) => f(...a)
|
|
587
580
|
});
|
|
588
581
|
(0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
|
|
589
582
|
F: __dxlog_file2,
|
|
590
|
-
L:
|
|
583
|
+
L: 150,
|
|
591
584
|
S: this,
|
|
592
585
|
A: [
|
|
593
586
|
"!this._closed",
|
|
@@ -597,7 +590,7 @@ var SignalRPCClient = class {
|
|
|
597
590
|
await this._connectTrigger.wait();
|
|
598
591
|
(0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
|
|
599
592
|
F: __dxlog_file2,
|
|
600
|
-
L:
|
|
593
|
+
L: 152,
|
|
601
594
|
S: this,
|
|
602
595
|
A: [
|
|
603
596
|
"this._rpc",
|
|
@@ -617,13 +610,13 @@ var SignalRPCClient = class {
|
|
|
617
610
|
payload
|
|
618
611
|
}, {
|
|
619
612
|
F: __dxlog_file2,
|
|
620
|
-
L:
|
|
613
|
+
L: 161,
|
|
621
614
|
S: this,
|
|
622
615
|
C: (f, a) => f(...a)
|
|
623
616
|
});
|
|
624
617
|
(0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
|
|
625
618
|
F: __dxlog_file2,
|
|
626
|
-
L:
|
|
619
|
+
L: 162,
|
|
627
620
|
S: this,
|
|
628
621
|
A: [
|
|
629
622
|
"!this._closed",
|
|
@@ -633,7 +626,7 @@ var SignalRPCClient = class {
|
|
|
633
626
|
await this._connectTrigger.wait();
|
|
634
627
|
(0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
|
|
635
628
|
F: __dxlog_file2,
|
|
636
|
-
L:
|
|
629
|
+
L: 164,
|
|
637
630
|
S: this,
|
|
638
631
|
A: [
|
|
639
632
|
"this._rpc",
|
|
@@ -1122,14 +1115,14 @@ var MemorySignalManager = class {
|
|
|
1122
1115
|
this.onMessage = new import_async4.Event();
|
|
1123
1116
|
this._joinedSwarms = new import_util3.ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
|
|
1124
1117
|
this._freezeTrigger = new import_async4.Trigger().wake();
|
|
1125
|
-
this._ctx = new
|
|
1118
|
+
this._ctx = new import_context3.Context();
|
|
1126
1119
|
this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
|
|
1127
1120
|
}
|
|
1128
1121
|
async open() {
|
|
1129
1122
|
if (!this._ctx.disposed) {
|
|
1130
1123
|
return;
|
|
1131
1124
|
}
|
|
1132
|
-
this._ctx = new
|
|
1125
|
+
this._ctx = new import_context3.Context();
|
|
1133
1126
|
this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
|
|
1134
1127
|
await Promise.all([
|
|
1135
1128
|
...this._joinedSwarms.values()
|
|
@@ -1631,7 +1624,7 @@ var WebsocketSignalManager = class {
|
|
|
1631
1624
|
await this._forEachServer(async (server) => server.unsubscribeMessages(peerId));
|
|
1632
1625
|
}
|
|
1633
1626
|
_initContext() {
|
|
1634
|
-
this._ctx = new
|
|
1627
|
+
this._ctx = new import_context4.Context({
|
|
1635
1628
|
onError: (err) => import_log5.log.catch(err, void 0, {
|
|
1636
1629
|
F: __dxlog_file5,
|
|
1637
1630
|
L: 178,
|