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