36fd61b2a2
This commit addresses parameter naming inconsistencies caused by Tauri v2's requirement for camelCase parameter names in IPC commands. Backend changes (Rust): - Updated all command parameters from snake_case to camelCase - Commands affected: * provider.rs: providerId (×4), timeoutSecs * import_export.rs: filePath (×2), defaultName * config.rs: defaultPath - Added #[allow(non_snake_case)] attributes for camelCase parameters - Removed unused QueryUsageParams struct Frontend changes (TypeScript): - Removed redundant snake_case parameters from all invoke() calls - Updated API files: * usage.ts: removed debug logs, unified to providerId * vscode.ts: updated 8 functions (providerId, timeoutSecs, filePath, defaultName) * settings.ts: updated 4 functions (defaultPath, filePath, defaultName) - Ensured all parameters now use camelCase exclusively Test updates: - Updated MSW handlers to accept both old and new parameter formats during transition - Added i18n mock compatibility for tests Root cause: The issue stemmed from Tauri v2 strictly requiring camelCase for command parameters, while the codebase was using snake_case. This caused parameters like 'provider_id' to not be recognized by the backend, resulting in "missing providerId parameter" errors. BREAKING CHANGE: All Tauri command invocations now require camelCase parameters. Any external tools or scripts calling these commands must be updated accordingly. Fixes: Usage query always failing with "missing providerId" error Fixes: Custom endpoint management not receiving provider ID Fixes: Import/export dialogs not respecting default paths
110 lines
2.9 KiB
Rust
110 lines
2.9 KiB
Rust
#![allow(non_snake_case)]
|
|
|
|
use serde_json::{json, Value};
|
|
use std::path::PathBuf;
|
|
use tauri::State;
|
|
use tauri_plugin_dialog::DialogExt;
|
|
|
|
use crate::error::AppError;
|
|
use crate::services::ConfigService;
|
|
use crate::store::AppState;
|
|
|
|
/// 导出配置文件
|
|
#[tauri::command]
|
|
pub async fn export_config_to_file(
|
|
#[allow(non_snake_case)]
|
|
filePath: String
|
|
) -> Result<Value, String> {
|
|
tauri::async_runtime::spawn_blocking(move || {
|
|
let target_path = PathBuf::from(&filePath);
|
|
ConfigService::export_config_to_path(&target_path)?;
|
|
Ok::<_, AppError>(json!({
|
|
"success": true,
|
|
"message": "Configuration exported successfully",
|
|
"filePath": filePath
|
|
}))
|
|
})
|
|
.await
|
|
.map_err(|e| format!("导出配置失败: {}", e))?
|
|
.map_err(|e: AppError| e.to_string())
|
|
}
|
|
|
|
/// 从文件导入配置
|
|
#[tauri::command]
|
|
pub async fn import_config_from_file(
|
|
#[allow(non_snake_case)]
|
|
filePath: String,
|
|
state: State<'_, AppState>,
|
|
) -> Result<Value, String> {
|
|
let (new_config, backup_id) = tauri::async_runtime::spawn_blocking(move || {
|
|
let path_buf = PathBuf::from(&filePath);
|
|
ConfigService::load_config_for_import(&path_buf)
|
|
})
|
|
.await
|
|
.map_err(|e| format!("导入配置失败: {}", e))?
|
|
.map_err(|e: AppError| e.to_string())?;
|
|
|
|
{
|
|
let mut guard = state
|
|
.config
|
|
.write()
|
|
.map_err(|e| AppError::from(e).to_string())?;
|
|
*guard = new_config;
|
|
}
|
|
|
|
Ok(json!({
|
|
"success": true,
|
|
"message": "Configuration imported successfully",
|
|
"backupId": backup_id
|
|
}))
|
|
}
|
|
|
|
/// 同步当前供应商配置到对应的 live 文件
|
|
#[tauri::command]
|
|
pub async fn sync_current_providers_live(state: State<'_, AppState>) -> Result<Value, String> {
|
|
{
|
|
let mut config_state = state
|
|
.config
|
|
.write()
|
|
.map_err(|e| AppError::from(e).to_string())?;
|
|
ConfigService::sync_current_providers_to_live(&mut config_state)
|
|
.map_err(|e| e.to_string())?;
|
|
}
|
|
|
|
Ok(json!({
|
|
"success": true,
|
|
"message": "Live configuration synchronized"
|
|
}))
|
|
}
|
|
|
|
/// 保存文件对话框
|
|
#[tauri::command]
|
|
pub async fn save_file_dialog<R: tauri::Runtime>(
|
|
app: tauri::AppHandle<R>,
|
|
#[allow(non_snake_case)]
|
|
defaultName: String,
|
|
) -> Result<Option<String>, String> {
|
|
let dialog = app.dialog();
|
|
let result = dialog
|
|
.file()
|
|
.add_filter("JSON", &["json"])
|
|
.set_file_name(&defaultName)
|
|
.blocking_save_file();
|
|
|
|
Ok(result.map(|p| p.to_string()))
|
|
}
|
|
|
|
/// 打开文件对话框
|
|
#[tauri::command]
|
|
pub async fn open_file_dialog<R: tauri::Runtime>(
|
|
app: tauri::AppHandle<R>,
|
|
) -> Result<Option<String>, String> {
|
|
let dialog = app.dialog();
|
|
let result = dialog
|
|
.file()
|
|
.add_filter("JSON", &["json"])
|
|
.blocking_pick_file();
|
|
|
|
Ok(result.map(|p| p.to_string()))
|
|
}
|