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: allow retrying desktop instance setup
tianma-iffbaa5e7b12a6
diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex 741156c8..10789122 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -1,6 +1,6 @@{"name": "@edgeever/desktop",- "version": "1.6.33",+ "version": "1.6.35","desktopName": "EdgeEver","private": true,"description": "Native EdgeEver desktop client",diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjsindex a42ef84d..963bb714 100644--- a/apps/desktop/src/main/index.mjs+++ b/apps/desktop/src/main/index.mjs@@ -514,7 +514,7 @@ app.whenReady().then(async () => {}if (normalized === configuredApiBaseUrl) return configuredApiBaseUrl;configuredApiBaseUrl = normalized;- void writeFile(instanceUrlPath(), configuredApiBaseUrl);+ await writeFile(instanceUrlPath(), configuredApiBaseUrl);if (sidecar) {await stopSidecar();const nextSidecar = await startSidecar(activeAccountId);diff --git a/apps/web/src/app/App.tsx b/apps/web/src/app/App.tsxindex a050a6ee..0e90f9fa 100644--- a/apps/web/src/app/App.tsx+++ b/apps/web/src/app/App.tsx@@ -38,18 +38,22 @@ const AuthLoadingScreen = ({ title = "EdgeEver", detail }: { title?: string; det</div>);-const DesktopInstanceSetup = () => {+const DesktopInstanceSetup = ({ onConfigured }: { onConfigured: () => void }) => {const { t } = useTranslation();const [value, setValue] = useState("");const [error, setError] = useState<string | null>(null);+ const [isSaving, setIsSaving] = useState(false);- const save = (event: FormEvent<HTMLFormElement>) => {+ const save = async (event: FormEvent<HTMLFormElement>) => {event.preventDefault();+ setError(null);+ setIsSaving(true);try {- saveDesktopApiBaseUrl(value);- window.location.reload();+ await saveDesktopApiBaseUrl(value);+ onConfigured();} catch {setError(t("login.desktopInstanceUrlInvalid"));+ setIsSaving(false);}};@@ -65,11 +69,14 @@ const DesktopInstanceSetup = () => {className="h-11 rounded-lg bg-slate-50/50 px-3.5 focus-visible:bg-white focus-visible:ring-4 focus-visible:ring-emerald-500/10"placeholder="https://notes.example.com"value={value}- onChange={(event) => setValue(event.target.value)}+ onChange={(event) => {+ setValue(event.target.value);+ setError(null);+ }}/></label>{error && <p className="text-sm text-rose-700">{error}</p>}- <Button className="h-11 w-full justify-center rounded-lg bg-emerald-500 font-semibold text-white transition hover:bg-emerald-600" type="submit" variant="solid">+ <Button className="h-11 w-full justify-center rounded-lg bg-emerald-500 font-semibold text-white transition hover:bg-emerald-600" disabled={isSaving} type="submit" variant="solid">{t("login.desktopInstanceContinue")}</Button></form>@@ -256,13 +263,19 @@ const AuthenticatedWorkspace = () => {};export const App = () => {+ const [desktopInstanceConfigured, setDesktopInstanceConfigured] = useState(+ () => !isDesktopInstanceConfigurationRequired(),+ );+useEffect(() => {const bridge = window.edgeeverDesktop;const baseUrl = getConfiguredDesktopApiBaseUrl();if (bridge?.isAvailable && baseUrl) void bridge.setApiBaseUrl(baseUrl);}, []);- if (isDesktopInstanceConfigurationRequired()) return <DesktopInstanceSetup />;+ if (!desktopInstanceConfigured) {+ return <DesktopInstanceSetup onConfigured={() => setDesktopInstanceConfigured(true)} />;+ }return (<PwaInstallProvider>diff --git a/apps/web/src/lib/api.test.mjs b/apps/web/src/lib/api.test.mjsnew file mode 100644index 00000000..e38b51b4--- /dev/null+++ b/apps/web/src/lib/api.test.mjs@@ -0,0 +1,49 @@+import { describe, expect, test } from "bun:test";++const storage = new Map();+const calls = [];+let completeSave;++globalThis.window = {+ edgeeverDesktop: {+ isAvailable: true,+ apiBaseUrl: "",+ setApiBaseUrl: async (value) => {+ calls.push(["bridge:start", value]);+ await new Promise((resolve) => {+ completeSave = resolve;+ });+ calls.push(["bridge:complete", value]);+ return value;+ },+ },+ localStorage: {+ getItem: (key) => storage.get(key) ?? null,+ setItem: (key, value) => {+ calls.push(["storage", value]);+ storage.set(key, value);+ },+ },+};++const { DESKTOP_API_BASE_URL_STORAGE_KEY, saveDesktopApiBaseUrl } = await import("./api.ts");++describe("desktop instance setup", () => {+ test("can retry with a valid URL after invalid input", async () => {+ await expect(saveDesktopApiBaseUrl("not-an-instance")).rejects.toThrow();++ const saving = saveDesktopApiBaseUrl(" https://notes.example.com/ ");+ await Promise.resolve();+ expect(calls).toEqual([["bridge:start", "https://notes.example.com"]]);+ expect(storage.has(DESKTOP_API_BASE_URL_STORAGE_KEY)).toBe(false);++ completeSave();+ await expect(saving).resolves.toBe("https://notes.example.com");+ expect(calls).toEqual([+ ["bridge:start", "https://notes.example.com"],+ ["bridge:complete", "https://notes.example.com"],+ ["storage", "https://notes.example.com"],+ ]);+ expect(storage.get(DESKTOP_API_BASE_URL_STORAGE_KEY)).toBe("https://notes.example.com");+ });+});diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.tsindex d7ef4a49..69c77029 100644--- a/apps/web/src/lib/api.ts+++ b/apps/web/src/lib/api.ts@@ -109,15 +109,15 @@ export const isDesktopInstanceConfigurationRequired = () =>window.location.protocol === "file:" &&!getConfiguredDesktopApiBaseUrl();-export const saveDesktopApiBaseUrl = (value: string) => {+export const saveDesktopApiBaseUrl = async (value: string) => {const normalized = value.trim().replace(/\/$/, "");const parsed = new URL(normalized);if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {throw new Error("Desktop instance URL must use http or https");}+ await window.edgeeverDesktop?.setApiBaseUrl(normalized);window.localStorage.setItem(DESKTOP_API_BASE_URL_STORAGE_KEY, normalized);- void window.edgeeverDesktop?.setApiBaseUrl(normalized);return normalized;};diff --git a/package.json b/package.jsonindex f6533fb3..df5b0d44 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "edgeever",- "version": "1.6.34",+ "version": "1.6.35","private": true,"type": "module","workspaces": [@@ -35,7 +35,7 @@"benchmark:desktop:sidecar": "bun scripts/benchmark-desktop-sidecar.mjs","verify:web-performance": "bun scripts/verify-web-performance.mjs","test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",- "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",+ "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar","verify:desktop-package": "bun scripts/verify-desktop-package.mjs","build:cloudflare": "bun run typecheck && bun run build","build:site": "bun --cwd apps/site build",