重构事件监听

Author: Silwings-git

src-tauri/src/api/launcher_api.rs

@@ -1,25 +1,25 @@
 use anyhow::Result;
 use rand::{Rng, distributions::Alphanumeric};
-use tauri::{AppHandle, Emitter, Manager, State};
-use tracing::{debug, info};
+use tauri::{AppHandle, State};
+use tracing::info;
 
 use crate::{
-    DatabaseManager, check_launch_then_exit,
+    DatabaseManager,
     db::{
         launcher,
         launcher_resource::{self, LauncherResource},
     },
     error::OneClickLaunchError,
     events::{
-        payloads::{LauncherLaunched, LauncherLaunchedPayload},
-        types::{EventDispatcher, EventSystem},
+        EventDispatcher,
+        types::{
+            LauncherBasicInfoUpdated, LauncherBasicInfoUpdatedPayload, LauncherLaunched,
+            LauncherLaunchedPayload,
+        },
     },
     open_using_default_program,
 };
 
-pub const LAUNCHER_LAUNCHED_EVENT: &str = "launcher_launched";
-pub const LAUNCHER_BASIC_INFO_UPDATED_EVENT: &str = "launcher_basic_info_updated";
-
 /// 创建新的启动器
 #[tauri::command]
 pub async fn craete_launcher(
@@ -29,7 +29,14 @@ pub async fn craete_launcher(
 ) -> Result<i64, OneClickLaunchError> {
     let name = name.unwrap_or_else(generate_default_launcher_name);
     let launcher_id = launcher::create(&db.pool, &name, None).await?;
-    let _ = app.emit(LAUNCHER_BASIC_INFO_UPDATED_EVENT, "");
+
+    let _ = EventDispatcher::<LauncherBasicInfoUpdated>::send_event(
+        &app,
+        LauncherBasicInfoUpdatedPayload {
+            launcher_ids: vec![launcher_id],
+        },
+    );
+
     Ok(launcher_id)
 }
 
@@ -57,7 +64,14 @@ pub async fn modify_launcher_name(
     name: String,
 ) -> Result<(), OneClickLaunchError> {
     launcher::modify_launcher_name(&db.pool, launcher_id, &name).await?;
-    let _ = app.emit(LAUNCHER_BASIC_INFO_UPDATED_EVENT, "");
+
+    let _ = EventDispatcher::<LauncherBasicInfoUpdated>::send_event(
+        &app,
+        LauncherBasicInfoUpdatedPayload {
+            launcher_ids: vec![launcher_id],
+        },
+    );
+
     Ok(())
 }
 
@@ -86,7 +100,12 @@ pub async fn copy_launcher(
 
     tx.commit().await?;
 
-    let _ = app.emit(LAUNCHER_BASIC_INFO_UPDATED_EVENT, "");
+    let _ = EventDispatcher::<LauncherBasicInfoUpdated>::send_event(
+        &app,
+        LauncherBasicInfoUpdatedPayload {
+            launcher_ids: vec![launcher_id],
+        },
+    );
 
     Ok(new_launcher_id)
 }
@@ -154,7 +173,12 @@ pub async fn delete_launcher(
 
     tx.commit().await?;
 
-    let _ = app.emit(LAUNCHER_BASIC_INFO_UPDATED_EVENT, "");
+    let _ = EventDispatcher::<LauncherBasicInfoUpdated>::send_event(
+        &app,
+        LauncherBasicInfoUpdatedPayload {
+            launcher_ids: vec![launcher_id],
+        },
+    );
 
     Ok(())
 }
@@ -180,7 +204,12 @@ pub async fn modify_launcher_sort(
 
     tx.commit().await?;
 
-    let _ = app.emit(LAUNCHER_BASIC_INFO_UPDATED_EVENT, "");
+    let _ = EventDispatcher::<LauncherBasicInfoUpdated>::send_event(
+        &app,
+        LauncherBasicInfoUpdatedPayload {
+            launcher_ids: launchers.iter().map(|e| e.id).collect(),
+        },
+    );
 
     Ok(())
 }
@@ -241,19 +270,19 @@ pub async fn launch(
 ) -> Result<(), OneClickLaunchError> {
     let resources = launcher_resource::query_by_launcher_id(&db.pool, launcher_id).await?;
 
-    launch_launcher_resources(&app, &resources);
+    launch_resources(&app, &resources);
 
-    // app.emit(
-    //     LAUNCHER_LAUNCHED_EVENT,
-    //     LauncherLaunchedPayload { launcher_id },
-    // )?;
-
-    EventDispatcher::<LauncherLaunched>::send_event(&app, LauncherLaunchedPayload { launcher_id })?;
+    EventDispatcher::<LauncherLaunched>::send_event(
+        &app,
+        LauncherLaunchedPayload {
+            launcher_ids: vec![launcher_id],
+        },
+    )?;
 
     Ok(())
 }
 
-pub fn launch_launcher_resources(app: &AppHandle, resources: &[LauncherResource]) {
+pub fn launch_resources(app: &AppHandle, resources: &[LauncherResource]) {
     for resource in resources.iter() {
         if let Err(e) = open_using_default_program(app, resource.path.as_str()) {
             info!(
@@ -263,30 +292,3 @@ pub fn launch_launcher_resources(app: &AppHandle, resources: &[LauncherResource]
         }
     }
 }
-
-pub fn de(app: AppHandle) {
-    // 监听 `event-name`（无论其在什么窗口中触发）
-    let app_handle = app; // 获取 AppHandle
-
-    EventSystem::register_listener(&app_handle.clone(), LauncherLaunched, move |_payload| {
-        let inner_app_handle = app_handle.clone();
-        tauri::async_runtime::spawn(async move {
-            let db = inner_app_handle.state::<DatabaseManager>();
-            if let Ok(_exit @ true) = check_launch_then_exit(&db.pool).await {
-                debug!("监听到启动器启动完成事件, 已设置启动后退出, 正在退出程序.");
-                inner_app_handle.exit(0);
-            }
-        });
-    });
-
-    //   let _id = app.listen(launcher_api::LAUNCHER_LAUNCHED_EVENT, move |_event| {
-    //       let inner_app_handle = app_handle.clone();
-    //       tauri::async_runtime::spawn(async move {
-    //           let db = inner_app_handle.state::<DatabaseManager>();
-    //           if let Ok(_exit @ true) = check_launch_then_exit(&db.pool).await {
-    //               debug!("监听到启动器启动完成事件, 已设置启动后退出, 正在退出程序.");
-    //               inner_app_handle.exit(0);
-    //           }
-    //       });
-    //   });
-}

src-tauri/src/api/setting_api.rs

@@ -1,20 +1,34 @@
-use tauri::State;
+use tauri::{AppHandle, State};
 
 use crate::{
     DatabaseManager,
     db::settings::{self, Settings},
     error::OneClickLaunchError,
+    events::{
+        EventDispatcher,
+        types::{SettingUpdated, SettingUpdatedPayload},
+    },
 };
 
 /// 保存设置
 #[tauri::command]
 pub async fn save_setting(
+    app: AppHandle,
     db: State<'_, DatabaseManager>,
     key: String,
     value: String,
 ) -> Result<(), OneClickLaunchError> {
     let setting = Settings { key, value };
     settings::save(&db.pool, &setting).await?;
+
+    let _ = EventDispatcher::<SettingUpdated>::send_event(
+        &app,
+        SettingUpdatedPayload {
+            key: setting.key.clone(),
+            value: setting.value.clone(),
+        },
+    );
+
     Ok(())
 }
 

src-tauri/src/api/window_api.rs

@@ -5,20 +5,13 @@ use tauri::{
 
 use crate::{DatabaseManager, WindowContext, db::launcher, error::OneClickLaunchError};
 
-/// 关闭窗口
-#[tauri::command]
-pub async fn hide_window(app: AppHandle) -> Result<(), OneClickLaunchError> {
-    hide_window_sync(app)
-}
-
-pub fn hide_window_sync(app: AppHandle) -> Result<(), OneClickLaunchError> {
+pub fn hide_window(app: &AppHandle) -> Result<(), OneClickLaunchError> {
     let window = app.get_webview_window("main").unwrap();
     window.hide()?;
     Ok(())
 }
 
 /// 刷新系统图标菜单
-#[tauri::command]
 pub async fn refresh_tray(app: AppHandle) -> Result<(), OneClickLaunchError> {
     // 获取全局状态
     let window_context: State<'_, WindowContext> = app.state();
@@ -47,9 +40,7 @@ pub async fn refresh_tray(app: AppHandle) -> Result<(), OneClickLaunchError> {
     Ok(())
 }
 
-/// 修改窗口主题
-#[tauri::command]
-pub async fn change_windows_theme(app: AppHandle, theme: &str) -> Result<(), OneClickLaunchError> {
+pub fn change_windows_theme(app: &AppHandle, theme: &str) -> Result<(), OneClickLaunchError> {
     if let Some(window) = app.get_webview_window("main") {
         window.set_theme(match theme {
             "dark" => Some(Theme::Dark),

src-tauri/src/constants.rs

@@ -0,0 +1,8 @@
+use lazy_static::lazy_static;
+
+lazy_static! {
+    pub static ref AUTO_START_FLAG: String = "--auto".to_string();
+}
+
+pub static APPLICATION_NAME: &str = "一键启动";
+pub static THEME: &str = "theme";

src-tauri/src/db/launcher_resource.rs

@@ -100,7 +100,7 @@ where
 // 按launcher_id查询
 pub async fn query_by_launcher_ids<'a, E>(
     executor: E,
-    launcher_ids: Vec<i64>,
+    launcher_ids: &[i64],
 ) -> Result<Vec<LauncherResource>>
 where
     E: Executor<'a, Database = Sqlite>,

src-tauri/src/events.rs

@@ -1,2 +1,47 @@
-pub mod payloads;
+pub mod system_listeners;
 pub mod types;
+
+use std::marker::PhantomData;
+
+use serde::{Deserialize, Serialize};
+use tauri::{AppHandle, Emitter, Listener};
+use tracing::error;
+
+use crate::error::OneClickLaunchError;
+
+pub trait Event {
+    type Payload: Serialize + for<'a> Deserialize<'a> + Clone;
+
+    fn name() -> &'static str;
+}
+
+// 事件发送器
+pub struct EventDispatcher<E: Event> {
+    _marker: PhantomData<E>,
+}
+
+impl<E: Event> EventDispatcher<E> {
+    pub fn send_event(app: &AppHandle, payload: E::Payload) -> Result<(), OneClickLaunchError> {
+        app.emit(E::name(), payload)?;
+        Ok(())
+    }
+}
+
+// 事件监听器注册系统
+pub struct EventSystem;
+
+impl EventSystem {
+    pub fn register_listener<E, F>(app: &AppHandle, _event: E, callback: F)
+    where
+        E: Event + 'static,
+        F: Fn(E::Payload) + Send + 'static,
+    {
+        app.listen(E::name(), move |e| {
+            if let Ok(payload) = serde_json::from_str(e.payload()) {
+                callback(payload);
+            } else {
+                error!("{}事件payload反序列化失败.原始数据: {}", "", e.payload());
+            }
+        });
+    }
+}