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(desktop): stop duplicate screenshot imports from one capture
tianma-ifbf88ab2c21ef
diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjsindex a9fe6f03..e746e2fe 100644--- a/apps/desktop/src/main/index.mjs+++ b/apps/desktop/src/main/index.mjs@@ -509,6 +509,7 @@ const importMarkdownFile = async (filePath) => {let pendingMarkdownImport = null;let pendingScreenshotImport = null;const screenshotCaptureGuard = createScreenshotCaptureGuard();+const sentScreenshotCaptureIds = new Set();let rendererReady = false;const flushPendingMarkdownImport = () => {@@ -521,11 +522,13 @@ const flushPendingMarkdownImport = () => {const sendScreenshotImport = (payload) => {const ipcPayload = screenshotImportIpcPayload(payload);if (!ipcPayload.bytes.byteLength) return;+ if (ipcPayload.captureId && sentScreenshotCaptureIds.has(ipcPayload.captureId)) return;if (!mainWindow || mainWindow.isDestroyed() || mainWindow.webContents.isLoading() || !rendererReady) {pendingScreenshotImport = ipcPayload;return;}pendingScreenshotImport = null;+ if (ipcPayload.captureId) sentScreenshotCaptureIds.add(ipcPayload.captureId);mainWindow.webContents.send("desktop:import-screenshot", ipcPayload);};@@ -534,6 +537,8 @@ const flushPendingScreenshotImport = () => {const payload = pendingScreenshotImport;pendingScreenshotImport = null;if (!payload.bytes?.byteLength) return;+ if (payload.captureId && sentScreenshotCaptureIds.has(payload.captureId)) return;+ if (payload.captureId) sentScreenshotCaptureIds.add(payload.captureId);mainWindow.webContents.send("desktop:import-screenshot", payload);};diff --git a/apps/desktop/src/main/screenshot-capture.mjs b/apps/desktop/src/main/screenshot-capture.mjsindex ccab1c07..a7b406eb 100644--- a/apps/desktop/src/main/screenshot-capture.mjs+++ b/apps/desktop/src/main/screenshot-capture.mjs@@ -30,7 +30,11 @@ export const normalizeIpcBytes = (value) => {return new Uint8Array();};+export const screenshotCaptureId = (date = new Date()) =>+ `shot-${date.getTime()}-${Math.random().toString(16).slice(2, 10)}`;+export const screenshotImportIpcPayload = (captured) => ({+ captureId: captured.captureId,name: captured.name,type: captured.type,title: captured.title,@@ -40,7 +44,7 @@ export const screenshotImportIpcPayload = (captured) => ({// Full-screen capture finishes in a few hundred milliseconds. macOS/Electron// tray menus can deliver the same click twice after that, so keep the capture// locked through a short cooldown instead of releasing it in the same tick.-export const SCREENSHOT_CAPTURE_COOLDOWN_MS = 2000;+export const SCREENSHOT_CAPTURE_COOLDOWN_MS = 4000;export const createScreenshotCaptureGuard = ({cooldownMs = SCREENSHOT_CAPTURE_COOLDOWN_MS,@@ -168,6 +172,7 @@ export const captureScreenToNote = async (input) => {if (!bytes || bytes.byteLength === 0) return null;const capturedAt = input.now ? new Date(input.now) : new Date();return {+ captureId: screenshotCaptureId(capturedAt),bytes: normalizeIpcBytes(bytes),name: screenshotFileName(capturedAt),type: "image/png",diff --git a/apps/desktop/src/main/screenshot-capture.test.mjs b/apps/desktop/src/main/screenshot-capture.test.mjsindex 2d16f4b2..be50d3b0 100644--- a/apps/desktop/src/main/screenshot-capture.test.mjs+++ b/apps/desktop/src/main/screenshot-capture.test.mjs@@ -77,7 +77,19 @@ describe("screenshot capture helpers", () => {const encoded = { type: "Buffer", data: [137, 80, 78, 71] };expect(new Uint8Array(encoded).byteLength).toBe(0);expect(Array.from(normalizeIpcBytes(encoded))).toEqual([137, 80, 78, 71]);+ expect(screenshotImportIpcPayload({+ captureId: "shot-1",+ name: "screenshot.png",+ type: "image/png",+ title: "截图",+ bytes: Buffer.from([1, 2, 3]),+ })).toMatchObject({+ captureId: "shot-1",+ name: "screenshot.png",+ title: "截图",+ });expect(Array.from(screenshotImportIpcPayload({+ captureId: "shot-1",name: "screenshot.png",type: "image/png",title: "截图",@@ -111,6 +123,7 @@ describe("desktop screenshot to note wiring", () => {expect(mainSource).toContain("captureScreenshotToNote");expect(mainSource).toContain("captureScreenToNote");expect(mainSource).toContain("createScreenshotCaptureGuard");+ expect(mainSource).toContain("sentScreenshotCaptureIds");expect(mainSource).toContain("pendingScreenshotImport = null");expect(mainSource).not.toContain("overlay.html");expect(mainSource).toContain("copy.screenshotToNote");@@ -118,10 +131,13 @@ describe("desktop screenshot to note wiring", () => {expect(mainSource).not.toContain('label: copy.backupNow, click: () => sendDesktopCommand("backup-now")');expect(preloadSource).toContain("onImportScreenshot");expect(preloadSource).toContain("screenshotImportListener");+ expect(preloadSource).toContain("rendererReadySent");+ expect(preloadSource).toContain("removeAllListeners");expect(preloadSource).toContain('value.type === "Buffer"');expect(workspaceSource).toContain("onImportScreenshot");expect(workspaceSource).toContain("createScreenshotMemo");expect(workspaceSource).toContain("screenshotImportGate");+ expect(workspaceSource).toContain("handleImportScreenshotRef");expect(workspaceSource).toContain("screenshotFileFromImportPayload");expect(workspaceSource).not.toContain("setPendingEditorInsert");});diff --git a/apps/desktop/src/preload/index.cjs b/apps/desktop/src/preload/index.cjsindex 29c3300f..f8136c0b 100644--- a/apps/desktop/src/preload/index.cjs+++ b/apps/desktop/src/preload/index.cjs@@ -22,6 +22,7 @@ const normalizeIpcBytes = (value) => {};let screenshotImportListener = null;+let rendererReadySent = false;contextBridge.exposeInMainWorld("edgeeverDesktop", Object.freeze({isAvailable: true,@@ -84,7 +85,10 @@ contextBridge.exposeInMainWorld("edgeeverDesktop", Object.freeze({onImportMarkdown: (callback) => {const listener = (_event, payload) => callback(payload);ipcRenderer.on("desktop:import-markdown", listener);- ipcRenderer.send("desktop:renderer-ready");+ if (!rendererReadySent) {+ rendererReadySent = true;+ ipcRenderer.send("desktop:renderer-ready");+ }return () => ipcRenderer.removeListener("desktop:import-markdown", listener);},onImportScreenshot: (callback) => {@@ -95,6 +99,7 @@ contextBridge.exposeInMainWorld("edgeeverDesktop", Object.freeze({callback({ ...payload, bytes: normalizeIpcBytes(payload?.bytes) });};screenshotImportListener = listener;+ ipcRenderer.removeAllListeners("desktop:import-screenshot");ipcRenderer.on("desktop:import-screenshot", listener);return () => {ipcRenderer.removeListener("desktop:import-screenshot", listener);diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsxindex 725cc58e..68218bd8 100644--- a/apps/web/src/components/WorkspaceApp.tsx+++ b/apps/web/src/components/WorkspaceApp.tsx@@ -1641,7 +1641,7 @@ export const WorkspaceApp = ({setNotebookDeleteConfirmation(notebook);};- const handleImportScreenshot = useCallback(async (payload: { name: string; type: string; title?: string; bytes: Uint8Array }) => {+ const handleImportScreenshot = useCallback(async (payload: { captureId?: string; name: string; type: string; title?: string; bytes: Uint8Array }) => {const importKey = screenshotImportDedupeKey(payload);if (!screenshotImportGate.tryBegin(importKey)) return;@@ -1649,13 +1649,13 @@ export const WorkspaceApp = ({? selectedNotebookId: defaultMemoNotebookId;if (!notebookId) {- screenshotImportGate.fail(importKey);+ screenshotImportGate.fail();return;}const file = screenshotFileFromImportPayload(payload);if (file.size === 0) {- screenshotImportGate.fail(importKey);+ screenshotImportGate.fail();setAppNoticeDialog({title: t("memoList.importScreenshotFailedTitle"),description: t("memoList.importScreenshotEmpty"),@@ -1698,7 +1698,7 @@ export const WorkspaceApp = ({revealCreatedMemo(memo);screenshotImportGate.finish(importKey);} catch {- screenshotImportGate.fail(importKey);+ screenshotImportGate.fail();creatingMemoSelectionRef.current = false;setAppNoticeDialog({title: t("memoList.importScreenshotFailedTitle"),@@ -1707,6 +1707,9 @@ export const WorkspaceApp = ({}}, [defaultMemoNotebookId, imageCompressionEnabled, localDataScope, memoView, notebooks, repository, selectedNotebookId, t]);+ const handleImportScreenshotRef = useRef(handleImportScreenshot);+ handleImportScreenshotRef.current = handleImportScreenshot;+const handleCreateMemo = (kind?: DiagramKind) => {const targetNotebookId = createMemoNotebookId;@@ -2363,14 +2366,14 @@ export const WorkspaceApp = ({createMemoMutation.mutate({ notebookId, title, contentMarkdown: payload.content, tags: [] });});const removeScreenshotListener = bridge.onImportScreenshot?.((payload) => {- void handleImportScreenshot(payload);+ void handleImportScreenshotRef.current(payload);}) ?? (() => {});return () => {removeCommandListener();removeMarkdownListener();removeScreenshotListener();};- }, [createMemoMutation, defaultMemoNotebookId, handleCreateMemo, handleCreateNotebook, handleGlobalSearch, handleImportScreenshot, notebooks, selectedNotebookId, toggleDesktopFocusMode]);+ }, [createMemoMutation, defaultMemoNotebookId, handleCreateMemo, handleCreateNotebook, handleGlobalSearch, notebooks, selectedNotebookId, toggleDesktopFocusMode]);const handleWorkspaceBackRequest = useCallback(() => {if (appNoticeDialog) {diff --git a/apps/web/src/lib/screenshot-import.test.mjs b/apps/web/src/lib/screenshot-import.test.mjsindex fb979dae..d20506f2 100644--- a/apps/web/src/lib/screenshot-import.test.mjs+++ b/apps/web/src/lib/screenshot-import.test.mjs@@ -124,12 +124,16 @@ describe("screenshot note content", () => {});describe("screenshot import gate", () => {- test("builds a stable key from the title, filename, and byte length", () => {+ test("prefers a capture id and otherwise keys by title and filename", () => {expect(screenshotImportDedupeKey({+ captureId: "shot-1",name: "screenshot-20260915-222604.png",title: "截图 2026-09-15 22:26",- bytes: new Uint8Array(4),- })).toBe(["截图 2026-09-15 22:26", "screenshot-20260915-222604.png", "4"].join("\u0000"));+ })).toBe("shot-1");+ expect(screenshotImportDedupeKey({+ name: "screenshot-20260915-222604.png",+ title: "截图 2026-09-15 22:26",+ })).toBe(["截图 2026-09-15 22:26", "screenshot-20260915-222604.png"].join("\u0000"));});test("drops a second import while the first screenshot is still being saved", () => {@@ -145,14 +149,14 @@ describe("screenshot import gate", () => {gate.finish("a", 0);expect(gate.tryBegin("a", 500)).toBe(false);expect(gate.tryBegin("b", 500)).toBe(true);- gate.fail("b");+ gate.fail();expect(gate.tryBegin("a", 1500)).toBe(true);});test("allows a retry after a failed import", () => {const gate = createScreenshotImportGate(1000);expect(gate.tryBegin("a")).toBe(true);- gate.fail("a");+ gate.fail();expect(gate.tryBegin("a")).toBe(true);});});diff --git a/apps/web/src/lib/screenshot-import.ts b/apps/web/src/lib/screenshot-import.tsindex 60a9b9e2..e96a9187 100644--- a/apps/web/src/lib/screenshot-import.ts+++ b/apps/web/src/lib/screenshot-import.ts@@ -33,34 +33,47 @@ export const screenshotFileFromImportPayload = (payload: {};export const screenshotImportDedupeKey = (payload: {+ captureId?: string;name?: string;title?: string;- bytes?: { byteLength?: number } | null;-}) => [payload.title?.trim() || "", payload.name || "", String(payload.bytes?.byteLength ?? 0)].join("\u0000");+}) => payload.captureId?.trim() || [payload.title?.trim() || "", payload.name || ""].join("\u0000");-export const createScreenshotImportGate = (cooldownMs = 2000) => {- let inFlightKey: string | null = null;- let lastKey: string | null = null;- let lastAt = 0;+export const createScreenshotImportGate = (cooldownMs = 15_000) => {+ let inFlight = false;+ const seen = new Map<string, number>();return {tryBegin(key: string, now = Date.now()) {- if (inFlightKey) return false;- if (lastKey === key && now - lastAt < cooldownMs) return false;- inFlightKey = key;+ if (inFlight) return false;+ const lastAt = seen.get(key);+ if (lastAt != null && now - lastAt < cooldownMs) return false;+ inFlight = true;return true;},finish(key: string, now = Date.now()) {- if (inFlightKey === key) inFlightKey = null;- lastKey = key;- lastAt = now;+ inFlight = false;+ seen.set(key, now);},- fail(key: string) {- if (inFlightKey === key) inFlightKey = null;+ fail() {+ inFlight = false;},};};-export const screenshotImportGate = createScreenshotImportGate();+const SCREENSHOT_IMPORT_GATE_KEY = "__edgeeverScreenshotImportGate";++export const getScreenshotImportGate = () => {+ const scope = globalThis as typeof globalThis & {+ [SCREENSHOT_IMPORT_GATE_KEY]?: ReturnType<typeof createScreenshotImportGate>;+ };+ scope[SCREENSHOT_IMPORT_GATE_KEY] ??= createScreenshotImportGate();+ return scope[SCREENSHOT_IMPORT_GATE_KEY];+};++export const screenshotImportGate = {+ tryBegin: (key: string, now?: number) => getScreenshotImportGate().tryBegin(key, now),+ finish: (key: string, now?: number) => getScreenshotImportGate().finish(key, now),+ fail: () => getScreenshotImportGate().fail(),+};const escapeMarkdownImageAlt = (value: string) => value.replaceAll("\\", "\\\\").replaceAll("]", "\\]");diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.tsindex 3429d5e6..3b9a8e19 100644--- a/apps/web/src/vite-env.d.ts+++ b/apps/web/src/vite-env.d.ts@@ -81,7 +81,7 @@ interface EdgeEverDesktopBridge {scheduledFor: string;}) => void | Promise<void>): () => void;onImportMarkdown(callback: (payload: { name: string; content: string }) => void): () => void;- onImportScreenshot?(callback: (payload: { name: string; type: string; title?: string; bytes: Uint8Array }) => void): () => void;+ onImportScreenshot?(callback: (payload: { captureId?: string; name: string; type: string; title?: string; bytes: Uint8Array }) => void): () => void;}interface DesktopUpdateStatus {