Merge pull request #43 from qianmoQ/dev-25.0.3

fix (core): 修复自动更新导致应用无法启动问题

Author: qianmoQ

package.json

@@ -1,7 +1,7 @@
 {
   "name": "codeforge",
   "private": true,
-  "version": "25.0.2",
+  "version": "25.0.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "CodeForge"
-version = "25.0.2"
+version = "25.0.3"
 description = "CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发者、学生和编程爱好者设计。"
 authors = ["devlive-community"]
 edition = "2024"

src-tauri/Cargo.toml

@@ -3,6 +3,10 @@ use serde::{Deserialize, Serialize};
 use std::time::SystemTime;
 use tauri::{AppHandle, Emitter, command};
 
+mod update_linux;
+mod update_mac;
+mod update_windows;
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct UpdateInfo {
     pub version: String,
@@ -118,14 +122,21 @@ async fn get_latest_release(
 // 查找平台对应的文件
 fn get_platform_asset(assets: &[GitHubAsset]) -> Option<&GitHubAsset> {
     let os = std::env::consts::OS;
-    info!("检查更新 -> 当前平台: {}", os);
+    let arch = std::env::consts::ARCH;
+    info!("检查更新 -> 当前平台: {} {}", os, arch);
 
     for asset in assets {
         let name = asset.name.to_lowercase();
 
         let matches = match os {
-            "windows" => name.contains("windows") || name.contains("win") || name.ends_with(".exe"),
-            "macos" => name.contains("macos") || name.contains("darwin") || name.ends_with(".dmg"),
+            "windows" => {
+                if arch == "x86_64" {
+                    name.contains("x64") && (name.ends_with(".exe") || name.ends_with(".msi"))
+                } else {
+                    name.contains("windows") || name.ends_with(".exe") || name.ends_with(".msi")
+                }
+            }
+            "macos" => name.contains("universal") && name.ends_with(".dmg"),
             "linux" => name.contains("linux") || name.ends_with(".appimage"),
             _ => false,
         };
@@ -136,7 +147,6 @@ fn get_platform_asset(assets: &[GitHubAsset]) -> Option<&GitHubAsset> {
         }
     }
 
-    // 如果没找到匹配的，返回第一个
     assets.first()
 }
 
@@ -179,7 +189,22 @@ async fn do_update(
     let temp_dir = std::env::temp_dir().join("codeforge_update");
     std::fs::create_dir_all(&temp_dir)?;
 
-    let file_name = format!("update_{}.exe", update_info.version);
+    // 根据平台确定文件扩展名
+    let os = std::env::consts::OS;
+    let file_extension = match os {
+        "windows" => {
+            if update_info.url.contains(".msi") {
+                "msi"
+            } else {
+                "exe"
+            }
+        }
+        "macos" => "dmg",
+        "linux" => "appimage",
+        _ => "bin",
+    };
+
+    let file_name = format!("update_{}.{}", update_info.version, file_extension);
     let download_path = temp_dir.join(&file_name);
 
     info!("检查更新 -> 下载更新文件: {}", update_info.url);
@@ -257,12 +282,16 @@ async fn do_update(
     Ok(())
 }
 
-// 安装更新
+// 安装更新函数
 async fn do_install(
     update_path: &std::path::Path,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let current_exe = std::env::current_exe()?;
-    std::fs::copy(update_path, &current_exe)?;
+    let os = std::env::consts::OS;
 
-    Ok(())
+    match os {
+        "windows" => update_windows::install(update_path).await,
+        "macos" => update_mac::install(update_path).await,
+        "linux" => update_linux::install(update_path).await,
+        _ => Err("不支持的操作系统".into()),
+    }
 }

src-tauri/src/update.rs

@@ -0,0 +1,80 @@
+use log::info;
+
+pub async fn install(
+    update_path: &std::path::Path,
+) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    info!("安装更新 -> Linux 更新安装: {}", update_path.display());
+
+    let current_exe = std::env::current_exe()?;
+    info!("安装更新 -> 当前可执行文件: {}", current_exe.display());
+
+    // 设置更新文件权限
+    set_executable_permission(update_path)?;
+
+    // 创建备份
+    let backup_path = create_backup(&current_exe)?;
+
+    // 替换可执行文件
+    match replace_executable(update_path, &current_exe) {
+        Ok(_) => {
+            info!("安装更新 -> 文件替换成功");
+            // 删除备份
+            let _ = std::fs::remove_file(backup_path);
+        }
+        Err(e) => {
+            info!("安装更新 -> 文件替换失败，恢复备份");
+            // 恢复备份
+            let _ = std::fs::copy(&backup_path, &current_exe);
+            let _ = std::fs::remove_file(backup_path);
+            return Err(e);
+        }
+    }
+
+    info!("安装更新 -> Linux 安装完成");
+    Ok(())
+}
+
+fn set_executable_permission(
+    update_path: &std::path::Path,
+) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    info!("安装更新 -> 设置更新文件可执行权限");
+
+    let _ = std::process::Command::new("chmod")
+        .args(["+x"])
+        .arg(update_path)
+        .output();
+
+    Ok(())
+}
+
+fn create_backup(
+    current_exe: &std::path::Path,
+) -> Result<std::path::PathBuf, Box<dyn std::error::Error + Send + Sync>> {
+    let backup_path = current_exe.with_extension("backup");
+    info!("安装更新 -> 创建备份: {}", backup_path.display());
+
+    std::fs::copy(current_exe, &backup_path)?;
+    Ok(backup_path)
+}
+
+fn replace_executable(
+    update_path: &std::path::Path,
+    current_exe: &std::path::Path,
+) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    info!("安装更新 -> 替换可执行文件");
+
+    // 复制新文件
+    std::fs::copy(update_path, current_exe)?;
+
+    // 设置可执行权限
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        let mut perms = std::fs::metadata(current_exe)?.permissions();
+        perms.set_mode(0o755);
+        std::fs::set_permissions(current_exe, perms)?;
+    }
+    info!("安装更新 -> 可执行文件权限设置完成");
+
+    Ok(())
+}