@dxos/messaging 0.7.4 → 0.7.5-labs.071a3e2

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 (42) hide show
  1. package/dist/lib/browser/{chunk-U5OG65N2.mjs → chunk-KWCKO7OY.mjs} +91 -84
  2. package/dist/lib/browser/chunk-KWCKO7OY.mjs.map +7 -0
  3. package/dist/lib/browser/index.mjs +1 -1
  4. package/dist/lib/browser/meta.json +1 -1
  5. package/dist/lib/browser/testing/index.mjs +1 -1
  6. package/dist/lib/node/{chunk-ZWQVINAC.cjs → chunk-ISUSZ44G.cjs} +92 -85
  7. package/dist/lib/node/chunk-ISUSZ44G.cjs.map +7 -0
  8. package/dist/lib/node/index.cjs +9 -9
  9. package/dist/lib/node/index.cjs.map +1 -1
  10. package/dist/lib/node/meta.json +1 -1
  11. package/dist/lib/node/testing/index.cjs +4 -4
  12. package/dist/lib/node-esm/{chunk-NCL2P63O.mjs → chunk-6MNUCAS7.mjs} +91 -84
  13. package/dist/lib/node-esm/chunk-6MNUCAS7.mjs.map +7 -0
  14. package/dist/lib/node-esm/index.mjs +1 -1
  15. package/dist/lib/node-esm/meta.json +1 -1
  16. package/dist/lib/node-esm/testing/index.mjs +1 -1
  17. package/dist/types/src/signal-client/signal-client.d.ts +2 -0
  18. package/dist/types/src/signal-client/signal-client.d.ts.map +1 -1
  19. package/dist/types/src/signal-client/signal-rpc-client.d.ts +5 -0
  20. package/dist/types/src/signal-client/signal-rpc-client.d.ts.map +1 -1
  21. package/dist/types/src/signal-manager/edge-signal-manager.d.ts +3 -1
  22. package/dist/types/src/signal-manager/edge-signal-manager.d.ts.map +1 -1
  23. package/dist/types/src/signal-manager/memory-signal-manager.d.ts +2 -2
  24. package/dist/types/src/signal-manager/memory-signal-manager.d.ts.map +1 -1
  25. package/dist/types/src/signal-manager/websocket-signal-manager.d.ts +2 -0
  26. package/dist/types/src/signal-manager/websocket-signal-manager.d.ts.map +1 -1
  27. package/dist/types/src/signal-methods.d.ts +15 -26
  28. package/dist/types/src/signal-methods.d.ts.map +1 -1
  29. package/dist/types/src/testing/test-peer.d.ts +2 -2
  30. package/dist/types/src/testing/utils.d.ts +2 -2
  31. package/dist/types/src/testing/utils.d.ts.map +1 -1
  32. package/dist/types/tsconfig.tsbuildinfo +1 -0
  33. package/package.json +16 -16
  34. package/src/signal-client/signal-client.ts +2 -0
  35. package/src/signal-client/signal-local-state.ts +1 -1
  36. package/src/signal-client/signal-rpc-client.ts +5 -0
  37. package/src/signal-manager/edge-signal-manager.ts +28 -15
  38. package/src/signal-manager/websocket-signal-manager.ts +2 -0
  39. package/src/signal-methods.ts +16 -30
  40. package/dist/lib/browser/chunk-U5OG65N2.mjs.map +0 -7
  41. package/dist/lib/node/chunk-ZWQVINAC.cjs.map +0 -7
  42. package/dist/lib/node-esm/chunk-NCL2P63O.mjs.map +0 -7
@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
26
26
  mod
27
27
  ));
28
28
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
- var chunk_ZWQVINAC_exports = {};
30
- __export(chunk_ZWQVINAC_exports, {
29
+ var chunk_ISUSZ44G_exports = {};
30
+ __export(chunk_ISUSZ44G_exports, {
31
31
  EdgeSignalManager: () => EdgeSignalManager,
32
32
  MemorySignalManager: () => MemorySignalManager,
33
33
  MemorySignalManagerContext: () => MemorySignalManagerContext,
@@ -37,7 +37,7 @@ __export(chunk_ZWQVINAC_exports, {
37
37
  WebsocketSignalManager: () => WebsocketSignalManager,
38
38
  setIdentityTags: () => setIdentityTags
39
39
  });
40
- module.exports = __toCommonJS(chunk_ZWQVINAC_exports);
40
+ module.exports = __toCommonJS(chunk_ISUSZ44G_exports);
41
41
  var import_async = require("@dxos/async");
42
42
  var import_context = require("@dxos/context");
43
43
  var import_invariant = require("@dxos/invariant");
@@ -768,7 +768,7 @@ var SignalRPCClient = class {
768
768
  id: traceId
769
769
  }), {
770
770
  F: __dxlog_file3,
771
- L: 61,
771
+ L: 66,
772
772
  S: this,
773
773
  C: (f, a) => f(...a)
774
774
  });
@@ -790,7 +790,7 @@ var SignalRPCClient = class {
790
790
  } catch (err) {
791
791
  import_log4.log.warn("send error", err, {
792
792
  F: __dxlog_file3,
793
- L: 80,
793
+ L: 85,
794
794
  S: this,
795
795
  C: (f, a) => f(...a)
796
796
  });
@@ -819,7 +819,7 @@ var SignalRPCClient = class {
819
819
  }
820
820
  (0, import_log4.log)(`RPC open ${this._url}`, void 0, {
821
821
  F: __dxlog_file3,
822
- L: 105,
822
+ L: 110,
823
823
  S: this,
824
824
  C: (f, a) => f(...a)
825
825
  });
@@ -827,7 +827,7 @@ var SignalRPCClient = class {
827
827
  this._connectTrigger.wake();
828
828
  this._keepaliveCtx = new import_context4.Context(void 0, {
829
829
  F: __dxlog_file3,
830
- L: 108
830
+ L: 113
831
831
  });
832
832
  (0, import_async4.scheduleTaskInterval)(this._keepaliveCtx, async () => {
833
833
  this._socket?.send("__ping__");
@@ -841,7 +841,7 @@ var SignalRPCClient = class {
841
841
  this._socket.onclose = async () => {
842
842
  (0, import_log4.log)(`Disconnected ${this._url}`, void 0, {
843
843
  F: __dxlog_file3,
844
- L: 128,
844
+ L: 133,
845
845
  S: this,
846
846
  C: (f, a) => f(...a)
847
847
  });
@@ -862,7 +862,7 @@ var SignalRPCClient = class {
862
862
  url: this._url
863
863
  }, {
864
864
  F: __dxlog_file3,
865
- L: 144,
865
+ L: 149,
866
866
  S: this,
867
867
  C: (f, a) => f(...a)
868
868
  });
@@ -871,7 +871,7 @@ var SignalRPCClient = class {
871
871
  id: traceId
872
872
  }), {
873
873
  F: __dxlog_file3,
874
- L: 147,
874
+ L: 152,
875
875
  S: this,
876
876
  C: (f, a) => f(...a)
877
877
  });
@@ -904,13 +904,13 @@ var SignalRPCClient = class {
904
904
  metadata: this._callbacks?.getMetadata?.()
905
905
  }, {
906
906
  F: __dxlog_file3,
907
- L: 173,
907
+ L: 178,
908
908
  S: this,
909
909
  C: (f, a) => f(...a)
910
910
  });
911
911
  (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
912
912
  F: __dxlog_file3,
913
- L: 174,
913
+ L: 179,
914
914
  S: this,
915
915
  A: [
916
916
  "!this._closed",
@@ -931,13 +931,13 @@ var SignalRPCClient = class {
931
931
  peerId
932
932
  }, {
933
933
  F: __dxlog_file3,
934
- L: 186,
934
+ L: 191,
935
935
  S: this,
936
936
  C: (f, a) => f(...a)
937
937
  });
938
938
  (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
939
939
  F: __dxlog_file3,
940
- L: 187,
940
+ L: 192,
941
941
  S: this,
942
942
  A: [
943
943
  "!this._closed",
@@ -959,13 +959,13 @@ var SignalRPCClient = class {
959
959
  metadata: this._callbacks?.getMetadata?.()
960
960
  }, {
961
961
  F: __dxlog_file3,
962
- L: 197,
962
+ L: 202,
963
963
  S: this,
964
964
  C: (f, a) => f(...a)
965
965
  });
966
966
  (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
967
967
  F: __dxlog_file3,
968
- L: 198,
968
+ L: 203,
969
969
  S: this,
970
970
  A: [
971
971
  "!this._closed",
@@ -987,7 +987,7 @@ var SignalRPCClient = class {
987
987
  } catch (err) {
988
988
  import_log4.log.catch(err, void 0, {
989
989
  F: __dxlog_file3,
990
- L: 213,
990
+ L: 218,
991
991
  S: this,
992
992
  C: (f, a) => f(...a)
993
993
  });
@@ -1032,7 +1032,7 @@ var SignalClient = class extends import_context2.Resource {
1032
1032
  id: this._instanceId
1033
1033
  }), {
1034
1034
  F: __dxlog_file4,
1035
- L: 92,
1035
+ L: 94,
1036
1036
  S: this,
1037
1037
  C: (f, a) => f(...a)
1038
1038
  });
@@ -1050,7 +1050,7 @@ var SignalClient = class extends import_context2.Resource {
1050
1050
  }));
1051
1051
  (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
1052
1052
  F: __dxlog_file4,
1053
- L: 102,
1053
+ L: 104,
1054
1054
  S: this,
1055
1055
  A: [
1056
1056
  "this._state === SignalState.CONNECTED",
@@ -1093,7 +1093,7 @@ var SignalClient = class extends import_context2.Resource {
1093
1093
  id: this._instanceId
1094
1094
  }), {
1095
1095
  F: __dxlog_file4,
1096
- L: 135,
1096
+ L: 137,
1097
1097
  S: this,
1098
1098
  C: (f, a) => f(...a)
1099
1099
  });
@@ -1105,7 +1105,7 @@ var SignalClient = class extends import_context2.Resource {
1105
1105
  if (this._state === import_signal.SignalState.CONNECTED && !this._lastReconciliationFailed) {
1106
1106
  import_log2.log.warn("SignalClient error:", err, {
1107
1107
  F: __dxlog_file4,
1108
- L: 144,
1108
+ L: 146,
1109
1109
  S: this,
1110
1110
  C: (f, a) => f(...a)
1111
1111
  });
@@ -1115,7 +1115,7 @@ var SignalClient = class extends import_context2.Resource {
1115
1115
  async _close() {
1116
1116
  (0, import_log2.log)("closing...", void 0, {
1117
1117
  F: __dxlog_file4,
1118
- L: 150,
1118
+ L: 152,
1119
1119
  S: this,
1120
1120
  C: (f, a) => f(...a)
1121
1121
  });
@@ -1128,7 +1128,7 @@ var SignalClient = class extends import_context2.Resource {
1128
1128
  await this._safeResetClient();
1129
1129
  (0, import_log2.log)("closed", void 0, {
1130
1130
  F: __dxlog_file4,
1131
- L: 158,
1131
+ L: 160,
1132
1132
  S: this,
1133
1133
  C: (f, a) => f(...a)
1134
1134
  });
@@ -1148,7 +1148,7 @@ var SignalClient = class extends import_context2.Resource {
1148
1148
  peerId: args.peer.peerKey
1149
1149
  }, {
1150
1150
  F: __dxlog_file4,
1151
- L: 172,
1151
+ L: 174,
1152
1152
  S: this,
1153
1153
  C: (f, a) => f(...a)
1154
1154
  });
@@ -1165,7 +1165,7 @@ var SignalClient = class extends import_context2.Resource {
1165
1165
  peerId: args.peer.peerKey
1166
1166
  }, {
1167
1167
  F: __dxlog_file4,
1168
- L: 179,
1168
+ L: 181,
1169
1169
  S: this,
1170
1170
  C: (f, a) => f(...a)
1171
1171
  });
@@ -1180,7 +1180,7 @@ var SignalClient = class extends import_context2.Resource {
1180
1180
  await this._clientReady.wait();
1181
1181
  (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
1182
1182
  F: __dxlog_file4,
1183
- L: 187,
1183
+ L: 189,
1184
1184
  S: this,
1185
1185
  A: [
1186
1186
  "this._state === SignalState.CONNECTED",
@@ -1189,7 +1189,7 @@ var SignalClient = class extends import_context2.Resource {
1189
1189
  });
1190
1190
  (0, import_invariant2.invariant)(msg.author.peerKey, "Author key required", {
1191
1191
  F: __dxlog_file4,
1192
- L: 188,
1192
+ L: 190,
1193
1193
  S: this,
1194
1194
  A: [
1195
1195
  "msg.author.peerKey",
@@ -1198,7 +1198,7 @@ var SignalClient = class extends import_context2.Resource {
1198
1198
  });
1199
1199
  (0, import_invariant2.invariant)(msg.recipient.peerKey, "Recipient key required", {
1200
1200
  F: __dxlog_file4,
1201
- L: 189,
1201
+ L: 191,
1202
1202
  S: this,
1203
1203
  A: [
1204
1204
  "msg.recipient.peerKey",
@@ -1215,7 +1215,7 @@ var SignalClient = class extends import_context2.Resource {
1215
1215
  async subscribeMessages(peer) {
1216
1216
  (0, import_invariant2.invariant)(peer.peerKey, "Peer key required", {
1217
1217
  F: __dxlog_file4,
1218
- L: 199,
1218
+ L: 201,
1219
1219
  S: this,
1220
1220
  A: [
1221
1221
  "peer.peerKey",
@@ -1226,7 +1226,7 @@ var SignalClient = class extends import_context2.Resource {
1226
1226
  peer
1227
1227
  }, {
1228
1228
  F: __dxlog_file4,
1229
- L: 200,
1229
+ L: 202,
1230
1230
  S: this,
1231
1231
  C: (f, a) => f(...a)
1232
1232
  });
@@ -1236,7 +1236,7 @@ var SignalClient = class extends import_context2.Resource {
1236
1236
  async unsubscribeMessages(peer) {
1237
1237
  (0, import_invariant2.invariant)(peer.peerKey, "Peer key required", {
1238
1238
  F: __dxlog_file4,
1239
- L: 206,
1239
+ L: 208,
1240
1240
  S: this,
1241
1241
  A: [
1242
1242
  "peer.peerKey",
@@ -1247,7 +1247,7 @@ var SignalClient = class extends import_context2.Resource {
1247
1247
  peer
1248
1248
  }, {
1249
1249
  F: __dxlog_file4,
1250
- L: 207,
1250
+ L: 209,
1251
1251
  S: this,
1252
1252
  C: (f, a) => f(...a)
1253
1253
  });
@@ -1262,13 +1262,13 @@ var SignalClient = class extends import_context2.Resource {
1262
1262
  state: this._state
1263
1263
  }, {
1264
1264
  F: __dxlog_file4,
1265
- L: 216,
1265
+ L: 218,
1266
1266
  S: this,
1267
1267
  C: (f, a) => f(...a)
1268
1268
  });
1269
1269
  (0, import_invariant2.invariant)(!this._client, "Client already created", {
1270
1270
  F: __dxlog_file4,
1271
- L: 217,
1271
+ L: 219,
1272
1272
  S: this,
1273
1273
  A: [
1274
1274
  "!this._client",
@@ -1280,7 +1280,7 @@ var SignalClient = class extends import_context2.Resource {
1280
1280
  this._connectionCtx.onDispose(async () => {
1281
1281
  (0, import_log2.log)("connection context disposed", void 0, {
1282
1282
  F: __dxlog_file4,
1283
- L: 224,
1283
+ L: 226,
1284
1284
  S: this,
1285
1285
  C: (f, a) => f(...a)
1286
1286
  });
@@ -1295,7 +1295,7 @@ var SignalClient = class extends import_context2.Resource {
1295
1295
  if (client === this._client) {
1296
1296
  (0, import_log2.log)("socket connected", void 0, {
1297
1297
  F: __dxlog_file4,
1298
- L: 235,
1298
+ L: 237,
1299
1299
  S: this,
1300
1300
  C: (f, a) => f(...a)
1301
1301
  });
@@ -1310,7 +1310,7 @@ var SignalClient = class extends import_context2.Resource {
1310
1310
  state: this._state
1311
1311
  }, {
1312
1312
  F: __dxlog_file4,
1313
- L: 244,
1313
+ L: 246,
1314
1314
  S: this,
1315
1315
  C: (f, a) => f(...a)
1316
1316
  });
@@ -1327,7 +1327,7 @@ var SignalClient = class extends import_context2.Resource {
1327
1327
  state: this._state
1328
1328
  }, {
1329
1329
  F: __dxlog_file4,
1330
- L: 256,
1330
+ L: 258,
1331
1331
  S: this,
1332
1332
  C: (f, a) => f(...a)
1333
1333
  });
@@ -1352,14 +1352,14 @@ var SignalClient = class extends import_context2.Resource {
1352
1352
  state: this._state
1353
1353
  }, {
1354
1354
  F: __dxlog_file4,
1355
- L: 271,
1355
+ L: 273,
1356
1356
  S: this,
1357
1357
  C: (f, a) => f(...a)
1358
1358
  });
1359
1359
  if (this._state === import_signal.SignalState.RECONNECTING) {
1360
1360
  import_log2.log.info("Signal api already reconnecting.", void 0, {
1361
1361
  F: __dxlog_file4,
1362
- L: 274,
1362
+ L: 276,
1363
1363
  S: this,
1364
1364
  C: (f, a) => f(...a)
1365
1365
  });
@@ -1401,7 +1401,7 @@ var SignalClient = class extends import_context2.Resource {
1401
1401
  status: this.getStatus()
1402
1402
  }, {
1403
1403
  F: __dxlog_file4,
1404
- L: 315,
1404
+ L: 317,
1405
1405
  S: this,
1406
1406
  C: (f, a) => f(...a)
1407
1407
  });
@@ -1711,7 +1711,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1711
1711
  hosts: this._hosts
1712
1712
  }, {
1713
1713
  F: __dxlog_file6,
1714
- L: 54,
1714
+ L: 56,
1715
1715
  S: this,
1716
1716
  C: (f, a) => f(...a)
1717
1717
  });
@@ -1733,7 +1733,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1733
1733
  hosts: this._hosts
1734
1734
  }, {
1735
1735
  F: __dxlog_file6,
1736
- L: 74,
1736
+ L: 76,
1737
1737
  S: this,
1738
1738
  C: (f, a) => f(...a)
1739
1739
  });
@@ -1741,7 +1741,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1741
1741
  id: this._instanceId
1742
1742
  }), {
1743
1743
  F: __dxlog_file6,
1744
- L: 75,
1744
+ L: 77,
1745
1745
  S: this,
1746
1746
  C: (f, a) => f(...a)
1747
1747
  });
@@ -1750,7 +1750,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1750
1750
  id: this._instanceId
1751
1751
  }), {
1752
1752
  F: __dxlog_file6,
1753
- L: 79,
1753
+ L: 81,
1754
1754
  S: this,
1755
1755
  C: (f, a) => f(...a)
1756
1756
  });
@@ -1763,13 +1763,13 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1763
1763
  serverName
1764
1764
  }, {
1765
1765
  F: __dxlog_file6,
1766
- L: 87,
1766
+ L: 89,
1767
1767
  S: this,
1768
1768
  C: (f, a) => f(...a)
1769
1769
  });
1770
1770
  (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
1771
1771
  F: __dxlog_file6,
1772
- L: 88,
1772
+ L: 90,
1773
1773
  S: this,
1774
1774
  A: [
1775
1775
  "this._lifecycleState === LifecycleState.OPEN",
@@ -1779,7 +1779,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1779
1779
  const server = this._servers.get(serverName);
1780
1780
  (0, import_invariant5.invariant)(server, "server not found", {
1781
1781
  F: __dxlog_file6,
1782
- L: 91,
1782
+ L: 93,
1783
1783
  S: this,
1784
1784
  A: [
1785
1785
  "server",
@@ -1799,13 +1799,13 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1799
1799
  peer
1800
1800
  }, {
1801
1801
  F: __dxlog_file6,
1802
- L: 104,
1802
+ L: 106,
1803
1803
  S: this,
1804
1804
  C: (f, a) => f(...a)
1805
1805
  });
1806
1806
  (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
1807
1807
  F: __dxlog_file6,
1808
- L: 105,
1808
+ L: 107,
1809
1809
  S: this,
1810
1810
  A: [
1811
1811
  "this._lifecycleState === LifecycleState.OPEN",
@@ -1823,13 +1823,13 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1823
1823
  peer
1824
1824
  }, {
1825
1825
  F: __dxlog_file6,
1826
- L: 111,
1826
+ L: 113,
1827
1827
  S: this,
1828
1828
  C: (f, a) => f(...a)
1829
1829
  });
1830
1830
  (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
1831
1831
  F: __dxlog_file6,
1832
- L: 112,
1832
+ L: 114,
1833
1833
  S: this,
1834
1834
  A: [
1835
1835
  "this._lifecycleState === LifecycleState.OPEN",
@@ -1846,13 +1846,13 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1846
1846
  recipient
1847
1847
  }, {
1848
1848
  F: __dxlog_file6,
1849
- L: 117,
1849
+ L: 119,
1850
1850
  S: this,
1851
1851
  C: (f, a) => f(...a)
1852
1852
  });
1853
1853
  (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
1854
1854
  F: __dxlog_file6,
1855
- L: 118,
1855
+ L: 120,
1856
1856
  S: this,
1857
1857
  A: [
1858
1858
  "this._lifecycleState === LifecycleState.OPEN",
@@ -1870,7 +1870,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1870
1870
  err
1871
1871
  }, {
1872
1872
  F: __dxlog_file6,
1873
- L: 126,
1873
+ L: 128,
1874
1874
  S: this,
1875
1875
  C: (f, a) => f(...a)
1876
1876
  });
@@ -1880,7 +1880,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1880
1880
  err
1881
1881
  }, {
1882
1882
  F: __dxlog_file6,
1883
- L: 129,
1883
+ L: 131,
1884
1884
  S: this,
1885
1885
  C: (f, a) => f(...a)
1886
1886
  });
@@ -1890,7 +1890,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1890
1890
  err
1891
1891
  }, {
1892
1892
  F: __dxlog_file6,
1893
- L: 132,
1893
+ L: 134,
1894
1894
  S: this,
1895
1895
  C: (f, a) => f(...a)
1896
1896
  });
@@ -1913,7 +1913,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1913
1913
  failureCount
1914
1914
  }, {
1915
1915
  F: __dxlog_file6,
1916
- L: 146,
1916
+ L: 148,
1917
1917
  S: this,
1918
1918
  C: (f, a) => f(...a)
1919
1919
  });
@@ -1931,7 +1931,7 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1931
1931
  serverName
1932
1932
  }, {
1933
1933
  F: __dxlog_file6,
1934
- L: 159,
1934
+ L: 161,
1935
1935
  S: this,
1936
1936
  C: (f, a) => f(...a)
1937
1937
  });
@@ -1944,13 +1944,13 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1944
1944
  peer
1945
1945
  }, {
1946
1946
  F: __dxlog_file6,
1947
- L: 166,
1947
+ L: 168,
1948
1948
  S: this,
1949
1949
  C: (f, a) => f(...a)
1950
1950
  });
1951
1951
  (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
1952
1952
  F: __dxlog_file6,
1953
- L: 167,
1953
+ L: 169,
1954
1954
  S: this,
1955
1955
  A: [
1956
1956
  "this._lifecycleState === LifecycleState.OPEN",
@@ -1964,13 +1964,13 @@ var WebsocketSignalManager = class extends import_context6.Resource {
1964
1964
  peer
1965
1965
  }, {
1966
1966
  F: __dxlog_file6,
1967
- L: 173,
1967
+ L: 175,
1968
1968
  S: this,
1969
1969
  C: (f, a) => f(...a)
1970
1970
  });
1971
1971
  (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
1972
1972
  F: __dxlog_file6,
1973
- L: 174,
1973
+ L: 176,
1974
1974
  S: this,
1975
1975
  A: [
1976
1976
  "this._lifecycleState === LifecycleState.OPEN",
@@ -1997,6 +1997,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
1997
1997
  constructor({ edgeConnection }) {
1998
1998
  super();
1999
1999
  this.swarmEvent = new import_async7.Event();
2000
+ this.swarmState = new import_async7.Event();
2000
2001
  this.onMessage = new import_async7.Event();
2001
2002
  this._swarmPeers = new import_util5.ComplexMap(import_keys7.PublicKey.hash);
2002
2003
  this._edgeConnection = edgeConnection;
@@ -2020,14 +2021,19 @@ var EdgeSignalManager = class extends import_context7.Resource {
2020
2021
  }
2021
2022
  }, {
2022
2023
  F: __dxlog_file7,
2023
- L: 56,
2024
+ L: 62,
2024
2025
  S: this,
2025
2026
  C: (f, a) => f(...a)
2026
2027
  });
2028
+ peer.identityKey = this._edgeConnection.identityKey;
2029
+ peer.peerKey = this._edgeConnection.peerKey;
2027
2030
  }
2028
- this._swarmPeers.set(topic, new import_util5.ComplexSet(PeerInfoHash));
2031
+ this._swarmPeers.set(topic, {
2032
+ lastState: peer.state,
2033
+ joinedPeers: new import_util5.ComplexSet(PeerInfoHash)
2034
+ });
2029
2035
  await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_messenger_pb.SwarmRequestSchema, {
2030
- serviceId: import_protocols5.EdgeService.SWARM_SERVICE_ID,
2036
+ serviceId: import_protocols5.EdgeService.SWARM,
2031
2037
  source: createMessageSource(topic, peer),
2032
2038
  payload: {
2033
2039
  action: import_messenger_pb.SwarmRequest_Action.JOIN,
@@ -2040,7 +2046,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
2040
2046
  async leave({ topic, peer }) {
2041
2047
  this._swarmPeers.delete(topic);
2042
2048
  await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_messenger_pb.SwarmRequestSchema, {
2043
- serviceId: import_protocols5.EdgeService.SWARM_SERVICE_ID,
2049
+ serviceId: import_protocols5.EdgeService.SWARM,
2044
2050
  source: createMessageSource(topic, peer),
2045
2051
  payload: {
2046
2052
  action: import_messenger_pb.SwarmRequest_Action.LEAVE,
@@ -2060,13 +2066,13 @@ var EdgeSignalManager = class extends import_context7.Resource {
2060
2066
  }
2061
2067
  }, {
2062
2068
  F: __dxlog_file7,
2063
- L: 89,
2069
+ L: 98,
2064
2070
  S: this,
2065
2071
  C: (f, a) => f(...a)
2066
2072
  });
2067
2073
  }
2068
2074
  await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_buf.bufWkt.AnySchema, {
2069
- serviceId: import_protocols5.EdgeService.SIGNAL_SERVICE_ID,
2075
+ serviceId: import_protocols5.EdgeService.SIGNAL,
2070
2076
  source: message.author,
2071
2077
  target: [
2072
2078
  message.recipient
@@ -2083,11 +2089,11 @@ var EdgeSignalManager = class extends import_context7.Resource {
2083
2089
  }
2084
2090
  _onMessage(message) {
2085
2091
  switch (message.serviceId) {
2086
- case import_protocols5.EdgeService.SWARM_SERVICE_ID: {
2092
+ case import_protocols5.EdgeService.SWARM: {
2087
2093
  this._processSwarmResponse(message);
2088
2094
  break;
2089
2095
  }
2090
- case import_protocols5.EdgeService.SIGNAL_SERVICE_ID: {
2096
+ case import_protocols5.EdgeService.SIGNAL: {
2091
2097
  this._processMessage(message);
2092
2098
  }
2093
2099
  }
@@ -2095,7 +2101,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
2095
2101
  _processSwarmResponse(message) {
2096
2102
  (0, import_invariant6.invariant)(import_edge_client.protocol.getPayloadType(message) === import_messenger_pb.SwarmResponseSchema.typeName, "Wrong payload type", {
2097
2103
  F: __dxlog_file7,
2098
- L: 126,
2104
+ L: 135,
2099
2105
  S: this,
2100
2106
  A: [
2101
2107
  "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2103,19 +2109,20 @@ var EdgeSignalManager = class extends import_context7.Resource {
2103
2109
  ]
2104
2110
  });
2105
2111
  const payload = import_edge_client.protocol.getPayload(message, import_messenger_pb.SwarmResponseSchema);
2112
+ this.swarmState.emit(payload);
2106
2113
  const topic = import_keys7.PublicKey.from(payload.swarmKey);
2107
2114
  if (!this._swarmPeers.has(topic)) {
2108
2115
  import_log7.log.warn("Received message from wrong topic", {
2109
2116
  topic
2110
2117
  }, {
2111
2118
  F: __dxlog_file7,
2112
- L: 130,
2119
+ L: 140,
2113
2120
  S: this,
2114
2121
  C: (f, a) => f(...a)
2115
2122
  });
2116
2123
  return;
2117
2124
  }
2118
- const oldPeers = this._swarmPeers.get(topic);
2125
+ const { joinedPeers: oldPeers } = this._swarmPeers.get(topic);
2119
2126
  const timestamp = message.timestamp ? new Date(Date.parse(message.timestamp)) : /* @__PURE__ */ new Date();
2120
2127
  const newPeers = new import_util5.ComplexSet(PeerInfoHash, payload.peers);
2121
2128
  for (const peer of newPeers) {
@@ -2141,12 +2148,12 @@ var EdgeSignalManager = class extends import_context7.Resource {
2141
2148
  }
2142
2149
  });
2143
2150
  }
2144
- this._swarmPeers.set(topic, newPeers);
2151
+ this._swarmPeers.get(topic).joinedPeers = newPeers;
2145
2152
  }
2146
2153
  _processMessage(message) {
2147
2154
  (0, import_invariant6.invariant)(import_edge_client.protocol.getPayloadType(message) === import_buf.bufWkt.AnySchema.typeName, "Wrong payload type", {
2148
2155
  F: __dxlog_file7,
2149
- L: 163,
2156
+ L: 173,
2150
2157
  S: this,
2151
2158
  A: [
2152
2159
  "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -2156,7 +2163,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
2156
2163
  const payload = import_edge_client.protocol.getPayload(message, import_buf.bufWkt.AnySchema);
2157
2164
  (0, import_invariant6.invariant)(message.source, "source is missing", {
2158
2165
  F: __dxlog_file7,
2159
- L: 165,
2166
+ L: 175,
2160
2167
  S: this,
2161
2168
  A: [
2162
2169
  "message.source",
@@ -2165,7 +2172,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
2165
2172
  });
2166
2173
  (0, import_invariant6.invariant)(message.target, "target is missing", {
2167
2174
  F: __dxlog_file7,
2168
- L: 166,
2175
+ L: 176,
2169
2176
  S: this,
2170
2177
  A: [
2171
2178
  "message.target",
@@ -2174,7 +2181,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
2174
2181
  });
2175
2182
  (0, import_invariant6.invariant)(message.target.length === 1, "target should have exactly one item", {
2176
2183
  F: __dxlog_file7,
2177
- L: 167,
2184
+ L: 177,
2178
2185
  S: this,
2179
2186
  A: [
2180
2187
  "message.target.length === 1",
@@ -2198,16 +2205,17 @@ var EdgeSignalManager = class extends import_context7.Resource {
2198
2205
  swarms: Array.from(this._swarmPeers.keys())
2199
2206
  }, {
2200
2207
  F: __dxlog_file7,
2201
- L: 186,
2208
+ L: 196,
2202
2209
  S: this,
2203
2210
  C: (f, a) => f(...a)
2204
2211
  });
2205
- for (const topic of this._swarmPeers.keys()) {
2212
+ for (const [topic, { lastState }] of this._swarmPeers.entries()) {
2206
2213
  await this.join({
2207
2214
  topic,
2208
2215
  peer: {
2209
2216
  peerKey: this._edgeConnection.peerKey,
2210
- identityKey: this._edgeConnection.identityKey
2217
+ identityKey: this._edgeConnection.identityKey,
2218
+ state: lastState
2211
2219
  }
2212
2220
  });
2213
2221
  }
@@ -2216,8 +2224,7 @@ var EdgeSignalManager = class extends import_context7.Resource {
2216
2224
  var createMessageSource = (topic, peerInfo) => {
2217
2225
  return {
2218
2226
  swarmKey: topic.toHex(),
2219
- identityKey: peerInfo.identityKey,
2220
- peerKey: peerInfo.peerKey
2227
+ ...peerInfo
2221
2228
  };
2222
2229
  };
2223
2230
  var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
@@ -2283,4 +2290,4 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
2283
2290
  WebsocketSignalManager,
2284
2291
  setIdentityTags
2285
2292
  });
2286
- //# sourceMappingURL=chunk-ZWQVINAC.cjs.map
2293
+ //# sourceMappingURL=chunk-ISUSZ44G.cjs.map