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): separate local save from remote sync

tianma-if3aeca0442b45
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 7f742271..64df55e3 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -98,6 +98,7 @@ import { getMemoUpdateQueueId, isMemoUpdateAlreadyApplied, queueMemoUpdate, shou
import { isLocalMemoId } from "@/lib/local-mirror";
import type { EdgeEverRepository } from "@/lib/repository";
import {
+ EDITOR_LOCAL_SAVE_DELAY_MS,
getEditableMemoTitle,
getNotebookMoveOptions,
} from "@/lib/app-helpers";
@@ -525,7 +526,6 @@ type EditorPaneProps = {
isLoading: boolean;
contentSearchQuery?: string;
imageCompressionEnabled: boolean;
- autoSaveIntervalMs: number | null;
hasNextMemo: boolean;
hasPreviousMemo: boolean;
onBackToList: () => void;
@@ -552,7 +552,6 @@ const MobileNativeEditorPane = ({
repository,
notebooks,
isTrashView,
- autoSaveIntervalMs,
onBackToList,
onSaved,
onMobileDefaultEditConsumed,
@@ -728,15 +727,13 @@ const MobileNativeEditorPane = ({
window.clearTimeout(saveTimerRef.current);
saveTimerRef.current = null;
}
- if (autoSaveIntervalMs !== null) {
- saveTimerRef.current = window.setTimeout(() => {
- saveTimerRef.current = null;
- if (hasUnsavedChangesRef.current) {
- void saveCurrent();
- }
- }, autoSaveIntervalMs);
- }
- }, [autoSaveIntervalMs, persistDraft, saveCurrent]);
+ saveTimerRef.current = window.setTimeout(() => {
+ saveTimerRef.current = null;
+ if (hasUnsavedChangesRef.current) {
+ void saveCurrent();
+ }
+ }, EDITOR_LOCAL_SAVE_DELAY_MS);
+ }, [persistDraft, saveCurrent]);
useEffect(() => {
document.documentElement.classList.add("edgeever-mobile-native-editing");
@@ -1145,7 +1142,6 @@ const RichEditorPane = ({
isLoading,
contentSearchQuery = "",
imageCompressionEnabled,
- autoSaveIntervalMs,
hasNextMemo,
hasPreviousMemo,
onBackToList,
@@ -2313,23 +2309,21 @@ const RichEditorPane = ({
if (mobileSaveTimerRef.current !== null) {
window.clearTimeout(mobileSaveTimerRef.current);
}
- if (autoSaveIntervalMs !== null) {
- mobileSaveTimerRef.current = window.setTimeout(() => {
- mobileSaveTimerRef.current = null;
- if (
- !memoRef.current ||
- memoRef.current.isDeleted ||
- !hasUnsavedChangesRef.current ||
- saveMutation.isPending ||
- saveState === "conflict"
- ) {
- return;
- }
+ mobileSaveTimerRef.current = window.setTimeout(() => {
+ mobileSaveTimerRef.current = null;
+ if (
+ !memoRef.current ||
+ memoRef.current.isDeleted ||
+ !hasUnsavedChangesRef.current ||
+ saveMutation.isPending ||
+ saveState === "conflict"
+ ) {
+ return;
+ }
- saveMutation.mutate();
- }, autoSaveIntervalMs);
- }
- }, [autoSaveIntervalMs, getMobilePlainTextValue, persistCurrentDraft, saveMutation, saveState, tagsText, title]);
+ saveMutation.mutate();
+ }, EDITOR_LOCAL_SAVE_DELAY_MS);
+ }, [getMobilePlainTextValue, persistCurrentDraft, saveMutation, saveState, tagsText, title]);
useEffect(() => {
markMobilePlainTextDirtyRef.current = markMobilePlainTextDirty;
@@ -2396,16 +2390,12 @@ const RichEditorPane = ({
return;
}
- if (autoSaveIntervalMs === null) {
- return;
- }
-
const timer = window.setTimeout(() => {
saveMutation.mutate();
- }, autoSaveIntervalMs);
+ }, EDITOR_LOCAL_SAVE_DELAY_MS);
return () => window.clearTimeout(timer);
- }, [autoSaveIntervalMs, dirtyVersion, editor, hasUnsavedChanges, memo, saveMutation, saveState, useMobilePlainTextEditor]);
+ }, [dirtyVersion, editor, hasUnsavedChanges, memo, saveMutation, saveState, useMobilePlainTextEditor]);
if (isSelectionMode) {
return (
diff --git a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx b/apps/web/src/components/MobileStandaloneTiptapEditor.tsx
index e8de5708..903f261b 100644
--- a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx
+++ b/apps/web/src/components/MobileStandaloneTiptapEditor.tsx
@@ -14,7 +14,7 @@ import {
MobileEditorNotebookSheet,
MobileEditorToolbar,
} from "@/components/MobileStandaloneEditorParts";
-import { getEditableMemoTitle, getNotebookMoveOptions, readAutoSaveIntervalPreference } from "@/lib/app-helpers";
+import { EDITOR_LOCAL_SAVE_DELAY_MS, getEditableMemoTitle, getNotebookMoveOptions } from "@/lib/app-helpers";
import { defaultLocale, normalizeLocale } from "@/i18n/locales";
import { compressImageForUpload } from "@/lib/image-compression";
import { localDb, type LocalDraft } from "@/lib/local-db";
@@ -200,13 +200,10 @@ export const MobileStandaloneTiptapEditor = ({
if (saveTimerRef.current !== null) {
window.clearTimeout(saveTimerRef.current);
}
- const autoSaveIntervalMs = readAutoSaveIntervalPreference();
- if (autoSaveIntervalMs !== null) {
- saveTimerRef.current = window.setTimeout(() => {
- saveTimerRef.current = null;
- void saveNowRef.current();
- }, autoSaveIntervalMs);
- }
+ saveTimerRef.current = window.setTimeout(() => {
+ saveTimerRef.current = null;
+ void saveNowRef.current();
+ }, EDITOR_LOCAL_SAVE_DELAY_MS);
},
});
@@ -452,13 +449,10 @@ export const MobileStandaloneTiptapEditor = ({
if (saveTimerRef.current !== null) {
window.clearTimeout(saveTimerRef.current);
}
- const autoSaveIntervalMs = readAutoSaveIntervalPreference();
- if (autoSaveIntervalMs !== null) {
- saveTimerRef.current = window.setTimeout(() => {
- saveTimerRef.current = null;
- void saveNow();
- }, autoSaveIntervalMs);
- }
+ saveTimerRef.current = window.setTimeout(() => {
+ saveTimerRef.current = null;
+ void saveNow();
+ }, EDITOR_LOCAL_SAVE_DELAY_MS);
}, [persistLocalDraft, saveNow, setSaveStateStable]);
const persistReturnPreview = useCallback(() => {
diff --git a/apps/web/src/components/SettingsPane.tsx b/apps/web/src/components/SettingsPane.tsx
index 2f84768f..0aca0e52 100644
--- a/apps/web/src/components/SettingsPane.tsx
+++ b/apps/web/src/components/SettingsPane.tsx
@@ -37,8 +37,8 @@ interface SettingsPaneProps {
onOpenTemplates: () => void;
imageCompressionEnabled: boolean;
onImageCompressionChange: (enabled: boolean) => void;
- autoSaveIntervalMs: number | null;
- onAutoSaveIntervalChange: (intervalMs: number | null) => void;
+ syncIntervalMs: number | null;
+ onSyncIntervalChange: (intervalMs: number | null) => void;
shortcutSettings: ShortcutSettings;
onShortcutSettingsChange: (settings: ShortcutSettings) => void;
onLogout: () => void;
@@ -74,8 +74,8 @@ export const SettingsPane = ({
onOpenTemplates,
imageCompressionEnabled,
onImageCompressionChange,
- autoSaveIntervalMs,
- onAutoSaveIntervalChange,
+ syncIntervalMs,
+ onSyncIntervalChange,
shortcutSettings,
onShortcutSettingsChange,
onLogout,
@@ -181,8 +181,8 @@ export const SettingsPane = ({
<PreferenceCard
imageCompressionEnabled={imageCompressionEnabled}
onImageCompressionChange={onImageCompressionChange}
- autoSaveIntervalMs={autoSaveIntervalMs}
- onAutoSaveIntervalChange={onAutoSaveIntervalChange}
+ syncIntervalMs={syncIntervalMs}
+ onSyncIntervalChange={onSyncIntervalChange}
shortcutSettings={shortcutSettings}
onShortcutSettingsChange={onShortcutSettingsChange}
/>
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index a876008b..f3d2a57a 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -60,9 +60,9 @@ import {
MAX_MEMO_LIST_WIDTH_PX,
DEFAULT_MEMO_LIST_WIDTH_PX,
isTextEntryTarget,
- readAutoSaveIntervalPreference,
+ readSyncIntervalPreference,
readImageCompressionPreference,
- writeAutoSaveIntervalPreference,
+ writeSyncIntervalPreference,
writeImageCompressionPreference,
readDesktopFocusModePreference,
writeDesktopFocusModePreference,
@@ -83,6 +83,7 @@ import {
import { useBrowserBackLayer } from "@/lib/app-hooks";
import { updateMemoSummaryInLists, type MemoListQueryData } from "@/lib/memo-list-cache";
import type { SyncQueueSummary } from "@/lib/sync-queue";
+import { SYNC_QUEUE_DEFERRED_EVENT } from "@/lib/sync-events";
import {
createLocalDataScope,
putLocalMemo,
@@ -706,7 +707,7 @@ export const WorkspaceApp = ({
});
const [multiSelectKeyDown, setMultiSelectKeyDown] = useState(false);
const [imageCompressionEnabled, setImageCompressionEnabled] = useState(readImageCompressionPreference);
- const [autoSaveIntervalMs, setAutoSaveIntervalMs] = useState(readAutoSaveIntervalPreference);
+ const [syncIntervalMs, setSyncIntervalMs] = useState(readSyncIntervalPreference);
const [desktopFocusMode, setDesktopFocusMode] = useState(readDesktopFocusModePreference);
const [shortcutSettings, setShortcutSettings] = useState<ShortcutSettings>(readShortcutSettingsPreference);
const [rightView, setRightView] = useState<"editor" | "settings" | "assets" | "tags" | "templates" | "evernote-migration">(() =>
@@ -737,6 +738,9 @@ export const WorkspaceApp = ({
const [isPullRefreshing, setIsPullRefreshing] = useState(false);
const isPullRefreshingRef = useRef(false);
const skipNextHomeRouteSyncRef = useRef(false);
+ const deferredSyncTimerRef = useRef<number | null>(null);
+ const deferredSyncPendingRef = useRef(false);
+ const runQueuedSyncRef = useRef<() => Promise<void>>(async () => undefined);
const [mobileListActionsOpen, setMobileListActionsOpen] = useState(false);
const [mobileMoveOpen, setMobileMoveOpen] = useState(false);
@@ -1167,10 +1171,10 @@ export const WorkspaceApp = ({
}, [imageCompressionEnabled]);
useEffect(() => {
- writeAutoSaveIntervalPreference(
- autoSaveIntervalMs === null ? "1m" : autoSaveIntervalMs === 300_000 ? "5m" : autoSaveIntervalMs === 900_000 ? "15m" : autoSaveIntervalMs === 1_800_000 ? "30m" : autoSaveIntervalMs === 3_600_000 ? "1h" : autoSaveIntervalMs === 7_200_000 ? "2h" : "1m"
+ writeSyncIntervalPreference(
+ syncIntervalMs === null ? "off" : syncIntervalMs === 300_000 ? "5m" : syncIntervalMs === 900_000 ? "15m" : syncIntervalMs === 1_800_000 ? "30m" : syncIntervalMs === 3_600_000 ? "1h" : syncIntervalMs === 7_200_000 ? "2h" : "1m"
);
- }, [autoSaveIntervalMs]);
+ }, [syncIntervalMs]);
useEffect(() => {
writeShortcutSettingsPreference(shortcutSettings);
@@ -1384,14 +1388,53 @@ export const WorkspaceApp = ({
};
}, [runQueuedSync]);
+ useEffect(() => {
+ runQueuedSyncRef.current = runQueuedSync;
+ }, [runQueuedSync]);
+
useEffect(() => {
const handleQueueChanged = () => {
+ deferredSyncPendingRef.current = false;
+ if (deferredSyncTimerRef.current !== null) {
+ window.clearTimeout(deferredSyncTimerRef.current);
+ deferredSyncTimerRef.current = null;
+ }
void runQueuedSync();
};
window.addEventListener("edgeever:sync-queue-changed", handleQueueChanged);
return () => window.removeEventListener("edgeever:sync-queue-changed", handleQueueChanged);
}, [runQueuedSync]);
+ useEffect(() => {
+ const scheduleDeferredSync = () => {
+ deferredSyncPendingRef.current = true;
+ if (deferredSyncTimerRef.current !== null) {
+ window.clearTimeout(deferredSyncTimerRef.current);
+ deferredSyncTimerRef.current = null;
+ }
+ if (syncIntervalMs === null) {
+ return;
+ }
+ deferredSyncTimerRef.current = window.setTimeout(() => {
+ deferredSyncTimerRef.current = null;
+ deferredSyncPendingRef.current = false;
+ void runQueuedSyncRef.current();
+ }, syncIntervalMs);
+ };
+
+ window.addEventListener(SYNC_QUEUE_DEFERRED_EVENT, scheduleDeferredSync);
+ if (deferredSyncPendingRef.current) {
+ scheduleDeferredSync();
+ }
+ return () => {
+ window.removeEventListener(SYNC_QUEUE_DEFERRED_EVENT, scheduleDeferredSync);
+ if (deferredSyncTimerRef.current !== null) {
+ window.clearTimeout(deferredSyncTimerRef.current);
+ deferredSyncTimerRef.current = null;
+ }
+ };
+ }, [syncIntervalMs]);
+
useEffect(() => {
if (!isStandaloneRuntime) {
return;
@@ -2979,8 +3022,8 @@ export const WorkspaceApp = ({
onOpenTemplates={handleOpenTemplates}
imageCompressionEnabled={imageCompressionEnabled}
onImageCompressionChange={setImageCompressionEnabled}
- autoSaveIntervalMs={autoSaveIntervalMs}
- onAutoSaveIntervalChange={setAutoSaveIntervalMs}
+ syncIntervalMs={syncIntervalMs}
+ onSyncIntervalChange={setSyncIntervalMs}
shortcutSettings={shortcutSettings}
onShortcutSettingsChange={setShortcutSettings}
onLogout={onLogout}
@@ -3032,7 +3075,6 @@ export const WorkspaceApp = ({
setActivePane("editor");
}}
imageCompressionEnabled={imageCompressionEnabled}
- autoSaveIntervalMs={autoSaveIntervalMs}
selectionActionBar={memoSelectionActionBar}
hasNextMemo={Boolean(nextMemoId)}
hasPreviousMemo={Boolean(previousMemoId)}
diff --git a/apps/web/src/components/settings/PreferenceCard.tsx b/apps/web/src/components/settings/PreferenceCard.tsx
index 0258225c..8e3d37ec 100644
--- a/apps/web/src/components/settings/PreferenceCard.tsx
+++ b/apps/web/src/components/settings/PreferenceCard.tsx
@@ -1,7 +1,7 @@
import { ChartNoAxesCombined, Image, Languages, Palette, RefreshCw } from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
-import { writeAutoSaveIntervalPreference, type AutoSaveIntervalPreference, type ShortcutSettings } from "@/lib/app-helpers";
+import { writeSyncIntervalPreference, type ShortcutSettings, type SyncIntervalPreference } from "@/lib/app-helpers";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -20,8 +20,8 @@ import { EDITOR_THEME_NAMES, MERMAID_THEME_NAMES, useTheme } from "../ThemeProvi
interface PreferenceCardProps {
imageCompressionEnabled: boolean;
onImageCompressionChange: (enabled: boolean) => void;
- autoSaveIntervalMs: number | null;
- onAutoSaveIntervalChange: (intervalMs: number | null) => void;
+ syncIntervalMs: number | null;
+ onSyncIntervalChange: (intervalMs: number | null) => void;
shortcutSettings: ShortcutSettings;
onShortcutSettingsChange: (settings: ShortcutSettings) => void;
}
@@ -29,8 +29,8 @@ interface PreferenceCardProps {
export const PreferenceCard = ({
imageCompressionEnabled,
onImageCompressionChange,
- autoSaveIntervalMs,
- onAutoSaveIntervalChange,
+ syncIntervalMs,
+ onSyncIntervalChange,
shortcutSettings,
onShortcutSettingsChange,
}: PreferenceCardProps) => {
@@ -44,8 +44,8 @@ export const PreferenceCard = ({
void changeAppLocalePreference(preference);
};
- const autoSaveIntervalPreference: AutoSaveIntervalPreference =
- autoSaveIntervalMs === 300_000 ? "5m" : autoSaveIntervalMs === 900_000 ? "15m" : autoSaveIntervalMs === 1_800_000 ? "30m" : autoSaveIntervalMs === 3_600_000 ? "1h" : autoSaveIntervalMs === 7_200_000 ? "2h" : "1m";
+ const syncIntervalPreference: SyncIntervalPreference =
+ syncIntervalMs === 300_000 ? "5m" : syncIntervalMs === 900_000 ? "15m" : syncIntervalMs === 1_800_000 ? "30m" : syncIntervalMs === 3_600_000 ? "1h" : syncIntervalMs === 7_200_000 ? "2h" : "1m";
return (
<Card className="w-full min-w-0 overflow-hidden shadow-none">
@@ -139,31 +139,31 @@ export const PreferenceCard = ({
<div className="flex min-w-0 items-start gap-3">
<RefreshCw className="mt-0.5 h-4 w-4 shrink-0 text-emerald-700" />
<div className="min-w-0">
- <div className="text-sm font-semibold text-slate-900">{t("settings.autoSaveIntervalTitle")}</div>
- <div className="mt-0.5 text-xs leading-4 text-slate-500">{t("settings.autoSaveIntervalDescription")}</div>
+ <div className="text-sm font-semibold text-slate-900">{t("settings.syncIntervalTitle")}</div>
+ <div className="mt-0.5 text-xs leading-4 text-slate-500">{t("settings.syncIntervalDescription")}</div>
</div>
</div>
<div className="w-full shrink-0 sm:w-44">
<Select
- value={autoSaveIntervalPreference}
+ value={syncIntervalPreference}
onValueChange={(value) => {
- const preference = value as AutoSaveIntervalPreference;
- writeAutoSaveIntervalPreference(preference);
- onAutoSaveIntervalChange(
+ const preference = value as SyncIntervalPreference;
+ writeSyncIntervalPreference(preference);
+ onSyncIntervalChange(
preference === "5m" ? 300_000 : preference === "15m" ? 900_000 : preference === "30m" ? 1_800_000 : preference === "1h" ? 3_600_000 : preference === "2h" ? 7_200_000 : 60_000
);
}}
>
- <SelectTrigger aria-label={t("settings.autoSaveIntervalTitle")} className="h-9 bg-white">
+ <SelectTrigger aria-label={t("settings.syncIntervalTitle")} className="h-9 bg-white">
<SelectValue />
</SelectTrigger>
<SelectContent>
- <SelectItem value="1m">{t("settings.autoSaveIntervals.1m")}</SelectItem>
- <SelectItem value="5m">{t("settings.autoSaveIntervals.5m")}</SelectItem>
- <SelectItem value="15m">{t("settings.autoSaveIntervals.15m")}</SelectItem>
- <SelectItem value="30m">{t("settings.autoSaveIntervals.30m")}</SelectItem>
- <SelectItem value="1h">{t("settings.autoSaveIntervals.1h")}</SelectItem>
- <SelectItem value="2h">{t("settings.autoSaveIntervals.2h")}</SelectItem>
+ <SelectItem value="1m">{t("settings.syncIntervals.1m")}</SelectItem>
+ <SelectItem value="5m">{t("settings.syncIntervals.5m")}</SelectItem>
+ <SelectItem value="15m">{t("settings.syncIntervals.15m")}</SelectItem>
+ <SelectItem value="30m">{t("settings.syncIntervals.30m")}</SelectItem>
+ <SelectItem value="1h">{t("settings.syncIntervals.1h")}</SelectItem>
+ <SelectItem value="2h">{t("settings.syncIntervals.2h")}</SelectItem>
</SelectContent>
</Select>
</div>
diff --git a/apps/web/src/lib/app-helpers.test.mjs b/apps/web/src/lib/app-helpers.test.mjs
index 7d505607..e3bdbb4f 100644
--- a/apps/web/src/lib/app-helpers.test.mjs
+++ b/apps/web/src/lib/app-helpers.test.mjs
@@ -1,7 +1,11 @@
import { afterEach, describe, expect, test } from "bun:test";
import {
+ DEFAULT_SYNC_INTERVAL_MS,
DESKTOP_FOCUS_MODE_STORAGE_KEY,
+ SYNC_INTERVAL_STORAGE_KEY,
+ readSyncIntervalPreference,
readDesktopFocusModePreference,
+ writeSyncIntervalPreference,
writeDesktopFocusModePreference,
} from "./app-helpers.ts";
@@ -65,3 +69,40 @@ describe("desktop focus mode preference", () => {
expect(() => writeDesktopFocusModePreference(true)).not.toThrow();
});
});
+
+describe("automatic sync interval preference", () => {
+ test("defaults to one minute", () => {
+ installLocalStorage();
+ expect(readSyncIntervalPreference()).toBe(DEFAULT_SYNC_INTERVAL_MS);
+ expect(DEFAULT_SYNC_INTERVAL_MS).toBe(60_000);
+ });
+
+ test("reads and writes sync intervals", () => {
+ const values = installLocalStorage();
+
+ writeSyncIntervalPreference("5m");
+ expect(values.get(SYNC_INTERVAL_STORAGE_KEY)).toBe("5m");
+ expect(readSyncIntervalPreference()).toBe(300_000);
+ });
+
+ test("preserves the legacy preference stored under the old key", () => {
+ const values = installLocalStorage();
+ values.set("edgeever.autoSaveInterval", "15m");
+ expect(readSyncIntervalPreference()).toBe(900_000);
+ });
+
+ test("falls back to the default for unknown or unavailable storage", () => {
+ const values = installLocalStorage();
+ values.set(SYNC_INTERVAL_STORAGE_KEY, "unexpected");
+ expect(readSyncIntervalPreference()).toBe(60_000);
+
+ globalThis.window = {
+ localStorage: {
+ getItem: () => {
+ throw new Error("blocked");
+ },
+ },
+ };
+ expect(readSyncIntervalPreference()).toBe(60_000);
+ });
+});
diff --git a/apps/web/src/lib/app-helpers.ts b/apps/web/src/lib/app-helpers.ts
index 8f30f11a..39556b82 100644
--- a/apps/web/src/lib/app-helpers.ts
+++ b/apps/web/src/lib/app-helpers.ts
@@ -208,7 +208,8 @@ export { buildNotebookTree, type NotebookNode };
export { DEFAULT_MEMO_TITLE };
export const IMAGE_COMPRESSION_STORAGE_KEY = "edgeever.imageCompressionEnabled";
-export const AUTO_SAVE_INTERVAL_STORAGE_KEY = "edgeever.autoSaveInterval";
+export const SYNC_INTERVAL_STORAGE_KEY = "edgeever.syncInterval";
+const LEGACY_AUTO_SAVE_INTERVAL_STORAGE_KEY = "edgeever.autoSaveInterval";
export const DESKTOP_FOCUS_MODE_STORAGE_KEY = "edgeever.desktopFocusMode";
export const MEMO_LIST_DENSITY_STORAGE_KEY = "edgeever.memoListDensity";
export const MEMO_LIST_WIDTH_STORAGE_KEY = "edgeever.memoListWidth";
@@ -217,10 +218,11 @@ export const SHORTCUT_SETTINGS_STORAGE_KEY = "edgeever.shortcutSettings";
export const DEFAULT_MEMO_LIST_WIDTH_PX = 360;
export const MIN_MEMO_LIST_WIDTH_PX = 300;
export const MAX_MEMO_LIST_WIDTH_PX = 540;
+export const EDITOR_LOCAL_SAVE_DELAY_MS = 1_200;
-export type AutoSaveIntervalPreference = "1m" | "5m" | "15m" | "30m" | "1h" | "2h" | "off";
-export const DEFAULT_AUTO_SAVE_INTERVAL_MS = 60_000;
-const AUTO_SAVE_INTERVAL_VALUES: Record<AutoSaveIntervalPreference, number | null> = {
+export type SyncIntervalPreference = "1m" | "5m" | "15m" | "30m" | "1h" | "2h" | "off";
+export const DEFAULT_SYNC_INTERVAL_MS = 60_000;
+const SYNC_INTERVAL_VALUES: Record<SyncIntervalPreference, number | null> = {
"1m": 60_000,
"5m": 300_000,
"15m": 900_000,
@@ -336,18 +338,21 @@ export const writeImageCompressionPreference = (enabled: boolean) => {
}
};
-export const readAutoSaveIntervalPreference = (): number | null => {
+export const readSyncIntervalPreference = (): number | null => {
try {
- const stored = window.localStorage.getItem(AUTO_SAVE_INTERVAL_STORAGE_KEY) as AutoSaveIntervalPreference | null;
- return stored && stored in AUTO_SAVE_INTERVAL_VALUES ? AUTO_SAVE_INTERVAL_VALUES[stored] : DEFAULT_AUTO_SAVE_INTERVAL_MS;
+ const stored = (
+ window.localStorage.getItem(SYNC_INTERVAL_STORAGE_KEY)
+ ?? window.localStorage.getItem(LEGACY_AUTO_SAVE_INTERVAL_STORAGE_KEY)
+ ) as SyncIntervalPreference | null;
+ return stored && stored in SYNC_INTERVAL_VALUES ? SYNC_INTERVAL_VALUES[stored] : DEFAULT_SYNC_INTERVAL_MS;
} catch {
- return DEFAULT_AUTO_SAVE_INTERVAL_MS;
+ return DEFAULT_SYNC_INTERVAL_MS;
}
};
-export const writeAutoSaveIntervalPreference = (preference: AutoSaveIntervalPreference) => {
+export const writeSyncIntervalPreference = (preference: SyncIntervalPreference) => {
try {
- window.localStorage.setItem(AUTO_SAVE_INTERVAL_STORAGE_KEY, preference);
+ window.localStorage.setItem(SYNC_INTERVAL_STORAGE_KEY, preference);
} catch {
// Local storage can be unavailable in private or restricted browser contexts.
}
diff --git a/apps/web/src/lib/desktop-repository.ts b/apps/web/src/lib/desktop-repository.ts
index c30b0680..ac91245d 100644
--- a/apps/web/src/lib/desktop-repository.ts
+++ b/apps/web/src/lib/desktop-repository.ts
@@ -11,6 +11,7 @@ import type { EdgeEverRepository } from "@/lib/repository";
import { api, getConfiguredDesktopApiBaseUrl } from "@/lib/api";
import { createStagedResourceListItem, mapMarkdownResourceUrls, mapTiptapResourceUrls, toApiResourceUrl, toDesktopResourceUrl } from "@/lib/desktop-resources";
import type { ResourceListItem, ResourceStorageSummary } from "@edgeever/shared";
+import { notifySyncQueueDeferred } from "@/lib/sync-events";
const resolveResourceUrls = <T extends { resources: Array<{ url: string }> }>(result: T): T => {
const baseUrl = getConfiguredDesktopApiBaseUrl();
@@ -224,7 +225,7 @@ export const createDesktopRepository = (): EdgeEverRepository => ({
tags: input.tags,
};
const result = await request("memo.update", rpcParams);
- window.dispatchEvent(new CustomEvent("edgeever:sync-queue-changed"));
+ notifySyncQueueDeferred();
return { memo: toDisplayMemo(result.memo), queued: true as const };
},
diff --git a/apps/web/src/lib/repository.test.mjs b/apps/web/src/lib/repository.test.mjs
index 62daa56a..f719b170 100644
--- a/apps/web/src/lib/repository.test.mjs
+++ b/apps/web/src/lib/repository.test.mjs
@@ -7,9 +7,10 @@ globalThis.IDBKeyRange = IDBKeyRange;
const { localDb } = await import("./local-db.ts");
const { api } = await import("./api.ts");
const { createWebRepository } = await import("./repository.ts");
+const { createLocalMemo } = await import("./local-mirror.ts");
afterEach(async () => {
- await localDb.transaction("rw", [localDb.templates, localDb.notebooks, localDb.memos, localDb.resources, localDb.revisions, localDb.syncMeta], async () => {
+ await localDb.transaction("rw", [localDb.templates, localDb.notebooks, localDb.memos, localDb.resources, localDb.revisions, localDb.syncMeta, localDb.syncQueue], async () => {
await Promise.all([
localDb.templates.clear(),
localDb.notebooks.clear(),
@@ -17,11 +18,52 @@ afterEach(async () => {
localDb.resources.clear(),
localDb.revisions.clear(),
localDb.syncMeta.clear(),
+ localDb.syncQueue.clear(),
]);
});
});
describe("web repository offline boundaries", () => {
+ test("saves memo edits locally while deferring remote synchronization", async () => {
+ const previousWindow = globalThis.window;
+ const eventTarget = new EventTarget();
+ globalThis.window = eventTarget;
+ let immediateEvents = 0;
+ let deferredEvents = 0;
+ eventTarget.addEventListener("edgeever:sync-queue-changed", () => {
+ immediateEvents += 1;
+ });
+ eventTarget.addEventListener("edgeever:sync-queue-deferred", () => {
+ deferredEvents += 1;
+ });
+
+ try {
+ const scope = "https://demo.edgeever.org|user-1";
+ const memo = await createLocalMemo(scope, { notebookId: "nb-1" });
+ const repository = createWebRepository(scope);
+ const contentJson = {
+ type: "doc",
+ content: [{ type: "paragraph", content: [{ type: "text", text: "Saved locally" }] }],
+ };
+
+ const result = await repository.updateMemo(memo, {
+ expectedRevision: memo.revision,
+ expectedContentHash: memo.contentHash,
+ editSessionId: "local-edit",
+ title: "",
+ contentJson,
+ tags: [],
+ });
+
+ expect(result.memo.contentText).toBe("Saved locally");
+ expect(await localDb.syncQueue.get(`memo.update:${memo.id}`)).toBeDefined();
+ expect(deferredEvents).toBe(1);
+ expect(immediateEvents).toBe(0);
+ } finally {
+ globalThis.window = previousWindow;
+ }
+ });
+
test("uses the remote detail when the local database is blocked and navigator falsely reports offline", async () => {
const previousOnline = globalThis.navigator?.onLine;
if (globalThis.navigator) Object.defineProperty(globalThis.navigator, "onLine", { configurable: true, value: false });
diff --git a/apps/web/src/lib/repository.ts b/apps/web/src/lib/repository.ts
index bc289014..2a3cdbaa 100644
--- a/apps/web/src/lib/repository.ts
+++ b/apps/web/src/lib/repository.ts
@@ -41,6 +41,7 @@ import { queueLocalAction, queueMemoCreate, queueMemoDelete, queueMemoRestore, q
import type { MemoUpdateSyncPayload } from "@/lib/local-db";
import { createDesktopRepository } from "@/lib/desktop-repository";
import { isBrowserOffline } from "@/lib/network-status";
+import { notifySyncQueueDeferred } from "@/lib/sync-events";
export type EdgeEverRepository = {
listNotebooks(): Promise<{ notebooks: Notebook[] }>;
@@ -361,7 +362,7 @@ export const createWebRepository = (scope: string): EdgeEverRepository => {
const payload: MemoUpdateSyncPayload = { ...input, memoId: memo.id };
const updated = await putLocalMemoUpdate(scope, memo, payload);
await queueMemoUpdate(payload, scope);
- window.dispatchEvent(new CustomEvent("edgeever:sync-queue-changed"));
+ notifySyncQueueDeferred();
return { memo: updated, queued: true };
},
diff --git a/apps/web/src/lib/sync-events.ts b/apps/web/src/lib/sync-events.ts
new file mode 100644
index 00000000..d01295c5
--- /dev/null
+++ b/apps/web/src/lib/sync-events.ts
@@ -0,0 +1,10 @@
+export const SYNC_QUEUE_CHANGED_EVENT = "edgeever:sync-queue-changed";
+export const SYNC_QUEUE_DEFERRED_EVENT = "edgeever:sync-queue-deferred";
+
+export const notifySyncQueueChanged = () => {
+ window.dispatchEvent(new CustomEvent(SYNC_QUEUE_CHANGED_EVENT));
+};
+
+export const notifySyncQueueDeferred = () => {
+ window.dispatchEvent(new CustomEvent(SYNC_QUEUE_DEFERRED_EVENT));
+};
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 6cbaec79..3f488295 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -162,9 +162,9 @@ export const enUS = {
imageCompressionTitle: "Compress note images",
imageCompressionDescription: "Compress large images locally before upload to reduce storage use.",
imageCompressionAria: "Compress note images",
- autoSaveIntervalTitle: "Automatic sync interval",
- autoSaveIntervalDescription: "Sync edits to the server automatically while keeping local drafts available immediately.",
- autoSaveIntervals: { "1m": "Every minute", "5m": "Every 5 minutes", "15m": "Every 15 minutes", "30m": "Every 30 minutes", "1h": "Every hour", "2h": "Every 2 hours" },
+ syncIntervalTitle: "Automatic sync interval",
+ syncIntervalDescription: "Sync edits to the server automatically while keeping local drafts available immediately.",
+ syncIntervals: { "1m": "Every minute", "5m": "Every 5 minutes", "15m": "Every 15 minutes", "30m": "Every 30 minutes", "1h": "Every hour", "2h": "Every 2 hours" },
mermaidThemeTitle: "Diagram theme",
mermaidThemeDescription: "Choose the visual theme for diagrams in notes.",
editorThemeTitle: "Editor theme",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index 6f580d39..727c113c 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -162,9 +162,9 @@ export const zhCN = {
imageCompressionTitle: "压缩笔记内图片",
imageCompressionDescription: "上传大图时在本地压缩,节省资源占用。",
imageCompressionAria: "是否压缩笔记内图片",
- autoSaveIntervalTitle: "自动同步间隔",
- autoSaveIntervalDescription: "定期将编辑内容同步到服务器,本地草稿仍会即时保留。",
- autoSaveIntervals: { "1m": "每 1 分钟", "5m": "每 5 分钟", "15m": "每 15 分钟", "30m": "每 30 分钟", "1h": "每 1 小时", "2h": "每 2 小时" },
+ syncIntervalTitle: "自动同步间隔",
+ syncIntervalDescription: "定期将编辑内容同步到服务器,本地草稿仍会即时保留。",
+ syncIntervals: { "1m": "每 1 分钟", "5m": "每 5 分钟", "15m": "每 15 分钟", "30m": "每 30 分钟", "1h": "每 1 小时", "2h": "每 2 小时" },
mermaidThemeTitle: "图表主题",
mermaidThemeDescription: "选择笔记中图表的视觉主题。",
editorThemeTitle: "编辑器主题",