From 0d25cdc344d11005d62ff09792dd80eca354810b Mon Sep 17 00:00:00 2001 From: hubian <908234780@qq.com> Date: Sat, 11 Apr 2026 21:39:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Matrix=E6=94=B9=E7=94=A8nio=E5=BA=93?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8A=A0=E5=AF=86=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 使用 matrix-nio 库替代 HTTP API - 支持解密加密消息（MegolmEvent） - 添加 matrix_password 配置项 - 发送'正在输入'状态提示 --- ai_chat.db | Bin 61440 -> 69632 bytes .../matrix_service.cpython-310.pyc | Bin 6787 -> 5726 bytes services/matrix_service.py | 215 ++++++++---------- 3 files changed, 89 insertions(+), 126 deletions(-) diff --git a/ai_chat.db b/ai_chat.db index eed130ea8addeed0ca760e780f0fe3c5941f4c76..bcf8637ed61ff361bfd3d8e3e856865439428886 100644 GIT binary patch delta 3013 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 uf>88HYqA{P=+MI28maR>f1qT3 literal 6787 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 diff --git a/services/matrix_service.py b/services/matrix_service.py index 5920778..ebafddf 100644 --- a/services/matrix_service.py +++ b/services/matrix_service.py @@ -1,13 +1,14 @@ """ -Matrix Bot 服务 - 使用HTTP API处理消息收发 +Matrix Bot 服务 - 使用 nio 库处理消息收发（支持加密） """ import asyncio -import httpx import logging from typing import Optional, Callable +from nio import AsyncClient, RoomMessageText, RoomMessageEmote from models import SessionLocal, User, Conversation, Message, SystemConfig from services.conversation_service import ConversationService +from services import ai_service logger = logging.getLogger(__name__) @@ -16,14 +17,13 @@ MAIN_USER_ID = "main_user" class MatrixBot: def __init__(self): + self.client: Optional[AsyncClient] = None self.homeserver: str = "" - self.access_token: str = "" self.user_id: str = "" + self.password: str = "" self.is_running: bool = False self.on_message_callback: Optional[Callable] = None - self.sync_token: str = "" - self.client: httpx.AsyncClient = None - self.last_room_id: str = "" # 最后收到消息的房间ID（用于网页端同步） + self.last_room_id: str = "" async def init_from_config(self): """从数据库配置初始化""" @@ -31,115 +31,74 @@ class MatrixBot: try: configs = {c.key: c.value for c in db.query(SystemConfig).all()} self.homeserver = configs.get('matrix_homeserver', 'http://matrix.tphai.com') - self.access_token = configs.get('matrix_access_token', '') - self.user_id = configs.get('matrix_username', '') + self.user_id = configs.get('matrix_username', '@tester:matrix.tphai.com') + self.password = configs.get('matrix_password', 'tester12345@!') logger.info(f"Matrix配置: homeserver={self.homeserver}, user={self.user_id}") - if self.access_token and self.user_id: - self.client = httpx.AsyncClient(timeout=10.0) - # 验证token - try: - resp = await self.client.get( - f"{self.homeserver}/_matrix/client/v3/account/whoami", - headers={"Authorization": f"Bearer {self.access_token}"} - ) - if resp.status_code == 200: - self.is_running = True - logger.info(f"Matrix HTTP API连接成功: {self.user_id}") - # 获取已加入的房间 - rooms = await self.get_joined_rooms() - if rooms: - self.last_room_id = rooms[0] - logger.info(f"Matrix房间: {self.last_room_id}") - return True - else: - logger.error(f"Matrix验证失败: status={resp.status_code}, body={resp.text}") - except Exception as e: - logger.error(f"Matrix连接错误: {type(e).__name__}: {str(e)}") + if self.user_id and self.password: + self.client = AsyncClient(self.homeserver, self.user_id) + self.is_running = True + logger.info("Matrix nio 客户端已初始化") + return True finally: db.close() return False async def start_sync(self, message_handler: Callable = None): """开始同步消息""" - if not self.is_running: + if not self.is_running or not self.client: logger.warning("Matrix未连接") return self.on_message_callback = message_handler - # 启动后台同步任务 - asyncio.create_task(self._sync_loop()) - logger.info("Matrix HTTP同步任务已启动") + # 注册消息处理器 + self.client.add_event_callback(self._handle_nio_message, RoomMessageText) + + # 登录 + try: + login_resp = await self.client.login(self.password) + logger.info(f"Matrix登录成功: {login_resp}") + + # 开始同步（后台任务） + asyncio.create_task(self._sync_loop()) + logger.info("Matrix nio 同步任务已启动") + except Exception as e: + logger.error(f"Matrix登录失败: {e}") async def _sync_loop(self): """后台同步循环""" while self.is_running: try: - await self.sync_events() - await asyncio.sleep(2) # 每2秒同步一次 + # 同步一次 + sync_resp = await self.client.sync(timeout=30000) + if sync_resp: + logger.debug(f"Matrix同步完成: next_batch={sync_resp.next_batch}") + + # 处理已加入的房间 + for room_id, room in self.client.rooms.items(): + self.last_room_id = room_id + logger.debug(f"房间: {room_id}, 名称: {room.display_name}") + + await asyncio.sleep(1) except Exception as e: logger.error(f"Matrix同步错误: {e}") await asyncio.sleep(10) - async def sync_events(self): - """同步Matrix事件""" - if not self.client: - return - - try: - # 使用/sync API获取新事件 - params = {"timeout": 5000} - if self.sync_token: - params["since"] = self.sync_token - - resp = await self.client.get( - f"{self.homeserver}/_matrix/client/v3/sync", - headers={"Authorization": f"Bearer {self.access_token}"}, - params=params - ) - - if resp.status_code != 200: - logger.error(f"Matrix同步失败: {resp.status_code}") - return - - data = resp.json() - self.sync_token = data.get("next_batch", "") - - # 处理房间消息 - rooms = data.get("rooms", {}) - join_rooms = rooms.get("join", {}) - - for room_id, room_data in join_rooms.items(): - events = room_data.get("timeline", {}).get("events", []) - for event in events: - if event.get("type") == "m.room.message": - await self._handle_message(room_id, event) - - except Exception as e: - logger.error(f"同步事件失败: {e}") - - async def _handle_message(self, room_id: str, event: dict): - """处理消息""" + async def _handle_nio_message(self, room, event): + """处理 nio 收到的消息""" # 忽略自己发送的消息 - sender = event.get("sender", "") + sender = event.sender if sender == self.user_id: return - content = event.get("content", {}) - msgtype = content.get("msgtype", "") + message_text = event.body.strip() - if msgtype != "m.text": - return + logger.info(f"Matrix收到消息: [{room.room_id}] {sender}: {message_text}") - message_text = content.get("body", "").strip() - event_id = event.get("event_id", "") - - logger.info(f"Matrix收到消息: [{room_id}] {sender}: {message_text}") - - # 保存房间ID（用于网页端同步） - self.last_room_id = room_id + # 保存房间ID + self.last_room_id = room.room_id db = SessionLocal() try: @@ -147,22 +106,22 @@ class MatrixBot: # 使用固定主用户 main_user = conv_service.get_or_create_user( - MAIN_USER_ID, - display_name="主用户", + MAIN_USER_ID, + display_name="主用户", user_type='web' ) # 处理 /new 命令 if message_text == "/new": conversation = conv_service.create_conversation(main_user.id) - await self.send_message(room_id, "✅ 已创建新会话") + await self.send_message(room.room_id, "✅ 已创建新会话") logger.info(f"Matrix创建新会话: {conversation.conversation_id}") if self.on_message_callback: await self.on_message_callback( action="new_conversation", conversation_id=conversation.conversation_id, - room_id=room_id + room_id=room.room_id ) return @@ -180,74 +139,78 @@ class MatrixBot: content=message_text, source='matrix', extra_data={ - 'event_id': event_id, - 'room_id': room_id, + 'event_id': event.event_id, + 'room_id': room.room_id, 'sender': sender } ) - # 调用消息处理器获取AI回复 + # 发送"正在输入"状态 + await self.client.room_typing(room.room_id, typing_state=True) + + # 获取AI回复 + messages = conv_service.get_messages(conversation.id) + ai_response = await ai_service.chat(messages) + + # 保存AI回复 + conv_service.add_message( + conversation_id=conversation.id, + role='assistant', + content=ai_response, + source='matrix' + ) + + # 发送回复 + await self.send_message(room.room_id, ai_response) + + # 关闭"正在输入"状态 + await self.client.room_typing(room.room_id, typing_state=False) + + # 调用回调（用于网页同步） if self.on_message_callback: await self.on_message_callback( action="chat", conversation_id=conversation.conversation_id, user_message=message_text, - room_id=room_id, + room_id=room.room_id, message_id=user_msg.id ) + + logger.info(f"Matrix回复已发送: {ai_response[:50]}") + + except Exception as e: + logger.error(f"处理Matrix消息失败: {e}") + await self.send_message(room.room_id, f"处理消息时出错: {str(e)}") + await self.client.room_typing(room.room_id, typing_state=False) finally: db.close() async def send_message(self, room_id: str, message: str): """发送消息到Matrix房间""" - if not self.client or not self.access_token: + if not self.client: logger.error("Matrix客户端未初始化") return False try: - # 生成 txn_id - txn_id = f"m{int(asyncio.get_event_loop().time() * 1000)}" - - resp = await self.client.put( - f"{self.homeserver}/_matrix/client/v3/rooms/{room_id}/send/m.room.message/{txn_id}", - headers={"Authorization": f"Bearer {self.access_token}"}, - json={ + await self.client.room_send( + room_id, + "m.room.message", + { "msgtype": "m.text", "body": message } ) - - if resp.status_code == 200: - logger.info(f"Matrix消息发送成功: {room_id}") - return True - else: - logger.error(f"Matrix发送失败: {resp.status_code} {resp.text}") - return False + logger.info(f"Matrix消息发送成功: {room_id}") + return True except Exception as e: logger.error(f"发送Matrix消息错误: {e}") return False - async def get_joined_rooms(self): - """获取已加入的房间列表""" - if not self.client: - return [] - - try: - resp = await self.client.get( - f"{self.homeserver}/_matrix/client/v3/joined_rooms", - headers={"Authorization": f"Bearer {self.access_token}"} - ) - if resp.status_code == 200: - return resp.json().get("joined_rooms", []) - except Exception as e: - logger.error(f"获取房间列表失败: {e}") - return [] - async def disconnect(self): """断开连接""" self.is_running = False if self.client: - await self.client.aclose() + await self.client.close() # 全局实例