fix: updater

LibNyanpasu · Dec 29, 2023 · ca1ed25 · ca1ed25
1 parent 67e26bc
commit ca1ed25
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/backend/tauri/Cargo.toml b/backend/tauri/Cargo.toml
@@ -40,13 +40,13 @@ tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
 tauri = { version = "1.5.3", features = [
+  "updater",
   "os-all",
   "global-shortcut-all",
   "notification-all",
   "process-all",
   "shell-all",
   "system-tray",
-  "updater",
   "window-all",
 ] }
 window-vibrancy = { version = "0.4.3" }

diff --git a/backend/tauri/src/core/updater.rs b/backend/tauri/src/core/updater.rs
@@ -155,7 +155,7 @@ impl Updater {
         .await??;
         // 3. if core is used, close it
         if current_core == *core_type {
-            CoreManager::global().stop_core()?;
+            tokio::task::spawn_blocking(move || CoreManager::global().stop_core()).await??;
         }
         // 4. replace core
         #[cfg(target_os = "windows")]
@@ -174,7 +174,12 @@ impl Updater {
                     "failed to copy core: {}, trying to use elevated permission to copy and override core",
                     err
                 );
-
+                let mut target_core_str = target_core.to_str().unwrap().to_string();
+                if target_core_str.starts_with("\\\\?\\") {
+                    target_core_str = target_core_str[4..].to_string();
+                }
+                debug!("tmp core path: {:?}", tmp_core_path);
+                debug!("target core path: {:?}", target_core_str);
                 // 防止 UAC 弹窗堵塞主线程
                 let status_code = tokio::task::spawn_blocking(move || {
                     #[cfg(target_os = "windows")]
@@ -185,18 +190,14 @@ impl Updater {
                                 "copy",
                                 "/Y",
                                 tmp_core_path.to_str().unwrap(),
-                                target_core.to_str().unwrap(),
+                                &target_core_str,
                             ])
                             .status()
                     }
                     #[cfg(not(target_os = "windows"))]
                     {
                         RunasCommand::new("cp")
-                            .args(&[
-                                "-f",
-                                tmp_core_path.to_str().unwrap(),
-                                target_core.to_str().unwrap(),
-                            ])
+                            .args(&["-f", tmp_core_path.to_str().unwrap(), &target_core_str])
                             .status()?;
                     }
                 })

diff --git a/scripts/generate-latest-version.ts b/scripts/generate-latest-version.ts
@@ -90,8 +90,7 @@ const resolveMihomoAlpha: LatestVersionResolver = async () => {
 
   const archMapping: ArchMapping = {
     // [SupportedArch.WindowsX86]: "mihomo-windows-386-{}.zip",
-    [SupportedArch.WindowsX86_64]:
-      "mihomo-windows-amd64-compatible-alpha-{}.zip",
+    [SupportedArch.WindowsX86_64]: "mihomo-windows-amd64-compatible-{}.zip",
     // [SupportedArch.WindowsAarch64]: "mihomo-windows-arm64-{}.zip",
     [SupportedArch.LinuxAarch64]: "mihomo-linux-arm64-{}.gz",
     [SupportedArch.LinuxAmd64]: "mihomo-linux-amd64-compatible-{}.gz",

diff --git a/src/components/setting/mods/clash-core-viewer.tsx b/src/components/setting/mods/clash-core-viewer.tsx
@@ -70,7 +70,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
         ...each,
         latest:
           each.core === "clash"
-            ? results["clash_premium"]
+            ? `n${results["clash_premium"]}`
             : results[each.core.replace(/-/g, "_") as keyof typeof results],
       }));
       setValidCores(buf);
@@ -101,7 +101,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
     }
   });
 
-  useAsyncEffect(async () => {
+  const getCoreVersions = async () => {
     try {
       const versions = await Promise.all(
         VALID_CORE.reduce(
@@ -126,7 +126,8 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
         console.error(e);
       }
     }
-  }, []);
+  };
+  useAsyncEffect(getCoreVersions, []);
 
   return (
     <BaseDialog
@@ -180,6 +181,9 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
               if (state === "start") setLock(true);
               else setLock(false);
             }}
+            onCoreUpdated={() => {
+              getCoreVersions();
+            }}
           />
         ))}
       </List>
@@ -194,11 +198,13 @@ function CoreElement({
   core,
   lock,
   onCoreChanged,
+  onCoreUpdated,
 }: {
   selected: boolean;
   core: Core;
   lock: boolean;
   onCoreChanged: (core: string, state: "start" | "finish") => void;
+  onCoreUpdated?: (core: string) => void;
 }) {
   const { t } = useTranslation();
   const { mutateVerge } = useVerge();
@@ -250,6 +256,7 @@ function CoreElement({
           mutate("getVersion");
         }, 100);
         useNotification(t("Success"), `Successfully updated to ${core}`);
+        onCoreUpdated?.(core);
       } catch (err: any) {
         useNotification(t("Error"), err?.message || err.toString());
       } finally {