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: require desktop instance setup on first launch
tianma-ifc73ca2b117a8
diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex 09edee88..750e0306 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -1,6 +1,6 @@{"name": "@edgeever/desktop",- "version": "1.6.30",+ "version": "1.6.32","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 c1692d85..ca29bd69 100644--- a/apps/desktop/src/main/index.mjs+++ b/apps/desktop/src/main/index.mjs@@ -19,7 +19,12 @@ const { autoUpdater } = electronUpdater;const currentDirectory = fileURLToPath(new URL(".", import.meta.url));const projectRoot = join(currentDirectory, "../../..");const webUrl = process.env.EDGE_EVER_DESKTOP_WEB_URL || "http://127.0.0.1:5173";-const apiBaseUrl = (process.env.EDGE_EVER_API_URL || (process.env.EDGE_EVER_DESKTOP_WEB_URL ? webUrl : "")).replace(/\/$/, "");+// A packaged desktop app is self-hosted-client software: its instance URL must+// come from the user-facing first-run setup, never from the build environment.+// Environment URLs are intentionally limited to local development.+const apiBaseUrl = (!app.isPackaged && (process.env.EDGE_EVER_API_URL || process.env.EDGE_EVER_DESKTOP_WEB_URL)+ ? process.env.EDGE_EVER_API_URL || webUrl+ : "").replace(/\/$/, "");let configuredApiBaseUrl = apiBaseUrl;const packagedSidecarName = process.platform === "win32" ? "edgeever-sidecar.exe" : "edgeever-sidecar";const sidecarPath = process.env.EDGE_EVER_SIDECAR_PATH || (app.isPackageddiff --git a/apps/web/src/app/App.tsx b/apps/web/src/app/App.tsxindex 94d5bb3e..0922b60e 100644--- a/apps/web/src/app/App.tsx+++ b/apps/web/src/app/App.tsx@@ -16,6 +16,7 @@ import {getConfiguredDesktopApiBaseUrl,getCachedDesktopSession,isDesktopInstanceConfigurationRequired,+ resetDesktopApiBaseUrl,saveDesktopApiBaseUrl,} from "@/lib/api";import { EVERNOTE_MIGRATION_PATH } from "@/lib/routes";@@ -229,6 +230,10 @@ const AuthenticatedWorkspace = () => {configurationError={configurationError}error={loginError}isSubmitting={loginMutation.isPending}+ onChangeInstance={desktopBridge?.isAvailable ? () => {+ resetDesktopApiBaseUrl();+ window.location.reload();+ } : undefined}onSubmit={(payload) => loginMutation.mutate(payload)}/></Suspense>diff --git a/apps/web/src/components/LoginScreen.tsx b/apps/web/src/components/LoginScreen.tsxindex 254f31f3..f5029452 100644--- a/apps/web/src/components/LoginScreen.tsx+++ b/apps/web/src/components/LoginScreen.tsx@@ -9,6 +9,7 @@ interface LoginScreenProps {configurationError: string | null;error: string | null;isSubmitting: boolean;+ onChangeInstance?: () => void;onSubmit: (payload: { username: string; password: string }) => void;}@@ -24,7 +25,7 @@ const getDefaultLoginCredentials = () => {return isDemoHost ? DEMO_LOGIN_CREDENTIALS : { username: "admin", password: "" };};-export const LoginScreen = ({ configurationError, error, isSubmitting, onSubmit }: LoginScreenProps) => {+export const LoginScreen = ({ configurationError, error, isSubmitting, onChangeInstance, onSubmit }: LoginScreenProps) => {const { t } = useTranslation();const [username, setUsername] = useState(() => getDefaultLoginCredentials().username);const [password, setPassword] = useState(() => getDefaultLoginCredentials().password);@@ -57,8 +58,15 @@ export const LoginScreen = ({ configurationError, error, isSubmitting, onSubmit</div>{configurationError ? (- <div className="rounded-lg border border-amber-200 bg-amber-50 px-4 py-3 text-sm font-medium leading-6 text-amber-900">- {configurationError}+ <div className="space-y-3">+ <div className="rounded-lg border border-amber-200 bg-amber-50 px-4 py-3 text-sm font-medium leading-6 text-amber-900">+ {configurationError}+ </div>+ {onChangeInstance ? (+ <Button className="h-10 w-full justify-center" type="button" variant="outline" onClick={onChangeInstance}>+ {t("login.desktopChangeInstance")}+ </Button>+ ) : null}</div>) : <form className="space-y-5" onSubmit={handleSubmit}><label className="block">diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.tsindex dde8e1a9..d7ef4a49 100644--- a/apps/web/src/lib/api.ts+++ b/apps/web/src/lib/api.ts@@ -121,6 +121,12 @@ export const saveDesktopApiBaseUrl = (value: string) => {return normalized;};+export const resetDesktopApiBaseUrl = () => {+ if (typeof window === "undefined" || !window.edgeeverDesktop?.isAvailable) return;+ window.localStorage.removeItem(DESKTOP_API_BASE_URL_STORAGE_KEY);+ void window.edgeeverDesktop.setApiBaseUrl("");+};+const createWebDeviceId = () => {const uuid = globalThis.crypto?.randomUUID?.();return uuiddiff --git a/package.json b/package.jsonindex 2464fbf5..508ebe41 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "edgeever",- "version": "1.6.31",+ "version": "1.6.32","private": true,"type": "module","workspaces": [diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex 7ea67212..4dac9672 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -58,6 +58,7 @@ export const enUS = {desktopInstanceDescription: "The desktop app needs your self-hosted instance URL. It is stored only in this computer's local storage.",desktopInstanceUrl: "Instance URL",desktopInstanceContinue: "Continue",+ desktopChangeInstance: "Change instance URL",desktopInstanceUrlInvalid: "Enter a valid instance URL beginning with http:// or https://.",},nav: {diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex f74b8de4..a809b667 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -58,6 +58,7 @@ export const zhCN = {desktopInstanceDescription: "桌面端需要知道你的自托管实例地址。地址只保存在本机浏览器存储中。",desktopInstanceUrl: "实例地址",desktopInstanceContinue: "继续",+ desktopChangeInstance: "更换实例地址",desktopInstanceUrlInvalid: "请输入以 http:// 或 https:// 开头的有效实例地址。",},nav: {