Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(web): preserve new memo drafts during sync

tianma-if4017d09bffab
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 018c1abc..29aa29ea 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -109,7 +109,7 @@ import {
getMemoSaveConflictInfoFromQueueItem,
} from "@/lib/memo-save-conflict";
import { copyTextToClipboard } from "@/lib/clipboard";
-import { isLocalMemoId } from "@/lib/local-mirror";
+import { isLocalMemoId, remapLocalDraftMemoId } from "@/lib/local-mirror";
import { shouldAcceptRemoteMemoDetail } from "@/lib/memo-detail-freshness";
import type { EdgeEverRepository } from "@/lib/repository";
import {
@@ -840,11 +840,7 @@ const RichEditorPane = ({
// A draft may already have been persisted during image processing.
// Move it to the durable server id so a reload cannot orphan it under
// the temporary id.
- void localDb.drafts.get(previousMemoId).then(async (draft) => {
- if (!draft) return;
- await localDb.drafts.put({ ...draft, memoId: nextMemoId });
- await localDb.drafts.delete(previousMemoId);
- }).catch(() => {
+ void remapLocalDraftMemoId(previousMemoId, nextMemoId).catch(() => {
// The live editor content remains authoritative; draft persistence can
// retry on the next editor update.
});
diff --git a/apps/web/src/hooks/useWorkspaceQueuedSync.ts b/apps/web/src/hooks/useWorkspaceQueuedSync.ts
index ce0fcbe5..fc3dfcdf 100644
--- a/apps/web/src/hooks/useWorkspaceQueuedSync.ts
+++ b/apps/web/src/hooks/useWorkspaceQueuedSync.ts
@@ -66,7 +66,7 @@ export const useWorkspaceQueuedSync = ({
scope: localDataScope,
onSynced: async (memo, item) => {
if (item.kind === "memo.create") {
- await replaceLocalMemoId(localDataScope, item.memoId, memo);
+ const remappedMemo = await replaceLocalMemoId(localDataScope, item.memoId, memo);
const remappedSelection = resolveCreatedMemoSelection(
selectedMemoIdRef.current,
pendingCreatedMemoIdRef.current,
@@ -79,10 +79,11 @@ export const useWorkspaceQueuedSync = ({
setCreatedMemoEditId(memo.id);
pendingCreatedMemoIdRef.current = memo.id;
}
+ queryClient.setQueryData(["memo", memo.id, memo.isDeleted ? "trash" : "notebook"], { memo: remappedMemo });
} else {
await putLocalMemo(localDataScope, memo);
+ queryClient.setQueryData(["memo", memo.id, memo.isDeleted ? "trash" : "notebook"], { memo });
}
- queryClient.setQueryData(["memo", memo.id, memo.isDeleted ? "trash" : "notebook"], { memo });
await Promise.all([
queryClient.invalidateQueries({ queryKey: ["memos"] }),
queryClient.invalidateQueries({ queryKey: ["memo", memo.id] }),
diff --git a/apps/web/src/lib/local-db.ts b/apps/web/src/lib/local-db.ts
index 2115c757..2a6e3409 100644
--- a/apps/web/src/lib/local-db.ts
+++ b/apps/web/src/lib/local-db.ts
@@ -10,6 +10,16 @@ export type LocalDraft = {
updatedAt: string;
};
+const localDraftTimestamp = (draft: LocalDraft | null | undefined) => {
+ const timestamp = draft ? Date.parse(draft.updatedAt) : Number.NaN;
+ return Number.isFinite(timestamp) ? timestamp : 0;
+};
+
+export const selectNewestLocalDraft = (
+ first: LocalDraft | null | undefined,
+ second: LocalDraft | null | undefined,
+) => localDraftTimestamp(second) > localDraftTimestamp(first) ? second ?? null : first ?? second ?? null;
+
export type MemoUpdateSyncPayload = {
memoId: string;
expectedRevision: number;
diff --git a/apps/web/src/lib/local-mirror.test.mjs b/apps/web/src/lib/local-mirror.test.mjs
index 3d6b0542..3cee4dc0 100644
--- a/apps/web/src/lib/local-mirror.test.mjs
+++ b/apps/web/src/lib/local-mirror.test.mjs
@@ -32,6 +32,7 @@ const {
createLocalResource,
listLocalResources,
replaceLocalResources,
+ remapLocalDraftMemoId,
} = await import("./local-mirror.ts");
const { getCachedLocalResourceBytes } = await import("./local-resource-cache.ts");
@@ -56,6 +57,28 @@ afterEach(async () => {
});
describe("local mirror", () => {
+ test("keeps the newest draft when memo ids are remapped more than once", async () => {
+ await localDb.drafts.put({
+ memoId: "local-memo",
+ title: "Older draft",
+ tagsText: "",
+ contentJson: { type: "doc", content: [] },
+ updatedAt: "2026-01-01T00:00:00.000Z",
+ });
+ await localDb.drafts.put({
+ memoId: "remote-memo",
+ title: "Newer draft",
+ tagsText: "",
+ contentJson: { type: "doc", content: [] },
+ updatedAt: "2026-01-02T00:00:00.000Z",
+ });
+
+ await remapLocalDraftMemoId("local-memo", "remote-memo");
+
+ expect(await localDb.drafts.get("local-memo")).toBeUndefined();
+ expect(await localDb.drafts.get("remote-memo")).toMatchObject({ title: "Newer draft" });
+ });
+
test("creates and lists a memo without a network request", async () => {
const scope = createLocalDataScope("https://demo.edgeever.org", "user-1");
const memo = await createLocalMemo(scope, {
diff --git a/apps/web/src/lib/local-mirror.ts b/apps/web/src/lib/local-mirror.ts
index c23016dc..dce115cc 100644
--- a/apps/web/src/lib/local-mirror.ts
+++ b/apps/web/src/lib/local-mirror.ts
@@ -1,9 +1,10 @@
import { createExcerpt, docToMarkdown, docToText, markdownToDoc, mergeMemoDocs, resolveMemoContentDoc, resolveMergedMemoTitle, type MemoDetail, type MemoRevision, type MemoSummary, type MemoTemplate, type Notebook, type ResourceListItem, type TagSummary, type TiptapDoc } from "@edgeever/shared";
import type { MemoFilterMode, MemoSortMode } from "@/lib/app-helpers";
import { api, type SyncChangesResponse } from "@/lib/api";
-import { localDb, type LocalMemo, type LocalNotebook, type LocalResource, type LocalRevision } from "@/lib/local-db";
+import { localDb, selectNewestLocalDraft, type LocalDraft, type LocalMemo, type LocalNotebook, type LocalResource, type LocalRevision } from "@/lib/local-db";
import { cacheLocalResourceBytes, localResourceUrl, removeCachedLocalResourceBytes } from "@/lib/local-resource-cache";
import { isBrowserOffline } from "@/lib/network-status";
+import { parseTagsText } from "@/lib/utils";
export type LocalMemoListParams = {
notebookId?: string | null;
@@ -284,16 +285,75 @@ export const createLocalMemo = async (
return memo;
};
+const draftTimestamp = (draft: LocalDraft | null | undefined) => {
+ const timestamp = draft ? Date.parse(draft.updatedAt) : Number.NaN;
+ return Number.isFinite(timestamp) ? timestamp : 0;
+};
+
+export const remapLocalDraftMemoId = async (temporaryId: string, remoteId: string) => {
+ if (temporaryId === remoteId) return;
+ await localDb.transaction("rw", localDb.drafts, async () => {
+ const temporaryDraft = await localDb.drafts.get(temporaryId);
+ if (!temporaryDraft) return;
+ const remoteDraft = await localDb.drafts.get(remoteId);
+ const newestDraft = selectNewestLocalDraft(temporaryDraft, remoteDraft);
+ if (newestDraft) {
+ await localDb.drafts.put({ ...newestDraft, memoId: remoteId });
+ }
+ await localDb.drafts.delete(temporaryId);
+ });
+};
+
export const replaceLocalMemoId = async (scope: string, temporaryId: string, memo: MemoDetail) => {
- await localDb.transaction("rw", [localDb.memos, localDb.idMappings], async () => {
- await localDb.memos.put({ ...memo, scope });
+ return localDb.transaction("rw", [localDb.memos, localDb.idMappings, localDb.drafts], async () => {
+ const [temporaryMemo, temporaryDraft, remoteDraft] = await Promise.all([
+ localDb.memos.get([scope, temporaryId]),
+ localDb.drafts.get(temporaryId),
+ localDb.drafts.get(memo.id),
+ ]);
+ const draft = selectNewestLocalDraft(temporaryDraft, remoteDraft);
+ const localIsNewer = Boolean(temporaryMemo && Date.parse(temporaryMemo.updatedAt) > Date.parse(memo.updatedAt));
+ const draftIsNewer = Boolean(draft && draftTimestamp(draft) >= Date.parse(memo.updatedAt));
+ const contentSource = draftIsNewer && draft
+ ? {
+ title: draft.title.trim() || null,
+ tags: parseTagsText(draft.tagsText),
+ contentJson: draft.contentJson,
+ contentMarkdown: docToMarkdown(draft.contentJson),
+ contentText: docToText(draft.contentJson),
+ updatedAt: draft.updatedAt,
+ }
+ : localIsNewer && temporaryMemo
+ ? {
+ title: temporaryMemo.title,
+ tags: temporaryMemo.tags,
+ contentJson: temporaryMemo.contentJson,
+ contentMarkdown: temporaryMemo.contentMarkdown,
+ contentText: temporaryMemo.contentText,
+ updatedAt: temporaryMemo.updatedAt,
+ }
+ : null;
+ const remappedMemo: MemoDetail = contentSource
+ ? {
+ ...memo,
+ ...contentSource,
+ excerpt: createExcerpt(contentSource.contentText),
+ }
+ : memo;
+
+ await localDb.memos.put({ ...remappedMemo, scope });
await localDb.memos.delete([scope, temporaryId]);
+ if (draft) {
+ await localDb.drafts.put({ ...draft, memoId: memo.id });
+ }
+ await localDb.drafts.delete(temporaryId);
await localDb.idMappings.put({
scope,
temporaryId,
remoteId: memo.id,
createdAt: new Date().toISOString(),
});
+ return remappedMemo;
});
};
diff --git a/apps/web/src/lib/sync-queue.test.mjs b/apps/web/src/lib/sync-queue.test.mjs
index ff180004..c46b3cba 100644
--- a/apps/web/src/lib/sync-queue.test.mjs
+++ b/apps/web/src/lib/sync-queue.test.mjs
@@ -6,8 +6,8 @@ globalThis.IDBKeyRange = IDBKeyRange;
const { localDb } = await import("./local-db.ts");
const { api } = await import("./api.ts");
-const { createLocalDataScope, createLocalMemo, getLocalMemo, putLocalMemo, createLocalResource, listLocalResources } = await import("./local-mirror.ts");
-const { discardWebConflicts, queueLocalAction, syncQueuedChanges } = await import("./sync-queue.ts");
+const { createLocalDataScope, createLocalMemo, getLocalMemo, putLocalMemo, replaceLocalMemoId, createLocalResource, listLocalResources } = await import("./local-mirror.ts");
+const { discardWebConflicts, getMemoUpdateQueueId, queueLocalAction, queueMemoCreate, queueMemoUpdate, syncQueuedChanges } = await import("./sync-queue.ts");
afterEach(async () => {
await localDb.transaction(
@@ -30,6 +30,143 @@ afterEach(async () => {
});
describe("web sync conflict recovery", () => {
+ test("preserves a draft written while a new memo create request is in flight", async () => {
+ const previousOnline = globalThis.navigator?.onLine;
+ if (globalThis.navigator) Object.defineProperty(globalThis.navigator, "onLine", { configurable: true, value: true });
+ const scope = createLocalDataScope("https://demo.edgeever.org", "user-1");
+ const localMemo = await createLocalMemo(scope, { notebookId: "inbox" });
+ await queueMemoCreate(scope, {
+ temporaryId: localMemo.id,
+ notebookId: localMemo.notebookId,
+ title: "",
+ contentMarkdown: "",
+ tags: [],
+ createdAt: localMemo.createdAt,
+ updatedAt: localMemo.updatedAt,
+ });
+
+ let createStarted;
+ let releaseCreate;
+ const createStartedPromise = new Promise((resolve) => { createStarted = resolve; });
+ const releaseCreatePromise = new Promise((resolve) => { releaseCreate = resolve; });
+ const remoteMemo = {
+ ...localMemo,
+ id: "memo-remote",
+ revision: 1,
+ contentHash: "remote-empty-hash",
+ };
+ const originalCreateMemo = api.createMemo;
+ api.createMemo = async () => {
+ createStarted();
+ await releaseCreatePromise;
+ return { memo: remoteMemo };
+ };
+
+ try {
+ const syncing = syncQueuedChanges({
+ scope,
+ onSynced: async (memo, item) => {
+ if (item.kind === "memo.create") await replaceLocalMemoId(scope, item.memoId, memo);
+ },
+ });
+ await createStartedPromise;
+ await localDb.drafts.put({
+ memoId: localMemo.id,
+ title: "Pasted while syncing",
+ tagsText: "important",
+ contentJson: { type: "doc", content: [{ type: "paragraph", content: [{ type: "text", text: "must survive" }] }] },
+ updatedAt: "2099-01-01T00:00:00.000Z",
+ });
+ releaseCreate();
+
+ expect(await syncing).toMatchObject({ synced: 1, failed: 0 });
+ expect(await localDb.drafts.get(localMemo.id)).toBeUndefined();
+ expect(await localDb.drafts.get(remoteMemo.id)).toMatchObject({ title: "Pasted while syncing" });
+ expect(await getLocalMemo(scope, remoteMemo.id)).toMatchObject({
+ title: "Pasted while syncing",
+ contentText: "must survive",
+ revision: remoteMemo.revision,
+ contentHash: remoteMemo.contentHash,
+ });
+ } finally {
+ api.createMemo = originalCreateMemo;
+ if (globalThis.navigator) Object.defineProperty(globalThis.navigator, "onLine", { configurable: true, value: previousOnline });
+ }
+ });
+
+ test("rebases an edit queued before a new memo receives its remote id", async () => {
+ const previousOnline = globalThis.navigator?.onLine;
+ if (globalThis.navigator) Object.defineProperty(globalThis.navigator, "onLine", { configurable: true, value: true });
+ const scope = createLocalDataScope("https://demo.edgeever.org", "user-1");
+ const localMemo = await createLocalMemo(scope, { notebookId: "inbox" });
+ await queueMemoCreate(scope, {
+ temporaryId: localMemo.id,
+ notebookId: localMemo.notebookId,
+ title: "",
+ contentMarkdown: "",
+ tags: [],
+ createdAt: localMemo.createdAt,
+ updatedAt: localMemo.updatedAt,
+ });
+ await queueMemoUpdate({
+ memoId: localMemo.id,
+ expectedRevision: 0,
+ expectedContentHash: localMemo.contentHash,
+ editSessionId: `local-edit:${localMemo.id}`,
+ title: "Queued edit",
+ contentJson: { type: "doc", content: [{ type: "paragraph", content: [{ type: "text", text: "queued body" }] }] },
+ tags: [],
+ }, scope);
+ const remoteMemo = { ...localMemo, id: "memo-remote-rebased", revision: 3, contentHash: "remote-base-hash" };
+ const original = {
+ createMemo: api.createMemo,
+ createMemoEditSession: api.createMemoEditSession,
+ updateMemo: api.updateMemo,
+ };
+ let receivedUpdate = null;
+ api.createMemo = async () => ({ memo: remoteMemo });
+ api.createMemoEditSession = async () => ({
+ editSession: {
+ id: "fresh-remote-session",
+ baseRevision: remoteMemo.revision,
+ baseContentHash: remoteMemo.contentHash,
+ },
+ });
+ api.updateMemo = async (_memoId, payload) => {
+ receivedUpdate = payload;
+ return { memo: { ...remoteMemo, ...payload, revision: remoteMemo.revision + 1, contentHash: "updated-hash" } };
+ };
+
+ try {
+ await syncQueuedChanges({ scope });
+ const update = await localDb.syncQueue.get(getMemoUpdateQueueId(remoteMemo.id));
+ expect(update).toMatchObject({
+ memoId: remoteMemo.id,
+ payload: {
+ memoId: remoteMemo.id,
+ expectedRevision: remoteMemo.revision,
+ expectedContentHash: remoteMemo.contentHash,
+ title: "Queued edit",
+ },
+ });
+ expect(await localDb.syncQueue.get(getMemoUpdateQueueId(localMemo.id))).toBeUndefined();
+
+ expect(await syncQueuedChanges({ scope })).toMatchObject({ synced: 1, conflicted: 0 });
+ expect(receivedUpdate).toMatchObject({
+ expectedRevision: remoteMemo.revision,
+ expectedContentHash: remoteMemo.contentHash,
+ editSessionId: "fresh-remote-session",
+ title: "Queued edit",
+ });
+ expect(await localDb.syncQueue.get(getMemoUpdateQueueId(remoteMemo.id))).toBeUndefined();
+ } finally {
+ api.createMemo = original.createMemo;
+ api.createMemoEditSession = original.createMemoEditSession;
+ api.updateMemo = original.updateMemo;
+ if (globalThis.navigator) Object.defineProperty(globalThis.navigator, "onLine", { configurable: true, value: previousOnline });
+ }
+ });
+
test("restores the authoritative remote memo and removes the conflict", async () => {
const scope = createLocalDataScope("https://demo.edgeever.org", "user-1");
const memo = await createLocalMemo(scope, { notebookId: "inbox", title: "Local draft" });
diff --git a/apps/web/src/lib/sync-queue.ts b/apps/web/src/lib/sync-queue.ts
index 32f00bc7..2d1b42f4 100644
--- a/apps/web/src/lib/sync-queue.ts
+++ b/apps/web/src/lib/sync-queue.ts
@@ -17,6 +17,7 @@ import { liveQuery } from "dexie";
import { ApiRequestError, api } from "@/lib/api";
import {
localDb,
+ selectNewestLocalDraft,
type MemoCreateSyncPayload,
type MemoDeleteSyncPayload,
type MemoRestoreSyncPayload,
@@ -144,14 +145,19 @@ export const queueMemoRestore = async (scope: string, payload: MemoRestoreSyncPa
});
};
-const remapQueuedMemoId = async (scope: string, temporaryId: string, remoteId: string) => {
+const remapQueuedMemoId = async (scope: string, temporaryId: string, remoteMemo: MemoDetail) => {
+ const remoteId = remoteMemo.id;
const items = (await localDb.syncQueue.toArray()).filter(
(item) => item.scope === scope && item.memoId === temporaryId && item.kind !== "memo.create"
);
- await localDb.transaction("rw", localDb.syncQueue, async () => {
+ await localDb.transaction("rw", [localDb.syncQueue, localDb.drafts], async () => {
for (const item of items) {
const payload = { ...item.payload } as Record<string, unknown>;
if ("memoId" in payload) payload.memoId = remoteId;
+ if (item.kind === "memo.update") {
+ payload.expectedRevision = remoteMemo.revision;
+ payload.expectedContentHash = remoteMemo.contentHash;
+ }
const nextId = item.kind === "memo.update"
? getMemoUpdateQueueId(remoteId)
: item.kind === "memo.delete"
@@ -167,6 +173,14 @@ const remapQueuedMemoId = async (scope: string, temporaryId: string, remoteId: s
payload: payload as SyncQueueItem["payload"],
});
}
+
+ const temporaryDraft = await localDb.drafts.get(temporaryId);
+ if (temporaryDraft) {
+ const remoteDraft = await localDb.drafts.get(remoteId);
+ const newestDraft = selectNewestLocalDraft(temporaryDraft, remoteDraft);
+ if (newestDraft) await localDb.drafts.put({ ...newestDraft, memoId: remoteId });
+ await localDb.drafts.delete(temporaryId);
+ }
});
};
@@ -318,11 +332,11 @@ const runQueuedChanges = async (options: {
try {
const memo = await syncQueueItem(item);
if (item.kind === "memo.create" && memo && item.scope) {
- await remapQueuedMemoId(item.scope, item.memoId, memo.id);
+ await remapQueuedMemoId(item.scope, item.memoId, memo as MemoDetail);
}
const removed = await removeClaimedQueueItem(item);
if (removed) {
- await localDb.drafts.delete(item.memoId);
+ if (item.kind !== "memo.create") await localDb.drafts.delete(item.memoId);
if (memo && (item.kind === "memo.create" || item.kind === "memo.update" || item.kind === "memo.restore" || item.kind === "memo.delete")) {
await options.onSynced?.(memo as MemoDetail, item);
}