From 1f5a78f4580345e3b0c56ac3b1a254ebb2abdb72 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Mon, 28 Apr 2025 16:30:31 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=8E=B7=E5=8F=96=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E6=95=8F=E6=84=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 39 +++++++++-
 .../core/handle/sendAudioHandle.py            | 71 ++++++++++---------
 2 files changed, 72 insertions(+), 38 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 3cf6b018..fe8d1ef3 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -241,7 +241,7 @@ class ConnectionHandler:
             )
             private_config["delete_audio"] = bool(self.config.get("delete_audio", True))
             self.logger.bind(tag=TAG).info(
-                f"{time.time() - begin_time} 秒，获取差异化配置成功: {private_config}"
+                f"{time.time() - begin_time} 秒，获取差异化配置成功: {json.dumps(filter_sensitive_info(private_config), ensure_ascii=False)}"
             )
         except DeviceNotFoundException as e:
             self.need_bind = True
@@ -448,7 +448,7 @@ class ConnectionHandler:
                 pos = current_text.rfind(punct)
                 prev_char = current_text[pos - 1] if pos - 1 >= 0 else ""
                 # 如果.前面是数字统一判断为小数
-                if prev_char.isdigit() and punct == '.':
+                if prev_char.isdigit() and punct == ".":
                     number_flag = False
                 if pos > last_punct_pos and number_flag:
                     last_punct_pos = pos
@@ -579,7 +579,7 @@ class ConnectionHandler:
                         pos = current_text.rfind(punct)
                         prev_char = current_text[pos - 1] if pos - 1 >= 0 else ""
                         # 如果.前面是数字统一判断为小数
-                        if prev_char.isdigit() and punct == '.':
+                        if prev_char.isdigit() and punct == ".":
                             number_flag = False
                         if pos > last_punct_pos and number_flag:
                             last_punct_pos = pos
@@ -945,3 +945,36 @@ class ConnectionHandler:
                     break
         except Exception as e:
             self.logger.bind(tag=TAG).error(f"超时检查任务出错: {e}")
+
+
+def filter_sensitive_info(config: dict) -> dict:
+    """
+    过滤配置中的敏感信息
+    Args:
+        config: 原始配置字典
+    Returns:
+        过滤后的配置字典
+    """
+    sensitive_keys = [
+        "api_key",
+        "personal_access_token",
+        "access_token",
+        "token",
+        "access_key_secret",
+        "secret_key",
+    ]
+
+    def _filter_dict(d: dict) -> dict:
+        filtered = {}
+        for k, v in d.items():
+            if any(sensitive in k.lower() for sensitive in sensitive_keys):
+                filtered[k] = "***"
+            elif isinstance(v, dict):
+                filtered[k] = _filter_dict(v)
+            elif isinstance(v, list):
+                filtered[k] = [_filter_dict(i) if isinstance(i, dict) else i for i in v]
+            else:
+                filtered[k] = v
+        return filtered
+
+    return _filter_dict(copy.deepcopy(config))
diff --git a/main/xiaozhi-server/core/handle/sendAudioHandle.py b/main/xiaozhi-server/core/handle/sendAudioHandle.py
index ec29a9fd..3387a133 100644
--- a/main/xiaozhi-server/core/handle/sendAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/sendAudioHandle.py
@@ -2,51 +2,52 @@ from config.logger import setup_logging
 import json
 import asyncio
 import time
-from core.utils.util import (
-    get_string_no_punctuation_or_emoji,
-    analyze_emotion
-)
+from core.utils.util import get_string_no_punctuation_or_emoji, analyze_emotion
 
 TAG = __name__
 logger = setup_logging()
 
 emoji_map = {
-    'neutral': '😶',
-    'happy': '🙂',
-    'laughing': '😆',
-    'funny': '😂',
-    'sad': '😔',
-    'angry': '😠',
-    'crying': '😭',
-    'loving': '😍',
-    'embarrassed': '😳',
-    'surprised': '😲',
-    'shocked': '😱',
-    'thinking': '🤔',
-    'winking': '😉',
-    'cool': '😎',
-    'relaxed': '😌',
-    'delicious': '🤤',
-    'kissy': '😘',
-    'confident': '😏',
-    'sleepy': '😴',
-    'silly': '😜',
-    'confused': '🙄'
+    "neutral": "😶",
+    "happy": "🙂",
+    "laughing": "😆",
+    "funny": "😂",
+    "sad": "😔",
+    "angry": "😠",
+    "crying": "😭",
+    "loving": "😍",
+    "embarrassed": "😳",
+    "surprised": "😲",
+    "shocked": "😱",
+    "thinking": "🤔",
+    "winking": "😉",
+    "cool": "😎",
+    "relaxed": "😌",
+    "delicious": "🤤",
+    "kissy": "😘",
+    "confident": "😏",
+    "sleepy": "😴",
+    "silly": "😜",
+    "confused": "🙄",
 }
 
+
 async def sendAudioMessage(conn, audios, text, text_index=0):
     # 发送句子开始消息
-    emotion = analyze_emotion(text)
-    emoji = emoji_map.get(emotion, '🙂')  # 默认使用笑脸
-    await conn.websocket.send(json.dumps(
-            {
-                "type": "llm",
-                "text": emoji,
-                "emotion": emotion,
-                "session_id": conn.session_id,
-            }
+    if text is not None:
+        emotion = analyze_emotion(text)
+        emoji = emoji_map.get(emotion, "🙂")  # 默认使用笑脸
+        await conn.websocket.send(
+            json.dumps(
+                {
+                    "type": "llm",
+                    "text": emoji,
+                    "emotion": emotion,
+                    "session_id": conn.session_id,
+                }
+            )
         )
-    )
+
     if text_index == conn.tts_first_text_index:
         logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
     await send_tts_message(conn, "sentence_start", text)