update

Author: xue160709

package-lock.json

@@ -45,7 +45,9 @@
         "@tauri-apps/plugin-autostart": "^2.3.0",
         "@tauri-apps/plugin-fs": "^2.3.0",
         "@tauri-apps/plugin-opener": "^2",
+        "@tauri-apps/plugin-process": "^2.2.1",
         "@tauri-apps/plugin-shell": "^2.2.1",
+        "@tauri-apps/plugin-updater": "^2.7.1",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "cmdk": "^1.0.0",

package.json

@@ -29,5 +29,4 @@ tauri-plugin-autostart = "2"
 tauri-plugin-single-instance = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tokio = { version = "1", features = ["time"] }
 

src-tauri/Cargo.lock

@@ -6,6 +6,7 @@
   "permissions": [
     "core:default",
     "opener:default",
+    "updater:default",
     "autostart:allow-enable",
     "autostart:allow-disable",
     "autostart:allow-is-enabled",

src-tauri/Cargo.toml

@@ -1,9 +1,8 @@
 use tauri::{
     menu::{Menu, MenuItem},
     tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
-    Emitter, Manager, WindowEvent
+    Manager, WindowEvent
 };
-use tauri_plugin_updater::UpdaterExt;
 
 // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
 #[tauri::command]
@@ -22,135 +21,7 @@ fn show_window(window: tauri::Window) {
     let _ = window.set_focus();
 }
 
-#[tauri::command]
-async fn check_for_updates(app: tauri::AppHandle) -> Result<Option<serde_json::Value>, String> {
-    println!("开始检查更新...");
-    println!("当前应用版本: {}", app.package_info().version);
-    
-    let updater = match app.updater() {
-        Ok(u) => {
-            println!("更新器初始化成功");
-            u
-        },
-        Err(e) => {
-            println!("更新器初始化失败: {:?}", e);
-            return Err(format!("更新器初始化失败: {:?}", e));
-        }
-    };
-    
-    println!("开始检查新版本...");
-    
-    // 添加重试逻辑
-    let mut retry_count = 0;
-    let max_retries = 3;
-    
-    while retry_count < max_retries {
-        match updater.check().await {
-            Ok(update_opt) => {
-                if let Some(update) = update_opt {
-                    println!("发现新版本！");
-                    println!("当前版本: {}", app.package_info().version);
-                    println!("新版本: {}", update.version);
-                    println!("更新说明: {}", update.body.as_deref().unwrap_or("无更新说明"));
-                    
-                    let update_info = serde_json::json!({
-                        "version": update.version,
-                        "date": update.date.map(|d| d.to_string()).unwrap_or_else(|| "未知".to_string()),
-                        "body": update.body.as_deref().unwrap_or("无更新说明"),
-                        "download_url": update.download_url
-                    });
-                    
-                    return Ok(Some(update_info));
-                } else {
-                    println!("检查完成：当前已是最新版本");
-                    return Ok(None);
-                }
-            }
-            Err(e) => {
-                println!("检查更新失败 (尝试 {}/{}): {:?}", retry_count + 1, max_retries, e);
-                if retry_count == max_retries - 1 {
-                    return Err(format!("检查更新失败: {:?}", e));
-                }
-            }
-        }
-        
-        retry_count += 1;
-        if retry_count < max_retries {
-            println!("等待 3 秒后重试...");
-            tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;
-        }
-    }
-
-    Err("检查更新失败".to_string())
-}
-
-#[tauri::command]
-async fn download_and_install_update(app: tauri::AppHandle) -> Result<(), String> {
-    println!("开始下载并安装更新...");
-    
-    let updater = match app.updater() {
-        Ok(u) => u,
-        Err(e) => {
-            return Err(format!("更新器初始化失败: {:?}", e));
-        }
-    };
-    
-    match updater.check().await {
-        Ok(Some(update)) => {
-            println!("开始下载更新...");
-            let mut downloaded = 0;
 
-            match update
-                .download_and_install(
-                    |chunk_length, content_length| {
-                        downloaded += chunk_length;
-                        if let Some(total) = content_length {
-                            let progress = (downloaded as f64 / total as f64 * 100.0) as u64;
-                            println!("下载进度: {}% ({} / {} 字节)", progress, downloaded, total);
-                            
-                            // 发送下载进度事件到前端
-                            if let Some(window) = app.get_webview_window("main") {
-                                let _ = window.emit("download-progress", serde_json::json!({
-                                    "progress": progress,
-                                    "downloaded": downloaded,
-                                    "total": total
-                                }));
-                            }
-                        } else {
-                            println!("已下载: {} 字节", downloaded);
-                        }
-                    },
-                    || {
-                        println!("下载完成，准备安装...");
-                        // 发送下载完成事件到前端
-                        if let Some(window) = app.get_webview_window("main") {
-                            let _ = window.emit("download-complete", ());
-                        }
-                    },
-                )
-                .await
-            {
-                Ok(_) => {
-                    println!("更新已安装完成，准备重启应用...");
-                    app.restart();
-                    // 注意：app.restart() 会终止当前进程，下面的代码不会执行
-                    #[allow(unreachable_code)]
-                    Ok(())
-                }
-                Err(e) => {
-                    println!("下载或安装更新失败: {:?}", e);
-                    Err(format!("下载或安装更新失败: {:?}", e))
-                }
-            }
-        }
-        Ok(None) => {
-            Err("没有可用的更新".to_string())
-        }
-        Err(e) => {
-            Err(format!("检查更新失败: {:?}", e))
-        }
-    }
-}
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -253,9 +124,7 @@ pub fn run() {
         .invoke_handler(tauri::generate_handler![
             greet,
             hide_window,
-            show_window,
-            check_for_updates,
-            download_and_install_update
+            show_window
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/capabilities/default.json

@@ -4,6 +4,8 @@ import { Search, Filter, Calendar, Tag, BarChart3, Plus, Edit2, Trash2, RefreshC
 import { invoke } from '@tauri-apps/api/core';
 import { getVersion } from '@tauri-apps/api/app';
 import { listen } from '@tauri-apps/api/event';
+import { check, Update } from '@tauri-apps/plugin-updater';
+import { relaunch } from '@tauri-apps/plugin-process';
 
 import { useProfile } from '../hooks/useProfile';
 import { useProfileSQL } from '../hooks/useProfileSQL';
@@ -103,21 +105,8 @@ const Index = () => {
     };
     checkAutostart();
 
-    // 监听下载进度事件
-    const unlistenProgress = listen('download-progress', (event: any) => {
-      const { progress } = event.payload;
-      setDownloadProgress(progress);
-    });
-
-    // 监听下载完成事件
-    const unlistenComplete = listen('download-complete', () => {
-      setIsDownloading(false);
-      showToast('success', t('updater.downloadComplete'));
-    });
-
     return () => {
-      unlistenProgress.then(fn => fn());
-      unlistenComplete.then(fn => fn());
+      // 清理函数，如果有其他监听器可以在这里清理
     };
   }, [t]);
 
@@ -347,13 +336,50 @@ const Index = () => {
     setUpdateInfo(null);
 
     try {
-      const result = await invoke('check_for_updates') as any;
+      console.log('开始检查更新...');
+      console.log('当前应用版本:', currentVersion);
 
-      if (result) {
-        setUpdateInfo(result);
-        showToast('success', t('updater.updateFound', { version: result.version }));
-      } else {
-        showToast('success', t('updater.upToDate'));
+      // 添加重试逻辑
+      let retryCount = 0;
+      const maxRetries = 3;
+      
+      while (retryCount < maxRetries) {
+        try {
+          const update = await check();
+          
+          if (update) {
+            console.log('发现新版本！');
+            console.log('当前版本:', currentVersion);
+            console.log('新版本:', update.version);
+            console.log('更新说明:', update.body || '无更新说明');
+            
+            const updateInfo = {
+              version: update.version,
+              date: update.date || '未知',
+              body: update.body || '无更新说明',
+              download_url: update.download
+            };
+            
+            setUpdateInfo(updateInfo);
+            showToast('success', t('updater.updateFound', { version: update.version }));
+            return;
+          } else {
+            console.log('检查完成：当前已是最新版本');
+            showToast('success', t('updater.upToDate'));
+            return;
+          }
+        } catch (error) {
+          console.log(`检查更新失败 (尝试 ${retryCount + 1}/${maxRetries}):`, error);
+          if (retryCount === maxRetries - 1) {
+            throw error;
+          }
+        }
+        
+        retryCount++;
+        if (retryCount < maxRetries) {
+          console.log('等待 3 秒后重试...');
+          await new Promise(resolve => setTimeout(resolve, 3000));
+        }
       }
     } catch (error) {
       console.error('检查更新失败:', error);
@@ -399,8 +425,43 @@ const Index = () => {
     setDownloadProgress(0);
 
     try {
-      await invoke('download_and_install_update');
+      console.log('开始下载并安装更新...');
+      
+      // 重新检查更新以获取 Update 对象
+      const update = await check();
+      
+      if (!update) {
+        throw new Error('没有可用的更新');
+      }
+
+      console.log('开始下载更新...');
+      let downloaded = 0;
+
+      // 下载并安装更新
+      await update.downloadAndInstall((event) => {
+        switch (event.event) {
+          case 'Started':
+            console.log('开始下载，总大小:', event.data);
+            break;
+          case 'Progress':
+            downloaded += event.data.chunkLength;
+            console.log(`下载进度: 已下载 ${downloaded} 字节`);
+            // 由于无法获取总大小，我们只能显示已下载的字节数
+            setDownloadProgress(Math.min(downloaded / 1024 / 1024, 100)); // 假设最大100MB
+            break;
+          case 'Finished':
+            console.log('下载完成，准备安装...');
+            setIsDownloading(false);
+            showToast('success', t('updater.downloadComplete'));
+            break;
+        }
+      });
+
+      console.log('更新已安装完成，准备重启应用...');
       showToast('success', t('updater.updateSuccess'));
+      
+      // 重启应用
+      await relaunch();
     } catch (error) {
       console.error('下载安装更新失败:', error);
       showToast('error', `${t('updater.updateFailed')}: ${error instanceof Error ? error.message : t('common.unknown')}`);