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): pick the client-ahead hint by deployment platform

tianma-if46707a52dfcf
diff --git a/apps/desktop/src/main/desktop-update-flow.test.mjs b/apps/desktop/src/main/desktop-update-flow.test.mjs
index 220e0305..9f081df4 100644
--- a/apps/desktop/src/main/desktop-update-flow.test.mjs
+++ b/apps/desktop/src/main/desktop-update-flow.test.mjs
@@ -84,7 +84,7 @@ describe("desktop update flow", () => {
expect(mainSource).not.toContain("heldUpdateVersion");
expect(mainSource).not.toContain("update.held-for-instance");
expect(mainSource).toContain("promptForDownloadedUpdate(downloadedUpdateVersion)");
- expect(systemInfoSource).toContain('t("systemInfo.clientAheadOfInstance")');
+ expect(systemInfoSource).toContain("clientAheadOfInstanceByPlatform");
expect(systemInfoSource).toContain("isClientAheadOfInstance");
});
});
diff --git a/apps/ios/EdgeEver/Features/Workspace/SettingsView.swift b/apps/ios/EdgeEver/Features/Workspace/SettingsView.swift
index c894a670..2c45308c 100644
--- a/apps/ios/EdgeEver/Features/Workspace/SettingsView.swift
+++ b/apps/ios/EdgeEver/Features/Workspace/SettingsView.swift
@@ -522,10 +522,23 @@ struct SettingsView: View {
guard let clientVersion, let instanceVersion, Self.isClient(clientVersion, aheadOfInstance: instanceVersion) else {
return nil
}
- return env.preferences.t(
- "当前客户端版本高于云端实例。可等待每天自动更新,或手动运行 Update deployed EdgeEver 工作流。",
- en: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run the Update deployed EdgeEver workflow."
- )
+ switch instanceHealth?.runtime {
+ case "cloudflare-workers":
+ return env.preferences.t(
+ "当前客户端版本高于云端实例。可等待每天自动更新,或手动运行 Update deployed EdgeEver 工作流。",
+ en: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run the Update deployed EdgeEver workflow."
+ )
+ case "self-hosted-bun":
+ return env.preferences.t(
+ "当前客户端版本高于云端实例。可等待每天自动更新,或手动执行 update.sh。",
+ en: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run update.sh on the instance."
+ )
+ default:
+ return env.preferences.t(
+ "当前客户端版本高于云端实例。可等待每天自动更新,也可手动更新实例。",
+ en: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or update the instance manually."
+ )
+ }
}
private static func isClient(_ clientVersion: String, aheadOfInstance instanceVersion: String) -> Bool {
diff --git a/apps/mobile/src/screens/WorkspaceSettingsView.tsx b/apps/mobile/src/screens/WorkspaceSettingsView.tsx
index a50c406d..28193d7a 100644
--- a/apps/mobile/src/screens/WorkspaceSettingsView.tsx
+++ b/apps/mobile/src/screens/WorkspaceSettingsView.tsx
@@ -486,7 +486,9 @@ const getMobileSystemInfoText = (localePreference: MobileLocaleMode) =>
? {
build: "Build",
client: "Client",
- clientAheadOfInstance: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run the Update deployed EdgeEver workflow.",
+ clientAheadOfInstanceCloudflare: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run the Update deployed EdgeEver workflow.",
+ clientAheadOfInstanceDocker: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run update.sh on the instance.",
+ clientAheadOfInstanceUnknown: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or update the instance manually.",
clientDescription: "The EdgeEver app and runtime environment on this device.",
clientSection: "Current client",
cloudDescription: "Version and deployment environment for the connected instance.",
@@ -527,7 +529,9 @@ const getMobileSystemInfoText = (localePreference: MobileLocaleMode) =>
: {
build: "构建",
client: "客户端",
- clientAheadOfInstance: "当前客户端版本高于云端实例。可等待每天自动更新,或手动运行 Update deployed EdgeEver 工作流。",
+ clientAheadOfInstanceCloudflare: "当前客户端版本高于云端实例。可等待每天自动更新,或手动运行 Update deployed EdgeEver 工作流。",
+ clientAheadOfInstanceDocker: "当前客户端版本高于云端实例。可等待每天自动更新,或手动执行 update.sh。",
+ clientAheadOfInstanceUnknown: "当前客户端版本高于云端实例。可等待每天自动更新,也可手动更新实例。",
clientDescription: "这台设备上的 EdgeEver 应用与运行环境。",
clientSection: "当前客户端",
cloudDescription: "当前连接实例的版本与部署环境。",
@@ -566,6 +570,17 @@ const getMobileSystemInfoText = (localePreference: MobileLocaleMode) =>
version: "版本",
};
+const getMobileClientAheadNotice = (
+ copy: ReturnType<typeof getMobileSystemInfoText>,
+ instanceVersion: string | null | undefined,
+ runtime: string | null | undefined,
+) => {
+ if (!isClientAheadOfInstance(MOBILE_APP_VERSION, instanceVersion)) return undefined;
+ if (runtime === "cloudflare-workers") return copy.clientAheadOfInstanceCloudflare;
+ if (runtime === "self-hosted-bun") return copy.clientAheadOfInstanceDocker;
+ return copy.clientAheadOfInstanceUnknown;
+};
+
const getMobileDeploymentPlatform = (runtime: string | null | undefined, english: boolean) => {
if (runtime === "cloudflare-workers") return "Cloudflare";
if (runtime === "self-hosted-bun") return "Docker";
@@ -637,7 +652,7 @@ const getMobileSystemInfoGroups = (
{
description: copy.cloudDescription,
id: "cloud",
- notice: isClientAheadOfInstance(MOBILE_APP_VERSION, instance?.version) ? copy.clientAheadOfInstance : undefined,
+ notice: getMobileClientAheadNotice(copy, instance?.version, instance?.health.runtime),
items: [
{ label: copy.instanceVersion, value: instance?.version ? `v${instance.version.replace(/^v/, "")}` : copy.unknown },
{ label: copy.instanceBuild, value: instance?.health.build || copy.unknown },
diff --git a/apps/web/src/components/settings/SystemInfoPanel.test.mjs b/apps/web/src/components/settings/SystemInfoPanel.test.mjs
index 835979ba..fcaf1d30 100644
--- a/apps/web/src/components/settings/SystemInfoPanel.test.mjs
+++ b/apps/web/src/components/settings/SystemInfoPanel.test.mjs
@@ -8,7 +8,8 @@ describe("system information client/instance version hint", () => {
expect(source).toContain("isClientAheadOfInstance");
expect(source).toContain("clientRuntimeQuery.data?.appVersion ?? __EDGEEVER_APP_VERSION__");
expect(source).toContain("release?.version");
- expect(source).toContain('t("systemInfo.clientAheadOfInstance")');
+ expect(source).toContain("clientAheadOfInstanceByPlatform");
+ expect(source).toContain("resolveDeploymentPlatform(healthQuery.data?.health?.runtime)");
expect(source).toContain("clientAheadOfInstance");
});
});
diff --git a/apps/web/src/components/settings/SystemInfoPanel.tsx b/apps/web/src/components/settings/SystemInfoPanel.tsx
index 9a1ad314..60cf9da1 100644
--- a/apps/web/src/components/settings/SystemInfoPanel.tsx
+++ b/apps/web/src/components/settings/SystemInfoPanel.tsx
@@ -341,6 +341,9 @@ export const SystemInfoPanel = ({ active = true }: { active?: boolean }) => {
clientRuntimeQuery.data?.appVersion ?? __EDGEEVER_APP_VERSION__,
release?.version,
);
+ const clientAheadHint = t(
+ `systemInfo.clientAheadOfInstanceByPlatform.${resolveDeploymentPlatform(healthQuery.data?.health?.runtime)}`,
+ );
const desktopUpdateState = desktopUpdateStatusQuery.data?.state ?? "idle";
const desktopAutoUpdateSupported = clientRuntimeQuery.data?.autoUpdateSupported !== false;
const desktopUpdateBusy = desktopUpdateCheckMutation.isPending || desktopUpdateInstallMutation.isPending;
@@ -437,7 +440,7 @@ export const SystemInfoPanel = ({ active = true }: { active?: boolean }) => {
{isCloud && active && clientAheadOfInstance ? (
<p className="flex items-start gap-1.5 px-0.5 text-[11px] leading-4 text-slate-500" role="status">
<Info className="mt-0.5 h-3 w-3 shrink-0 text-slate-400" />
- <span>{t("systemInfo.clientAheadOfInstance")}</span>
+ <span>{clientAheadHint}</span>
</p>
) : isCloud && active && release ? (
<div className="flex flex-wrap items-center gap-2 rounded-lg border border-emerald-200/80 bg-emerald-50/70 px-3 py-1.5 text-slate-800" role="status">
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 58f6d2b7..99cf0948 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -1137,7 +1137,11 @@ export const enUS = {
browserMode: "Browser",
unknown: "Unknown",
copy: "Copy info",
- clientAheadOfInstance: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run the Update deployed EdgeEver workflow.",
+ clientAheadOfInstanceByPlatform: {
+ cloudflare: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run the Update deployed EdgeEver workflow.",
+ docker: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or run update.sh on the instance.",
+ unknown: "This client is newer than the connected cloud instance. You can wait for the daily automatic instance update, or update the instance manually.",
+ },
deployedUpdateTitle: "Your cloud instance was automatically updated to v{{version}}",
viewReleaseNotes: "Release notes",
desktopCheckForUpdates: "Check for updates",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index b18620c7..cf0635db 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -1137,7 +1137,11 @@ export const zhCN = {
browserMode: "浏览器",
unknown: "未知",
copy: "复制信息",
- clientAheadOfInstance: "当前客户端版本高于云端实例。可等待每天自动更新,或手动运行 Update deployed EdgeEver 工作流。",
+ clientAheadOfInstanceByPlatform: {
+ cloudflare: "当前客户端版本高于云端实例。可等待每天自动更新,或手动运行 Update deployed EdgeEver 工作流。",
+ docker: "当前客户端版本高于云端实例。可等待每天自动更新,或手动执行 update.sh。",
+ unknown: "当前客户端版本高于云端实例。可等待每天自动更新,也可手动更新实例。",
+ },
deployedUpdateTitle: "您的云端实例已自动更新至 v{{version}}",
viewReleaseNotes: "版本说明",
desktopCheckForUpdates: "检查更新",