mac 更新适配

Author: SengokuCola

src/main/ipc/app.ts

@@ -751,40 +751,145 @@ function versionAsTag(version: string | undefined): string | undefined {
   return /^v/iu.test(trimmed) ? trimmed : `v${trimmed}`;
 }
 
-function sanitizeDownloadFileName(value: string): string {
+function launcherUpdatePackageLabel(
+  platform: NodeJS.Platform = process.platform,
+): string {
+  if (platform === "darwin") {
+    return "macOS DMG 安装包";
+  }
+  if (platform === "win32") {
+    return "Windows 安装包";
+  }
+  return "当前平台安装包";
+}
+
+function launcherUpdateDefaultFileName(
+  platform: NodeJS.Platform = process.platform,
+): string {
+  if (platform === "darwin") {
+    return "MaiBot-OneKey-update.dmg";
+  }
+  if (platform === "win32") {
+    return "MaiBot-OneKey-update.exe";
+  }
+  return "MaiBot-OneKey-update";
+}
+
+function launcherAssetArchNames(arch: string): string[] {
+  if (arch === "arm64") {
+    return ["arm64", "aarch64"];
+  }
+  if (arch === "x64") {
+    return ["x64", "x86_64", "amd64"];
+  }
+  return [arch.toLowerCase()];
+}
+
+function scoreLauncherUpdateAsset(
+  asset: GitHubReleaseAsset,
+  platformNames: string[],
+  arch: string,
+): number {
+  const name = String(asset.name ?? "").toLowerCase();
+  const archNames = launcherAssetArchNames(arch);
+  let score = 0;
+  if (platformNames.some((platformName) => name.includes(platformName))) {
+    score += 20;
+  }
+  if (archNames.some((archName) => name.includes(archName))) {
+    score += 10;
+  }
+  if (name.includes("universal")) {
+    score += 5;
+  }
+  return score;
+}
+
+function selectBestLauncherUpdateAsset(
+  assets: GitHubReleaseAsset[],
+  platformNames: string[],
+  arch: string,
+): GitHubReleaseAsset | undefined {
+  return assets
+    .map((asset, index) => ({
+      asset,
+      index,
+      score: scoreLauncherUpdateAsset(asset, platformNames, arch),
+    }))
+    .sort((left, right) => {
+      if (right.score !== left.score) {
+        return right.score - left.score;
+      }
+      return left.index - right.index;
+    })[0]?.asset;
+}
+
+function sanitizeDownloadFileName(
+  value: string,
+  platform: NodeJS.Platform = process.platform,
+): string {
   const sanitized = basename(value)
     .replace(/[<>:"/\\|?*\u0000-\u001F]/gu, "-")
     .replace(/\s+/gu, " ")
     .trim()
     .replace(/[. ]+$/u, "");
-  return sanitized || "MaiBot-OneKey-update.exe";
+  return sanitized || launcherUpdateDefaultFileName(platform);
 }
 
 function selectLauncherUpdateAsset(
   rawAssets: unknown,
+  platform: NodeJS.Platform = process.platform,
+  arch: string = process.arch,
 ): GitHubReleaseAsset | undefined {
   const assets = Array.isArray(rawAssets)
     ? rawAssets.filter((item): item is GitHubReleaseAsset => {
         return Boolean(item && typeof item === "object");
       })
     : [];
-  const executableAssets = assets.filter((asset) => {
+  const downloadableAssets = assets.filter((asset) => {
     const name = typeof asset.name === "string" ? asset.name.toLowerCase() : "";
     const url =
       typeof asset.browser_download_url === "string"
         ? asset.browser_download_url
         : "";
+    return Boolean(name && url);
+  });
+
+  if (platform === "darwin") {
+    const dmgAssets = downloadableAssets.filter((asset) => {
+      const name =
+        typeof asset.name === "string" ? asset.name.toLowerCase() : "";
+      return name.endsWith(".dmg");
+    });
+    return selectBestLauncherUpdateAsset(
+      dmgAssets,
+      ["mac", "darwin", "osx"],
+      arch,
+    );
+  }
+
+  if (platform === "win32") {
+    const executableAssets = downloadableAssets.filter((asset) => {
+      const name =
+        typeof asset.name === "string" ? asset.name.toLowerCase() : "";
+      return name.endsWith(".exe") && !name.includes("uninstaller");
+    });
+    return selectBestLauncherUpdateAsset(
+      executableAssets,
+      ["win", "windows"],
+      arch,
+    );
+  }
+
+  const linuxAssets = downloadableAssets.filter((asset) => {
+    const name = typeof asset.name === "string" ? asset.name.toLowerCase() : "";
     return (
-      name.endsWith(".exe") && !name.includes("uninstaller") && Boolean(url)
+      name.endsWith(".appimage") ||
+      name.endsWith(".deb") ||
+      name.endsWith(".rpm")
     );
   });
-  return (
-    executableAssets.find((asset) =>
-      String(asset.name ?? "")
-        .toLowerCase()
-        .includes("win"),
-    ) ?? executableAssets[0]
-  );
+  return selectBestLauncherUpdateAsset(linuxAssets, ["linux"], arch);
 }
 
 async function fetchLauncherReleaseNotesInRange(
@@ -1156,7 +1261,7 @@ async function downloadLauncherUpdate(
   onProgress?: LauncherUpdateDownloadProgressCallback,
 ): Promise<LauncherUpdateDownloadResult> {
   if (!update.downloadUrl || !update.assetName) {
-    throw new Error("最新版本没有可下载的 Windows 安装包");
+    throw new Error(`最新版本没有可下载的${launcherUpdatePackageLabel()}`);
   }
 
   const controller = new AbortController();
@@ -3241,12 +3346,21 @@ export function registerAppIpc({
       );
       await assertLauncherUpdateAllowed(serviceManager);
       const installerPath = download.installerPath;
-      const child = spawn(installerPath, [], {
-        detached: true,
-        stdio: "ignore",
-        windowsHide: false,
-      });
-      child.unref();
+      let willQuit = false;
+      if (process.platform === "win32") {
+        const child = spawn(installerPath, [], {
+          detached: true,
+          stdio: "ignore",
+          windowsHide: false,
+        });
+        child.unref();
+        willQuit = true;
+      } else {
+        const openError = await shell.openPath(installerPath);
+        if (openError) {
+          throw new Error(`安装包打开失败：${openError}`);
+        }
+      }
       sendProgress({
         phase: "completed",
         assetName: update.assetName,
@@ -3257,18 +3371,24 @@ export function registerAppIpc({
       logStore.append(
         "desktop",
         "system",
-        `启动器更新安装器已启动: ${installerPath}`,
+        `启动器更新安装包已打开: ${installerPath}`,
       );
-      setTimeout(() => requestQuit(), 800);
+      if (willQuit) {
+        setTimeout(() => requestQuit(), 800);
+      }
       return {
         update: publicLauncherUpdateInfo(update),
         installerPath,
         started: true,
-        willQuit: true,
+        willQuit,
       };
     },
   );
 
+  ipcMain.handle("launcher:quit", (): void => {
+    requestQuit();
+  });
+
   ipcMain.handle(
     "plugins:listMarket",
     async (

src/preload/index.ts

@@ -233,6 +233,8 @@ const desktopBridge: DesktopBridge = {
       ipcRenderer.invoke("launcher:checkUpdate") as Promise<LauncherUpdateInfo>,
     downloadAndInstallUpdate: () =>
       ipcRenderer.invoke("launcher:downloadAndInstallUpdate") as Promise<LauncherUpdateApplyResult>,
+    quit: () =>
+      ipcRenderer.invoke("launcher:quit") as Promise<void>,
     onDownloadProgress: (callback: (progress: LauncherUpdateDownloadProgress) => void) =>
       onIpc("launcher:update-download-progress", callback),
     resetSettings: () =>

src/renderer/src/components/app/HomePanel.tsx

@@ -2221,6 +2221,7 @@ export function HomePanel({
   const [busy, setBusy] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [launcherUpdateInfo, setLauncherUpdateInfo] = useState<LauncherUpdateInfo | null>(null);
+  const [launcherQuitPromptOpen, setLauncherQuitPromptOpen] = useState(false);
   const [maibotUpdateInfo, setMaibotUpdateInfo] = useState<MaiBotUpdateInfo | null>(null);
   const [maibotUpdateInfoLoading, setMaibotUpdateInfoLoading] = useState(false);
   const [maibotUpdateInfoError, setMaibotUpdateInfoError] = useState<string | null>(null);
@@ -2669,12 +2670,37 @@ export function HomePanel({
     try {
       const result = await window.maibotDesktop.launcher.downloadAndInstallUpdate();
       setLauncherUpdateInfo(result.update);
-      toast.success(result.willQuit ? "安装器已启动，启动器即将退出" : "安装器已启动");
+      if (result.willQuit) {
+        toast.success("安装包已打开，启动器即将退出");
+        return;
+      }
+      setBusy(null);
+      if (snapshot.platform === "darwin") {
+        setUpdateDialog(null);
+        setLauncherQuitPromptOpen(true);
+      } else {
+        toast.success("安装包已打开");
+      }
+    } catch (nextError) {
+      setError(messageFromError(nextError));
+      setBusy(null);
+    }
+  }, [launcherUpdateBlocked, snapshot.platform]);
+
+  const quitAfterLauncherUpdate = useCallback(async () => {
+    if (!window.maibotDesktop?.launcher) {
+      setError("桌面桥未就绪，无法退出启动器");
+      return;
+    }
+    setBusy("launcher:quit");
+    setError(null);
+    try {
+      await window.maibotDesktop.launcher.quit();
     } catch (nextError) {
       setError(messageFromError(nextError));
       setBusy(null);
     }
-  }, [launcherUpdateBlocked]);
+  }, []);
 
   const openMessagePlatformDialog = useCallback(() => {
     setError(null);
@@ -3589,7 +3615,7 @@ export function HomePanel({
       >
         <DialogContent onInteractOutside={(event) => event.preventDefault()} size="lg">
           <DialogHeader
-            description="检查 MaiBot OneKey 的最新安装包，并在确认后启动安装器。"
+            description="检查 MaiBot OneKey 的最新安装包，并在确认后下载打开。"
             icon={<PackageCheck className="size-4" />}
             title="更新一键包"
             tone="primary"
@@ -3642,7 +3668,49 @@ export function HomePanel({
               size="sm"
             >
               {busy === "launcher:update" ? <Loader2 className="animate-spin" /> : <Download />}
-              下载并安装
+              下载并打开
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog
+        open={launcherQuitPromptOpen}
+        onOpenChange={(next) => {
+          if (busy !== "launcher:quit") setLauncherQuitPromptOpen(next);
+        }}
+      >
+        <DialogContent onInteractOutside={(event) => event.preventDefault()} size="sm">
+          <DialogHeader
+            description="请关闭当前启动器并拖拽替换。安装完成后再重新打开 MaiBot OneKey。"
+            icon={<PackageCheck className="size-4" />}
+            title="安装包已打开"
+            tone="primary"
+          />
+          <DialogBody className="space-y-3 text-sm text-muted-foreground">
+            {error ? (
+              <div className={cn("border border-destructive/30 bg-destructive/10 px-3 py-2 text-xs text-destructive", useRetroHome ? "rounded-sm" : "rounded-lg")}>
+                {error}
+              </div>
+            ) : null}
+            <p>请在打开的 DMG 窗口中，把新版应用拖拽替换到 Applications。</p>
+          </DialogBody>
+          <DialogFooter>
+            <Button
+              disabled={busy === "launcher:quit"}
+              onClick={() => setLauncherQuitPromptOpen(false)}
+              size="sm"
+              variant="ghost"
+            >
+              稍后退出
+            </Button>
+            <Button
+              disabled={busy === "launcher:quit"}
+              onClick={() => void quitAfterLauncherUpdate()}
+              size="sm"
+            >
+              {busy === "launcher:quit" ? <Loader2 className="animate-spin" /> : <X />}
+              退出启动器
             </Button>
           </DialogFooter>
         </DialogContent>

src/shared/contracts.ts

@@ -1442,6 +1442,7 @@ export interface DesktopBridge {
     selectAppIcon: (iconId: AppIconId) => Promise<AppIconSettings>;
     checkUpdate: () => Promise<LauncherUpdateInfo>;
     downloadAndInstallUpdate: () => Promise<LauncherUpdateApplyResult>;
+    quit: () => Promise<void>;
     onDownloadProgress: (callback: (progress: LauncherUpdateDownloadProgress) => void) => () => void;
     resetSettings: () => Promise<LauncherResetResult>;
     resetAll: () => Promise<LauncherResetResult>;