1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
|
/**
* Integration tests for CRDT concurrent edit scenarios
*
* These tests simulate real-world concurrent editing scenarios where
* multiple devices/clients edit the same data while offline and then sync.
*/
import * as Automerge from "@automerge/automerge";
import { describe, expect, it } from "vitest";
import type { LocalCard, LocalDeck } from "../../db/index";
import { CardState } from "../../db/index";
import {
applyChanges,
cardToCrdtDocument,
crdtDocumentToCard,
crdtDocumentToDeck,
createDocument,
deckToCrdtDocument,
getChanges,
hasConflicts,
loadDocument,
mergeDocuments,
saveDocument,
updateDocument,
} from "./document-manager";
import type { CrdtDeckDocument } from "./types";
/**
* Helper to create a test deck
*/
function createTestDeck(overrides: Partial<LocalDeck> = {}): LocalDeck {
const now = new Date();
return {
id: "deck-1",
userId: "user-1",
name: "Test Deck",
description: null,
newCardsPerDay: 20,
createdAt: now,
updatedAt: now,
deletedAt: null,
syncVersion: 1,
_synced: true,
...overrides,
};
}
/**
* Helper to create a test card
*/
function createTestCard(overrides: Partial<LocalCard> = {}): LocalCard {
const now = new Date();
return {
id: "card-1",
deckId: "deck-1",
noteId: "note-1",
isReversed: false,
front: "Question",
back: "Answer",
state: CardState.New,
due: now,
stability: 0,
difficulty: 0,
elapsedDays: 0,
scheduledDays: 0,
reps: 0,
lapses: 0,
lastReview: null,
createdAt: now,
updatedAt: now,
deletedAt: null,
syncVersion: 1,
_synced: true,
...overrides,
};
}
describe("Concurrent edit scenarios", () => {
describe("Two devices editing different fields of the same deck", () => {
it("should merge changes from both devices without conflicts", () => {
// Setup: Create initial deck document (represents server state)
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Device A: Offline edit - change deck name
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Updated by Device A";
d.meta.lastModified = Date.now();
});
// Device B: Offline edit - change newCardsPerDay
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.newCardsPerDay = 30;
d.meta.lastModified = Date.now();
});
// Sync: Merge both changes
const mergeResult = mergeDocuments(deviceAEdited, deviceBEdited);
// Both changes should be present
expect(mergeResult.merged.data.name).toBe("Updated by Device A");
expect(mergeResult.merged.data.newCardsPerDay).toBe(30);
expect(mergeResult.hasChanges).toBe(true);
});
it("should correctly convert merged deck back to LocalDeck", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Device A and B make different edits
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "New Name";
d.data.description = "Added by Device A";
d.meta.lastModified = Date.now();
});
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.newCardsPerDay = 50;
d.meta.lastModified = Date.now();
});
const mergeResult = mergeDocuments(deviceAEdited, deviceBEdited);
const mergedDeck = crdtDocumentToDeck(mergeResult.merged);
expect(mergedDeck.name).toBe("New Name");
expect(mergedDeck.description).toBe("Added by Device A");
expect(mergedDeck.newCardsPerDay).toBe(50);
});
});
describe("Two devices editing the same field", () => {
it("should detect conflicts when same field is edited concurrently", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Both devices edit the same field
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Name from Device A";
});
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.name = "Name from Device B";
});
// hasConflicts should detect the divergence
expect(hasConflicts(deviceAEdited, deviceBEdited)).toBe(true);
});
it("should resolve conflicting edits deterministically using Automerge", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Both devices edit the same field
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Name from Device A";
});
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.name = "Name from Device B";
});
// Merge from both directions should produce the same result
const mergeAB = mergeDocuments(deviceAEdited, deviceBEdited);
const mergeBA = mergeDocuments(deviceBEdited, deviceAEdited);
// Results should be deterministic (same regardless of merge order)
expect(mergeAB.merged.data.name).toBe(mergeBA.merged.data.name);
});
});
describe("Concurrent edit and delete", () => {
it("should handle concurrent edit and soft-delete", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Device A: Edit the deck
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Edited name";
d.meta.lastModified = Date.now();
});
// Device B: Delete the deck
const now = Date.now();
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBDeleted = updateDocument(deviceBDoc, (d) => {
d.meta.deleted = true;
d.data.deletedAt = now;
d.meta.lastModified = now;
});
// Merge: Both changes should be preserved
const mergeResult = mergeDocuments(deviceAEdited, deviceBDeleted);
// The edit should be present, and the delete flag should be set
expect(mergeResult.merged.data.name).toBe("Edited name");
expect(mergeResult.merged.meta.deleted).toBe(true);
expect(mergeResult.merged.data.deletedAt).toBe(now);
});
it("should preserve deletedAt timestamp from the deleting device", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
const deleteTime = Date.now();
const deviceADoc = Automerge.clone(serverDoc);
const deviceADeleted = updateDocument(deviceADoc, (d) => {
d.meta.deleted = true;
d.data.deletedAt = deleteTime;
d.meta.lastModified = deleteTime;
});
// Another device just syncs without knowing about the delete
const deviceBDoc = Automerge.clone(serverDoc);
// Merge
const mergeResult = mergeDocuments(deviceADeleted, deviceBDoc);
expect(mergeResult.merged.meta.deleted).toBe(true);
expect(mergeResult.merged.data.deletedAt).toBe(deleteTime);
});
});
describe("Card FSRS field concurrent edits", () => {
it("should merge concurrent card reviews from different devices", () => {
const card = createTestCard();
const crdtData = cardToCrdtDocument(card);
const serverDoc = createDocument(crdtData);
// Device A: Review card (update FSRS fields)
const deviceADoc = Automerge.clone(serverDoc);
const now = Date.now();
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.state = CardState.Learning;
d.data.reps = 1;
d.data.stability = 1.5;
d.data.lastReview = now;
d.meta.lastModified = now;
});
// Device B: Different field edit (update front text)
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.front = "Updated question";
d.meta.lastModified = now + 100;
});
// Merge
const mergeResult = mergeDocuments(deviceAEdited, deviceBEdited);
// Both sets of changes should be present
expect(mergeResult.merged.data.state).toBe(CardState.Learning);
expect(mergeResult.merged.data.reps).toBe(1);
expect(mergeResult.merged.data.stability).toBe(1.5);
expect(mergeResult.merged.data.front).toBe("Updated question");
});
it("should handle concurrent FSRS updates deterministically", () => {
const card = createTestCard();
const crdtData = cardToCrdtDocument(card);
const serverDoc = createDocument(crdtData);
const now = Date.now();
// Device A: Review with "Good"
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.state = CardState.Review;
d.data.reps = 2;
d.data.stability = 4.0;
d.data.difficulty = 0.3;
d.data.scheduledDays = 4;
d.data.lastReview = now;
d.meta.lastModified = now;
});
// Device B: Review with "Hard" (different scheduling)
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.state = CardState.Review;
d.data.reps = 1;
d.data.stability = 2.0;
d.data.difficulty = 0.5;
d.data.scheduledDays = 2;
d.data.lastReview = now + 100;
d.meta.lastModified = now + 100;
});
// Merge from both directions
const mergeAB = mergeDocuments(deviceAEdited, deviceBEdited);
const mergeBA = mergeDocuments(deviceBEdited, deviceAEdited);
// Results should be deterministic
expect(mergeAB.merged.data.reps).toBe(mergeBA.merged.data.reps);
expect(mergeAB.merged.data.stability).toBe(mergeBA.merged.data.stability);
expect(mergeAB.merged.data.difficulty).toBe(
mergeBA.merged.data.difficulty,
);
});
});
describe("Incremental sync simulation", () => {
it("should sync changes incrementally between devices", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
// Create server document
const serverDoc = createDocument(crdtData);
const serverBinary = saveDocument(serverDoc);
// Device A downloads initial state
const deviceADoc = loadDocument<CrdtDeckDocument>(serverBinary);
// Device A makes an edit
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Edit 1 from A";
d.meta.lastModified = Date.now();
});
// Get changes from Device A to send to server
const changesFromA = getChanges(deviceADoc, deviceAEdited);
expect(changesFromA.length).toBeGreaterThan(0);
// Server applies changes from A
const serverUpdated = applyChanges(serverDoc, changesFromA);
expect(serverUpdated.data.name).toBe("Edit 1 from A");
// Device B downloads initial state
const deviceBDoc = loadDocument<CrdtDeckDocument>(serverBinary);
// Device B makes a different edit
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.newCardsPerDay = 100;
d.meta.lastModified = Date.now();
});
// Get changes from Device B
const changesFromB = getChanges(deviceBDoc, deviceBEdited);
// Server merges Device B's changes with its current state
const serverWithB = applyChanges(serverUpdated, changesFromB);
// Both changes should be present
expect(serverWithB.data.name).toBe("Edit 1 from A");
expect(serverWithB.data.newCardsPerDay).toBe(100);
});
it("should handle three-way merge correctly", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Clone for 3 devices
const deviceADoc = Automerge.clone(serverDoc);
const deviceBDoc = Automerge.clone(serverDoc);
const deviceCDoc = Automerge.clone(serverDoc);
// Each device makes a different edit
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Name from A";
});
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.description = "Description from B";
});
const deviceCEdited = updateDocument(deviceCDoc, (d) => {
d.data.newCardsPerDay = 75;
});
// Sequential merge: A + B
const mergeAB = mergeDocuments(deviceAEdited, deviceBEdited);
// Then: (A+B) + C
const mergeABC = mergeDocuments(mergeAB.merged, deviceCEdited);
// All three changes should be present
expect(mergeABC.merged.data.name).toBe("Name from A");
expect(mergeABC.merged.data.description).toBe("Description from B");
expect(mergeABC.merged.data.newCardsPerDay).toBe(75);
});
});
describe("Serialization roundtrip with concurrent edits", () => {
it("should preserve merged changes after serialization", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Two concurrent edits
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.name = "Serialization test name";
});
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.description = "Serialization test description";
});
// Merge
const mergeResult = mergeDocuments(deviceAEdited, deviceBEdited);
// Serialize and deserialize
const binary = saveDocument(mergeResult.merged);
const restored = loadDocument<CrdtDeckDocument>(binary);
// Verify changes are preserved
expect(restored.data.name).toBe("Serialization test name");
expect(restored.data.description).toBe("Serialization test description");
});
it("should maintain history after serialization roundtrip", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
let doc = createDocument(crdtData);
// Make multiple edits
doc = updateDocument(doc, (d) => {
d.data.name = "First edit";
});
doc = updateDocument(doc, (d) => {
d.data.name = "Second edit";
});
doc = updateDocument(doc, (d) => {
d.data.name = "Third edit";
});
// Serialize and deserialize
const binary = saveDocument(doc);
const restored = loadDocument<CrdtDeckDocument>(binary);
// Final state should be preserved
expect(restored.data.name).toBe("Third edit");
// Automerge history should be preserved
const history = Automerge.getHistory(restored);
expect(history.length).toBeGreaterThanOrEqual(3);
});
});
describe("Edge cases", () => {
it("should handle empty description being set to a value", () => {
const deck = createTestDeck({ description: null });
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.description = "Now has a description";
});
const localDeck = crdtDocumentToDeck(deviceAEdited);
expect(localDeck.description).toBe("Now has a description");
});
it("should handle description being set to null", () => {
const deck = createTestDeck({ description: "Has description" });
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.description = null;
});
const localDeck = crdtDocumentToDeck(deviceAEdited);
expect(localDeck.description).toBeNull();
});
it("should handle concurrent null to value and value to null", () => {
const deck = createTestDeck({ description: "Initial" });
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Device A: Set description to null
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.description = null;
});
// Device B: Update description to new value
const deviceBDoc = Automerge.clone(serverDoc);
const deviceBEdited = updateDocument(deviceBDoc, (d) => {
d.data.description = "Updated value";
});
// Merge - result is deterministic (one of the values)
const mergeAB = mergeDocuments(deviceAEdited, deviceBEdited);
const mergeBA = mergeDocuments(deviceBEdited, deviceAEdited);
// Both merges should produce the same result
expect(mergeAB.merged.data.description).toBe(
mergeBA.merged.data.description,
);
});
it("should handle card with null lastReview being reviewed", () => {
const card = createTestCard({ lastReview: null });
const crdtData = cardToCrdtDocument(card);
const serverDoc = createDocument(crdtData);
const now = Date.now();
const deviceADoc = Automerge.clone(serverDoc);
const deviceAEdited = updateDocument(deviceADoc, (d) => {
d.data.lastReview = now;
d.data.reps = 1;
d.data.state = CardState.Learning;
});
const localCard = crdtDocumentToCard(deviceAEdited);
expect(localCard.lastReview).toBeInstanceOf(Date);
expect(localCard.lastReview?.getTime()).toBe(now);
expect(localCard.reps).toBe(1);
});
it("should handle multiple rapid edits to the same document", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
let doc = createDocument(crdtData);
// Simulate rapid typing in name field
for (let i = 1; i <= 10; i++) {
doc = updateDocument(doc, (d) => {
d.data.name = `Name after ${i} edits`;
d.meta.lastModified = Date.now();
});
}
expect(doc.data.name).toBe("Name after 10 edits");
// Should still serialize/deserialize correctly
const binary = saveDocument(doc);
const restored = loadDocument<CrdtDeckDocument>(binary);
expect(restored.data.name).toBe("Name after 10 edits");
});
});
describe("Multi-device simulation with offline queuing", () => {
it("should simulate offline edit queue being synced", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Device A goes offline and makes multiple edits
let deviceADoc = Automerge.clone(serverDoc);
const offlineEdits: Automerge.Change[][] = [];
// Edit 1
const beforeEdit1 = Automerge.clone(deviceADoc);
deviceADoc = updateDocument(deviceADoc, (d) => {
d.data.name = "Offline edit 1";
});
offlineEdits.push(getChanges(beforeEdit1, deviceADoc));
// Edit 2
const beforeEdit2 = Automerge.clone(deviceADoc);
deviceADoc = updateDocument(deviceADoc, (d) => {
d.data.description = "Offline edit 2";
});
offlineEdits.push(getChanges(beforeEdit2, deviceADoc));
// Edit 3
const beforeEdit3 = Automerge.clone(deviceADoc);
deviceADoc = updateDocument(deviceADoc, (d) => {
d.data.newCardsPerDay = 42;
});
offlineEdits.push(getChanges(beforeEdit3, deviceADoc));
// Device comes online and syncs all changes
let currentServer = serverDoc;
for (const changes of offlineEdits) {
currentServer = applyChanges(currentServer, changes);
}
// Verify all offline edits are applied
expect(currentServer.data.name).toBe("Offline edit 1");
expect(currentServer.data.description).toBe("Offline edit 2");
expect(currentServer.data.newCardsPerDay).toBe(42);
});
it("should handle two devices syncing after extended offline periods", () => {
const deck = createTestDeck();
const crdtData = deckToCrdtDocument(deck);
const serverDoc = createDocument(crdtData);
// Device A: Multiple offline edits
let deviceADoc = Automerge.clone(serverDoc);
deviceADoc = updateDocument(deviceADoc, (d) => {
d.data.name = "A: First edit";
});
deviceADoc = updateDocument(deviceADoc, (d) => {
d.data.name = "A: Second edit";
});
deviceADoc = updateDocument(deviceADoc, (d) => {
d.data.name = "A: Final name";
d.data.description = "A: Added description";
});
// Device B: Different offline edits
let deviceBDoc = Automerge.clone(serverDoc);
deviceBDoc = updateDocument(deviceBDoc, (d) => {
d.data.newCardsPerDay = 50;
});
deviceBDoc = updateDocument(deviceBDoc, (d) => {
d.data.newCardsPerDay = 60;
});
deviceBDoc = updateDocument(deviceBDoc, (d) => {
d.data.newCardsPerDay = 100;
});
// Both devices come online and sync
const mergeResult = mergeDocuments(deviceADoc, deviceBDoc);
// Device A's content edits and Device B's card setting
expect(mergeResult.merged.data.name).toBe("A: Final name");
expect(mergeResult.merged.data.description).toBe("A: Added description");
expect(mergeResult.merged.data.newCardsPerDay).toBe(100);
});
});
});
|