一些 0.6.7 的工作

ica-rs/ica_typing.py

@@ -1,6 +1,7 @@
 # Python 兼容版本 3.8+
 
-from typing import Callable, Tuple, NewType, TYPE_CHECKING, TypeVar
+from typing import Callable, Tuple
+from typing_extensions import Optional
 
 """
 ica.rs
@@ -9,9 +10,9 @@ pub type UserId = i64;
 pub type MessageId = String;
 """
 class IcaType:
-    RoomId = NewType('RoomId', int)
+    RoomId = int
-    UserId = NewType('UserId', int)
+    UserId = int
-    MessageId = NewType('MessageId', str)
+    MessageId = str
 
 """
 tailchat.rs
@@ -21,14 +22,12 @@ pub type UserId = String;
 pub type MessageId = String;
 """
 class TailchatType:
-    GroupId = NewType('GroupId', str)
+    GroupId = str
-    ConverseId = NewType('ConverseId', str)
+    ConverseId = str
-    UserId = NewType('UserId', str)
+    UserId = str
-    MessageId = NewType('MessageId', str)
+    MessageId = str
 
-if TYPE_CHECKING:
+class IcaStatus:
-
-    class IcaStatus:
     """
     ica状态信息
     此类并不存储信息, 所有方法都是实时获取
@@ -62,11 +61,11 @@ if TYPE_CHECKING:
         ...
 
 
-    class IcaReplyMessage:
+class IcaReplyMessage:
     ...
 
 
-    class IcaSendMessage:
+class IcaSendMessage:
     @property
     def content(self) -> str:
         ...
@@ -88,12 +87,12 @@ if TYPE_CHECKING:
         """
 
 
-    class IcaDeleteMessage:
+class IcaDeleteMessage:
     def __str__(self) -> str:
         ...
 
 
-    class IcaNewMessage:
+class IcaNewMessage:
     """
     Icalingua 接收到新消息
     """
@@ -136,7 +135,7 @@ if TYPE_CHECKING:
         ...
 
 
-    class IcaClient:
+class IcaClient:
     """
     Icalingua 的客户端
     """
@@ -177,7 +176,7 @@ if TYPE_CHECKING:
         ...
 
 
-    class TailchatReciveMessage:
+class TailchatReciveMessage:
     """
     Tailchat 接收到的新消息
     """
@@ -197,7 +196,7 @@ if TYPE_CHECKING:
     def is_reply(self) -> bool:
         ...
     @property
-        def group_id(self) -> TailchatType.GroupId:
+    def group_id(self) -> Optional[TailchatType.GroupId]:
         ...
     @property
     def converse_id(self) -> TailchatType.ConverseId:
@@ -210,7 +209,7 @@ if TYPE_CHECKING:
         ...
 
 
-    class TailchatSendingMessage:
+class TailchatSendingMessage:
     """
     Tailchat 将要发送的信息
     """
@@ -220,6 +219,18 @@ if TYPE_CHECKING:
     @content.setter
     def content(self, value: str) -> None:
         ...
+    @property
+    def group_id(self) -> Optional[TailchatType.GroupId]:
+        ...
+    @group_id.setter
+    def group_id(self, value: Optional[TailchatType.GroupId]) -> None:
+        ...
+    @property
+    def converse_id(self) -> TailchatType.ConverseId:
+        ...
+    @converse_id.setter
+    def converse_id(self, value: TailchatType.ConverseId) -> None:
+        ...
     def with_content(self, content: str) -> "TailchatSendingMessage":
         """
         为了链式调用, 返回自身
@@ -235,7 +246,7 @@ if TYPE_CHECKING:
     #     """
 
 
-    class TailchatClient:
+class TailchatClient:
     """
     Tailchat 的客户端
     """
@@ -260,28 +271,12 @@ if TYPE_CHECKING:
         """向日志中输出警告信息"""
 
 
-    class ConfigData:
+class ConfigData:
     def __getitem__(self, key: str):
         ...
     def have_key(self, key: str) -> bool:
         ...
 
-    CONFIG_DATA: ConfigData = ConfigData()
-else:
-    """
-    正常 Import 的时候使用的类型定义
-    """
-    IcaStatus = TypeVar("IcaStatus")
-    IcaReplyMessage = TypeVar("IcaReplyMessage")
-    IcaNewMessage = TypeVar("IcaNewMessage")
-    IcaSendMessage = TypeVar("IcaSendMessage")
-    IcaDeleteMessage = TypeVar("IcaDeleteMessage")
-    IcaClient = TypeVar("IcaClient")
-    TailchatReciveMessage = TypeVar("TailchatReciveMessage")
-    TailchatSendingMessage = TypeVar("TailchatSendingMessage")
-    TailchatClient = TypeVar("TailchatClient")
-    ConfigData = TypeVar("ConfigData")
-
 
 on_load = Callable[[IcaClient], None]
 # def on_load(client: IcaClient) -> None:
@@ -300,3 +295,5 @@ on_tailchat_message = Callable[[TailchatClient, TailchatReciveMessage], None]
 #     ...
 
 on_config = Callable[[None], Tuple[str, str]]
+
+CONFIG_DATA: ConfigData = ConfigData()

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

@@ -16,8 +16,9 @@ pub struct ReciveMessage {
     #[serde(rename = "author")]
     pub sender_id: UserId,
     /// 服务器ID
+    /// 在私聊中不存在
     #[serde(rename = "groupId")]
-    pub group_id: GroupId,
+    pub group_id: Option<GroupId>,
     /// 会话ID
     #[serde(rename = "converseId")]
     pub converse_id: ConverseId,
@@ -31,13 +32,10 @@ pub struct ReciveMessage {
     pub reactions: Vec<JsonValue>,
     /// 创建时间
     #[serde(rename = "createdAt")]
-    pub created_at: JsonValue,
+    pub created_at: String,
     /// 更新时间
     #[serde(rename = "updatedAt")]
-    pub updated_at: JsonValue,
+    pub updated_at: String,
-    /// 未知
-    #[serde(rename = "__v")]
-    pub v: JsonValue,
 }
 
 impl ReciveMessage {
@@ -69,7 +67,7 @@ impl Display for ReciveMessage {
         // msgid|groupid-converseid|senderid|content
         write!(
             f,
-            "{}|{}-{}|{}|{}",
+            "{}|{:?}-{}|{}|{}",
             self.msg_id, self.group_id, self.converse_id, self.sender_id, self.content
         )
     }
@@ -98,7 +96,7 @@ pub struct SendingMessage {
     pub converse_id: ConverseId,
     /// 服务器ID
     #[serde(rename = "groupId")]
-    pub group_id: GroupId,
+    pub group_id: Option<GroupId>,
     /// 消息的元数据
     pub meta: Option<ReplyMeta>,
 }
@@ -107,7 +105,7 @@ impl SendingMessage {
     pub fn new(
         content: String,
         converse_id: ConverseId,
-        group_id: GroupId,
+        group_id: Option<GroupId>,
         meta: Option<ReplyMeta>,
     ) -> Self {
         Self {
@@ -117,7 +115,11 @@ impl SendingMessage {
             meta,
         }
     }
-    pub fn new_without_meta(content: String, converse_id: ConverseId, group_id: GroupId) -> Self {
+    pub fn new_without_meta(
+        content: String,
+        converse_id: ConverseId,
+        group_id: Option<GroupId>,
+    ) -> Self {
         Self {
             content,
             converse_id,

ica-rs/src/data_struct/tailchat/status.rs

@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use serde_json::Value as JsonValue;
 
 use crate::data_struct::tailchat::UserId;
 
@@ -11,3 +12,24 @@ pub struct LoginData {
     pub nickname: String,
     pub avatar: String,
 }
+
+/*
+{"__v":0,"_id":"66045ddb5163504389a6f5b1","createdAt":"2024-03-27T17:56:43.528Z","members":["6602e20d7b8d10675758e36b","6604482b5163504389a6f481"],"type":"DM","updatedAt":"2024-03-27T17:56:43.528Z"}
+*/
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct UpdateDMConverse {
+    /// 会话ID
+    #[serde(rename = "_id")]
+    pub id: String,
+    /// 创建时间
+    #[serde(rename = "createdAt")]
+    pub created_at: String,
+    /// 成员
+    pub members: Vec<UserId>,
+    /// 类型
+    #[serde(rename = "type")]
+    pub converse_type: String,
+    /// 更新时间
+    #[serde(rename = "updatedAt")]
+    pub updated_at: String,
+}

ica-rs/src/ica.rs

@@ -10,7 +10,7 @@ use crate::config::IcaConfig;
 use crate::error::{ClientResult, IcaError};
 use crate::{wrap_any_callback, wrap_callback, StopGetter};
 
-const ICA_PROTOCOL_VERSION: &str = "2.12.2";
+const ICA_PROTOCOL_VERSION: &str = "2.12.6";
 
 pub async fn start_ica(config: &IcaConfig, stop_reciver: StopGetter) -> ClientResult<(), IcaError> {
     let span = span!(Level::INFO, "Icalingua Client");

ica-rs/src/ica/events.rs

@@ -123,6 +123,7 @@ pub async fn any_event(event: Event, payload: Payload, _client: Client) {
         // 忽略的
         "notify",
         "closeLoading", // 发送消息/加载新聊天 有一个 loading
+        "renewMessage", // 我也不确定到底是啥事件
         "updateRoom",
         "syncRead", // 同步已读
     ];

ica-rs/src/py/class/tailchat.rs

@@ -86,7 +86,7 @@ impl TailchatReciveMessagePy {
     #[getter]
     pub fn get_sender_id(&self) -> UserId { self.message.sender_id.clone() }
     #[getter]
-    pub fn get_group_id(&self) -> GroupId { self.message.group_id.clone() }
+    pub fn get_group_id(&self) -> Option<GroupId> { self.message.group_id.clone() }
     #[getter]
     pub fn get_converse_id(&self) -> ConverseId { self.message.converse_id.clone() }
     /// 作为回复
@@ -110,8 +110,14 @@ impl TailchatSendingMessagePy {
     pub fn set_content(&mut self, content: String) { self.message.content = content; }
     #[getter]
     pub fn get_converse_id(&self) -> ConverseId { self.message.converse_id.clone() }
+    #[setter]
+    pub fn set_converse_id(&mut self, converse_id: ConverseId) {
+        self.message.converse_id = converse_id;
+    }
     #[getter]
-    pub fn get_group_id(&self) -> GroupId { self.message.group_id.clone() }
+    pub fn get_group_id(&self) -> Option<GroupId> { self.message.group_id.clone() }
+    #[setter]
+    pub fn set_group_id(&mut self, group_id: Option<GroupId>) { self.message.group_id = group_id; }
     pub fn with_content(&mut self, content: String) -> Self {
         self.message.content = content;
         self.clone()

ica-rs/src/tailchat.rs

@@ -1,6 +1,7 @@
 pub mod client;
 pub mod events;
 
+use colored::Colorize;
 use futures_util::FutureExt;
 use md5::{Digest, Md5};
 use reqwest::ClientBuilder as reqwest_ClientBuilder;
@@ -42,6 +43,7 @@ pub async fn start_tailchat(
         Ok(resp) => {
             if resp.status().is_success() {
                 let raw_data = resp.text().await?;
+
                 let json_data = serde_json::from_str::<Value>(&raw_data).unwrap();
                 let login_data = serde_json::from_value::<LoginData>(json_data["data"].clone());
                 match login_data {
@@ -64,20 +66,24 @@ pub async fn start_tailchat(
         .on_any(wrap_any_callback!(events::any_event))
         .on("notify:chat.message.add", wrap_callback!(events::on_message))
         .on("notify:chat.message.delete", wrap_callback!(events::on_msg_delete))
+        .on(
+            "notify:chat.converse.updateDMConverse",
+            wrap_callback!(events::on_converse_update),
+        )
         // .on("notify:chat.message.update", wrap_callback!(events::on_message))
         // .on("notify:chat.message.addReaction", wrap_callback!(events::on_msg_update))
         .connect()
         .await
         .unwrap();
 
-    event!(Level::INFO, "tailchat connected");
+    event!(Level::INFO, "{}", "已经连接到 tailchat!".green());
 
     // sleep for 500ms to wait for the connection to be established
     tokio::time::sleep(std::time::Duration::from_millis(500)).await;
 
     socket.emit("chat.converse.findAndJoinRoom", json!([])).await.unwrap();
 
-    event!(Level::INFO, "tailchat joined room");
+    event!(Level::INFO, "{}", "tailchat 已经加入房间".green());
 
     stop_reciver.await.ok();
     event!(Level::INFO, "socketio client stopping");

ica-rs/src/tailchat/client.rs

@@ -4,8 +4,8 @@ use crate::data_struct::tailchat::messages::SendingMessage;
 use rust_socketio::asynchronous::Client;
 
 use colored::Colorize;
-use serde_json::Value;
+use serde_json::{json, Value};
-use tracing::{debug, warn};
+use tracing::{debug, info, warn};
 
 pub async fn send_message(client: &Client, message: &SendingMessage) -> bool {
     let value: Value = message.as_value();
@@ -20,3 +20,16 @@ pub async fn send_message(client: &Client, message: &SendingMessage) -> bool {
         }
     }
 }
+
+pub async fn emit_join_room(client: &Client) -> bool {
+    match client.emit("chat.converse.findAndJoinRoom", json!([])).await {
+        Ok(_) => {
+            info!("emiting join room");
+            true
+        }
+        Err(e) => {
+            warn!("emit_join_room faild:{}", format!("{:#?}", e).red());
+            false
+        }
+    }
+}

ica-rs/src/tailchat/events.rs

@@ -12,6 +12,7 @@ pub async fn any_event(event: Event, payload: Payload, _client: Client) {
         // 真正处理过的
         "notify:chat.message.add",
         "notify:chat.message.delete",
+        "notify:chat.converse.updateDMConverse",
         // 也许以后会用到
         "notify:chat.message.update",
         "notify:chat.message.addReaction",
@@ -60,7 +61,14 @@ pub async fn any_event(event: Event, payload: Payload, _client: Client) {
 pub async fn on_message(payload: Payload, client: Client) {
     if let Payload::Text(values) = payload {
         if let Some(value) = values.first() {
-            let message: ReciveMessage = serde_json::from_value(value.clone()).unwrap();
+            let message: ReciveMessage = match serde_json::from_value(value.clone()) {
+                Ok(v) => v,
+                Err(e) => {
+                    info!("tailchat_msg {}", value.to_string().red());
+                    info!("tailchat_msg {}", format!("{:?}", e).red());
+                    return;
+                }
+            };
             info!("tailchat_msg {}", message.to_string().cyan());
 
             if !message.is_reply() {
@@ -84,3 +92,11 @@ pub async fn on_msg_delete(payload: Payload, _client: Client) {
         }
     }
 }
+
+pub async fn on_converse_update(payload: Payload, _client: Client) {
+    if let Payload::Text(values) = payload {
+        if let Some(value) = values.first() {
+            info!("更新会话 {}", value.to_string().green());
+        }
+    }
+}

news.md

@@ -1,5 +1,20 @@
 # 更新日志
 
+## 0.6.7
+
+游学回来啦
+
+- 处理了一些 tailchat 的特殊情况
+  - 比如 message 里面的 `GroupId` 实际上是可选的, 在私聊中没有这一项
+  - 忽略了所有的 `__v` (用于数据库记录信息的, bot不需要管)
+    - 作者原话 `不用管。数据库记录版本`
+  - 修复了如果没法解析新的信息, 会 panic 的问题
+- `ica_typing.py`
+  - 补充了 `TailchatSendingMessage` 的 `group_id` 和 `converse_id` 字段
+  - 把 `group_id` 的设置和返回都改成了 `Optional[GroupId]`
+- tailchat 的 API 也差点意思就是了(逃)
+- 处理了 icalingua 的 `renewMessage` 事件 (其实就是直接忽略掉了)
+
 ## 0.6.6
 
 游学之前最后一次更新