feat: 完善 db 的内容

Cargo.toml

@@ -1,3 +1,4 @@
 [workspace]
 resolver = "2"
 members = ["packages/gotify-ws", "packages/home-api"]
+default-members = ["packages/gotify-ws"]

packages/gotify-ws/Cargo.toml

@@ -7,6 +7,9 @@ edition = "2024"
 env_logger = "0.11.8"
 futures = "0.3.31"
 log = "0.4.27"
+r2d2 = "0.8.10"
+r2d2_sqlite = "0.31.0"
+rusqlite = { version = "0.37.0", features = ["bundled"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.133"
 tokio = { version = "1.47.0", features = ["full"] }

packages/gotify-ws/src/main.rs

@@ -1,48 +1,40 @@
-mod utils;
 mod model;
+mod utils;
 
+use crate::model::ws::WsMessage;
 use futures::StreamExt;
 use log::info;
 use serde_json;
 use tokio_tungstenite::connect_async;
-use utils::logger;
+use utils::{logger, sql};
-use crate::model::ws::WsMessage;
+use utils::sql::sqlite::SqliteDB;
-
 #[tokio::main]
 async fn main() {
-    logger::init_logger();
+  logger::init_logger();
-    const WS: &str = "wss://home.hzer.xyz/gotify/stream?token=CDIwYlYJuxWxVr5";
+  const WS: &str = "wss://home.hzer.xyz/gotify/stream?token=CDIwYlYJuxWxVr5";
-
+  let (stream, _) = connect_async(WS).await.unwrap();
-    match connect_async(WS).await {
+  info!("Connected to Gotify server {WS}");
-        Ok((stream, _)) => {
+  
-            info!("Connected to Gotify server {WS}");
+  let (_, mut read) = stream.split();
-
+  while let Some(msg) = read.next().await {
-            let (_, mut read) = stream.split();
+    match msg {
-            while let Some(msg) = read.next().await {
+      Ok(msg) => {
-                match msg {
+        let str = msg.to_text().unwrap().to_string();
-                    Ok(tokio_tungstenite::tungstenite::Message::Text(text)) => {
+        match serde_json::from_str::<WsMessage>(&str) {
-                        info!("Received text message: {}", text);
+          Ok(ws) => {
-                        match serde_json::from_str::<WsMessage>(&text) {
+            info!("Got {} from Gotify", ws.message);
-                            Ok(ws_msg) => {
+            let db = SqliteDB::new("db.sqlite").unwrap();
-                                info!("Parsed message: {ws_msg:?}");
+            db.create_table();
-                            }
+          }
-                            Err(e) => {
+          Err(_) => {
-                                info!("Failed to parse message: {e}");
+            info!("监听到心跳{}", &str)
-                            }
+          }
-                        }
-                    }
-                    Ok(other_msg) => {
-                        info!("Received non-text message: {other_msg:?}");
-                    }
-                    Err(e) => {
-                        info!("Error receiving message: {e}");
-                        break;
-                    }
-                }
-            }
-        }
-        Err(e) => {
-            info!("Failed to connect to Gotify server: {e}");
         }
+      }
+      Err(e) => {
+        info!("Error receiving message: {e}");
+        break;
+      }
     }
+  }
 }

packages/gotify-ws/src/model/ws.rs

@@ -2,7 +2,7 @@
 pub struct WsMessage {
     id: u64,
     appid: u64,
-    message: String,
+    pub message: String,
     title: String,
     priority: u64,
     date: String,

packages/gotify-ws/src/utils/mod.rs

@@ -1 +1,2 @@
-pub mod logger;
+pub mod logger;
+pub mod sql;

packages/gotify-ws/src/utils/sql/mod.rs

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

packages/gotify-ws/src/utils/sql/sqlite/mod.rs

@@ -0,0 +1,31 @@
+mod sql_line;
+
+use log::warn;
+use r2d2::{Pool};
+use r2d2_sqlite::SqliteConnectionManager;
+use crate::utils::sql::sqlite::sql_line::{generate_sql_line};
+
+#[derive(Debug)]
+pub struct SqliteDB {
+  pub connection_pool: Pool<SqliteConnectionManager>,
+}
+
+impl SqliteDB {
+  pub fn new(address: &str) -> Option<Self> {
+    let manager = SqliteConnectionManager::file(address);
+    match Pool::builder().build(manager) {
+      Ok(pool) => Some(SqliteDB {
+        connection_pool: pool
+      }),
+      Err(e) => {
+        warn!("Failed to create connection pool: {}", e);
+        None
+      }
+    }
+  }
+  pub fn create_table(&self) {
+    let conn = self.connection_pool.get().unwrap();
+    let line = generate_sql_line();
+    conn.execute(line.get("create_table").unwrap(), []).expect(&format!("Failed to create db table: {:?}", self));
+  }
+}

packages/gotify-ws/src/utils/sql/sqlite/sql_line.rs

@@ -0,0 +1,15 @@
+use std::collections::HashMap;
+
+pub fn generate_sql_line() -> HashMap<&'static str, &'static str> {
+  let mut line = HashMap::new();
+  line.insert("create_table", "
+  CREATE TABLE IF NOT EXISTS gotify (
+      id INTEGER PRIMARY KEY,
+      appid INTEGER,
+      message TEXT,
+      title TEXT,
+      priority INTEGER,
+      date TEXT
+  ");
+  line
+}

packages/home-api/src/test/sqlite.rs

@@ -10,7 +10,7 @@ mod sqlite {
 
     #[test]
     fn init() {
-        let manager = SqliteConnectionManager::file("database.sqlite");
+        let manager = SqliteConnectionManager::file("database.mod");
         let pool = r2d2::Pool::new(manager).unwrap();
 
         let file = File::open("./resources/ID/id.txt").unwrap();

packages/home-api/src/utils/database.rs

@@ -9,7 +9,7 @@ pub struct SqliteState {
 }
 
 pub fn init_database() -> Data<SqliteState> {
-    let db = SqliteConnectionManager::file("./database.sqlite");
+    let db = SqliteConnectionManager::file("./database.mod");
     let pool = Pool::new(db).unwrap();
     Data::new(SqliteState { pool: pool.clone() })
 }

rustfmt.toml

@@ -0,0 +1,4 @@
+# Rust 格式化配置
+tab_spaces = 2  # 设置缩进为2个空格
+max_width = 100  # 每行最大宽度
+edition = "2025"  # 使用Rust 2021版本