cojson 0.18.33 → 0.18.35

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 (93) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/CHANGELOG.md +17 -0
  3. package/dist/SyncStateManager.d.ts.map +1 -1
  4. package/dist/SyncStateManager.js +2 -2
  5. package/dist/SyncStateManager.js.map +1 -1
  6. package/dist/coValueContentMessage.d.ts +5 -2
  7. package/dist/coValueContentMessage.d.ts.map +1 -1
  8. package/dist/coValueContentMessage.js +15 -0
  9. package/dist/coValueContentMessage.js.map +1 -1
  10. package/dist/coValueCore/SessionMap.d.ts +4 -3
  11. package/dist/coValueCore/SessionMap.d.ts.map +1 -1
  12. package/dist/coValueCore/SessionMap.js +21 -30
  13. package/dist/coValueCore/SessionMap.js.map +1 -1
  14. package/dist/coValueCore/coValueCore.d.ts +14 -6
  15. package/dist/coValueCore/coValueCore.d.ts.map +1 -1
  16. package/dist/coValueCore/coValueCore.js +32 -52
  17. package/dist/coValueCore/coValueCore.js.map +1 -1
  18. package/dist/coValueCore/verifiedState.d.ts +6 -4
  19. package/dist/coValueCore/verifiedState.d.ts.map +1 -1
  20. package/dist/coValueCore/verifiedState.js +21 -7
  21. package/dist/coValueCore/verifiedState.js.map +1 -1
  22. package/dist/coValues/group.d.ts.map +1 -1
  23. package/dist/coValues/group.js +20 -15
  24. package/dist/coValues/group.js.map +1 -1
  25. package/dist/knownState.d.ts +9 -1
  26. package/dist/knownState.d.ts.map +1 -1
  27. package/dist/knownState.js +29 -3
  28. package/dist/knownState.js.map +1 -1
  29. package/dist/localNode.d.ts +7 -2
  30. package/dist/localNode.d.ts.map +1 -1
  31. package/dist/localNode.js +10 -15
  32. package/dist/localNode.js.map +1 -1
  33. package/dist/queue/LocalTransactionsSyncQueue.d.ts +10 -9
  34. package/dist/queue/LocalTransactionsSyncQueue.d.ts.map +1 -1
  35. package/dist/queue/LocalTransactionsSyncQueue.js +53 -47
  36. package/dist/queue/LocalTransactionsSyncQueue.js.map +1 -1
  37. package/dist/storage/knownState.js +2 -2
  38. package/dist/storage/knownState.js.map +1 -1
  39. package/dist/sync.d.ts +1 -2
  40. package/dist/sync.d.ts.map +1 -1
  41. package/dist/sync.js +15 -19
  42. package/dist/sync.js.map +1 -1
  43. package/dist/tests/coPlainText.test.js +13 -14
  44. package/dist/tests/coPlainText.test.js.map +1 -1
  45. package/dist/tests/coValueContentMessage.test.js +130 -1
  46. package/dist/tests/coValueContentMessage.test.js.map +1 -1
  47. package/dist/tests/coValueCore.isCompletelyDownloaded.test.js +3 -2
  48. package/dist/tests/coValueCore.isCompletelyDownloaded.test.js.map +1 -1
  49. package/dist/tests/coValueCore.isStreaming.test.js +54 -3
  50. package/dist/tests/coValueCore.isStreaming.test.js.map +1 -1
  51. package/dist/tests/coValueCore.test.js +3 -6
  52. package/dist/tests/coValueCore.test.js.map +1 -1
  53. package/dist/tests/group.childKeyRotation.test.js +9 -9
  54. package/dist/tests/group.childKeyRotation.test.js.map +1 -1
  55. package/dist/tests/knownState.test.js +82 -10
  56. package/dist/tests/knownState.test.js.map +1 -1
  57. package/dist/tests/sync.load.test.js +29 -29
  58. package/dist/tests/sync.mesh.test.js +38 -31
  59. package/dist/tests/sync.mesh.test.js.map +1 -1
  60. package/dist/tests/sync.storage.test.js +24 -23
  61. package/dist/tests/sync.storage.test.js.map +1 -1
  62. package/dist/tests/sync.storageAsync.test.js +24 -23
  63. package/dist/tests/sync.storageAsync.test.js.map +1 -1
  64. package/dist/tests/sync.upload.test.js +58 -58
  65. package/dist/tests/testUtils.d.ts +11 -9
  66. package/dist/tests/testUtils.d.ts.map +1 -1
  67. package/dist/tests/testUtils.js +26 -16
  68. package/dist/tests/testUtils.js.map +1 -1
  69. package/package.json +3 -4
  70. package/src/SyncStateManager.ts +8 -2
  71. package/src/coValueContentMessage.ts +29 -2
  72. package/src/coValueCore/SessionMap.ts +41 -31
  73. package/src/coValueCore/coValueCore.ts +41 -74
  74. package/src/coValueCore/verifiedState.ts +36 -11
  75. package/src/coValues/group.ts +40 -27
  76. package/src/knownState.ts +39 -4
  77. package/src/localNode.ts +16 -21
  78. package/src/queue/LocalTransactionsSyncQueue.ts +77 -93
  79. package/src/storage/knownState.ts +2 -2
  80. package/src/sync.ts +24 -26
  81. package/src/tests/coPlainText.test.ts +13 -14
  82. package/src/tests/coValueContentMessage.test.ts +197 -2
  83. package/src/tests/coValueCore.isCompletelyDownloaded.test.ts +3 -2
  84. package/src/tests/coValueCore.isStreaming.test.ts +84 -2
  85. package/src/tests/coValueCore.test.ts +7 -10
  86. package/src/tests/group.childKeyRotation.test.ts +9 -9
  87. package/src/tests/knownState.test.ts +106 -9
  88. package/src/tests/sync.load.test.ts +29 -29
  89. package/src/tests/sync.mesh.test.ts +38 -31
  90. package/src/tests/sync.storage.test.ts +24 -23
  91. package/src/tests/sync.storageAsync.test.ts +24 -23
  92. package/src/tests/sync.upload.test.ts +58 -58
  93. package/src/tests/testUtils.ts +30 -18
package/src/tests/sync.storageAsync.test.ts CHANGED
@@ -304,28 +304,28 @@ describe("client syncs with a server with storage", () => {
304
304
  [
305
305
  "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
306
306
  "client -> server | CONTENT Group header: true new: After: 0 New: 5",
307
- "client -> storage | CONTENT Map header: true new: After: 0 New: 20 expectContentUntil: header/100",
308
- "client -> server | CONTENT Map header: true new: After: 0 New: 20 expectContentUntil: header/100",
309
- "client -> storage | CONTENT Map header: false new: After: 20 New: 21",
310
- "client -> server | CONTENT Map header: false new: After: 20 New: 21",
311
- "client -> storage | CONTENT Map header: false new: After: 41 New: 21",
312
- "client -> server | CONTENT Map header: false new: After: 41 New: 21",
313
- "client -> storage | CONTENT Map header: false new: After: 62 New: 21",
314
- "client -> server | CONTENT Map header: false new: After: 62 New: 21",
315
- "client -> storage | CONTENT Map header: false new: After: 83 New: 17",
316
- "client -> server | CONTENT Map header: false new: After: 83 New: 17",
307
+ "client -> storage | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
308
+ "client -> server | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
309
+ "client -> storage | CONTENT Map header: false new: After: 21 New: 21",
310
+ "client -> server | CONTENT Map header: false new: After: 21 New: 21",
311
+ "client -> storage | CONTENT Map header: false new: After: 42 New: 21",
312
+ "client -> server | CONTENT Map header: false new: After: 42 New: 21",
313
+ "client -> storage | CONTENT Map header: false new: After: 63 New: 21",
314
+ "client -> server | CONTENT Map header: false new: After: 63 New: 21",
315
+ "client -> storage | CONTENT Map header: false new: After: 84 New: 16",
316
+ "client -> server | CONTENT Map header: false new: After: 84 New: 16",
317
317
  "server -> client | KNOWN Group sessions: header/5",
318
318
  "server -> storage | CONTENT Group header: true new: After: 0 New: 5",
319
- "server -> client | KNOWN Map sessions: header/20",
320
- "server -> storage | CONTENT Map header: true new: After: 0 New: 20",
321
- "server -> client | KNOWN Map sessions: header/41",
322
- "server -> storage | CONTENT Map header: false new: After: 20 New: 21",
323
- "server -> client | KNOWN Map sessions: header/62",
324
- "server -> storage | CONTENT Map header: false new: After: 41 New: 21",
325
- "server -> client | KNOWN Map sessions: header/83",
326
- "server -> storage | CONTENT Map header: false new: After: 62 New: 21",
319
+ "server -> client | KNOWN Map sessions: header/21",
320
+ "server -> storage | CONTENT Map header: true new: After: 0 New: 21",
321
+ "server -> client | KNOWN Map sessions: header/42",
322
+ "server -> storage | CONTENT Map header: false new: After: 21 New: 21",
323
+ "server -> client | KNOWN Map sessions: header/63",
324
+ "server -> storage | CONTENT Map header: false new: After: 42 New: 21",
325
+ "server -> client | KNOWN Map sessions: header/84",
326
+ "server -> storage | CONTENT Map header: false new: After: 63 New: 21",
327
327
  "server -> client | KNOWN Map sessions: header/100",
328
- "server -> storage | CONTENT Map header: false new: After: 83 New: 17",
328
+ "server -> storage | CONTENT Map header: false new: After: 84 New: 16",
329
329
  ]
330
330
  `);
331
331
 
@@ -357,11 +357,12 @@ describe("client syncs with a server with storage", () => {
357
357
  "client -> storage | LOAD Map sessions: empty",
358
358
  "storage -> client | CONTENT Group header: true new: After: 0 New: 5",
359
359
  "client -> server | LOAD Group sessions: header/5",
360
- "storage -> client | CONTENT Map header: true new: After: 0 New: 41 expectContentUntil: header/100",
360
+ "storage -> client | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
361
361
  "client -> server | LOAD Map sessions: header/100",
362
- "storage -> client | CONTENT Map header: true new: After: 41 New: 21",
363
- "storage -> client | CONTENT Map header: true new: After: 62 New: 21",
364
- "storage -> client | CONTENT Map header: true new: After: 83 New: 17",
362
+ "storage -> client | CONTENT Map header: true new: After: 21 New: 21",
363
+ "storage -> client | CONTENT Map header: true new: After: 42 New: 21",
364
+ "storage -> client | CONTENT Map header: true new: After: 63 New: 21",
365
+ "storage -> client | CONTENT Map header: true new: After: 84 New: 16",
365
366
  "server -> client | KNOWN Group sessions: header/5",
366
367
  "server -> client | KNOWN Map sessions: header/100",
367
368
  ]
package/src/tests/sync.upload.test.ts CHANGED
@@ -406,36 +406,36 @@ describe("client to server upload", () => {
406
406
  ).toMatchInlineSnapshot(`
407
407
  [
408
408
  "client -> server | CONTENT Group header: true new: After: 0 New: 5",
409
- "client -> server | CONTENT Map header: true new: After: 0 New: 72 expectContentUntil: header/1024",
410
- "client -> server | CONTENT Map header: false new: After: 72 New: 73",
411
- "client -> server | CONTENT Map header: false new: After: 145 New: 73",
412
- "client -> server | CONTENT Map header: false new: After: 218 New: 73",
413
- "client -> server | CONTENT Map header: false new: After: 291 New: 73",
414
- "client -> server | CONTENT Map header: false new: After: 364 New: 73",
415
- "client -> server | CONTENT Map header: false new: After: 437 New: 73",
416
- "client -> server | CONTENT Map header: false new: After: 510 New: 73",
417
- "client -> server | CONTENT Map header: false new: After: 583 New: 73",
418
- "client -> server | CONTENT Map header: false new: After: 656 New: 73",
419
- "client -> server | CONTENT Map header: false new: After: 729 New: 73",
420
- "client -> server | CONTENT Map header: false new: After: 802 New: 73",
421
- "client -> server | CONTENT Map header: false new: After: 875 New: 73",
422
- "client -> server | CONTENT Map header: false new: After: 948 New: 73",
423
- "client -> server | CONTENT Map header: false new: After: 1021 New: 3",
409
+ "client -> server | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/1024",
410
+ "client -> server | CONTENT Map header: false new: After: 73 New: 73",
411
+ "client -> server | CONTENT Map header: false new: After: 146 New: 73",
412
+ "client -> server | CONTENT Map header: false new: After: 219 New: 73",
413
+ "client -> server | CONTENT Map header: false new: After: 292 New: 73",
414
+ "client -> server | CONTENT Map header: false new: After: 365 New: 73",
415
+ "client -> server | CONTENT Map header: false new: After: 438 New: 73",
416
+ "client -> server | CONTENT Map header: false new: After: 511 New: 73",
417
+ "client -> server | CONTENT Map header: false new: After: 584 New: 73",
418
+ "client -> server | CONTENT Map header: false new: After: 657 New: 73",
419
+ "client -> server | CONTENT Map header: false new: After: 730 New: 73",
420
+ "client -> server | CONTENT Map header: false new: After: 803 New: 73",
421
+ "client -> server | CONTENT Map header: false new: After: 876 New: 73",
422
+ "client -> server | CONTENT Map header: false new: After: 949 New: 73",
423
+ "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
424
424
  "server -> client | KNOWN Group sessions: header/5",
425
- "server -> client | KNOWN Map sessions: header/72",
426
- "server -> client | KNOWN Map sessions: header/145",
427
- "server -> client | KNOWN Map sessions: header/218",
428
- "server -> client | KNOWN Map sessions: header/291",
429
- "server -> client | KNOWN Map sessions: header/364",
430
- "server -> client | KNOWN Map sessions: header/437",
431
- "server -> client | KNOWN Map sessions: header/510",
432
- "server -> client | KNOWN Map sessions: header/583",
433
- "server -> client | KNOWN Map sessions: header/656",
434
- "server -> client | KNOWN Map sessions: header/729",
435
- "server -> client | KNOWN Map sessions: header/802",
436
- "server -> client | KNOWN Map sessions: header/875",
437
- "server -> client | KNOWN Map sessions: header/948",
438
- "server -> client | KNOWN Map sessions: header/1021",
425
+ "server -> client | KNOWN Map sessions: header/73",
426
+ "server -> client | KNOWN Map sessions: header/146",
427
+ "server -> client | KNOWN Map sessions: header/219",
428
+ "server -> client | KNOWN Map sessions: header/292",
429
+ "server -> client | KNOWN Map sessions: header/365",
430
+ "server -> client | KNOWN Map sessions: header/438",
431
+ "server -> client | KNOWN Map sessions: header/511",
432
+ "server -> client | KNOWN Map sessions: header/584",
433
+ "server -> client | KNOWN Map sessions: header/657",
434
+ "server -> client | KNOWN Map sessions: header/730",
435
+ "server -> client | KNOWN Map sessions: header/803",
436
+ "server -> client | KNOWN Map sessions: header/876",
437
+ "server -> client | KNOWN Map sessions: header/949",
438
+ "server -> client | KNOWN Map sessions: header/1022",
439
439
  "server -> client | KNOWN Map sessions: header/1024",
440
440
  ]
441
441
  `);
@@ -476,37 +476,37 @@ describe("client to server upload", () => {
476
476
  [
477
477
  "client -> server | CONTENT Group header: true new: After: 0 New: 5",
478
478
  "client -> server | CONTENT Map header: true new: ",
479
- "client -> server | CONTENT Map header: false new: After: 0 New: 72 expectContentUntil: header/1024",
480
- "client -> server | CONTENT Map header: false new: After: 72 New: 73",
481
- "client -> server | CONTENT Map header: false new: After: 145 New: 73",
482
- "client -> server | CONTENT Map header: false new: After: 218 New: 73",
483
- "client -> server | CONTENT Map header: false new: After: 291 New: 73",
484
- "client -> server | CONTENT Map header: false new: After: 364 New: 73",
485
- "client -> server | CONTENT Map header: false new: After: 437 New: 73",
486
- "client -> server | CONTENT Map header: false new: After: 510 New: 73",
487
- "client -> server | CONTENT Map header: false new: After: 583 New: 73",
488
- "client -> server | CONTENT Map header: false new: After: 656 New: 73",
489
- "client -> server | CONTENT Map header: false new: After: 729 New: 73",
490
- "client -> server | CONTENT Map header: false new: After: 802 New: 73",
491
- "client -> server | CONTENT Map header: false new: After: 875 New: 73",
492
- "client -> server | CONTENT Map header: false new: After: 948 New: 73",
493
- "client -> server | CONTENT Map header: false new: After: 1021 New: 3",
479
+ "client -> server | CONTENT Map header: false new: After: 0 New: 73 expectContentUntil: header/1024",
480
+ "client -> server | CONTENT Map header: false new: After: 73 New: 73",
481
+ "client -> server | CONTENT Map header: false new: After: 146 New: 73",
482
+ "client -> server | CONTENT Map header: false new: After: 219 New: 73",
483
+ "client -> server | CONTENT Map header: false new: After: 292 New: 73",
484
+ "client -> server | CONTENT Map header: false new: After: 365 New: 73",
485
+ "client -> server | CONTENT Map header: false new: After: 438 New: 73",
486
+ "client -> server | CONTENT Map header: false new: After: 511 New: 73",
487
+ "client -> server | CONTENT Map header: false new: After: 584 New: 73",
488
+ "client -> server | CONTENT Map header: false new: After: 657 New: 73",
489
+ "client -> server | CONTENT Map header: false new: After: 730 New: 73",
490
+ "client -> server | CONTENT Map header: false new: After: 803 New: 73",
491
+ "client -> server | CONTENT Map header: false new: After: 876 New: 73",
492
+ "client -> server | CONTENT Map header: false new: After: 949 New: 73",
493
+ "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
494
494
  "server -> client | KNOWN Group sessions: header/5",
495
495
  "server -> client | KNOWN Map sessions: header/0",
496
- "server -> client | KNOWN Map sessions: header/72",
497
- "server -> client | KNOWN Map sessions: header/145",
498
- "server -> client | KNOWN Map sessions: header/218",
499
- "server -> client | KNOWN Map sessions: header/291",
500
- "server -> client | KNOWN Map sessions: header/364",
501
- "server -> client | KNOWN Map sessions: header/437",
502
- "server -> client | KNOWN Map sessions: header/510",
503
- "server -> client | KNOWN Map sessions: header/583",
504
- "server -> client | KNOWN Map sessions: header/656",
505
- "server -> client | KNOWN Map sessions: header/729",
506
- "server -> client | KNOWN Map sessions: header/802",
507
- "server -> client | KNOWN Map sessions: header/875",
508
- "server -> client | KNOWN Map sessions: header/948",
509
- "server -> client | KNOWN Map sessions: header/1021",
496
+ "server -> client | KNOWN Map sessions: header/73",
497
+ "server -> client | KNOWN Map sessions: header/146",
498
+ "server -> client | KNOWN Map sessions: header/219",
499
+ "server -> client | KNOWN Map sessions: header/292",
500
+ "server -> client | KNOWN Map sessions: header/365",
501
+ "server -> client | KNOWN Map sessions: header/438",
502
+ "server -> client | KNOWN Map sessions: header/511",
503
+ "server -> client | KNOWN Map sessions: header/584",
504
+ "server -> client | KNOWN Map sessions: header/657",
505
+ "server -> client | KNOWN Map sessions: header/730",
506
+ "server -> client | KNOWN Map sessions: header/803",
507
+ "server -> client | KNOWN Map sessions: header/876",
508
+ "server -> client | KNOWN Map sessions: header/949",
509
+ "server -> client | KNOWN Map sessions: header/1022",
510
510
  "server -> client | KNOWN Map sessions: header/1024",
511
511
  ]
512
512
  `);
package/src/tests/testUtils.ts CHANGED
@@ -14,6 +14,7 @@ import {
14
14
  type CoID,
15
15
  type CoValueCore,
16
16
  type RawAccount,
17
+ RawAccountID,
17
18
  type RawCoValue,
18
19
  StorageAPI,
19
20
  } from "../exports.js";
@@ -557,14 +558,34 @@ export async function setupTestAccount(
557
558
  isSyncServer?: boolean;
558
559
  connected?: boolean;
559
560
  storage?: StorageAPI;
561
+ accountID?: RawAccountID;
562
+ accountSecret?: AgentSecret;
560
563
  } = {},
561
564
  ) {
562
- const ctx = await LocalNode.withNewlyCreatedAccount({
563
- peers: [],
564
- crypto: Crypto,
565
- creationProps: { name: "Client" },
566
- storage: opts.storage,
567
- });
565
+ const ctx =
566
+ opts.accountSecret && opts.accountID
567
+ ? {
568
+ node: await LocalNode.withLoadedAccount({
569
+ peers: [
570
+ getSyncServerConnectedPeer({
571
+ peerId: opts.accountID,
572
+ }).peer,
573
+ ],
574
+ crypto: Crypto,
575
+ storage: opts.storage,
576
+ accountID: opts.accountID,
577
+ accountSecret: opts.accountSecret,
578
+ sessionID: Crypto.newRandomSessionID(opts.accountID),
579
+ }),
580
+ accountID: opts.accountID,
581
+ accountSecret: opts.accountSecret,
582
+ }
583
+ : await LocalNode.withNewlyCreatedAccount({
584
+ peers: [],
585
+ crypto: Crypto,
586
+ creationProps: { name: "Client" },
587
+ storage: opts.storage,
588
+ });
568
589
 
569
590
  if (opts.isSyncServer) {
570
591
  syncServer.current = ctx.node;
@@ -577,7 +598,7 @@ export async function setupTestAccount(
577
598
  }) {
578
599
  const { peer, peerStateOnServer, peerOnServer } =
579
600
  getSyncServerConnectedPeer({
580
- peerId: ctx.node.getCurrentAgent().id,
601
+ peerId: ctx.node.currentSessionID,
581
602
  syncServerName: opts?.syncServerName,
582
603
  ourName: opts?.ourName,
583
604
  syncServer: opts?.syncServer,
@@ -635,19 +656,10 @@ export async function setupTestAccount(
635
656
  addStorage,
636
657
  addAsyncStorage,
637
658
  spawnNewSession: () => {
638
- const { peer } = getSyncServerConnectedPeer({
639
- peerId: ctx.node.getCurrentAgent().id,
640
- });
641
-
642
- ctx.node.syncManager.addPeer(peer);
643
-
644
- return LocalNode.withLoadedAccount({
645
- peers: [peer],
646
- crypto: Crypto,
647
- storage: opts.storage,
659
+ return setupTestAccount({
648
660
  accountID: ctx.accountID,
649
661
  accountSecret: ctx.accountSecret,
650
- sessionID: Crypto.newRandomSessionID(ctx.accountID),
662
+ connected: true,
651
663
  });
652
664
  },
653
665
  disconnect: () => {