@dxos/network-manager 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6
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/{chunk-AQSYW43M.mjs → chunk-WMCWASCJ.mjs} +76 -81
- package/dist/lib/browser/chunk-WMCWASCJ.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +17 -7
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/node-esm/{chunk-SCX3PZRE.mjs → chunk-AL2EW6AJ.mjs} +76 -81
- package/dist/lib/node-esm/chunk-AL2EW6AJ.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +1 -1
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +17 -7
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/types/src/network-manager.d.ts +5 -4
- package/dist/types/src/network-manager.d.ts.map +1 -1
- package/dist/types/src/signal/signal-connection.d.ts +3 -2
- package/dist/types/src/signal/signal-connection.d.ts.map +1 -1
- package/dist/types/src/signal/signal-messenger.d.ts +3 -2
- package/dist/types/src/signal/signal-messenger.d.ts.map +1 -1
- package/dist/types/src/signal/swarm-messenger.d.ts +7 -7
- package/dist/types/src/signal/swarm-messenger.d.ts.map +1 -1
- package/dist/types/src/swarm/connection.d.ts +2 -1
- package/dist/types/src/swarm/connection.d.ts.map +1 -1
- package/dist/types/src/swarm/peer.d.ts +4 -3
- package/dist/types/src/swarm/peer.d.ts.map +1 -1
- package/dist/types/src/swarm/swarm.d.ts +3 -2
- package/dist/types/src/swarm/swarm.d.ts.map +1 -1
- package/dist/types/src/testing/test-builder.d.ts.map +1 -1
- package/dist/types/src/tests/property-test-suite.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +18 -18
- package/src/network-manager.ts +19 -15
- package/src/signal/integration.node.test.ts +11 -10
- package/src/signal/signal-connection.ts +3 -2
- package/src/signal/signal-messenger.ts +3 -2
- package/src/signal/swarm-messenger.node.test.ts +25 -24
- package/src/signal/swarm-messenger.ts +65 -55
- package/src/swarm/connection.test.ts +6 -6
- package/src/swarm/connection.ts +5 -5
- package/src/swarm/peer.ts +5 -5
- package/src/swarm/swarm.test.ts +2 -2
- package/src/swarm/swarm.ts +9 -9
- package/src/testing/test-builder.ts +4 -3
- package/src/tests/property-test-suite.ts +4 -3
- package/dist/lib/browser/chunk-AQSYW43M.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-SCX3PZRE.mjs.map +0 -7
|
@@ -60,7 +60,7 @@ var Connection = class {
|
|
|
60
60
|
_instanceId = PublicKey.random().toHex();
|
|
61
61
|
transportStats = new Event();
|
|
62
62
|
_signalSendTask = new DeferredTask(this._ctx, async () => {
|
|
63
|
-
await this._flushSignalBuffer();
|
|
63
|
+
await this._flushSignalBuffer(this._ctx);
|
|
64
64
|
});
|
|
65
65
|
_signallingDelay = STARTING_SIGNALLING_DELAY;
|
|
66
66
|
constructor(topic, localInfo, remoteInfo, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
|
|
@@ -433,20 +433,20 @@ var Connection = class {
|
|
|
433
433
|
this._outgoingSignalBuffer.push(signal);
|
|
434
434
|
this._signalSendTask.schedule();
|
|
435
435
|
}
|
|
436
|
-
async _flushSignalBuffer() {
|
|
436
|
+
async _flushSignalBuffer(ctx) {
|
|
437
437
|
if (this._outgoingSignalBuffer.length === 0) {
|
|
438
438
|
return;
|
|
439
439
|
}
|
|
440
440
|
try {
|
|
441
441
|
if (true) {
|
|
442
|
-
await cancelWithContext(
|
|
442
|
+
await cancelWithContext(ctx, sleep(this._signallingDelay));
|
|
443
443
|
this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
|
|
444
444
|
}
|
|
445
445
|
const signals = [
|
|
446
446
|
...this._outgoingSignalBuffer
|
|
447
447
|
];
|
|
448
448
|
this._outgoingSignalBuffer.length = 0;
|
|
449
|
-
await this._signalMessaging.signal({
|
|
449
|
+
await this._signalMessaging.signal(ctx, {
|
|
450
450
|
author: this.localInfo,
|
|
451
451
|
recipient: this.remoteInfo,
|
|
452
452
|
sessionId: this.sessionId,
|
|
@@ -480,7 +480,7 @@ var Connection = class {
|
|
|
480
480
|
/**
|
|
481
481
|
* Receive a signal from the remote peer.
|
|
482
482
|
*/
|
|
483
|
-
async signal(msg) {
|
|
483
|
+
async signal(_ctx, msg) {
|
|
484
484
|
invariant(msg.sessionId, void 0, {
|
|
485
485
|
F: __dxlog_file,
|
|
486
486
|
L: 410,
|
|
@@ -616,7 +616,6 @@ _ts_decorate([
|
|
|
616
616
|
], Connection.prototype, "close", null);
|
|
617
617
|
|
|
618
618
|
// src/signal/swarm-messenger.ts
|
|
619
|
-
import { Context as Context2 } from "@dxos/context";
|
|
620
619
|
import { invariant as invariant2 } from "@dxos/invariant";
|
|
621
620
|
import { PublicKey as PublicKey2 } from "@dxos/keys";
|
|
622
621
|
import { log as log2 } from "@dxos/log";
|
|
@@ -626,10 +625,6 @@ import { ComplexMap } from "@dxos/util";
|
|
|
626
625
|
var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
|
|
627
626
|
var SwarmMessage = schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
|
|
628
627
|
var SwarmMessenger = class {
|
|
629
|
-
_ctx = new Context2(void 0, {
|
|
630
|
-
F: __dxlog_file2,
|
|
631
|
-
L: 35
|
|
632
|
-
});
|
|
633
628
|
_sendMessage;
|
|
634
629
|
_onSignal;
|
|
635
630
|
_onOffer;
|
|
@@ -641,7 +636,7 @@ var SwarmMessenger = class {
|
|
|
641
636
|
this._onOffer = onOffer;
|
|
642
637
|
this._topic = topic;
|
|
643
638
|
}
|
|
644
|
-
async receiveMessage({ author, recipient, payload }) {
|
|
639
|
+
async receiveMessage(ctx, { author, recipient, payload }) {
|
|
645
640
|
if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
|
|
646
641
|
return;
|
|
647
642
|
}
|
|
@@ -655,12 +650,12 @@ var SwarmMessenger = class {
|
|
|
655
650
|
msg: message
|
|
656
651
|
}, {
|
|
657
652
|
F: __dxlog_file2,
|
|
658
|
-
L:
|
|
653
|
+
L: 72,
|
|
659
654
|
S: this,
|
|
660
655
|
C: (f, a) => f(...a)
|
|
661
656
|
});
|
|
662
657
|
if (message.data?.offer) {
|
|
663
|
-
await this._handleOffer({
|
|
658
|
+
await this._handleOffer(ctx, {
|
|
664
659
|
author,
|
|
665
660
|
recipient,
|
|
666
661
|
message
|
|
@@ -668,13 +663,13 @@ var SwarmMessenger = class {
|
|
|
668
663
|
} else if (message.data?.answer) {
|
|
669
664
|
await this._resolveAnswers(message);
|
|
670
665
|
} else if (message.data?.signal) {
|
|
671
|
-
await this._handleSignal({
|
|
666
|
+
await this._handleSignal(ctx, {
|
|
672
667
|
author,
|
|
673
668
|
recipient,
|
|
674
669
|
message
|
|
675
670
|
});
|
|
676
671
|
} else if (message.data?.signalBatch) {
|
|
677
|
-
await this._handleSignal({
|
|
672
|
+
await this._handleSignal(ctx, {
|
|
678
673
|
author,
|
|
679
674
|
recipient,
|
|
680
675
|
message
|
|
@@ -684,29 +679,29 @@ var SwarmMessenger = class {
|
|
|
684
679
|
message
|
|
685
680
|
}, {
|
|
686
681
|
F: __dxlog_file2,
|
|
687
|
-
L:
|
|
682
|
+
L: 83,
|
|
688
683
|
S: this,
|
|
689
684
|
C: (f, a) => f(...a)
|
|
690
685
|
});
|
|
691
686
|
}
|
|
692
687
|
}
|
|
693
|
-
async signal(message) {
|
|
688
|
+
async signal(ctx, message) {
|
|
694
689
|
invariant2(message.data?.signal || message.data?.signalBatch, "Invalid message", {
|
|
695
690
|
F: __dxlog_file2,
|
|
696
|
-
L:
|
|
691
|
+
L: 88,
|
|
697
692
|
S: this,
|
|
698
693
|
A: [
|
|
699
694
|
"message.data?.signal || message.data?.signalBatch",
|
|
700
695
|
"'Invalid message'"
|
|
701
696
|
]
|
|
702
697
|
});
|
|
703
|
-
await this._sendReliableMessage({
|
|
698
|
+
await this._sendReliableMessage(ctx, {
|
|
704
699
|
author: message.author,
|
|
705
700
|
recipient: message.recipient,
|
|
706
701
|
message
|
|
707
702
|
});
|
|
708
703
|
}
|
|
709
|
-
async offer(message) {
|
|
704
|
+
async offer(ctx, message) {
|
|
710
705
|
const networkMessage = {
|
|
711
706
|
...message,
|
|
712
707
|
messageId: PublicKey2.random()
|
|
@@ -715,14 +710,14 @@ var SwarmMessenger = class {
|
|
|
715
710
|
this._offerRecords.set(networkMessage.messageId, {
|
|
716
711
|
resolve
|
|
717
712
|
});
|
|
718
|
-
this._sendReliableMessage({
|
|
713
|
+
this._sendReliableMessage(ctx, {
|
|
719
714
|
author: message.author,
|
|
720
715
|
recipient: message.recipient,
|
|
721
716
|
message: networkMessage
|
|
722
717
|
}).catch((err) => reject(err));
|
|
723
718
|
});
|
|
724
719
|
}
|
|
725
|
-
async _sendReliableMessage({ author, recipient, message }) {
|
|
720
|
+
async _sendReliableMessage(ctx, { author, recipient, message }) {
|
|
726
721
|
const networkMessage = {
|
|
727
722
|
...message,
|
|
728
723
|
// Setting unique message_id if it not specified yet.
|
|
@@ -734,11 +729,11 @@ var SwarmMessenger = class {
|
|
|
734
729
|
msg: networkMessage
|
|
735
730
|
}, {
|
|
736
731
|
F: __dxlog_file2,
|
|
737
|
-
L:
|
|
732
|
+
L: 129,
|
|
738
733
|
S: this,
|
|
739
734
|
C: (f, a) => f(...a)
|
|
740
735
|
});
|
|
741
|
-
await this._sendMessage({
|
|
736
|
+
await this._sendMessage(ctx, {
|
|
742
737
|
author,
|
|
743
738
|
recipient,
|
|
744
739
|
payload: {
|
|
@@ -750,7 +745,7 @@ var SwarmMessenger = class {
|
|
|
750
745
|
async _resolveAnswers(message) {
|
|
751
746
|
invariant2(message.data?.answer?.offerMessageId, "No offerMessageId", {
|
|
752
747
|
F: __dxlog_file2,
|
|
753
|
-
L:
|
|
748
|
+
L: 141,
|
|
754
749
|
S: this,
|
|
755
750
|
A: [
|
|
756
751
|
"message.data?.answer?.offerMessageId",
|
|
@@ -762,7 +757,7 @@ var SwarmMessenger = class {
|
|
|
762
757
|
this._offerRecords.delete(message.data.answer.offerMessageId);
|
|
763
758
|
invariant2(message.data?.answer, "No answer", {
|
|
764
759
|
F: __dxlog_file2,
|
|
765
|
-
L:
|
|
760
|
+
L: 145,
|
|
766
761
|
S: this,
|
|
767
762
|
A: [
|
|
768
763
|
"message.data?.answer",
|
|
@@ -773,17 +768,17 @@ var SwarmMessenger = class {
|
|
|
773
768
|
answer: message.data.answer
|
|
774
769
|
}, {
|
|
775
770
|
F: __dxlog_file2,
|
|
776
|
-
L:
|
|
771
|
+
L: 146,
|
|
777
772
|
S: this,
|
|
778
773
|
C: (f, a) => f(...a)
|
|
779
774
|
});
|
|
780
775
|
offerRecord.resolve(message.data.answer);
|
|
781
776
|
}
|
|
782
777
|
}
|
|
783
|
-
async _handleOffer({ author, recipient, message }) {
|
|
778
|
+
async _handleOffer(ctx, { author, recipient, message }) {
|
|
784
779
|
invariant2(message.data.offer, "No offer", {
|
|
785
780
|
F: __dxlog_file2,
|
|
786
|
-
L:
|
|
781
|
+
L: 163,
|
|
787
782
|
S: this,
|
|
788
783
|
A: [
|
|
789
784
|
"message.data.offer",
|
|
@@ -798,10 +793,10 @@ var SwarmMessenger = class {
|
|
|
798
793
|
offer: message.data.offer
|
|
799
794
|
}
|
|
800
795
|
};
|
|
801
|
-
const answer = await this._onOffer(offerMessage);
|
|
796
|
+
const answer = await this._onOffer(ctx, offerMessage);
|
|
802
797
|
answer.offerMessageId = message.messageId;
|
|
803
798
|
try {
|
|
804
|
-
await this._sendReliableMessage({
|
|
799
|
+
await this._sendReliableMessage(ctx, {
|
|
805
800
|
author: recipient,
|
|
806
801
|
recipient: author,
|
|
807
802
|
message: {
|
|
@@ -818,7 +813,7 @@ var SwarmMessenger = class {
|
|
|
818
813
|
err
|
|
819
814
|
}, {
|
|
820
815
|
F: __dxlog_file2,
|
|
821
|
-
L:
|
|
816
|
+
L: 184,
|
|
822
817
|
S: this,
|
|
823
818
|
C: (f, a) => f(...a)
|
|
824
819
|
});
|
|
@@ -827,17 +822,17 @@ var SwarmMessenger = class {
|
|
|
827
822
|
err
|
|
828
823
|
}, {
|
|
829
824
|
F: __dxlog_file2,
|
|
830
|
-
L:
|
|
825
|
+
L: 186,
|
|
831
826
|
S: this,
|
|
832
827
|
C: (f, a) => f(...a)
|
|
833
828
|
});
|
|
834
829
|
}
|
|
835
830
|
}
|
|
836
831
|
}
|
|
837
|
-
async _handleSignal({ author, recipient, message }) {
|
|
832
|
+
async _handleSignal(ctx, { author, recipient, message }) {
|
|
838
833
|
invariant2(message.messageId, void 0, {
|
|
839
834
|
F: __dxlog_file2,
|
|
840
|
-
L:
|
|
835
|
+
L: 203,
|
|
841
836
|
S: this,
|
|
842
837
|
A: [
|
|
843
838
|
"message.messageId",
|
|
@@ -846,7 +841,7 @@ var SwarmMessenger = class {
|
|
|
846
841
|
});
|
|
847
842
|
invariant2(message.data.signal || message.data.signalBatch, "Invalid message", {
|
|
848
843
|
F: __dxlog_file2,
|
|
849
|
-
L:
|
|
844
|
+
L: 204,
|
|
850
845
|
S: this,
|
|
851
846
|
A: [
|
|
852
847
|
"message.data.signal || message.data.signalBatch",
|
|
@@ -862,13 +857,13 @@ var SwarmMessenger = class {
|
|
|
862
857
|
signalBatch: message.data.signalBatch
|
|
863
858
|
}
|
|
864
859
|
};
|
|
865
|
-
await this._onSignal(signalMessage);
|
|
860
|
+
await this._onSignal(ctx, signalMessage);
|
|
866
861
|
}
|
|
867
862
|
};
|
|
868
863
|
|
|
869
864
|
// src/swarm/swarm.ts
|
|
870
865
|
import { Event as Event3, scheduleTask as scheduleTask3, sleep as sleep2, synchronized as synchronized3 } from "@dxos/async";
|
|
871
|
-
import { Context as
|
|
866
|
+
import { Context as Context3 } from "@dxos/context";
|
|
872
867
|
import { ErrorStream as ErrorStream2 } from "@dxos/debug";
|
|
873
868
|
import { invariant as invariant4 } from "@dxos/invariant";
|
|
874
869
|
import { PublicKey as PublicKey4 } from "@dxos/keys";
|
|
@@ -879,7 +874,7 @@ import { ComplexMap as ComplexMap2, isNonNullable } from "@dxos/util";
|
|
|
879
874
|
|
|
880
875
|
// src/swarm/peer.ts
|
|
881
876
|
import { Event as Event2, scheduleTask as scheduleTask2, synchronized as synchronized2 } from "@dxos/async";
|
|
882
|
-
import { Context as
|
|
877
|
+
import { Context as Context2 } from "@dxos/context";
|
|
883
878
|
import { invariant as invariant3 } from "@dxos/invariant";
|
|
884
879
|
import { PublicKey as PublicKey3 } from "@dxos/keys";
|
|
885
880
|
import { log as log3 } from "@dxos/log";
|
|
@@ -914,7 +909,7 @@ var Peer = class {
|
|
|
914
909
|
_availableAfter = 0;
|
|
915
910
|
availableToConnect = true;
|
|
916
911
|
_lastConnectionTime;
|
|
917
|
-
_ctx = new
|
|
912
|
+
_ctx = new Context2(void 0, {
|
|
918
913
|
F: __dxlog_file3,
|
|
919
914
|
L: 81
|
|
920
915
|
});
|
|
@@ -939,7 +934,7 @@ var Peer = class {
|
|
|
939
934
|
/**
|
|
940
935
|
* Respond to remote offer.
|
|
941
936
|
*/
|
|
942
|
-
async onOffer(message) {
|
|
937
|
+
async onOffer(_ctx, message) {
|
|
943
938
|
const remote = message.author;
|
|
944
939
|
if (this.connection && ![
|
|
945
940
|
ConnectionState.CREATED,
|
|
@@ -1022,7 +1017,7 @@ var Peer = class {
|
|
|
1022
1017
|
/**
|
|
1023
1018
|
* Initiate a connection to the remote peer.
|
|
1024
1019
|
*/
|
|
1025
|
-
async initiateConnection() {
|
|
1020
|
+
async initiateConnection(ctx) {
|
|
1026
1021
|
invariant3(!this.initiating, "Initiation in progress.", {
|
|
1027
1022
|
F: __dxlog_file3,
|
|
1028
1023
|
L: 173,
|
|
@@ -1059,7 +1054,7 @@ var Peer = class {
|
|
|
1059
1054
|
try {
|
|
1060
1055
|
await this._connectionLimiter.connecting(sessionId);
|
|
1061
1056
|
connection.initiate();
|
|
1062
|
-
answer = await this._signalMessaging.offer({
|
|
1057
|
+
answer = await this._signalMessaging.offer(ctx, {
|
|
1063
1058
|
author: this.localInfo,
|
|
1064
1059
|
recipient: this.remoteInfo,
|
|
1065
1060
|
sessionId,
|
|
@@ -1343,7 +1338,7 @@ var Peer = class {
|
|
|
1343
1338
|
C: (f, a) => f(...a)
|
|
1344
1339
|
});
|
|
1345
1340
|
}
|
|
1346
|
-
async onSignal(message) {
|
|
1341
|
+
async onSignal(ctx, message) {
|
|
1347
1342
|
if (!this.connection) {
|
|
1348
1343
|
log3("dropping signal message for non-existent connection", {
|
|
1349
1344
|
message
|
|
@@ -1355,7 +1350,7 @@ var Peer = class {
|
|
|
1355
1350
|
});
|
|
1356
1351
|
return;
|
|
1357
1352
|
}
|
|
1358
|
-
await this.connection.signal(message);
|
|
1353
|
+
await this.connection.signal(ctx, message);
|
|
1359
1354
|
}
|
|
1360
1355
|
async safeDestroy(reason) {
|
|
1361
1356
|
await this._ctx.dispose();
|
|
@@ -1410,7 +1405,7 @@ var Swarm = class {
|
|
|
1410
1405
|
_connectionLimiter;
|
|
1411
1406
|
_initiationDelay;
|
|
1412
1407
|
_swarmMessenger;
|
|
1413
|
-
_ctx = new
|
|
1408
|
+
_ctx = new Context3(void 0, {
|
|
1414
1409
|
F: __dxlog_file4,
|
|
1415
1410
|
L: 39
|
|
1416
1411
|
});
|
|
@@ -1474,9 +1469,9 @@ var Swarm = class {
|
|
|
1474
1469
|
});
|
|
1475
1470
|
_topology.init(this._getSwarmController());
|
|
1476
1471
|
this._swarmMessenger = new SwarmMessenger({
|
|
1477
|
-
sendMessage: async (msg) => await this._messenger.sendMessage(msg),
|
|
1478
|
-
onSignal: async (msg) => await this.onSignal(msg),
|
|
1479
|
-
onOffer: async (msg) => await this.onOffer(msg),
|
|
1472
|
+
sendMessage: async (ctx, msg) => await this._messenger.sendMessage(ctx, msg),
|
|
1473
|
+
onSignal: async (ctx, msg) => await this.onSignal(ctx, msg),
|
|
1474
|
+
onOffer: async (ctx, msg) => await this.onOffer(ctx, msg),
|
|
1480
1475
|
topic: this._topic
|
|
1481
1476
|
});
|
|
1482
1477
|
log4.trace("dxos.mesh.swarm.constructor", trace2.end({
|
|
@@ -1520,7 +1515,7 @@ var Swarm = class {
|
|
|
1520
1515
|
peer: this._ownPeer,
|
|
1521
1516
|
payloadType: "dxos.mesh.swarm.SwarmMessage",
|
|
1522
1517
|
onMessage: async (message) => {
|
|
1523
|
-
await this._swarmMessenger.receiveMessage(message).catch((err) => log4.info("Error while receiving message", {
|
|
1518
|
+
await this._swarmMessenger.receiveMessage(this._ctx, message).catch((err) => log4.info("Error while receiving message", {
|
|
1524
1519
|
err
|
|
1525
1520
|
}, {
|
|
1526
1521
|
F: __dxlog_file4,
|
|
@@ -1640,7 +1635,7 @@ var Swarm = class {
|
|
|
1640
1635
|
}
|
|
1641
1636
|
this._topology.update();
|
|
1642
1637
|
}
|
|
1643
|
-
async onOffer(message) {
|
|
1638
|
+
async onOffer(ctx, message) {
|
|
1644
1639
|
log4("offer", {
|
|
1645
1640
|
message
|
|
1646
1641
|
}, {
|
|
@@ -1696,7 +1691,7 @@ var Swarm = class {
|
|
|
1696
1691
|
};
|
|
1697
1692
|
}
|
|
1698
1693
|
const peer = this._getOfferSenderPeer(message.author);
|
|
1699
|
-
const answer = await peer.onOffer(message);
|
|
1694
|
+
const answer = await peer.onOffer(ctx, message);
|
|
1700
1695
|
this._topology.update();
|
|
1701
1696
|
return answer;
|
|
1702
1697
|
}
|
|
@@ -1710,7 +1705,7 @@ var Swarm = class {
|
|
|
1710
1705
|
}
|
|
1711
1706
|
return peer;
|
|
1712
1707
|
}
|
|
1713
|
-
async onSignal(message) {
|
|
1708
|
+
async onSignal(ctx, message) {
|
|
1714
1709
|
log4("signal", {
|
|
1715
1710
|
message
|
|
1716
1711
|
}, {
|
|
@@ -1756,7 +1751,7 @@ var Swarm = class {
|
|
|
1756
1751
|
]
|
|
1757
1752
|
});
|
|
1758
1753
|
const peer = this._getOrCreatePeer(message.author);
|
|
1759
|
-
await peer.onSignal(message);
|
|
1754
|
+
await peer.onSignal(ctx, message);
|
|
1760
1755
|
}
|
|
1761
1756
|
// For debug purposes
|
|
1762
1757
|
async goOffline() {
|
|
@@ -1767,7 +1762,7 @@ var Swarm = class {
|
|
|
1767
1762
|
}
|
|
1768
1763
|
// For debug purposes
|
|
1769
1764
|
async goOnline() {
|
|
1770
|
-
this._ctx = new
|
|
1765
|
+
this._ctx = new Context3(void 0, {
|
|
1771
1766
|
F: __dxlog_file4,
|
|
1772
1767
|
L: 273
|
|
1773
1768
|
});
|
|
@@ -1931,7 +1926,7 @@ var Swarm = class {
|
|
|
1931
1926
|
S: this,
|
|
1932
1927
|
C: (f, a) => f(...a)
|
|
1933
1928
|
});
|
|
1934
|
-
await peer.initiateConnection();
|
|
1929
|
+
await peer.initiateConnection(ctx);
|
|
1935
1930
|
this._topology.update();
|
|
1936
1931
|
log4("initiated", {
|
|
1937
1932
|
remotePeer
|
|
@@ -2059,7 +2054,7 @@ var SwarmMapper = class {
|
|
|
2059
2054
|
|
|
2060
2055
|
// src/swarm/connection-limiter.ts
|
|
2061
2056
|
import { DeferredTask as DeferredTask2 } from "@dxos/async";
|
|
2062
|
-
import { Context as
|
|
2057
|
+
import { Context as Context4 } from "@dxos/context";
|
|
2063
2058
|
import { invariant as invariant5 } from "@dxos/invariant";
|
|
2064
2059
|
import { PublicKey as PublicKey6 } from "@dxos/keys";
|
|
2065
2060
|
import { log as log6 } from "@dxos/log";
|
|
@@ -2068,7 +2063,7 @@ import { ComplexMap as ComplexMap4 } from "@dxos/util";
|
|
|
2068
2063
|
var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
|
|
2069
2064
|
var MAX_CONCURRENT_INITIATING_CONNECTIONS = 50;
|
|
2070
2065
|
var ConnectionLimiter = class {
|
|
2071
|
-
_ctx = new
|
|
2066
|
+
_ctx = new Context4(void 0, {
|
|
2072
2067
|
F: __dxlog_file6,
|
|
2073
2068
|
L: 23
|
|
2074
2069
|
});
|
|
@@ -2274,8 +2269,8 @@ var SwarmNetworkManager = class {
|
|
|
2274
2269
|
signalManager: this._signalManager
|
|
2275
2270
|
});
|
|
2276
2271
|
this._signalConnection = {
|
|
2277
|
-
join: (opts) => this._signalManager.join(opts),
|
|
2278
|
-
leave: (opts) => this._signalManager.leave(opts)
|
|
2272
|
+
join: (ctx, opts) => this._signalManager.join(ctx, opts),
|
|
2273
|
+
leave: (ctx, opts) => this._signalManager.leave(ctx, opts)
|
|
2279
2274
|
};
|
|
2280
2275
|
this._peerInfo = peerInfo;
|
|
2281
2276
|
this._connectionLimiter = new ConnectionLimiter();
|
|
@@ -2308,7 +2303,7 @@ var SwarmNetworkManager = class {
|
|
|
2308
2303
|
id: this._instanceId
|
|
2309
2304
|
}), {
|
|
2310
2305
|
F: __dxlog_file7,
|
|
2311
|
-
L:
|
|
2306
|
+
L: 134,
|
|
2312
2307
|
S: this,
|
|
2313
2308
|
C: (f, a) => f(...a)
|
|
2314
2309
|
});
|
|
@@ -2318,17 +2313,17 @@ var SwarmNetworkManager = class {
|
|
|
2318
2313
|
id: this._instanceId
|
|
2319
2314
|
}), {
|
|
2320
2315
|
F: __dxlog_file7,
|
|
2321
|
-
L:
|
|
2316
|
+
L: 137,
|
|
2322
2317
|
S: this,
|
|
2323
2318
|
C: (f, a) => f(...a)
|
|
2324
2319
|
});
|
|
2325
2320
|
}
|
|
2326
|
-
async close() {
|
|
2321
|
+
async close(ctx) {
|
|
2327
2322
|
for (const topic of this._swarms.keys()) {
|
|
2328
|
-
await this.leaveSwarm(topic).catch((err) => {
|
|
2323
|
+
await this.leaveSwarm(ctx, topic).catch((err) => {
|
|
2329
2324
|
log7(err, void 0, {
|
|
2330
2325
|
F: __dxlog_file7,
|
|
2331
|
-
L:
|
|
2326
|
+
L: 143,
|
|
2332
2327
|
S: this,
|
|
2333
2328
|
C: (f, a) => f(...a)
|
|
2334
2329
|
});
|
|
@@ -2340,10 +2335,10 @@ var SwarmNetworkManager = class {
|
|
|
2340
2335
|
/**
|
|
2341
2336
|
* Join the swarm.
|
|
2342
2337
|
*/
|
|
2343
|
-
async joinSwarm({ topic, topology, protocolProvider: protocol, label }) {
|
|
2338
|
+
async joinSwarm(ctx, { topic, topology, protocolProvider: protocol, label }) {
|
|
2344
2339
|
invariant6(PublicKey8.isPublicKey(topic), void 0, {
|
|
2345
2340
|
F: __dxlog_file7,
|
|
2346
|
-
L:
|
|
2341
|
+
L: 164,
|
|
2347
2342
|
S: this,
|
|
2348
2343
|
A: [
|
|
2349
2344
|
"PublicKey.isPublicKey(topic)",
|
|
@@ -2352,7 +2347,7 @@ var SwarmNetworkManager = class {
|
|
|
2352
2347
|
});
|
|
2353
2348
|
invariant6(topology, void 0, {
|
|
2354
2349
|
F: __dxlog_file7,
|
|
2355
|
-
L:
|
|
2350
|
+
L: 165,
|
|
2356
2351
|
S: this,
|
|
2357
2352
|
A: [
|
|
2358
2353
|
"topology",
|
|
@@ -2361,7 +2356,7 @@ var SwarmNetworkManager = class {
|
|
|
2361
2356
|
});
|
|
2362
2357
|
invariant6(this._peerInfo, void 0, {
|
|
2363
2358
|
F: __dxlog_file7,
|
|
2364
|
-
L:
|
|
2359
|
+
L: 166,
|
|
2365
2360
|
S: this,
|
|
2366
2361
|
A: [
|
|
2367
2362
|
"this._peerInfo",
|
|
@@ -2370,7 +2365,7 @@ var SwarmNetworkManager = class {
|
|
|
2370
2365
|
});
|
|
2371
2366
|
invariant6(typeof protocol === "function", void 0, {
|
|
2372
2367
|
F: __dxlog_file7,
|
|
2373
|
-
L:
|
|
2368
|
+
L: 167,
|
|
2374
2369
|
S: this,
|
|
2375
2370
|
A: [
|
|
2376
2371
|
"typeof protocol === 'function'",
|
|
@@ -2386,7 +2381,7 @@ var SwarmNetworkManager = class {
|
|
|
2386
2381
|
topology: topology.toString()
|
|
2387
2382
|
}, {
|
|
2388
2383
|
F: __dxlog_file7,
|
|
2389
|
-
L:
|
|
2384
|
+
L: 172,
|
|
2390
2385
|
S: this,
|
|
2391
2386
|
C: (f, a) => f(...a)
|
|
2392
2387
|
});
|
|
@@ -2396,7 +2391,7 @@ var SwarmNetworkManager = class {
|
|
|
2396
2391
|
error
|
|
2397
2392
|
}, {
|
|
2398
2393
|
F: __dxlog_file7,
|
|
2399
|
-
L:
|
|
2394
|
+
L: 185,
|
|
2400
2395
|
S: this,
|
|
2401
2396
|
C: (f, a) => f(...a)
|
|
2402
2397
|
});
|
|
@@ -2404,12 +2399,12 @@ var SwarmNetworkManager = class {
|
|
|
2404
2399
|
this._swarms.set(topic, swarm);
|
|
2405
2400
|
this._mappers.set(topic, new SwarmMapper(swarm));
|
|
2406
2401
|
await swarm.open();
|
|
2407
|
-
this._signalConnection.join({
|
|
2402
|
+
this._signalConnection.join(ctx, {
|
|
2408
2403
|
topic,
|
|
2409
2404
|
peer: this._peerInfo
|
|
2410
2405
|
}).catch((error) => log7.catch(error, void 0, {
|
|
2411
2406
|
F: __dxlog_file7,
|
|
2412
|
-
L:
|
|
2407
|
+
L: 194,
|
|
2413
2408
|
S: this,
|
|
2414
2409
|
C: (f, a) => f(...a)
|
|
2415
2410
|
}));
|
|
@@ -2420,18 +2415,18 @@ var SwarmNetworkManager = class {
|
|
|
2420
2415
|
count: this._swarms.size
|
|
2421
2416
|
}, {
|
|
2422
2417
|
F: __dxlog_file7,
|
|
2423
|
-
L:
|
|
2418
|
+
L: 198,
|
|
2424
2419
|
S: this,
|
|
2425
2420
|
C: (f, a) => f(...a)
|
|
2426
2421
|
});
|
|
2427
2422
|
return {
|
|
2428
|
-
close: () => this.leaveSwarm(topic)
|
|
2423
|
+
close: (ctx2) => this.leaveSwarm(ctx2, topic)
|
|
2429
2424
|
};
|
|
2430
2425
|
}
|
|
2431
2426
|
/**
|
|
2432
2427
|
* Close the connection.
|
|
2433
2428
|
*/
|
|
2434
|
-
async leaveSwarm(topic) {
|
|
2429
|
+
async leaveSwarm(ctx, topic) {
|
|
2435
2430
|
if (!this._swarms.has(topic)) {
|
|
2436
2431
|
return;
|
|
2437
2432
|
}
|
|
@@ -2439,12 +2434,12 @@ var SwarmNetworkManager = class {
|
|
|
2439
2434
|
topic: PublicKey8.from(topic)
|
|
2440
2435
|
}, {
|
|
2441
2436
|
F: __dxlog_file7,
|
|
2442
|
-
L:
|
|
2437
|
+
L: 215,
|
|
2443
2438
|
S: this,
|
|
2444
2439
|
C: (f, a) => f(...a)
|
|
2445
2440
|
});
|
|
2446
2441
|
const swarm = this._swarms.get(topic);
|
|
2447
|
-
await this._signalConnection.leave({
|
|
2442
|
+
await this._signalConnection.leave(ctx, {
|
|
2448
2443
|
topic,
|
|
2449
2444
|
peer: swarm.ownPeer
|
|
2450
2445
|
});
|
|
@@ -2460,7 +2455,7 @@ var SwarmNetworkManager = class {
|
|
|
2460
2455
|
count: this._swarms.size
|
|
2461
2456
|
}, {
|
|
2462
2457
|
F: __dxlog_file7,
|
|
2463
|
-
L:
|
|
2458
|
+
L: 229,
|
|
2464
2459
|
S: this,
|
|
2465
2460
|
C: (f, a) => f(...a)
|
|
2466
2461
|
});
|
|
@@ -4242,4 +4237,4 @@ export {
|
|
|
4242
4237
|
RtcTransportService,
|
|
4243
4238
|
createTeleportProtocolFactory
|
|
4244
4239
|
};
|
|
4245
|
-
//# sourceMappingURL=chunk-
|
|
4240
|
+
//# sourceMappingURL=chunk-WMCWASCJ.mjs.map
|