cojson 0.13.12 → 0.13.14

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 (64) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/CHANGELOG.md +12 -0
  3. package/dist/PeerState.d.ts +4 -6
  4. package/dist/PeerState.d.ts.map +1 -1
  5. package/dist/PeerState.js +30 -26
  6. package/dist/PeerState.js.map +1 -1
  7. package/dist/PriorityBasedMessageQueue.d.ts +2 -8
  8. package/dist/PriorityBasedMessageQueue.d.ts.map +1 -1
  9. package/dist/PriorityBasedMessageQueue.js +1 -17
  10. package/dist/PriorityBasedMessageQueue.js.map +1 -1
  11. package/dist/coValueCore.js +1 -1
  12. package/dist/coValueCore.js.map +1 -1
  13. package/dist/coValueState.d.ts.map +1 -1
  14. package/dist/coValueState.js +8 -19
  15. package/dist/coValueState.js.map +1 -1
  16. package/dist/localNode.d.ts.map +1 -1
  17. package/dist/localNode.js +2 -2
  18. package/dist/localNode.js.map +1 -1
  19. package/dist/streamUtils.d.ts.map +1 -1
  20. package/dist/streamUtils.js +1 -1
  21. package/dist/streamUtils.js.map +1 -1
  22. package/dist/sync.d.ts +11 -17
  23. package/dist/sync.d.ts.map +1 -1
  24. package/dist/sync.js +49 -91
  25. package/dist/sync.js.map +1 -1
  26. package/dist/tests/PeerState.test.js +27 -14
  27. package/dist/tests/PeerState.test.js.map +1 -1
  28. package/dist/tests/PriorityBasedMessageQueue.test.js +5 -33
  29. package/dist/tests/PriorityBasedMessageQueue.test.js.map +1 -1
  30. package/dist/tests/SyncStateManager.test.js +5 -9
  31. package/dist/tests/SyncStateManager.test.js.map +1 -1
  32. package/dist/tests/sync.load.test.js +21 -17
  33. package/dist/tests/sync.load.test.js.map +1 -1
  34. package/dist/tests/sync.mesh.test.js +46 -18
  35. package/dist/tests/sync.mesh.test.js.map +1 -1
  36. package/dist/tests/sync.peerReconciliation.test.js +13 -15
  37. package/dist/tests/sync.peerReconciliation.test.js.map +1 -1
  38. package/dist/tests/sync.storage.test.js +13 -9
  39. package/dist/tests/sync.storage.test.js.map +1 -1
  40. package/dist/tests/sync.test.js +16 -28
  41. package/dist/tests/sync.test.js.map +1 -1
  42. package/dist/tests/sync.upload.test.js +13 -13
  43. package/dist/tests/testUtils.d.ts +1 -0
  44. package/dist/tests/testUtils.d.ts.map +1 -1
  45. package/dist/tests/testUtils.js +1 -0
  46. package/dist/tests/testUtils.js.map +1 -1
  47. package/package.json +1 -1
  48. package/src/PeerState.ts +33 -37
  49. package/src/PriorityBasedMessageQueue.ts +2 -30
  50. package/src/coValueCore.ts +1 -1
  51. package/src/coValueState.ts +13 -21
  52. package/src/localNode.ts +4 -2
  53. package/src/streamUtils.ts +2 -2
  54. package/src/sync.ts +58 -103
  55. package/src/tests/PeerState.test.ts +28 -14
  56. package/src/tests/PriorityBasedMessageQueue.test.ts +5 -39
  57. package/src/tests/SyncStateManager.test.ts +4 -12
  58. package/src/tests/sync.load.test.ts +21 -17
  59. package/src/tests/sync.mesh.test.ts +46 -18
  60. package/src/tests/sync.peerReconciliation.test.ts +13 -25
  61. package/src/tests/sync.storage.test.ts +13 -9
  62. package/src/tests/sync.test.ts +16 -30
  63. package/src/tests/sync.upload.test.ts +13 -13
  64. package/src/tests/testUtils.ts +1 -0
package/src/tests/sync.test.ts CHANGED
@@ -31,7 +31,7 @@ beforeEach(async () => {
31
31
  });
32
32
  });
33
33
 
34
- test("If we add a peer, but it never subscribes to a coValue, it won't get any messages", async () => {
34
+ test("If we add a client peer, but it never subscribes to a coValue, it won't get any messages", async () => {
35
35
  const [admin, session] = randomAnonymousAccountAndSessionID();
36
36
  const node = new LocalNode(admin, session, Crypto);
37
37
 
@@ -47,7 +47,7 @@ test("If we add a peer, but it never subscribes to a coValue, it won't get any m
47
47
  id: "test",
48
48
  incoming: inRx,
49
49
  outgoing: outTx,
50
- role: "peer",
50
+ role: "client",
51
51
  crashOnClose: true,
52
52
  });
53
53
 
@@ -561,7 +561,7 @@ describe("SyncManager - knownStates vs optimisticKnownStates", () => {
561
561
  const mapOnClient = group.createMap();
562
562
  mapOnClient.set("key1", "value1", "trusting");
563
563
 
564
- await client.syncManager.actuallySyncCoValue(mapOnClient.core);
564
+ await client.syncManager.syncCoValue(mapOnClient.core);
565
565
 
566
566
  // Wait for the full sync to complete
567
567
  await mapOnClient.core.waitForSync();
@@ -592,7 +592,7 @@ describe("SyncManager - knownStates vs optimisticKnownStates", () => {
592
592
  const map = group.createMap();
593
593
  map.set("key1", "value1", "trusting");
594
594
 
595
- await client.node.syncManager.actuallySyncCoValue(map.core);
595
+ await client.node.syncManager.syncCoValue(map.core);
596
596
  await map.core.waitForSync();
597
597
 
598
598
  // Block the content messages
@@ -604,7 +604,7 @@ describe("SyncManager - knownStates vs optimisticKnownStates", () => {
604
604
 
605
605
  map.set("key2", "value2", "trusting");
606
606
 
607
- await client.node.syncManager.actuallySyncCoValue(map.core);
607
+ await client.node.syncManager.syncCoValue(map.core);
608
608
 
609
609
  expect(peerState.optimisticKnownStates.get(map.core.id)).not.toEqual(
610
610
  peerState.knownStates.get(map.core.id),
@@ -636,7 +636,7 @@ describe("SyncManager.addPeer", () => {
636
636
  const map = group.createMap();
637
637
  map.set("key1", "value1", "trusting");
638
638
 
639
- await client.node.syncManager.actuallySyncCoValue(map.core);
639
+ await client.node.syncManager.syncCoValue(map.core);
640
640
 
641
641
  // Wait for initial sync
642
642
  await map.core.waitForSync();
@@ -669,7 +669,7 @@ describe("SyncManager.addPeer", () => {
669
669
  const map = group.createMap();
670
670
  map.set("key1", "value1", "trusting");
671
671
 
672
- await client.node.syncManager.actuallySyncCoValue(map.core);
672
+ await client.node.syncManager.syncCoValue(map.core);
673
673
 
674
674
  // Wait for initial sync
675
675
  await map.core.waitForSync();
@@ -841,7 +841,7 @@ describe("waitForSyncWithPeer", () => {
841
841
  const map = group.createMap();
842
842
  map.set("key1", "value1", "trusting");
843
843
 
844
- await client.node.syncManager.actuallySyncCoValue(map.core);
844
+ await client.node.syncManager.syncCoValue(map.core);
845
845
 
846
846
  await expect(
847
847
  client.node.syncManager.waitForSyncWithPeer(
@@ -866,7 +866,7 @@ describe("waitForSyncWithPeer", () => {
866
866
  return Promise.resolve();
867
867
  });
868
868
 
869
- await client.node.syncManager.actuallySyncCoValue(map.core);
869
+ await client.node.syncManager.syncCoValue(map.core);
870
870
 
871
871
  await expect(
872
872
  client.node.syncManager.waitForSyncWithPeer(
@@ -914,7 +914,7 @@ describe("metrics", () => {
914
914
  const node = new LocalNode(admin, session, Crypto);
915
915
 
916
916
  let connectedPeers = await metricReader.getMetricValue("jazz.peers", {
917
- role: "peer",
917
+ role: "client",
918
918
  });
919
919
  expect(connectedPeers).toBeUndefined();
920
920
  let connectedServerPeers = await metricReader.getMetricValue("jazz.peers", {
@@ -928,12 +928,12 @@ describe("metrics", () => {
928
928
  id: "peer-1",
929
929
  incoming: inPeer1,
930
930
  outgoing: outPeer1,
931
- role: "peer",
931
+ role: "client",
932
932
  crashOnClose: false,
933
933
  });
934
934
 
935
935
  connectedPeers = await metricReader.getMetricValue("jazz.peers", {
936
- role: "peer",
936
+ role: "client",
937
937
  });
938
938
  expect(connectedPeers).toBe(1);
939
939
 
@@ -943,12 +943,12 @@ describe("metrics", () => {
943
943
  id: "peer-2",
944
944
  incoming: inPeer2,
945
945
  outgoing: outPeer2,
946
- role: "peer",
946
+ role: "client",
947
947
  crashOnClose: false,
948
948
  });
949
949
 
950
950
  connectedPeers = await metricReader.getMetricValue("jazz.peers", {
951
- role: "peer",
951
+ role: "client",
952
952
  });
953
953
  expect(connectedPeers).toBe(2);
954
954
 
@@ -966,7 +966,7 @@ describe("metrics", () => {
966
966
  });
967
967
  expect(connectedServerPeers).toBe(1);
968
968
  connectedPeers = await metricReader.getMetricValue("jazz.peers", {
969
- role: "peer",
969
+ role: "client",
970
970
  });
971
971
  expect(connectedPeers).toBe(2);
972
972
 
@@ -975,7 +975,7 @@ describe("metrics", () => {
975
975
  await waitFor(() => node.syncManager.peers["peer-1"]?.closed);
976
976
 
977
977
  connectedPeers = await metricReader.getMetricValue("jazz.peers", {
978
- role: "peer",
978
+ role: "client",
979
979
  });
980
980
  expect(connectedPeers).toBe(1);
981
981
 
@@ -991,20 +991,6 @@ describe("metrics", () => {
991
991
  });
992
992
  });
993
993
 
994
- function groupContentEx(group: RawGroup) {
995
- return {
996
- action: "content",
997
- id: group.core.id,
998
- };
999
- }
1000
-
1001
- function groupStateEx(group: RawGroup) {
1002
- return {
1003
- action: "known",
1004
- id: group.core.id,
1005
- };
1006
- }
1007
-
1008
994
  describe("LocalNode.load", () => {
1009
995
  test("should throw error when trying to load with undefined ID", async () => {
1010
996
  const client = await setupTestAccount();
package/src/tests/sync.upload.test.ts CHANGED
@@ -169,32 +169,32 @@ describe("client to server upload", () => {
169
169
  "client -> server | CONTENT Map header: false new: After: 0 New: 73",
170
170
  "server -> client | KNOWN Map sessions: header/73",
171
171
  "client -> server | CONTENT Map header: false new: After: 73 New: 73",
172
- "client -> server | CONTENT Map header: false new: After: 146 New: 73",
173
172
  "server -> client | KNOWN Map sessions: header/146",
174
- "client -> server | CONTENT Map header: false new: After: 219 New: 73",
175
- "client -> server | CONTENT Map header: false new: After: 292 New: 73",
173
+ "client -> server | CONTENT Map header: false new: After: 146 New: 73",
176
174
  "server -> client | KNOWN Map sessions: header/219",
177
- "client -> server | CONTENT Map header: false new: After: 365 New: 73",
178
- "client -> server | CONTENT Map header: false new: After: 438 New: 73",
175
+ "client -> server | CONTENT Map header: false new: After: 219 New: 73",
179
176
  "server -> client | KNOWN Map sessions: header/292",
180
- "client -> server | CONTENT Map header: false new: After: 511 New: 73",
181
- "client -> server | CONTENT Map header: false new: After: 584 New: 73",
177
+ "client -> server | CONTENT Map header: false new: After: 292 New: 73",
182
178
  "server -> client | KNOWN Map sessions: header/365",
183
- "client -> server | CONTENT Map header: false new: After: 657 New: 73",
184
- "client -> server | CONTENT Map header: false new: After: 730 New: 73",
179
+ "client -> server | CONTENT Map header: false new: After: 365 New: 73",
185
180
  "server -> client | KNOWN Map sessions: header/438",
186
- "client -> server | CONTENT Map header: false new: After: 803 New: 73",
187
- "client -> server | CONTENT Map header: false new: After: 876 New: 73",
181
+ "client -> server | CONTENT Map header: false new: After: 438 New: 73",
188
182
  "server -> client | KNOWN Map sessions: header/511",
189
- "client -> server | CONTENT Map header: false new: After: 949 New: 73",
190
- "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
183
+ "client -> server | CONTENT Map header: false new: After: 511 New: 73",
191
184
  "server -> client | KNOWN Map sessions: header/584",
185
+ "client -> server | CONTENT Map header: false new: After: 584 New: 73",
192
186
  "server -> client | KNOWN Map sessions: header/657",
187
+ "client -> server | CONTENT Map header: false new: After: 657 New: 73",
193
188
  "server -> client | KNOWN Map sessions: header/730",
189
+ "client -> server | CONTENT Map header: false new: After: 730 New: 73",
194
190
  "server -> client | KNOWN Map sessions: header/803",
191
+ "client -> server | CONTENT Map header: false new: After: 803 New: 73",
195
192
  "server -> client | KNOWN Map sessions: header/876",
193
+ "client -> server | CONTENT Map header: false new: After: 876 New: 73",
196
194
  "server -> client | KNOWN Map sessions: header/949",
195
+ "client -> server | CONTENT Map header: false new: After: 949 New: 73",
197
196
  "server -> client | KNOWN Map sessions: header/1022",
197
+ "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
198
198
  "server -> client | KNOWN Map sessions: header/1024",
199
199
  ]
200
200
  `);
package/src/tests/testUtils.ts CHANGED
@@ -295,6 +295,7 @@ export function blockMessageTypeOnOutgoingPeer(
295
295
  });
296
296
 
297
297
  return {
298
+ blockedMessages,
298
299
  sendBlockedMessages: async () => {
299
300
  for (const msg of blockedMessages) {
300
301
  await push.call(peer.outgoing, msg);