Files
crumbs/src/lib/sync/server.test.ts
T
Claude 57a05bbee0 fix: resolve lost updates in multi-user collaboration sync
Concurrent edits to shared notes (e.g., one user checks a shopping list
item while another adds an item) were lost because the sync system used
whole-document Last-Write-Wins. This replaces it with a 3-way line-level
content merge using node-diff3, so changes to different lines are
preserved from both users.

Key changes:
- Add node-diff3 for 3-way line-level content merging
- Remove the timestamp gate in processSyncPush that rejected entire
  offline sync pushes when another user had updated the note
- Add content merge to both the sync push path and the PATCH endpoint,
  using version snapshots as the merge base
- Send baseVersion from the client so the server can find the correct
  common ancestor for 3-way merge
- Protect pending local fields during client pull merge by reading
  the sync queue and preserving queued-but-unpushed changes
- Add comprehensive tests for content merge, server sync, and CRDT merge

https://claude.ai/code/session_01FNpVBBjM6vKzfR8y9NM9Ci
2026-03-12 20:19:10 +01:00

343 lines
11 KiB
TypeScript

import { describe, it, expect, beforeEach } from 'vitest';
import { createTestDb } from '../server/db/test-helpers.js';
import { notes, noteCollaborators, noteUserState, users, syncLog } from '../server/db/schema.js';
import { eq, and } from 'drizzle-orm';
import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
import type * as schema from '../server/db/schema.js';
import { getChangesSince, processSyncPush } from './server.js';
let db: BetterSQLite3Database<typeof schema>;
const OWNER_ID = 1;
const COLLAB_ID = 2;
function seedUsers() {
db.insert(users).values([
{ email: 'owner@test.com', displayName: 'Owner', role: 'admin', authProvider: 'password', createdAt: new Date() },
{ email: 'collab@test.com', displayName: 'Collaborator', role: 'user', authProvider: 'password', createdAt: new Date() }
]).run();
}
function seedSharedNote(id: string, overrides: Partial<typeof notes.$inferInsert> = {}) {
const now = new Date();
db.insert(notes).values({
id,
userId: OWNER_ID,
title: 'Shared Note',
content: 'Original content',
createdAt: now,
updatedAt: now,
...overrides
}).run();
db.insert(noteCollaborators).values({
noteId: id,
userId: COLLAB_ID,
addedBy: OWNER_ID,
addedAt: now
}).run();
}
beforeEach(() => {
const testDb = createTestDb();
db = testDb.db;
seedUsers();
});
describe('getChangesSince — shared notes', () => {
it('should return shared notes updated after the given timestamp', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
const t2 = new Date('2024-01-02T00:00:00Z');
seedSharedNote('n1', { updatedAt: t2, createdAt: t1 });
const changes = await getChangesSince(db, t1.getTime(), COLLAB_ID);
expect(changes).toHaveLength(1);
expect(changes[0].id).toBe('n1');
expect(changes[0].title).toBe('Shared Note');
expect(changes[0].content).toBe('Original content');
});
it('should not return shared notes updated before the given timestamp', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
const t2 = new Date('2024-01-02T00:00:00Z');
seedSharedNote('n1', { updatedAt: t1, createdAt: t1 });
const changes = await getChangesSince(db, t2.getTime(), COLLAB_ID);
expect(changes).toHaveLength(0);
});
it('should return per-user state overlay for collaborators', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
const t2 = new Date('2024-01-02T00:00:00Z');
// Owner has pinned=true, archived=false on the note
seedSharedNote('n1', { updatedAt: t2, createdAt: t1, pinned: true, archived: false });
// Collaborator has pinned=false, archived=true in noteUserState
db.insert(noteUserState).values({
noteId: 'n1',
userId: COLLAB_ID,
pinned: false,
archived: true,
sortOrder: 5
}).run();
const changes = await getChangesSince(db, t1.getTime(), COLLAB_ID);
expect(changes).toHaveLength(1);
// Should reflect the collaborator's per-user state, not the owner's
expect(changes[0].pinned).toBeFalsy();
expect(changes[0].archived).toBeTruthy();
expect(changes[0].sortOrder).toBe(5);
});
it('should default to false/0 when collaborator has no noteUserState', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
const t2 = new Date('2024-01-02T00:00:00Z');
// Owner has pinned=true, sortOrder=10
seedSharedNote('n1', { updatedAt: t2, createdAt: t1, pinned: true, sortOrder: 10 });
const changes = await getChangesSince(db, t1.getTime(), COLLAB_ID);
expect(changes).toHaveLength(1);
// Without noteUserState, collaborator should get defaults (false/0), not owner's values
expect(changes[0].pinned).toBeFalsy();
expect(changes[0].sortOrder).toBe(0);
});
it('should not return trashed notes for collaborators', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
const t2 = new Date('2024-01-02T00:00:00Z');
seedSharedNote('n1', { updatedAt: t2, createdAt: t1, trashed: true });
const changes = await getChangesSince(db, t1.getTime(), COLLAB_ID);
expect(changes).toHaveLength(0);
});
it('should return owner edits to a shared note for the collaborator', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
seedSharedNote('n1', { updatedAt: t1, createdAt: t1 });
// Simulate owner editing the note
const t2 = new Date('2024-01-02T00:00:00Z');
db.update(notes)
.set({ content: 'Updated by owner', updatedAt: t2, version: 2 })
.where(eq(notes.id, 'n1'))
.run();
// Collaborator syncs since t1
const changes = await getChangesSince(db, t1.getTime(), COLLAB_ID);
expect(changes).toHaveLength(1);
expect(changes[0].content).toBe('Updated by owner');
expect(changes[0].version).toBe(2);
});
it('should return both owned and shared notes for a user who is both owner and collaborator on different notes', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
const t2 = new Date('2024-01-02T00:00:00Z');
// Note owned by COLLAB_ID
db.insert(notes).values({
id: 'owned-by-collab',
userId: COLLAB_ID,
title: 'My Own Note',
content: '',
createdAt: t1,
updatedAt: t2
}).run();
// Note shared with COLLAB_ID (owned by OWNER_ID)
seedSharedNote('shared-with-collab', { updatedAt: t2, createdAt: t1 });
const changes = await getChangesSince(db, t1.getTime(), COLLAB_ID);
expect(changes).toHaveLength(2);
const ids = changes.map((c) => c.id).sort();
expect(ids).toEqual(['owned-by-collab', 'shared-with-collab']);
});
});
describe('processSyncPush — shared notes', () => {
it('should allow collaborator to update shared content fields', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
seedSharedNote('n1', { updatedAt: t1, createdAt: t1 });
const t2 = t1.getTime() + 1000;
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t2,
data: { title: 'Updated by collab', content: 'New content' }
}], COLLAB_ID);
const note = db.select().from(notes).where(eq(notes.id, 'n1')).get()!;
expect(note.title).toBe('Updated by collab');
expect(note.content).toBe('New content');
expect(note.version).toBe(2);
});
it('should route collaborator per-user fields to noteUserState', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
seedSharedNote('n1', { updatedAt: t1, createdAt: t1 });
const t2 = t1.getTime() + 1000;
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t2,
data: { pinned: true, sortOrder: 3 }
}], COLLAB_ID);
// Per-user fields should be in noteUserState, not in notes
const note = db.select().from(notes).where(eq(notes.id, 'n1')).get()!;
expect(note.pinned).toBe(false); // Owner's pinned state unchanged
const userState = db.select().from(noteUserState)
.where(and(eq(noteUserState.noteId, 'n1'), eq(noteUserState.userId, COLLAB_ID)))
.get();
expect(userState).toBeDefined();
expect(userState!.pinned).toBe(true);
expect(userState!.sortOrder).toBe(3);
});
it('should not allow collaborator to trash a note', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
seedSharedNote('n1', { updatedAt: t1, createdAt: t1 });
const t2 = t1.getTime() + 1000;
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t2,
data: { trashed: true }
}], COLLAB_ID);
const note = db.select().from(notes).where(eq(notes.id, 'n1')).get()!;
expect(note.trashed).toBe(false);
});
it('should apply field changes even when timestamp is older (no timestamp gate)', async () => {
const t2 = new Date('2024-01-02T00:00:00Z');
seedSharedNote('n1', { updatedAt: t2, createdAt: new Date('2024-01-01T00:00:00Z') });
// Collaborator's change has a timestamp BEFORE the server's updatedAt.
// With field-level sync, the title change should still be applied because
// the sync data only contains fields the client explicitly modified.
const t1 = new Date('2024-01-01T12:00:00Z').getTime();
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t1,
data: { title: 'Offline edit' }
}], COLLAB_ID);
const note = db.select().from(notes).where(eq(notes.id, 'n1')).get()!;
expect(note.title).toBe('Offline edit');
// updatedAt should be max of change timestamp and server timestamp
expect(note.updatedAt.getTime()).toBe(t2.getTime());
});
it('should merge checklist content when collaborator pushes concurrent content change', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
seedSharedNote('n1', {
updatedAt: t1,
createdAt: t1,
content: '- [ ] Milk\n- [ ] Bread',
checklistMode: true
});
// Simulate owner editing content on server (checking Bread)
const t2 = new Date('2024-01-01T12:00:00Z');
db.update(notes)
.set({ content: '- [ ] Milk\n- [x] Bread', updatedAt: t2, version: 2 })
.where(eq(notes.id, 'n1'))
.run();
// Create a version snapshot for the base content (version 1)
const { noteVersions } = await import('../server/db/schema.js');
db.insert(noteVersions).values({
id: 'snap-1',
noteId: 'n1',
version: 1,
title: 'Shared Note',
content: '- [ ] Milk\n- [ ] Bread',
checklistMode: true,
color: 'default',
createdAt: t1
}).run();
// Collaborator was offline since version 1, checked Milk
const t3 = new Date('2024-01-01T13:00:00Z').getTime();
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t3,
data: { content: '- [x] Milk\n- [ ] Bread' },
baseVersion: 1
}], COLLAB_ID);
const note = db.select().from(notes).where(eq(notes.id, 'n1')).get()!;
// Both changes should be merged: Milk checked by collab, Bread checked by owner
expect(note.content).toBe('- [x] Milk\n- [x] Bread');
});
it('should not allow non-collaborator to update the note', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
// Create note without sharing with user 3
db.insert(notes).values({
id: 'n1',
userId: OWNER_ID,
title: 'Private',
content: '',
createdAt: t1,
updatedAt: t1
}).run();
// Add a third user
db.insert(users).values({
email: 'stranger@test.com',
displayName: 'Stranger',
role: 'user',
authProvider: 'password',
createdAt: new Date()
}).run();
const t2 = t1.getTime() + 1000;
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t2,
data: { title: 'Hacked' }
}], 3); // User 3 is not owner or collaborator
const note = db.select().from(notes).where(eq(notes.id, 'n1')).get()!;
expect(note.title).toBe('Private'); // Unchanged
});
it('should log sync operations', async () => {
const t1 = new Date('2024-01-01T00:00:00Z');
seedSharedNote('n1', { updatedAt: t1, createdAt: t1 });
const t2 = t1.getTime() + 1000;
await processSyncPush(db, [{
noteId: 'n1',
operation: 'update',
timestamp: t2,
data: { title: 'Updated' }
}], COLLAB_ID);
const logs = db.select().from(syncLog).where(eq(syncLog.noteId, 'n1')).all();
expect(logs).toHaveLength(1);
expect(logs[0].userId).toBe(COLLAB_ID);
expect(logs[0].operation).toBe('update');
});
});