v1.8.9

Author: Cloxl

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cursor-pool",
   "private": true,
-  "version": "1.8.5",
+  "version": "1.8.9",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cursor-pool"
-version = "1.8.5"
+version = "1.8.9"
 description = "Cursor Pool App"
 authors = ["Cloxl"]
 edition = "2021"

src-tauri/Cargo.toml

@@ -82,42 +82,7 @@ impl ApiClient {
             }
         }
 
-        // 检查请求是否可克隆
-        let can_clone = request.try_clone().is_some();
-        
-        if can_clone {
-            // 第一次尝试
-            let cloned_request = request.try_clone().unwrap();
-            let result = self.client.execute(cloned_request).await;
-            
-            if let Ok(response) = result {
-                return self.process_response(response, &method.to_string(), &url).await;
-            }
-            
-            let err = result.unwrap_err();
-            error!(
-                target: "http_client",
-                "第一次请求失败 - 方法: {}, URL: {}, 错误: {}",
-                method, url, err
-            );
-            
-            // 第二次尝试
-            let cloned_request = request.try_clone().unwrap();
-            let result = self.client.execute(cloned_request).await;
-            
-            if let Ok(response) = result {
-                return self.process_response(response, &method.to_string(), &url).await;
-            }
-            
-            let err = result.unwrap_err();
-            error!(
-                target: "http_client",
-                "第二次请求失败 - 方法: {}, URL: {}, 错误: {}",
-                method, url, err
-            );
-        }
-        
-        // 第三次尝试 (对于注册请求是第一次)
+        // 执行请求
         let result = self.client.execute(request).await;
 
         match result {

src-tauri/src/api/client.rs

@@ -410,7 +410,7 @@ pub async fn report_bug(
     };
 
     let response = client
-        .post(format!("{}/bug/report", client.get_base_url()))
+        .post(format!("{}/report", client.get_base_url()))
         .json(&request)
         .send()
         .await

src-tauri/src/api/endpoints.rs

@@ -11,6 +11,7 @@ use std::fs;
 use std::time::Duration;
 use tauri::State;
 use tauri::Manager;
+use tauri::Emitter;
 use tracing::error;
 use tokio;
 
@@ -123,6 +124,21 @@ pub async fn reset_machine_id(
         }
     };
 
+    // 在这里调用新的清理函数
+    if let Err(cleanup_err) = cleanup_database_entries(db.clone()).await {
+        error!(target: "reset", "数据库清理步骤失败: {}", cleanup_err);
+        ErrorReporter::report_error(
+            client.clone(),
+            "reset_machine_id_cleanup_step",
+            &cleanup_err,
+            None,
+            Some("medium".to_string()),
+        )
+        .await;
+        return Err(format!("数据库清理失败: {}", cleanup_err));
+    }
+    error!(target: "reset", "数据库清理步骤完成");
+
     let new_ids = if let Some(id) = machine_id {
         // 生成随机 ID
         let mut ids = generate_new_ids();
@@ -266,6 +282,10 @@ pub async fn reset_machine_id(
             ("mac_id", new_ids.get("telemetry.macMachineId").unwrap()),
             ("machineId", new_ids.get("telemetry.machineId").unwrap()),
             ("sqm_id", new_ids.get("telemetry.sqmId").unwrap()),
+            (
+                "storage.serviceMachineId",
+                new_ids.get("telemetry.devDeviceId").unwrap(),
+            ),
         ];
 
         if let Err(e) = update_database(&paths.db, &updates) {
@@ -964,4 +984,105 @@ pub fn get_running_cursor_path() -> Result<String, String> {
         error!(target: "cursor", "{}", err_msg);
         return Err(err_msg);
     }
+}
+
+#[tauri::command]
+pub async fn refresh_inbound(app_handle: tauri::AppHandle) -> Result<bool, String> {
+    error!(target: "inbound", "手动触发线路刷新");
+    
+    // 重新获取线路配置并测速
+    match crate::api::inbound::init_inbound_config(&app_handle).await {
+        Ok(_) => {
+            error!(target: "inbound", "线路刷新成功完成");
+            // 通知前端刷新完成
+            if let Some(window) = app_handle.get_webview_window("main") {
+                if let Err(e) = window.emit("inbound-refreshed", ()) {
+                    error!(target: "inbound", "发送线路刷新事件失败: {}", e);
+                }
+            } else {
+                error!(target: "inbound", "无法获取主窗口实例");
+            }
+            Ok(true)
+        },
+        Err(e) => {
+            error!(target: "inbound", "线路刷新失败: {}", e);
+            Err(format!("线路刷新失败: {}", e))
+        }
+    }
+}
+
+#[tauri::command]
+pub async fn cleanup_database_entries(
+    db_state: State<'_, Database>,
+) -> Result<(), String> {
+    error!(target: "database_cleanup", "开始清理数据库条目");
+
+    // 从 db_state 创建 AppPaths 实例
+    let app_paths = match AppPaths::new_with_db(Some(&db_state)) {
+        Ok(p) => p,
+        Err(e) => {
+            let err_msg = format!("获取应用路径失败: {}", e);
+            error!(target: "database_cleanup", "{}", err_msg);
+            return Err(err_msg);
+        }
+    };
+
+    let db_path = &app_paths.db;
+
+    if !db_path.exists() {
+        let err_msg = "数据库文件不存在，跳过清理".to_string();
+        error!(target: "database_cleanup", "{}", err_msg);
+        return Err(err_msg);
+    }
+
+    let conn = match Connection::open(db_path) {
+        Ok(c) => c,
+        Err(e) => {
+            let err_msg = format!("打开数据库失败: {}", e);
+            error!(target: "database_cleanup", "{}", err_msg);
+            return Err(err_msg);
+        }
+    };
+
+    let keys_to_delete = vec![
+        "src.vs.platform.reactivestorage.browser.reactiveStorageServiceImpl.persistentStorage.applicationUser",
+        "workbench.auxiliarybar.pinnedPanels",
+        "memento/mainThreadCustomEditors.origins",
+    ];
+
+    for key in keys_to_delete {
+        match conn.execute("DELETE FROM ItemTable WHERE key = ?1", [key]) {
+            Ok(rows_affected) => {
+                if rows_affected > 0 {
+                    error!(target: "database_cleanup", "成功删除键: {}", key);
+                } else {
+                    error!(target: "database_cleanup", "键不存在或删除失败: {}", key);
+                }
+            }
+            Err(e) => {
+                let err_msg = format!("删除键 {} 失败: {}", key, e);
+                error!(target: "database_cleanup", "{}", err_msg);
+                //可以选择在这里返回错误，或者继续尝试删除其他键
+            }
+        }
+    }
+
+    let key_to_upsert = "cursorAuth/stripeMembershipType";
+    let value_to_upsert = "free_trial";
+    match conn.execute(
+        "INSERT OR REPLACE INTO ItemTable (key, value) VALUES (?1, ?2)",
+        [key_to_upsert, value_to_upsert],
+    ) {
+        Ok(_) => {
+            error!(target: "database_cleanup", "成功设置键 {} 为 {}", key_to_upsert, value_to_upsert);
+        }
+        Err(e) => {
+            let err_msg = format!("设置键 {} 失败: {}", key_to_upsert, e);
+            error!(target: "database_cleanup", "{}", err_msg);
+            return Err(err_msg); // 如果这个关键操作失败，则返回错误
+        }
+    }
+
+    error!(target: "database_cleanup", "数据库条目清理完成");
+    Ok(())
 }

src-tauri/src/cursor_reset/commands.rs

@@ -1,3 +1,3 @@
 pub mod commands;
 
-pub use commands::{get_machine_ids, reset_machine_id, switch_account, get_running_cursor_path};
+pub use commands::{get_machine_ids, reset_machine_id, switch_account, get_running_cursor_path, refresh_inbound};

src-tauri/src/cursor_reset/mod.rs

@@ -170,6 +170,8 @@ pub fn run() {
             cursor_reset::commands::close_cursor,
             cursor_reset::commands::launch_cursor,
             cursor_reset::commands::find_cursor_path,
+            // 线路管理
+            cursor_reset::commands::refresh_inbound,
             // 日志
             cursor_reset::commands::log_error,
             cursor_reset::commands::log_warn,

src-tauri/src/lib.rs

@@ -93,7 +93,9 @@
       "active": true,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEM5NjUxODYwQkUzMkY2RTYKUldUbTlqSytZQmhseVIvWXg0c1RLakxCajBpdGQzeGxUbVMyaGYyRWZXdXdvNURtTW5lZXBVVWQK",
       "endpoints": [
-        "https://pool.52ai.org/api/version"
+        "https://vip.123pan.cn/1840147130/updater/latest.json",
+        "https://github.com/Cloxl/CursorPool_Client/releases/latest/download/latest.json",
+        "https://gh-proxy.com/github.com/Cloxl/CursorPool_Client/releases/latest/download/latest.json"
       ],
       "windows": {
         "installMode": "passive"

src-tauri/tauri.conf.json

@@ -11,6 +11,7 @@
   import { Window } from '@tauri-apps/api/window'
   import { initializeDevToolsProtection } from './utils/devtools'
   import { initEventListeners, destroyEventListeners } from './utils/eventBus'
+  import { apiClient } from './utils/apiClient'
 
   const { currentTheme } = useTheme()
   const { currentLang } = useI18n()
@@ -27,6 +28,13 @@
     // 初始化语言设置
     await initLanguage()
 
+    // 初始化API客户端配置
+    apiClient.configure({
+      maxRetries: 2,
+      refreshInboundOnMaxRetries: true,
+      showRetryNotification: true,
+    })
+
     // 使用统一的初始化方法
     await historyStore.init()
 
@@ -52,8 +60,11 @@
 
   // 应用卸载时清理
   onUnmounted(() => {
-    // 销毁所有事件监听器
+    // 清理事件监听器
     destroyEventListeners()
+
+    // 清理API客户端资源
+    apiClient.cleanup()
   })
 </script>