From a1ac91c1ec22d0706d49fb8dced328b43d3cd87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Sun, 12 Jul 2026 22:41:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20Tauri=20IPC=20=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=20+=20useStore=20=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?(B4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - commands.rs: exec_op/undo/redo/can_undo/can_redo/get_deck/set_navigation/save_file Rust AppState 持有 deck + 历史栈,所有写操作通过 Op Log - bridge.ts: 安全 Tauri IPC 调用层(动态 import,Web 模式 mock) - useStore.ts: 统一 store 接口,检测 __TAURI__ 环境 Web 模式直接调 TS store;Tauri 模式走 invoke - 50 个测试全部通过,前后端编译零错误 --- src-tauri/src/commands.rs | 159 ++++++++++++++++++++++++++++++++++++ src-tauri/src/lib.rs | 46 ++++------- src/composables/useStore.ts | 73 +++++++++++++++++ src/core/bridge.ts | 44 ++++++++++ 4 files changed, 294 insertions(+), 28 deletions(-) create mode 100644 src-tauri/src/commands.rs create mode 100644 src/composables/useStore.ts create mode 100644 src/core/bridge.ts diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs new file mode 100644 index 0000000..9397727 --- /dev/null +++ b/src-tauri/src/commands.rs @@ -0,0 +1,159 @@ +/* ===================================================================== + * commands.rs — Tauri IPC 命令（前端 invoke 入口） + * + * 设计原则： + * - 所有写操作通过 exec_op 统一走 Op Log（未来协同基础） + * - 所有读操作直接返回当前状态 + * - AI 流式通过 emit("ai-delta", token) 实时推送到前端 + * - 前端检测 __TAURI__ 环境，Web 模式回退到 TS store + * ===================================================================== */ +use serde::{Deserialize, Serialize}; +use tauri::State; +use std::sync::Mutex; + +use crate::model::*; +use crate::op::{apply_op, invert_op}; + +/* ---------- 应用状态 ---------- */ + +pub struct AppState { + pub deck: Mutex, + pub current_index: Mutex, + pub selected_id: Mutex>, + pub history: Mutex>, // forward ops + pub backward: Mutex>, // backward ops (for undo) +} + +impl AppState { + pub fn new() -> Self { + Self { + deck: Mutex::new(Deck { v: 3, theme: "indigo".into(), slides: vec![], chat_id: None }), + current_index: Mutex::new(0), + selected_id: Mutex::new(None), + history: Mutex::new(vec![]), + backward: Mutex::new(vec![]), + } + } +} + +/* ---------- 命令参数 ---------- */ + +#[derive(Deserialize)] +pub struct ExecOpArgs { + pub op: serde_json::Value, // { type, payload... } +} + +#[derive(Serialize)] +pub struct OpResult { + pub success: bool, + pub deck: Deck, + pub error: Option, +} + +/* ---------- 命令实现 ---------- */ + +/// 执行一个 Op，记录历史（用于 undo） +#[tauri::command] +pub fn exec_op(state: State, op_json: serde_json::Value) -> Result { + let op: crate::model::Op = serde_json::from_value(op_json.clone()) + .map_err(|e| format!("Op 解析失败: {}", e))?; + + let mut deck = state.deck.lock().map_err(|e| e.to_string())?; + let backward_op = invert_op(&deck, &op); + *deck = apply_op(&deck, &op); + + let mut hist = state.history.lock().map_err(|e| e.to_string())?; + hist.push(op); + if hist.len() > 40 { hist.remove(0); } + + let mut back = state.backward.lock().map_err(|e| e.to_string())?; + back.truncate(0); // 新操作清空 redo 栈 + + Ok(OpResult { success: true, deck: deck.clone(), error: None }) +} + +/// 撤销 +#[tauri::command] +pub fn undo(state: State) -> Result { + let mut deck = state.deck.lock().map_err(|e| e.to_string())?; + let mut hist = state.history.lock().map_err(|e| e.to_string())?; + let mut back = state.backward.lock().map_err(|e| e.to_string())?; + + if hist.is_empty() { return Ok(OpResult { success: false, deck: deck.clone(), error: Some("无可撤销操作".into()) }); } + + let forward_op = hist.pop().unwrap(); + let backward_op = invert_op(&deck, &forward_op); + *deck = apply_op(&deck, &backward_op); + back.push(forward_op); + + Ok(OpResult { success: true, deck: deck.clone(), error: None }) +} + +/// 重做 +#[tauri::command] +pub fn redo(state: State) -> Result { + let mut deck = state.deck.lock().map_err(|e| e.to_string())?; + let mut hist = state.history.lock().map_err(|e| e.to_string())?; + let mut back = state.backward.lock().map_err(|e| e.to_string())?; + + if back.is_empty() { return Ok(OpResult { success: false, deck: deck.clone(), error: Some("无可重做操作".into()) }); } + + let forward_op = back.pop().unwrap(); + *deck = apply_op(&deck, &forward_op); + hist.push(forward_op); + + Ok(OpResult { success: true, deck: deck.clone(), error: None }) +} + +/// 检查是否可撤销 +#[tauri::command] +pub fn can_undo(state: State) -> bool { + state.history.lock().map(|h| !h.is_empty()).unwrap_or(false) +} + +/// 检查是否可重做 +#[tauri::command] +pub fn can_redo(state: State) -> bool { + state.backward.lock().map(|b| !b.is_empty()).unwrap_or(false) +} + +/// 获取当前 deck +#[tauri::command] +pub fn get_deck(state: State) -> Deck { + state.deck.lock().unwrap().clone() +} + +/// 设置当前页索引 + 选中元素 +#[tauri::command] +pub fn set_navigation(state: State, index: usize, selected: Option) { + if let Ok(mut ci) = state.current_index.lock() { + *ci = index; + } + if let Ok(mut si) = state.selected_id.lock() { + *si = selected; + } +} + +/// 获取连接信息 +#[tauri::command] +pub fn app_info() -> serde_json::Value { + serde_json::json!({ + "name": "u-ppt", + "version": env!("CARGO_PKG_VERSION"), + "platform": std::env::consts::OS, + "backend": "tauri-rust", + }) +} + +/// Ping 测试 +#[tauri::command] +pub fn ping() -> String { + "pong".to_string() +} + +/// 保存 deck 到文件 +#[tauri::command] +pub fn save_file(content: String) -> Result { + // 后续通过 tauri-plugin-dialog 实现文件对话框 + Ok("ok".to_string()) +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c74faf1..f56e00b 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,46 +1,36 @@ -/* ===================================================================== - * lib.rs — Tauri 应用入口 - * - * B0: 脚手架 + ping IPC - * B1: 数据模型（model.rs）+ 颜色纯函数（color.rs） - * B2: store 迁移（待实现） - * B3: AI 引擎迁移（待实现） - * ===================================================================== */ - mod ai; mod color; +mod commands; mod model; mod op; -/// IPC 验证命令 -#[tauri::command] -fn ping() -> String { - "pong".to_string() -} - -/// 返回应用版本信息 -#[tauri::command] -fn app_info() -> serde_json::Value { - serde_json::json!({ - "name": "u-ppt", - "version": env!("CARGO_PKG_VERSION"), - "platform": std::env::consts::OS, - }) -} - pub fn run() { + let app_state = commands::AppState::new(); + tauri::Builder::default() - .invoke_handler(tauri::generate_handler![ping, app_info]) + .manage(app_state) + .invoke_handler(tauri::generate_handler![ + commands::ping, + commands::app_info, + commands::exec_op, + commands::undo, + commands::redo, + commands::can_undo, + commands::can_redo, + commands::get_deck, + commands::set_navigation, + commands::save_file, + ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } #[cfg(test)] mod tests { - use super::*; + use super::commands; #[test] fn test_ping() { - assert_eq!(ping(), "pong"); + assert_eq!(commands::ping(), "pong"); } } diff --git a/src/composables/useStore.ts b/src/composables/useStore.ts new file mode 100644 index 0000000..1dcab19 --- /dev/null +++ b/src/composables/useStore.ts @@ -0,0 +1,73 @@ +/* ===================================================================== + * useStore.ts — 统一 Store 接口（兼容 Tauri 和 Web 双模式） + * + * 设计： + * - 检测 __TAURI__ 环境，决定走 invoke 还是直接调 TS store + * - 暴露与现有 store 相同的方法签名（88 处组件调用零改动） + * - 返回 reactive ref（与 Vue 响应式兼容） + * + * Web 模式：直接 return store（现有行为，零改动） + * Tauri 模式：返回封装对象，内部 invoke Rust 命令 + * ===================================================================== */ +import type { Deck, Slide, SlideElement, LibItem, PageTemplate, ChatMessage, AiCfg } from '../core/types' +import { store as tsStore } from '../core/store' +import { invoke } from '../core/bridge' + +/** 是否运行在 Tauri 桌面环境中 */ +export const isTauri = typeof window !== 'undefined' && '__TAURI__' in window + +/** 根据环境创建 store 接口 */ +function createStore() { + // Web 模式：直接返回现有 TS store + if (!isTauri) return tsStore + + // Tauri 模式：封装 invoke 调用 + // 注意：所有写操作通过 exec_op 统一走 Op Log + const CLIENT_ID = 'client-' + Math.random().toString(36).slice(2, 10) + + /** 生成一个 Op 并发送到 Rust 后端 */ + async function execOp(type: string, payload: Record) { + try { + const result = await invoke<{ success: boolean; deck: Deck; error?: string }>('exec_op', { + opJson: { type, clientId: CLIENT_ID, timestamp: Date.now(), ...payload } + }) + if (result?.deck) { + // 更新本地 ref 状态（由 TauriBridge watcher 处理） + } + } catch (e) { + console.error('exec_op 失败:', e) + } + } + + // 返回与 TS store 类型兼容的对象 + // 关键属性通过 computed ref 暴露 + return { + ...tsStore, + // 读操作暂时委托给 TS store（未来Rust端会emit状态同步） + // 写操作改为 invoke + setTheme: async (name: string) => { + await execOp('set_theme', { theme: name }) + }, + addSlide: async (atIndex?: number) => { + const slide: Slide = { id: 's-' + Date.now(), background: 'bg', elements: [] } + const idx = atIndex != null ? atIndex + 1 : tsStore.getCount() + await execOp('add_slide', { atIndex: idx, slide }) + tsStore.addSlide(atIndex) + }, + updateElement: async (id: string, patch: Record) => { + await execOp('update_element', { slideIdx: tsStore.getCurrentIndex(), elementId: id, patch }) + }, + delElement: async (id: string) => { + const el = tsStore.findElement(id) + await execOp('del_element', { slideIdx: tsStore.getCurrentIndex(), elementId: id, deletedElement: el ? { ...el } : undefined }) + }, + undo: async () => { + await invoke('undo') + }, + redo: async () => { + await invoke('redo') + }, + } +} + +export const store = createStore() diff --git a/src/core/bridge.ts b/src/core/bridge.ts new file mode 100644 index 0000000..5d72c51 --- /dev/null +++ b/src/core/bridge.ts @@ -0,0 +1,44 @@ +/* ===================================================================== + * bridge.ts — Tauri IPC 安全调用桥接 + * + * 安全检测 __TAURI__ 环境，动态 import @tauri-apps/api/core。 + * Web 模式下返回 mock，组件无需关心环境。 + * ===================================================================== */ + +/** 动态获取 invoke 函数 */ +let _invoke: ((cmd: string, args?: Record) => Promise) | null = null + +async function ensureInvoke() { + if (_invoke) return true + if (typeof window === 'undefined' || !('__TAURI__' in window)) return false + try { + const mod = await import('@tauri-apps/api/core') + _invoke = mod.invoke + return true + } catch { + return false + } +} + +/** + * 安全调用 Tauri IPC 命令。 + * Web 模式下返回 undefined（调用方需处理）。 + */ +export async function invoke(cmd: string, args?: Record): Promise { + const ok = await ensureInvoke() + if (!ok || !_invoke) return undefined + return _invoke(cmd, args) as Promise +} + +/** 注册 Tauri 事件监听（用于 Rust → 前端推送） */ +export async function listen(event: string, handler: (payload: T) => void): Promise<() => void> { + if (typeof window === 'undefined' || !('__TAURI__' in window)) { + return () => {} // 空注销函数 + } + try { + const { listen } = await import('@tauri-apps/api/event') + return listen(event, (e: { payload: T }) => handler(e.payload)) + } catch { + return () => {} + } +}