Merge pull request #38 from luoqiz/feat-update-tauri2

重构，可配置化

Author: lich0821

src-tauri/config.json5

@@ -1 +1 @@
-{"cburl":["http://192.168.1.2:9999"],"wsurl":"","file_dir":""}
+{"cburl":[],"http_server_port":10080,"wsurl":"","file_dir":"","front_msg_show":true}

src-tauri/src/service/message/event_entity.rs renamed to src-tauri/src/handler/event_entity.rs

@@ -5,9 +5,11 @@ use crate::wcferry::wcf;
 #[derive(Clone)]
 pub enum Event {
     ClientMessage(wcf::WxMsg),
+    StartUp(),
+    Shutdown(),
 }
 
 #[async_trait]
 pub trait EventHandler {
-    async fn handle(&self, event: Event);
+    async fn handle(&mut self, event: Event);
 }

src-tauri/src/service/message/console_message_handler.rs renamed to src-tauri/src/handler/message/console_message_handler.rs

@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 
-use super::event_entity::{Event, EventHandler};
+use crate::handler::event_entity::{Event, EventHandler};
 
 // 控制台日志打印
 pub struct ConsoleLogMessageHandler {
@@ -9,7 +9,7 @@ pub struct ConsoleLogMessageHandler {
 
 #[async_trait]
 impl EventHandler for ConsoleLogMessageHandler {
-    async fn handle(&self, event: Event) {
+    async fn handle(&mut self, event: Event) {
         if let Event::ClientMessage(ref msg) = event {
             println!("控制台日志处理器 {} -- 接收到信息: {:?}", self.id, msg);
         }

src-tauri/src/service/message/http_message_handler.rs renamed to src-tauri/src/handler/message/http_message_handler.rs

@@ -1,23 +1,21 @@
 use async_trait::async_trait;
 
-use crate::service::global_service::GLOBAL;
+use crate::{handler::event_entity::{Event, EventHandler}, service::global_service::GLOBAL};
 
 use serde_json::json;
 
-use super::event_entity::{Event, EventHandler};
-
 /// 配置 http 回调地址后，将调用设置的url，
 pub struct HttpMessageHandler {
     pub id: String,
 }
 
 #[async_trait]
 impl EventHandler for HttpMessageHandler {
-    async fn handle(&self, event: Event) {
+    async fn handle(&mut self, event: Event) {
         if let Event::ClientMessage(ref msg) = event {
             let global = GLOBAL.get().unwrap();
-            let k_config = global.wechat_config.try_lock().unwrap();
-            let cburl = k_config.cburl.clone();
+            let wechat_config = global.wechat_config.read().unwrap();
+            let cburl = wechat_config.cburl.clone();
             if cburl.is_empty() {
                 return;
             }

src-tauri/src/handler/message/log_message_handler.rs

@@ -0,0 +1,25 @@
+use async_trait::async_trait;
+
+use crate::{handler::event_entity::{Event, EventHandler}, service::global_service::GLOBAL};
+
+/// 日志打印
+pub struct LogMessageHandler {
+    pub id: String,
+}
+
+#[async_trait]
+impl EventHandler for LogMessageHandler {
+    async fn handle(&mut self, event: Event) {
+        if let Event::ClientMessage(ref msg) = event {
+            let global = GLOBAL.get().unwrap();
+            let wechat_config = global.wechat_config.read().unwrap();
+            let show = wechat_config.front_msg_show.clone();
+            if show {
+                log::info!("日志处理器 {} -- 接收到信息: {:?}", self.id, msg);
+            }
+        }
+    }
+}
+
+
+

src-tauri/src/service/message/mod.rs renamed to src-tauri/src/handler/message/mod.rs

@@ -1,4 +1,3 @@
-pub mod event_entity;
 pub mod log_message_handler;
 pub mod console_message_handler;
 pub mod http_message_handler;

src-tauri/src/handler/mod.rs

@@ -0,0 +1,5 @@
+pub mod event_entity;
+pub mod startup_event_mgr;
+pub mod startup;
+pub mod message;
+pub mod msg_event_mgr;

src-tauri/src/service/msg_event_mgr.rs renamed to src-tauri/src/handler/msg_event_mgr.rs

@@ -2,7 +2,7 @@ use std::sync::{Arc, Mutex};
 
 use tokio::{sync::broadcast, task};
 
-use super::message::event_entity::{Event, EventHandler};
+use super::event_entity::{Event, EventHandler};
 
 pub struct MsgEventBus {
     pub broadcaster: Arc<Mutex<broadcast::Sender<Event>>>,
@@ -15,13 +15,15 @@ impl MsgEventBus {
         }
     }
 
-    pub fn subscribe(&mut self, handler: Arc<dyn EventHandler + Send + Sync>) {
+    pub fn subscribe(&mut self, mut handler: Box<dyn EventHandler + Send + Sync>) {
          let broadcast = self.broadcaster.lock().unwrap();
          let mut rx = broadcast.subscribe();
          task::spawn(async move {
             loop {
               match rx.recv().await {
-                  Ok(msg) => handler.handle(msg).await,
+                  Ok(msg) => {
+                    handler.handle(msg).await
+                  },
                   Err(broadcast::error::RecvError::Closed) => break,
                   Err(broadcast::error::RecvError::Lagged(msg)) => {
                     println!("客户端丢失了消息: {:?}", msg);

src-tauri/src/handler/startup/http_server_handler.rs

@@ -0,0 +1,56 @@
+use async_trait::async_trait;
+use log::info;
+
+use crate::{handler::event_entity::{Event, EventHandler}, http_server::HttpServer, service::global_service::GLOBAL};
+
+// 启动事件发布后，开启http服务
+pub struct HttpServerHandler {
+    pub id: String,
+    pub http_server_running: bool,
+    pub http_server: HttpServer,// 声明一个http server
+}
+
+#[async_trait]
+impl EventHandler for HttpServerHandler {
+    async fn handle(&mut self, event: Event) {
+        
+        if let Event::StartUp() = event {
+            info!("HttpServer {} 启动", self.id);
+
+            let global = GLOBAL.get().unwrap();
+            let wechat_config = global.wechat_config.read().unwrap();
+            let port = wechat_config.http_server_port;
+
+            let host_bytes = "0.0.0.0".to_string()
+            .split('.')
+            .map(|part| part.parse::<u8>().unwrap_or(0))
+            .collect::<Vec<u8>>()
+            .try_into()
+            .map_err(|_| "Invalid host address".to_string()).unwrap();
+            
+            if !self.http_server_running {
+                self.http_server.start(host_bytes, port).unwrap();
+                self.http_server_running = true;
+            }
+            info!("服务启动，监听 http://{}:{}", "0.0.0.0", port);
+            info!("浏览器访问 http://localhost:{}/swagger/ 查看文档", port);
+        }
+        
+        if let Event::Shutdown() = event {
+            info!("HttpServer {} 关闭", self.id);
+            if self.http_server_running {
+                match self.http_server.stop() {
+                    Ok(()) => {
+                        self.http_server_running = false;
+                        ()
+                    }
+                    Err(e) => {
+                        log::error!("http服务关闭失败 {}", e);
+                    }
+                }
+            } else {
+                info!("服务已停止");
+            }
+        }
+    }
+}

src-tauri/src/handler/startup/mod.rs

@@ -0,0 +1 @@
+pub mod http_server_handler;