From 6625dda349956edc4f367efc96c3932c2fa57b7b Mon Sep 17 00:00:00 2001
From: hubian <908234780@qq.com>
Date: Sat, 11 Apr 2026 22:36:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=20sync=5Fforever=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E4=BA=8B=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E5=AF=86=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 改用 sync_forever 替代手动 sync 循环
- 添加 store_path 加密存储路径
- 注册 MegolmEvent 加密消息回调
- 添加更详细的日志输出
---
 ai_chat.db                                    | Bin 69632 -> 69632 bytes
 .../matrix_service.cpython-310.pyc            | Bin 5726 -> 6707 bytes
 services/matrix_service.py                    |  98 ++++++++++++------
 3 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/ai_chat.db b/ai_chat.db
index bcf8637ed61ff361bfd3d8e3e856865439428886..3b7bd7ac27f031db06d6019f9667b98d013aec60 100644
GIT binary patch
delta 399
zcmZozz|ydQWr8&0|A{irjQ=+#Jd@%xu`)KbGBnq-G%_|dG29#?ZJ!JjGcvL=Fw?WN
zurM;S*u1bV*^pU^KW#Gm216G99R9S;h6-BzJgm%&j8ak{Qc`kr(f&yeiu}y64E!2=
zZ+H*!wsCFZ%I8pEf5o<mt%0?THIOBiMU8o@BBKR!eWRNcCj+B=lcBJqC~IPIab|Hz
zVqS@%g0_O8f~|s)0vFed{WG7<SpRHJ!_)b@o-b^8KC9)~)D2J9E_>Rw;MwM>FZNG(
zzHa*aJ&hmc&*)Nkx~%Ehyg5(yE_gPl^V#ezPnYyQo7)7}@pAgQmy2dR>zMYUq4jC&
zwkNx%J*#it{H$-$i*+l2ie9Xr3zUApr|0FY{%6y-J)PL~Vtwbcj)_kvFMGdtUU_Pg
zk%5t!u7QcJp`n5yB3LZVjLq^&b8<{2IT#p4r9u8EElw>m)Hbwzzh^#HZAN-#2BsDk
Rrg^1IIXT;7Sr`{{0|1NPp>6;G

delta 118
zcmZozz|ydQWr8$g-9#B@#=4CO&!qT_t&A<L42<<G4NZ(JjW&l!+b4s>%&m+~^-RnR
zEKCeHFRV*8WR~DBn#{hzaI>L;760a<{gWKzcv)f@_%-<6@E+oA<J!cP&!NEnift2H
W18W;=AWQ7ViPkLJV_6s%a{~bX!XiZg

diff --git a/services/__pycache__/matrix_service.cpython-310.pyc b/services/__pycache__/matrix_service.cpython-310.pyc
index b69dd76bef8bed4f6fa51dedd6aa3d5f5eb7fa1c..faece90ee6c7c56c7a493b4a1c47a3da0a9ac311 100644
GIT binary patch
literal 6707
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
ZCinmi8`mcdPxs&^$<bv@?JwNY{{R)Buk-)_

delta 2830
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
av0PIu)dGmlkSXdCmpD|T303Ji$NvX8d9)`0

diff --git a/services/matrix_service.py b/services/matrix_service.py
index ebafddf..67403e1 100644
--- a/services/matrix_service.py
+++ b/services/matrix_service.py
@@ -3,8 +3,9 @@ Matrix Bot 服务 - 使用 nio 库处理消息收发（支持加密）
 """
 import asyncio
 import logging
+import os
 from typing import Optional, Callable
-from nio import AsyncClient, RoomMessageText, RoomMessageEmote
+from nio import AsyncClient, RoomMessageText, MegolmEvent
 
 from models import SessionLocal, User, Conversation, Message, SystemConfig
 from services.conversation_service import ConversationService
@@ -13,6 +14,7 @@ from services import ai_service
 logger = logging.getLogger(__name__)
 
 MAIN_USER_ID = "main_user"
+STORE_PATH = "/home/xian/.openclaw/workspace-coder/works/ai-chat/matrix_store"
 
 
 class MatrixBot:
@@ -37,9 +39,17 @@ class MatrixBot:
             logger.info(f"Matrix配置: homeserver={self.homeserver}, user={self.user_id}")
             
             if self.user_id and self.password:
-                self.client = AsyncClient(self.homeserver, self.user_id)
+                # 创建存储目录
+                os.makedirs(STORE_PATH, exist_ok=True)
+                
+                # 使用加密存储
+                self.client = AsyncClient(
+                    self.homeserver, 
+                    self.user_id,
+                    store_path=STORE_PATH
+                )
                 self.is_running = True
-                logger.info("Matrix nio 客户端已初始化")
+                logger.info(f"Matrix nio 客户端已初始化，存储路径: {STORE_PATH}")
                 return True
         finally:
             db.close()
@@ -53,44 +63,57 @@ class MatrixBot:
         
         self.on_message_callback = message_handler
         
-        # 注册消息处理器
-        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 同步任务已启动")
+            # 加载加密存储
+            logger.info("加载加密存储...")
+            
+            # 第一次同步获取房间密钥
+            sync_resp = await self.client.sync(full_state=True)
+            logger.info(f"初始同步完成: next_batch={sync_resp.next_batch}")
+            
+            # 注册消息处理器 - 普通文本消息
+            self.client.add_event_callback(self._handle_nio_message, RoomMessageText)
+            # 注册加密消息处理器（解密后）
+            self.client.add_event_callback(self._handle_encrypted_message, MegolmEvent)
+            
+            logger.info("Matrix消息回调已注册")
+            
+            # 使用 sync_forever 自动处理事件（后台任务）
+            asyncio.create_task(self._run_sync_forever())
+            logger.info("Matrix nio sync_forever 任务已启动")
         except Exception as e:
-            logger.error(f"Matrix登录失败: {e}")
+            logger.error(f"Matrix启动失败: {e}")
+            import traceback
+            logger.error(traceback.format_exc())
     
-    async def _sync_loop(self):
-        """后台同步循环"""
-        while self.is_running:
-            try:
-                # 同步一次
-                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 _run_sync_forever(self):
+        """运行 sync_forever，自动处理所有事件"""
+        try:
+            logger.info("开始 Matrix sync_forever...")
+            await self.client.sync_forever(timeout=30000, full_state=True)
+        except Exception as e:
+            logger.error(f"sync_forever 错误: {e}")
+            self.is_running = False
+    
+    async def _handle_encrypted_message(self, room, event):
+        """处理加密消息（MegolmEvent）"""
+        logger.info(f"收到加密消息: [{room.room_id}] event_id={event.event_id}")
+        
+        # MegolmEvent 需要解密，nio 会自动解密并转换为普通消息事件
+        # 解密后会触发 RoomMessageText 回调，所以这里只是记录
+        # 如果解密失败，检查是否有密钥
+        pass
     
     async def _handle_nio_message(self, room, event):
         """处理 nio 收到的消息"""
         # 忽略自己发送的消息
         sender = event.sender
         if sender == self.user_id:
+            logger.debug(f"忽略自己发送的消息: {sender}")
             return
         
         message_text = event.body.strip()
@@ -146,7 +169,10 @@ class MatrixBot:
             )
             
             # 发送"正在输入"状态
-            await self.client.room_typing(room.room_id, typing_state=True)
+            try:
+                await self.client.room_typing(room.room_id, typing_state=True)
+            except Exception as e:
+                logger.warning(f"发送输入状态失败: {e}")
             
             # 获取AI回复
             messages = conv_service.get_messages(conversation.id)
@@ -164,7 +190,10 @@ class MatrixBot:
             await self.send_message(room.room_id, ai_response)
             
             # 关闭"正在输入"状态
-            await self.client.room_typing(room.room_id, typing_state=False)
+            try:
+                await self.client.room_typing(room.room_id, typing_state=False)
+            except Exception as e:
+                logger.warning(f"关闭输入状态失败: {e}")
             
             # 调用回调（用于网页同步）
             if self.on_message_callback:
@@ -180,8 +209,13 @@ class MatrixBot:
             
         except Exception as e:
             logger.error(f"处理Matrix消息失败: {e}")
+            import traceback
+            logger.error(traceback.format_exc())
             await self.send_message(room.room_id, f"处理消息时出错: {str(e)}")
-            await self.client.room_typing(room.room_id, typing_state=False)
+            try:
+                await self.client.room_typing(room.room_id, typing_state=False)
+            except:
+                pass
         finally:
             db.close()
     
@@ -204,6 +238,8 @@ class MatrixBot:
             return True
         except Exception as e:
             logger.error(f"发送Matrix消息错误: {e}")
+            import traceback
+            logger.error(traceback.format_exc())
             return False
     
     async def disconnect(self):