AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(mobile): prevent stale draft writes after submit
tianma-if6ef578c9e4b3
diff --git a/apps/mobile/src/components/LocalTiptapEditor.tsx b/apps/mobile/src/components/LocalTiptapEditor.tsxindex d4e7f6fa..c0118136 100644--- a/apps/mobile/src/components/LocalTiptapEditor.tsx+++ b/apps/mobile/src/components/LocalTiptapEditor.tsx@@ -675,11 +675,14 @@ function LocalTiptapEditorImpl(props: LocalTiptapEditorProps) {const next = resolveImageSources(parsed, props.baseUrl);// Do not focus while replacing content. Callers decide when the editor should// take focus and place the caret via focusEnd().- editor.commands.setContent(next, { emitUpdate: !isViewer });+ // This command synchronizes native-owned state (draft restore/template/new+ // composer reset). Callers already own persistence for that state, so an+ // emitted update would create a delayed stale write during screen teardown.+ editor.commands.setContent(next, { emitUpdate: false });} catch {// Ignore malformed payloads from the native bridge.}- }, [editor, isViewer, props.baseUrl]);+ }, [editor, props.baseUrl]);const search = useCallback((query: DOMValue, requestedIndex: DOMValue) => {const normalizedQuery = typeof query === "string" ? query : "";diff --git a/apps/mobile/src/lib/mobile-draft-write-barrier.test.ts b/apps/mobile/src/lib/mobile-draft-write-barrier.test.tsnew file mode 100644index 00000000..5948e71b--- /dev/null+++ b/apps/mobile/src/lib/mobile-draft-write-barrier.test.ts@@ -0,0 +1,66 @@+import { expect, test } from "bun:test";+import { createMobileDraftWriteBarrier } from "./mobile-draft-write-barrier";++test("drains an active draft write before submit cleanup continues", async () => {+ const events: string[] = [];+ let finishWrite: (() => void) | null = null;+ const barrier = createMobileDraftWriteBarrier();++ const write = barrier.enqueue(async () => {+ events.push("write:start");+ await new Promise<void>((resolve) => {+ finishWrite = resolve;+ });+ events.push("write:end");+ });+ await Promise.resolve();++ const drained = barrier.blockAndDrain().then(() => {+ events.push("drained");+ });+ expect(events).toEqual(["write:start"]);++ finishWrite?.();+ await Promise.all([write, drained]);+ expect(events).toEqual(["write:start", "write:end", "drained"]);+});++test("drops queued and future draft writes after submit begins", async () => {+ const events: string[] = [];+ let finishFirstWrite: (() => void) | null = null;+ const barrier = createMobileDraftWriteBarrier();++ const first = barrier.enqueue(async () => {+ events.push("first");+ await new Promise<void>((resolve) => {+ finishFirstWrite = resolve;+ });+ });+ await Promise.resolve();+ const stale = barrier.enqueue(async () => {+ events.push("stale");+ });+ const drained = barrier.blockAndDrain();+ const late = barrier.enqueue(async () => {+ events.push("late");+ });++ finishFirstWrite?.();+ expect(await first).toBe(true);+ expect(await stale).toBe(false);+ await drained;+ expect(await late).toBe(false);+ expect(events).toEqual(["first"]);+});++test("accepts draft writes again when a submit fails", async () => {+ const barrier = createMobileDraftWriteBarrier();+ await barrier.blockAndDrain();+ barrier.unblock();++ let writes = 0;+ expect(await barrier.enqueue(async () => {+ writes += 1;+ })).toBe(true);+ expect(writes).toBe(1);+});diff --git a/apps/mobile/src/lib/mobile-draft-write-barrier.ts b/apps/mobile/src/lib/mobile-draft-write-barrier.tsnew file mode 100644index 00000000..afb95505--- /dev/null+++ b/apps/mobile/src/lib/mobile-draft-write-barrier.ts@@ -0,0 +1,35 @@+export type MobileDraftWriteBarrier = {+ blockAndDrain: () => Promise<void>;+ enqueue: (write: () => Promise<void>) => Promise<boolean>;+ unblock: () => void;+};++/**+ * Serializes draft writes and lets a successful submit stop late writes before+ * the persisted draft is cleared. A blocked queued write resolves as `false`.+ */+export const createMobileDraftWriteBarrier = (): MobileDraftWriteBarrier => {+ let blocked = false;+ let tail = Promise.resolve();++ return {+ enqueue(write) {+ const result = tail.then(async () => {+ if (blocked) {+ return false;+ }+ await write();+ return true;+ });+ tail = result.then(() => undefined, () => undefined);+ return result;+ },+ async blockAndDrain() {+ blocked = true;+ await tail;+ },+ unblock() {+ blocked = false;+ },+ };+};diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsxindex e0f45675..5bef37dc 100644--- a/apps/mobile/src/screens/WorkspaceScreen.tsx+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx@@ -123,6 +123,7 @@ import { MobileCreateChoiceModal, MobileTemplatePickerModal } from "../componentimport { resolveMobileThemeStyles, useMobileTheme } from "../lib/mobile-theme";import { useMobileUpdate } from "../lib/mobile-update";import { createMemoSeedHasContent, type MobileCreateMemoSeed } from "../lib/mobile-templates";+import { createMobileDraftWriteBarrier } from "../lib/mobile-draft-write-barrier";import { MobileMermaidDiagram, MobileMermaidProvider } from "../components/MobileMermaid";import { getMobileMarkdownFenceLanguage, trimMobileMarkdownFenceContent } from "../lib/mobile-mermaid";import {@@ -1787,6 +1788,7 @@ const CreateMemoModal = ({const contentJsonRef = useRef<TiptapDoc>(markdownToDoc(""));const contentMarkdownRef = useRef("");const draftVersionRef = useRef(0);+ const draftWriteBarrier = useMemo(createMobileDraftWriteBarrier, []);const flushResolverRef = useRef<(() => void) | null>(null);const materializedMemoRef = useRef<MemoDetail | null>(null);const [notebookId, setNotebookId] = useState(fallbackNotebookId);@@ -1802,6 +1804,8 @@ const CreateMemoModal = ({const imageOperationRef = useRef(imageOperation);const sharedImagesHandledRef = useRef(false);const createPendingRef = useRef(false);+ const submitStartedRef = useRef(false);+ const [submitStarted, setSubmitStarted] = useState(false);const [resourceTarget, setResourceTarget] = useState<MobileResourceTarget | null>(null);const { pickUploadAsset, uploadSourcePicker } = useMobileEditorUploadAsset();const targetNotebookId = notebookId || fallbackNotebookId;@@ -1860,12 +1864,12 @@ const CreateMemoModal = ({// Component is only mounted while create is open — init once on mount.useEffect(() => {let active = true;+ setDraftLoaded(false);setEditorReady(false);setTemplatePickerOpen(false);userEditedSinceOpenRef.current = false;draftVersionRef.current = 0;- // Mount DomWebView immediately — do not wait on AsyncStorage before cold start.if (initialDraft) {const markdown = initialDraft.contentMarkdown;contentMarkdownRef.current = markdown;@@ -1888,14 +1892,14 @@ const CreateMemoModal = ({setContentMarkdown("");setNotebookId(fallbackNotebookId);setDirty(false);- setDraftLoaded(true);void readMobileNewMemoDraft(dataScope).then((draft) => {- if (!active || !draft) {+ if (!active) {return;}// Don't clobber if the user already started typing.- if (userEditedSinceOpenRef.current) {+ if (!draft || userEditedSinceOpenRef.current) {+ setDraftLoaded(true);return;}const restoredNotebookId = notebooksRef.current.some((notebook) => notebook.id === draft.notebookId)@@ -1910,8 +1914,11 @@ const CreateMemoModal = ({setContentMarkdown(markdown);setNotebookId(restoredNotebookId);setDirty(false);- // setContent no longer steals focus — keep the title IME if the user is already typing.- pushBodyToEditor(doc);+ setDraftLoaded(true);+ }).catch(() => {+ if (active) {+ setDraftLoaded(true);+ }});return () => {active = false;@@ -1923,6 +1930,33 @@ const CreateMemoModal = ({initialDraft && "sourceUrl" in initialDraft && typeof initialDraft.sourceUrl === "string" && initialDraft.sourceUrl.length > 0);+ const persistCurrentDraft = useCallback(() => {+ const materializedMemo = materializedMemoRef.current;+ const currentTitle = titleRef.current;+ const currentContentMarkdown = contentMarkdownRef.current;+ const currentNotebookId = targetNotebookIdRef.current;+ const currentTagsText = tagsTextRef.current;+ const updatedAt = new Date().toISOString();++ return draftWriteBarrier.enqueue(() => materializedMemo+ ? writeMobileMemoDraft({+ memoId: materializedMemo.id,+ expectedRevision: materializedMemo.revision,+ title: currentTitle,+ contentMarkdown: currentContentMarkdown,+ notebookId: currentNotebookId,+ tagsText: currentTagsText,+ updatedAt,+ })+ : writeMobileNewMemoDraft(dataScope, {+ title: currentTitle,+ contentMarkdown: currentContentMarkdown,+ notebookId: currentNotebookId,+ tagsText: currentTagsText,+ updatedAt,+ }));+ }, [dataScope, draftWriteBarrier]);+const applyTemplateSeed = useCallback((seed: MobileCreateMemoSeed) => {const markdown = seed.contentMarkdown;const doc = markdownToDoc(markdown);@@ -1961,32 +1995,14 @@ const CreateMemoModal = ({}const draftVersion = draftVersionRef.current;const timeout = setTimeout(() => {- const materializedMemo = materializedMemoRef.current;- const writeDraft = materializedMemo- ? writeMobileMemoDraft({- memoId: materializedMemo.id,- expectedRevision: materializedMemo.revision,- title,- contentMarkdown: contentMarkdownRef.current,- notebookId: targetNotebookId,- tagsText,- updatedAt: new Date().toISOString(),- })- : writeMobileNewMemoDraft(dataScope, {- title,- contentMarkdown: contentMarkdownRef.current,- notebookId: targetNotebookId,- tagsText,- updatedAt: new Date().toISOString(),- });- void writeDraft.then(() => {- if (draftVersionRef.current === draftVersion) {+ void persistCurrentDraft().then((written) => {+ if (written && !submitStartedRef.current && draftVersionRef.current === draftVersion) {setDirty(false);}- });+ }).catch(() => undefined);}, 350);return () => clearTimeout(timeout);- }, [contentMarkdown, dataScope, dirty, draftLoaded, isWebClipDraft, tagsText, targetNotebookId, title]);+ }, [contentMarkdown, dirty, draftLoaded, isWebClipDraft, persistCurrentDraft, tagsText, targetNotebookId, title]);const createMutation = useMutation({mutationFn: async () => {@@ -2053,6 +2069,15 @@ const CreateMemoModal = ({},onSuccess: async (memo) => {const materializedMemoId = materializedMemoRef.current?.id ?? null;+ // Wait for any already-running AsyncStorage write before removing the+ // draft. Nothing queued after submit began is allowed to recreate it.+ await draftWriteBarrier.blockAndDrain();+ if (!isWebClipDraft) {+ await clearMobileNewMemoDraft(dataScope);+ }+ if (materializedMemoId) {+ await clearMobileMemoDraft(materializedMemoId);+ }await Promise.all([queryClient.invalidateQueries({ queryKey: ["mobile", "notebooks"] }),queryClient.invalidateQueries({ queryKey: ["mobile", "memos"] }),@@ -2065,19 +2090,23 @@ const CreateMemoModal = ({materializedMemoRef.current = null;draftVersionRef.current += 1;setDirty(false);- if (!isWebClipDraft) {- await clearMobileNewMemoDraft(dataScope);- }- if (materializedMemoId) {- await clearMobileMemoDraft(materializedMemoId);- }void onQueued();onCreated(memo);},+ onError: () => {+ submitStartedRef.current = false;+ draftWriteBarrier.unblock();+ setSubmitStarted(false);+ draftVersionRef.current += 1;+ setDirty(true);+ if (!isWebClipDraft) {+ void persistCurrentDraft().catch(() => undefined);+ }+ },});createPendingRef.current = createMutation.isPending;- const canSubmitCreateMemo = Boolean(targetNotebookId) && !createMutation.isPending && imageOperation === "idle";- const canUseTemplate = imageOperation === "idle" && !createMutation.isPending;+ const canSubmitCreateMemo = Boolean(targetNotebookId) && !submitStarted && !createMutation.isPending && imageOperation === "idle";+ const canUseTemplate = editorReady && imageOperation === "idle" && !submitStarted && !createMutation.isPending;const materializeMemoForImage = async () => {if (materializedMemoRef.current) {@@ -2150,6 +2179,9 @@ const CreateMemoModal = ({}, [editorReady, initialSharedImages]);const markDirty = () => {+ if (submitStartedRef.current) {+ return;+ }userEditedSinceOpenRef.current = true;draftVersionRef.current += 1;setDirty(true);@@ -2157,15 +2189,26 @@ const CreateMemoModal = ({const flushEditor = () => flushMobileEditor(editorRef, flushResolverRef);- const requestClose = async () => {- if (createPendingRef.current || imageOperationRef.current !== "idle") {+ const submitCreateMemo = async () => {+ if (submitStartedRef.current || createPendingRef.current || imageOperationRef.current !== "idle") {return;}- await flushEditor();- // Match prior Android create behavior: back commits the note (even if empty draft).- createMutation.mutate();+ submitStartedRef.current = true;+ setSubmitStarted(true);+ const draftsDrained = draftWriteBarrier.blockAndDrain();+ try {+ await flushEditor();+ await draftsDrained;+ createMutation.mutate();+ } catch {+ submitStartedRef.current = false;+ draftWriteBarrier.unblock();+ setSubmitStarted(false);+ }};+ const requestClose = () => submitCreateMemo();+useEffect(() => {const subscription = BackHandler.addEventListener("hardwareBackPress", () => {void requestClose();@@ -2235,17 +2278,17 @@ const CreateMemoModal = ({locale={resolvedLocale}theme={resolvedTheme}/>- ) : null, [aiPromptsJson, baseUrl, cancelSelectionAi, draftLoaded, loadEditorResource, requestSelectionAi, resolvedLocale, resolvedTheme, scheduleBodyKeyboard, selectResource]);+ ) : null, [aiPromptsJson, baseUrl, cancelSelectionAi, draftLoaded, loadEditorResource, pushBodyToEditor, requestSelectionAi, resolvedLocale, resolvedTheme, scheduleBodyKeyboard, selectResource]);return (<SafeAreaView edges={["top", "left", "right", "bottom"]} style={styles.createMemoSafeArea}><View style={styles.createMemoHeader}>- <Pressable accessibilityLabel="返回" accessibilityRole="button" disabled={createMutation.isPending || imageOperation !== "idle"} onPress={() => void requestClose()} style={styles.createMemoBackButton}>- <ChevronLeft color={createMutation.isPending || imageOperation !== "idle" ? "#cbd5e1" : "#0f172a"} size={30} />+ <Pressable accessibilityLabel="返回" accessibilityRole="button" disabled={submitStarted || createMutation.isPending || imageOperation !== "idle"} onPress={() => void requestClose()} style={styles.createMemoBackButton}>+ <ChevronLeft color={submitStarted || createMutation.isPending || imageOperation !== "idle" ? "#cbd5e1" : "#0f172a"} size={30} /></Pressable><View style={styles.createMemoHeaderActions}>- <Text style={[styles.createMemoStatus, createMutation.isPending && styles.createMemoStatusActive]}>- {imageOperation === "creating" ? "正在创建" : imageOperation === "uploading" ? "正在上传" : createMutation.isPending || dirty ? "保存中" : editorReady ? "已保存" : "准备中"}+ <Text style={[styles.createMemoStatus, (submitStarted || createMutation.isPending) && styles.createMemoStatusActive]}>+ {imageOperation === "creating" ? "正在创建" : imageOperation === "uploading" ? "正在上传" : submitStarted || createMutation.isPending || dirty ? "保存中" : editorReady ? "已保存" : "准备中"}</Text><PressableaccessibilityLabel={translate("模板")}@@ -2259,10 +2302,10 @@ const CreateMemoModal = ({<PressableaccessibilityLabel="完成新建笔记"disabled={!canSubmitCreateMemo}- onPress={() => void flushEditor().then(() => createMutation.mutate())}+ onPress={() => void submitCreateMemo()}style={[styles.createMemoDoneButton, !canSubmitCreateMemo && styles.createMemoDoneButtonDisabled]}>- {createMutation.isPending ? <ActivityIndicator color="#64748b" size="small" /> : <Text style={[styles.createMemoDoneText, !canSubmitCreateMemo && styles.createMemoDoneTextDisabled]}>完成</Text>}+ {submitStarted || createMutation.isPending ? <ActivityIndicator color="#64748b" size="small" /> : <Text style={[styles.createMemoDoneText, !canSubmitCreateMemo && styles.createMemoDoneTextDisabled]}>完成</Text>}</Pressable></View></View>