.github/workflows/publish.yml

@@ -1,45 +0,0 @@
-name: publish
-
-on:
-  workflow_dispatch:
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  publish:    # 全都要！
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        # python-version: ["3.8", "3.9", "3.10", "3.11",]
-    
-    runs-on:  ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: 获取版本号
-      id: get_version
-      uses: sravinet/toml-select@v1.0.1
-      with:
-        file: ./ica-rs/Cargo.toml
-        field: "package.version"
-    
-    - name: Setup Python
-      uses: actions/setup-python@v5.0.0
-      with:
-        # Version range or exact version of Python or PyPy to use, using SemVer's version range syntax. Reads from .python-version if unset.
-        python-version: 3.8
-
-    - name: Run tests
-      run: cargo test --verbose
-    
-    - name: Build
-      run: cargo build --release
-    
-    - name: 上传
-      uses: actions/upload-artifact@v2
-      with:
-        name: ica-rs-b${{ github.run_number }}-${{ steps.get_version.outputs.value }}-py38-win-x64
-        path: ./target/release/ica-rs.exe

Cargo.lock

@@ -57,7 +57,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -68,7 +68,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -385,6 +385,21 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.30"
@@ -392,6 +407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
@@ -400,6 +416,17 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.30"
@@ -414,7 +441,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -435,6 +462,7 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
+ "futures-channel",
  "futures-core",
  "futures-io",
  "futures-macro",
@@ -612,7 +640,7 @@ dependencies = [
 
 [[package]]
 name = "ica-rs"
-version = "0.5.0"
+version = "0.4.12"
 dependencies = [
  "chrono",
  "colored",
@@ -621,6 +649,7 @@ dependencies = [
  "futures-util",
  "hex",
  "pyo3",
+ "pyo3-asyncio",
  "rust_socketio",
  "serde",
  "serde_json",
@@ -852,7 +881,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -987,6 +1016,31 @@ dependencies = [
  "unindent",
 ]
 
+[[package]]
+name = "pyo3-asyncio"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995"
+dependencies = [
+ "futures",
+ "once_cell",
+ "pin-project-lite",
+ "pyo3",
+ "pyo3-asyncio-macros",
+ "tokio",
+]
+
+[[package]]
+name = "pyo3-asyncio-macros"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c467178e1da6252c95c29ecf898b133f742e9181dca5def15dc24e19d45a39"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "pyo3-build-config"
 version = "0.20.3"
@@ -1016,7 +1070,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1029,7 +1083,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1271,7 +1325,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1396,6 +1450,17 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.50"
@@ -1469,7 +1534,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1555,7 +1620,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1655,7 +1720,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1824,7 +1889,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
  "wasm-bindgen-shared",
 ]
 
@@ -1858,7 +1923,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.50",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

config-temp.toml

@@ -1,12 +1,4 @@
 
-# python 插件路径
-py_plugin_path = "/path/to/your/plugin"
-py_config_path = "/path/to/your/config"
-
-enable_ica = true # 是否启用 ica
-
-[ica]
-
 private_key = "" # 与 icalingua 客户端使用的 private_key 一致
 host = ""  # docker 版 icalingua 服务的地址
 self_id = 0 # 机器人的 qq 号
@@ -20,3 +12,7 @@ notice_start = true # 是否在启动 bot 后通知
 admin_list = [0] # 机器人的管理员
 # 过滤的人
 filter_list = [0]
+
+# python 插件路径
+py_plugin_path = "/path/to/your/plugin"
+py_config_path = "/path/to/your/config"

ica-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ica-rs"
-version = "0.5.0"
+version = "0.4.12"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -21,7 +21,7 @@ tokio = { version = "1.0", features = ["full"] }
 futures-util = "0.3.30"
 pyo3 = "0.20.3"
 # pyo3-async = "0.3.2"
-# pyo3-asyncio = { version = "0.20.0", features = ["attributes", "tokio-runtime"] }
+pyo3-asyncio = { version = "0.20.0", features = ["attributes", "tokio-runtime"] }
 
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["time"] }

ica-rs/ica_typing.py

@@ -146,9 +146,6 @@ on_delete_message = Callable[[MessageId, IcaClient], None]
 # def on_delete_message(msg_id: MessageId, client: IcaClient) -> None:
 #     ...
 
-# TODO: Matrix adapter
-# on_matrix_room_message = Callable[[RoomId, NewMessage, IcaClient], None]
-
 on_config = Callable[[None], Tuple[str, str]]
 
 CONFIG_DATA: ConfigData = ConfigData()

ica-rs/src/client.rs

@@ -1,8 +1,8 @@
-use crate::config::{BotConfig, IcaConfig};
+use crate::config::IcaConfig;
-use crate::ica::data_struct::all_rooms::Room;
+use crate::data_struct::all_rooms::Room;
-use crate::ica::data_struct::messages::{DeleteMessage, SendMessage};
+use crate::data_struct::messages::{DeleteMessage, SendMessage};
-use crate::ica::data_struct::online_data::OnlineData;
+use crate::data_struct::online_data::OnlineData;
-use crate::ClientStatus_Global;
+use crate::ClientStatus;
 
 use colored::Colorize;
 use ed25519_dalek::{Signature, Signer, SigningKey};
@@ -47,85 +47,73 @@ pub async fn delete_message(client: &Client, message: &DeleteMessage) -> bool {
 // pub async fn fetch_history(client: &Client, roomd_id: RoomId) -> bool { false }
 
 #[derive(Debug, Clone)]
-pub struct BotStatus {
+pub struct IcalinguaStatus {
     pub login: bool,
     /// currentLoadedMessagesCount
     pub current_loaded_messages_count: u64,
     pub online_data: Option<OnlineData>,
     pub rooms: Option<Vec<Room>>,
-    pub config: Option<BotConfig>,
+    pub config: Option<IcaConfig>,
 }
 
-impl BotStatus {
+impl IcalinguaStatus {
     pub fn new() -> Self {
         Self {
             login: false,
             current_loaded_messages_count: 0,
             online_data: None,
             rooms: None,
-            config: Some(BotConfig::new_from_cli()),
+            config: Some(IcaConfig::new_from_cli()),
         }
     }
 
     #[inline]
     pub fn update_online_data(online_data: OnlineData) {
         unsafe {
-            ClientStatus_Global.online_data = Some(online_data);
+            ClientStatus.online_data = Some(online_data);
         }
     }
     #[inline]
     pub fn update_rooms(rooms: Vec<Room>) {
         unsafe {
-            ClientStatus_Global.rooms = Some(rooms);
+            ClientStatus.rooms = Some(rooms);
         }
     }
     #[inline]
     pub fn update_login_status(login: bool) {
         unsafe {
-            ClientStatus_Global.login = login;
+            ClientStatus.login = login;
         }
     }
     #[inline]
-    pub fn update_config(config: BotConfig) {
+    pub fn update_config(config: IcaConfig) {
         unsafe {
-            ClientStatus_Global.config = Some(config);
+            ClientStatus.config = Some(config);
         }
     }
     #[inline]
     pub fn update_loaded_messages_count(count: u64) {
         unsafe {
-            ClientStatus_Global.current_loaded_messages_count = count;
+            ClientStatus.current_loaded_messages_count = count;
         }
     }
     #[inline]
-    pub fn get_login_status() -> bool { unsafe { ClientStatus_Global.login } }
+    pub fn get_login_status() -> bool { unsafe { ClientStatus.login } }
     #[inline]
     pub fn get_rooms() -> &'static Vec<Room> {
-        unsafe { ClientStatus_Global.rooms.as_ref().expect("rooms should be set") }
+        unsafe { ClientStatus.rooms.as_ref().expect("rooms should be set") }
     }
     #[inline]
     pub fn get_loaded_messages_count() -> u64 {
-        unsafe { ClientStatus_Global.current_loaded_messages_count }
+        unsafe { ClientStatus.current_loaded_messages_count }
     }
     #[inline]
     pub fn get_online_data() -> &'static OnlineData {
-        unsafe { ClientStatus_Global.online_data.as_ref().expect("online_data should be set") }
+        unsafe { ClientStatus.online_data.as_ref().expect("online_data should be set") }
     }
     #[inline]
-    pub fn get_config() -> &'static BotConfig {
+    pub fn get_config() -> &'static IcaConfig {
-        unsafe { ClientStatus_Global.config.as_ref().expect("config should be set") }
+        unsafe { ClientStatus.config.as_ref().expect("config should be set") }
-    }
-    #[inline]
-    pub fn get_ica_config() -> &'static IcaConfig {
-        unsafe {
-            ClientStatus_Global
-                .config
-                .as_ref()
-                .expect("config should be set")
-                .ica
-                .as_ref()
-                .expect("ica should be set")
-        }
     }
 }
 
@@ -146,7 +134,7 @@ pub async fn sign_callback(payload: Payload, client: Client) {
     .expect("auth_key should be string");
     let salt = hex::decode(auth_key).expect("Got an invalid salt from the server");
     // 签名
-    let private_key = BotStatus::get_config().ica().private_key.clone();
+    let private_key = IcalinguaStatus::get_config().private_key.clone();
     let array_key: [u8; 32] = hex::decode(private_key)
         .expect("Not a vaild pub key")
         .try_into()

ica-rs/src/config.rs

@@ -21,24 +21,13 @@ pub struct IcaConfig {
     pub admin_list: Vec<i64>,
     /// 过滤列表
     pub filter_list: Vec<i64>,
-}
-
-/// 主配置
-#[derive(Debug, Clone, Deserialize)]
-pub struct BotConfig {
-    /// 是否启用 icalingua
-    pub enable_ica: bool,
-    /// Ica 配置
-    pub ica: Option<IcaConfig>,
-    /// Matrix 配置
-    // TODO: MatrixConfig
     /// Python 插件路径
     pub py_plugin_path: Option<String>,
     /// Python 配置文件路径
     pub py_config_path: Option<String>,
 }
 
-impl BotConfig {
+impl IcaConfig {
     pub fn new_from_path(config_file_path: String) -> Self {
         // try read config from file
         let config = fs::read_to_string(&config_file_path).expect("Failed to read config file");
@@ -50,6 +39,4 @@ impl BotConfig {
         let config_file_path = env::args().nth(1).expect("No config path given");
         Self::new_from_path(config_file_path)
     }
-
-    pub fn ica(&self) -> IcaConfig { self.ica.clone().expect("No ica config found") }
 }

ica-rs/src/data_struct/all_rooms.rs

@@ -1,5 +1,5 @@
-use crate::ica::data_struct::messages::{At, LastMessage};
+use crate::data_struct::messages::{At, LastMessage};
-use crate::ica::data_struct::RoomId;
+use crate::data_struct::RoomId;
 
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;

ica-rs/src/data_struct/messages.rs

@@ -1,5 +1,5 @@
-use crate::ica::data_struct::files::MessageFile;
+use crate::data_struct::files::MessageFile;
-use crate::ica::data_struct::{MessageId, RoomId, UserId};
+use crate::data_struct::{MessageId, RoomId, UserId};
 
 use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};

ica-rs/src/data_struct/messages/msg_trait.rs

@@ -4,9 +4,9 @@ use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
 
-use crate::client::BotStatus;
+use crate::client::IcalinguaStatus;
-use crate::ica::data_struct::messages::{At, Message, NewMessage};
+use crate::data_struct::messages::{At, Message, NewMessage};
-use crate::ica::data_struct::{MessageId, UserId};
+use crate::data_struct::{MessageId, UserId};
 
 impl Serialize for At {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -34,7 +34,7 @@ impl<'de> Deserialize<'de> for At {
 pub trait MessageTrait {
     fn is_reply(&self) -> bool;
     fn is_from_self(&self) -> bool {
-        let qq_id = BotStatus::get_online_data().qqid;
+        let qq_id = IcalinguaStatus::get_online_data().qqid;
         self.sender_id() == qq_id
     }
     fn msg_id(&self) -> &MessageId;

ica-rs/src/events.rs

@@ -3,10 +3,10 @@ use rust_socketio::asynchronous::Client;
 use rust_socketio::{Event, Payload};
 use tracing::{info, warn};
 
-use crate::client::{send_message, BotStatus};
+use crate::client::{send_message, IcalinguaStatus};
-use crate::ica::data_struct::all_rooms::Room;
+use crate::data_struct::all_rooms::Room;
-use crate::ica::data_struct::messages::{Message, MessageTrait, NewMessage};
+use crate::data_struct::messages::{Message, MessageTrait, NewMessage};
-use crate::ica::data_struct::online_data::OnlineData;
+use crate::data_struct::online_data::OnlineData;
 use crate::{py, VERSION};
 
 /// 获取在线数据
@@ -15,7 +15,7 @@ pub async fn get_online_data(payload: Payload, _client: Client) {
         if let Some(value) = values.first() {
             let online_data = OnlineData::new_from_json(value);
             info!("update_online_data {}", format!("{:?}", online_data).cyan());
-            BotStatus::update_online_data(online_data);
+            IcalinguaStatus::update_online_data(online_data);
         }
     }
 }
@@ -26,7 +26,7 @@ pub async fn add_message(payload: Payload, client: Client) {
         if let Some(value) = values.first() {
             let message: NewMessage = serde_json::from_value(value.clone()).unwrap();
             // 检测是否在过滤列表内
-            if BotStatus::get_ica_config().filter_list.contains(&message.msg.sender_id) {
+            if IcalinguaStatus::get_config().filter_list.contains(&message.msg.sender_id) {
                 return;
             }
             info!("add_message {}", message.to_string().cyan());
@@ -76,7 +76,7 @@ pub async fn update_all_room(payload: Payload, _client: Client) {
             if let Some(raw_rooms) = value.as_array() {
                 let rooms: Vec<Room> =
                     raw_rooms.iter().map(|room| Room::new_from_json(room)).collect();
-                BotStatus::update_rooms(rooms.clone());
+                IcalinguaStatus::update_rooms(rooms.clone());
                 info!("update_all_room {}", rooms.len());
             }
         }

ica-rs/src/ica.rs

@@ -1,52 +0,0 @@
-pub mod data_struct;
-pub mod events;
-
-use futures_util::FutureExt;
-use rust_socketio::asynchronous::{Client, ClientBuilder};
-use rust_socketio::{Event, Payload, TransportType};
-use tracing::info;
-
-use crate::config::IcaConfig;
-use crate::{wrap_any_callback, wrap_callback};
-
-pub async fn start_ica(config: &IcaConfig, stop_reciver: tokio::sync::oneshot::Receiver<()>) {
-    let socket = ClientBuilder::new(config.host.clone())
-        .transport_type(TransportType::Websocket)
-        .on_any(wrap_any_callback!(events::any_event))
-        .on("requireAuth", wrap_callback!(crate::client::sign_callback))
-        .on("message", wrap_callback!(events::connect_callback))
-        .on("authSucceed", wrap_callback!(events::connect_callback))
-        .on("authFailed", wrap_callback!(events::connect_callback))
-        .on("messageSuccess", wrap_callback!(events::succes_message))
-        .on("messageFailed", wrap_callback!(events::failed_message))
-        .on("onlineData", wrap_callback!(events::get_online_data))
-        .on("setAllRooms", wrap_callback!(events::update_all_room))
-        .on("setMessages", wrap_callback!(events::set_messages))
-        .on("addMessage", wrap_callback!(events::add_message))
-        .on("deleteMessage", wrap_callback!(events::delete_message))
-        .connect()
-        .await
-        .expect("Connection failed");
-
-    info!("Connected");
-
-    if config.notice_start {
-        for room in config.notice_room.iter() {
-            let startup_msg = data_struct::messages::SendMessage::new(
-                format!("ica-async-rs bot v{}", crate::VERSION),
-                room.clone(),
-                None,
-            );
-            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-            info!("发送启动消息到房间: {}", room);
-            if let Err(e) =
-                socket.emit("sendMessage", serde_json::to_value(startup_msg).unwrap()).await
-            {
-                info!("启动信息发送失败 房间:{}|e:{}", room, e);
-            }
-        }
-    }
-    // 等待停止信号
-    stop_reciver.await.ok();
-    socket.disconnect().await.expect("Disconnect failed");
-}

ica-rs/src/main.rs

@@ -1,16 +1,18 @@
 use std::time::Duration;
 
-use config::{BotConfig, IcaConfig};
+use futures_util::FutureExt;
+use rust_socketio::asynchronous::{Client, ClientBuilder};
+use rust_socketio::{Event, Payload, TransportType};
 use tracing::info;
 
 mod client;
 mod config;
-mod ica;
+mod data_struct;
-mod matrix;
+mod events;
 mod py;
 
 #[allow(non_upper_case_globals)]
-pub static mut ClientStatus_Global: client::BotStatus = client::BotStatus {
+pub static mut ClientStatus: client::IcalinguaStatus = client::IcalinguaStatus {
     login: false,
     current_loaded_messages_count: 0,
     online_data: None,
@@ -20,19 +22,18 @@ pub static mut ClientStatus_Global: client::BotStatus = client::BotStatus {
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-#[macro_export]
 macro_rules! wrap_callback {
     ($f:expr) => {
         |payload: Payload, client: Client| $f(payload, client).boxed()
     };
 }
 
-#[macro_export]
 macro_rules! wrap_any_callback {
     ($f:expr) => {
         |event: Event, payload: Payload, client: Client| $f(event, payload, client).boxed()
     };
 }
+
 #[tokio::main]
 async fn main() {
     tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).init();
@@ -40,20 +41,45 @@ async fn main() {
 
     // 从命令行获取 host 和 key
     // 从命令行获取配置文件路径
-    let bot_config = config::BotConfig::new_from_cli();
+    let ica_config = config::IcaConfig::new_from_cli();
-    client::BotStatus::update_config(bot_config.clone());
+    client::IcalinguaStatus::update_config(ica_config.clone());
-    py::init_py(&bot_config);
+    py::init_py(&ica_config);
 
-    // 准备一个用于停止 socket 的变量
+    let socket = ClientBuilder::new(ica_config.host.clone())
-    let (send, recv) = tokio::sync::oneshot::channel::<()>();
+        .transport_type(TransportType::Websocket)
-    if bot_config.enable_ica && bot_config.ica.is_some() {
+        .on_any(wrap_any_callback!(events::any_event))
-        info!("启动 ica");
+        .on("requireAuth", wrap_callback!(client::sign_callback))
-        let config = bot_config.ica();
+        .on("message", wrap_callback!(events::connect_callback))
-        tokio::spawn(async move {
+        .on("authSucceed", wrap_callback!(events::connect_callback))
-            ica::start_ica(&config, recv).await;
+        .on("authFailed", wrap_callback!(events::connect_callback))
-        });
+        .on("messageSuccess", wrap_callback!(events::succes_message))
-    } else {
+        .on("messageFailed", wrap_callback!(events::failed_message))
-        info!("未启用 ica");
+        .on("onlineData", wrap_callback!(events::get_online_data))
+        .on("setAllRooms", wrap_callback!(events::update_all_room))
+        .on("setMessages", wrap_callback!(events::set_messages))
+        .on("addMessage", wrap_callback!(events::add_message))
+        .on("deleteMessage", wrap_callback!(events::delete_message))
+        .connect()
+        .await
+        .expect("Connection failed");
+
+    info!("Connected");
+
+    if ica_config.notice_start {
+        for room in ica_config.notice_room.iter() {
+            let startup_msg = crate::data_struct::messages::SendMessage::new(
+                format!("ica-async-rs bot v{}", VERSION),
+                room.clone(),
+                None,
+            );
+            tokio::time::sleep(Duration::from_secs(1)).await;
+            info!("发送启动消息到房间: {}", room);
+            if let Err(e) =
+                socket.emit("sendMessage", serde_json::to_value(startup_msg).unwrap()).await
+            {
+                info!("启动信息发送失败 房间:{}|e:{}", room, e);
+            }
+        }
     }
 
     tokio::time::sleep(Duration::from_secs(2)).await;
@@ -62,7 +88,6 @@ async fn main() {
     let mut input = String::new();
     std::io::stdin().read_line(&mut input).unwrap();
 
-    // socket.disconnect().await.expect("Disconnect failed");
+    socket.disconnect().await.expect("Disconnect failed");
-    send.send(()).ok();
     info!("Disconnected");
 }

ica-rs/src/matrix.rs

@@ -1 +0,0 @@
-

ica-rs/src/py/call.rs

@@ -4,9 +4,9 @@ use pyo3::prelude::*;
 use rust_socketio::asynchronous::Client;
 use tracing::{debug, info, warn};
 
-use crate::client::BotStatus;
+use crate::client::IcalinguaStatus;
-use crate::ica::data_struct::messages::NewMessage;
+use crate::data_struct::messages::NewMessage;
-use crate::ica::data_struct::MessageId;
+use crate::data_struct::MessageId;
 use crate::py::{class, PyPlugin, PyStatus};
 
 pub fn get_func<'py>(py_module: &'py PyAny, path: &PathBuf, name: &'py str) -> Option<&'py PyAny> {
@@ -45,7 +45,7 @@ pub fn get_func<'py>(py_module: &'py PyAny, path: &PathBuf, name: &'py str) -> O
 
 pub fn verify_plugins() {
     let mut need_reload_files: Vec<PathBuf> = Vec::new();
-    let plugin_path = BotStatus::get_config().py_plugin_path.as_ref();
+    let plugin_path = IcalinguaStatus::get_config().py_plugin_path.as_ref();
     if let None = plugin_path {
         warn!("未配置 Python 插件路径");
         return;

ica-rs/src/py/class.rs

@@ -4,12 +4,12 @@ use tokio::runtime::Runtime;
 use toml::Value as TomlValue;
 use tracing::{debug, info, warn};
 
-use crate::client::{delete_message, send_message, BotStatus};
+use crate::client::{delete_message, send_message, IcalinguaStatus};
-use crate::ica::data_struct::messages::{
+use crate::data_struct::messages::{
     DeleteMessage, MessageTrait, NewMessage, ReplyMessage, SendMessage,
 };
-use crate::ica::data_struct::MessageId;
+use crate::data_struct::MessageId;
-use crate::ClientStatus_Global;
+use crate::ClientStatus;
 
 #[pyclass]
 #[pyo3(name = "IcaStatus")]
@@ -20,37 +20,39 @@ impl IcaStatusPy {
     #[new]
     pub fn py_new() -> Self { Self {} }
     #[getter]
-    pub fn get_login(&self) -> bool { unsafe { ClientStatus_Global.login } }
+    pub fn get_login(&self) -> bool { unsafe { ClientStatus.login } }
     #[getter]
-    pub fn get_online(&self) -> bool { BotStatus::get_online_data().online }
+    pub fn get_online(&self) -> bool { IcalinguaStatus::get_online_data().online }
     #[getter]
-    pub fn get_self_id(&self) -> i64 { BotStatus::get_online_data().qqid }
+    pub fn get_self_id(&self) -> i64 { IcalinguaStatus::get_online_data().qqid }
     #[getter]
-    pub fn get_nick_name(&self) -> String { BotStatus::get_online_data().nick.clone() }
+    pub fn get_nick_name(&self) -> String { IcalinguaStatus::get_online_data().nick.clone() }
     #[getter]
-    pub fn get_loaded_messages_count(&self) -> u64 { BotStatus::get_loaded_messages_count() }
+    pub fn get_loaded_messages_count(&self) -> u64 { IcalinguaStatus::get_loaded_messages_count() }
     #[getter]
     pub fn get_ica_version(&self) -> String {
-        BotStatus::get_online_data().icalingua_info.ica_version.clone()
+        IcalinguaStatus::get_online_data().icalingua_info.ica_version.clone()
     }
 
     #[getter]
     pub fn get_os_info(&self) -> String {
-        BotStatus::get_online_data().icalingua_info.os_info.clone()
+        IcalinguaStatus::get_online_data().icalingua_info.os_info.clone()
     }
 
     #[getter]
     pub fn get_resident_set_size(&self) -> String {
-        BotStatus::get_online_data().icalingua_info.resident_set_size.clone()
+        IcalinguaStatus::get_online_data().icalingua_info.resident_set_size.clone()
     }
 
     #[getter]
     pub fn get_heap_used(&self) -> String {
-        BotStatus::get_online_data().icalingua_info.heap_used.clone()
+        IcalinguaStatus::get_online_data().icalingua_info.heap_used.clone()
     }
 
     #[getter]
-    pub fn get_load(&self) -> String { BotStatus::get_online_data().icalingua_info.load.clone() }
+    pub fn get_load(&self) -> String {
+        IcalinguaStatus::get_online_data().icalingua_info.load.clone()
+    }
 }
 
 impl IcaStatusPy {
@@ -178,16 +180,16 @@ impl IcaClientPy {
     /// 仅作占位
     /// (因为目前来说, rust调用 Python端没法启动一个异步运行时
     /// 所以只能 tokio::task::block_in_place 转换成同步调用)
-    // #[staticmethod]
+    #[staticmethod]
-    // pub fn send_message_a(
+    pub fn send_message_a(
-    //     py: Python,
+        py: Python,
-    //     client: IcaClientPy,
+        client: IcaClientPy,
-    //     message: SendMessagePy,
+        message: SendMessagePy,
-    // ) -> PyResult<&PyAny> {
+    ) -> PyResult<&PyAny> {
-    //     pyo3_asyncio::tokio::future_into_py(py, async move {
+        pyo3_asyncio::tokio::future_into_py(py, async move {
-    //         Ok(send_message(&client.client, &message.msg).await)
+            Ok(send_message(&client.client, &message.msg).await)
-    //     })
+        })
-    // }
+    }
 
     #[getter]
     pub fn get_status(&self) -> IcaStatusPy { IcaStatusPy::new() }

ica-rs/src/py/mod.rs

@@ -8,8 +8,8 @@ use pyo3::prelude::*;
 use pyo3::types::PyTuple;
 use tracing::{debug, info, warn};
 
-use crate::client::BotStatus;
+use crate::client::IcalinguaStatus;
-use crate::config::{BotConfig, IcaConfig};
+use crate::config::IcaConfig;
 
 #[derive(Debug, Clone)]
 pub struct PyStatus {
@@ -75,7 +75,7 @@ impl TryFrom<RawPyPlugin> for PyPlugin {
                         if config.is_instance_of::<PyTuple>() {
                             let (config, default) = config.extract::<(String, String)>().unwrap();
                             let base_path =
-                                BotStatus::get_config().py_config_path.as_ref().unwrap();
+                                IcalinguaStatus::get_config().py_config_path.as_ref().unwrap();
 
                             let mut base_path: PathBuf = PathBuf::from(base_path);
 
@@ -244,7 +244,7 @@ pub fn load_py_file(path: &PathBuf) -> std::io::Result<RawPyPlugin> {
     Ok((path.clone(), changed_time, content))
 }
 
-pub fn init_py(config: &BotConfig) {
+pub fn init_py(config: &IcaConfig) {
     debug!("initing python threads");
     pyo3::prepare_freethreaded_python();
     if let Some(plugin_path) = &config.py_plugin_path {

news.md

@@ -1,11 +1,5 @@
 # 更新日志
 
-## 0.5.0
-
-准备接入 `Matrix`
-
-去掉 `pyo3-async` 的依赖
-
 ## 0.4.12
 
 把 0.4.11 的遗留问题修完了