diff --git a/ica-rs/Cargo.toml b/ica-rs/Cargo.toml index e16e8b2..6f04e01 100644 --- a/ica-rs/Cargo.toml +++ b/ica-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ica-rs" -version = "0.4.2" +version = "0.4.3" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ica-rs/ica_typing.py b/ica-rs/ica_typing.py index 6396431..0462e46 100644 --- a/ica-rs/ica_typing.py +++ b/ica-rs/ica_typing.py @@ -44,11 +44,25 @@ class SendMessage: class NewMessage: def reply_with(self, message: str) -> SendMessage: ... + def __str__(self) -> str: + ... + @property + def content(self) -> str: + ... + @property + def sender_id(self) -> int: + ... + @property + def is_from_self(self) -> bool: + ... class IcaClient: @staticmethod - async def send_message(client: "IcaClient", message: SendMessage) -> bool: + async def send_message_a(client: "IcaClient", message: SendMessage) -> bool: + ... + + def send_message(self, message: SendMessage) -> bool: ... diff --git a/ica-rs/plugins/test.py b/ica-rs/plugins/test.py index e69de29..e5e5f36 100644 --- a/ica-rs/plugins/test.py +++ b/ica-rs/plugins/test.py @@ -0,0 +1,20 @@ +from typing import TYPE_CHECKING, TypeVar + +if TYPE_CHECKING: + from ica_typing import NewMessage, IcaClient +else: + NewMessage = TypeVar("NewMessage") + IcaClient = TypeVar("IcaClient") + +_version_ = "0.1.0" + +def on_message(msg: NewMessage, client: IcaClient) -> None: + # print(msg) + # reply = msg.reply_with("Hello, world!") + # print(reply) + # print(msg.content) + # print(msg.is_from_self) + if not msg.is_from_self: + if msg.content == "/bot-rs-py": + reply = msg.reply_with(f"ica-async-rs-sync-py {_version_}") + client.send_message(reply) diff --git a/ica-rs/src/events.rs b/ica-rs/src/events.rs index 890d706..cf57d90 100644 --- a/ica-rs/src/events.rs +++ b/ica-rs/src/events.rs @@ -31,15 +31,15 @@ pub async fn add_message(payload: Payload, client: Client) { if let Some(value) = values.first() { let message = NewMessage::new_from_json(value); info!("add_message {}", format!("{:#?}", message).cyan()); - if message.is_reply() { - return; - } - if message.is_from_self() { - return; - } + // if message.is_reply() { + // return; + // } + // if message.is_from_self() { + // return; + // } // 就在这里处理掉最基本的消息 // 之后的处理交给插件 - if message.content.eq("/bot-rs") { + if message.content.eq("/bot-rs") && !message.is_from_self() && !message.is_reply() { let reply = message.reply_with(&format!("ica-async-rs pong v{}", VERSION)); send_message(&client, &reply).await; } diff --git a/ica-rs/src/py/class.rs b/ica-rs/src/py/class.rs index 932405d..c6afccd 100644 --- a/ica-rs/src/py/class.rs +++ b/ica-rs/src/py/class.rs @@ -1,5 +1,6 @@ use pyo3::prelude::*; use rust_socketio::asynchronous::Client; +use tokio::runtime::Runtime; use crate::client::send_message; use crate::data_struct::messages::{NewMessage, ReplyMessage, SendMessage}; @@ -120,6 +121,23 @@ impl NewMessagePy { pub fn reply_with(&self, content: String) -> SendMessagePy { SendMessagePy::new(self.msg.reply_with(&content)) } + + pub fn __str__(&self) -> String { + format!("{:?}", self.msg) + } + + #[getter] + pub fn get_content(&self) -> String { + self.msg.content.clone() + } + #[getter] + pub fn get_sender_id(&self) -> i64 { + self.msg.sender_id + } + #[getter] + pub fn get_is_from_self(&self) -> bool { + self.msg.is_from_self() + } } impl NewMessagePy { @@ -134,6 +152,13 @@ pub struct ReplyMessagePy { pub msg: ReplyMessage, } +#[pymethods] +impl ReplyMessagePy { + pub fn __str__(&self) -> String { + format!("{:?}", self.msg) + } +} + impl ReplyMessagePy { pub fn new(msg: ReplyMessage) -> Self { Self { msg } @@ -147,6 +172,13 @@ pub struct SendMessagePy { pub msg: SendMessage, } +#[pymethods] +impl SendMessagePy { + pub fn __str__(&self) -> String { + format!("{:?}", self.msg) + } +} + impl SendMessagePy { pub fn new(msg: SendMessage) -> Self { Self { msg } @@ -173,8 +205,17 @@ impl IcaClientPy { // // }); // // Ok(future.await) // } + pub fn send_message(&self, message: SendMessagePy) -> bool { + // let handle = tokio::runtime::Handle::current(); + // handle.block_on(send_message(&self.client, &message.msg)) + tokio::task::block_in_place(|| { + let rt = Runtime::new().unwrap(); + rt.block_on(send_message(&self.client, &message.msg)) + }) + } + #[staticmethod] - pub fn send_message( + pub fn send_message_a( py: Python, client: IcaClientPy, message: SendMessagePy, diff --git a/ica-rs/src/py/mod.rs b/ica-rs/src/py/mod.rs index 0dacde7..12b4f2b 100644 --- a/ica-rs/src/py/mod.rs +++ b/ica-rs/src/py/mod.rs @@ -10,8 +10,6 @@ use tracing::{debug, info, warn}; use crate::config::IcaConfig; use crate::data_struct::messages::NewMessage; -use self::class::{IcaClientPy, NewMessagePy}; - #[derive(Debug, Clone)] pub struct PyStatus { pub files: Option, Py)>>, @@ -149,55 +147,23 @@ pub fn init_py(config: &IcaConfig) { info!("python inited") } -// #[pyfunction] -// pub fn call_new_message(py: Python, func: PyA,msg: NewMessagePy, client: IcaClientPy) -> PyResult<&PyAny> { -// pyo3_asyncio::tokio::future_into_py(py, async move { -// let py_sleep = Python::with_gil(|py| { -// pyo3_asyncio::tokio::into_future( -// // py.import("asyncio")?.call_method1("sleep", (1,))? -// ) -// })?; - -// py_sleep.await?; - -// Ok(Python::with_gil(|py| py.None())) -// }) -// } - /// 执行 new message 的 python 插件 pub async fn new_message_py(message: &NewMessage, client: &Client) { + let cwd = std::env::current_dir().unwrap(); let plugins = PyStatus::get_files(); - for (_, (_, py_module)) in plugins.iter() { + for (path, (_, py_module)) in plugins.iter() { + // 切换工作目录到运行的插件的位置 + if let Err(e) = std::env::set_current_dir(path.parent().unwrap()) { + warn!("failed to set current dir: {:?}", e); + } Python::with_gil(|py| { let msg = class::NewMessagePy::new(message); let client = class::IcaClientPy::new(client); - let args = (("message", msg), ("client", client)); - // py.run("message.reply_with('')", None, Some(locals)) - // .unwrap(); + let args = (msg, client); let async_py_func = py_module.getattr(py, "on_message"); match async_py_func { Ok(async_py_func) => { - // pyo3_asyncio::tokio::future_into_py(py, async move { - // let call = pyo3_asyncio::tokio::into_future({ - // async_py_func.call1(py, args) - // }) - // .unwrap(); - // Ok(call.await?) - // }); - let future = pyo3_asyncio::tokio::into_future( - async_py_func.as_ref(py).call1(args).unwrap(), - ) - .unwrap(); - tokio::spawn(async move { - match future.await { - Ok(_) => { - info!("python 插件执行成功"); - } - Err(e) => { - warn!("python 插件执行失败: {:?}", e); - } - } - }); + async_py_func.as_ref(py).call1(args).unwrap(); } Err(e) => { warn!("failed to get on_message function: {:?}", e); @@ -205,4 +171,8 @@ pub async fn new_message_py(message: &NewMessage, client: &Client) { } }); } + // 最后切换回来 + if let Err(e) = std::env::set_current_dir(cwd) { + warn!("failed to set current dir: {:?}", e); + } } diff --git a/news.md b/news.md index c7e1599..c160882 100644 --- a/news.md +++ b/news.md @@ -1,5 +1,9 @@ # 更新日志 +## 0.4.3 + +噫! 好! 我成了! + ## 0.4.2 现在是 async 版本啦!