Merge branch 'main' into py_device_bind

main/xiaozhi-server/config/config_loader.py

@@ -68,6 +68,7 @@ async def get_config_from_api_async(config):
         "url": config["manager-api"].get("url", ""),
         "secret": config["manager-api"].get("secret", ""),
     }
+    auth_enabled = config_data.get("server", {}).get("auth", {}).get("enabled", False)
     # server的配置以本地为准
     if config.get("server"):
         config_data["server"] = {
@@ -77,6 +78,7 @@ async def get_config_from_api_async(config):
             "vision_explain": config["server"].get("vision_explain", ""),
             "auth_key": config["server"].get("auth_key", ""),
         }
+    config_data["server"]["auth"] = {"enabled": auth_enabled}
     # 如果服务器没有prompt_template，则从本地配置读取
     if not config_data.get("prompt_template"):
         config_data["prompt_template"] = config.get("prompt_template")

main/xiaozhi-server/core/connection.py

@@ -498,7 +498,7 @@ class ConnectionHandler:
 
     def _initialize_asr(self):
         """初始化ASR"""
-        if self._asr.interface_type == InterfaceType.LOCAL:
+        if self._asr is not None and hasattr(self._asr, "interface_type") and self._asr.interface_type == InterfaceType.LOCAL:
             # 如果公共ASR是本地服务，则直接返回
             # 因为本地一个实例ASR，可以被多个连接共享
             asr = self._asr

main/xiaozhi-server/requirements.txt

@@ -13,7 +13,7 @@ pydub==0.25.1
 funasr==1.2.7
 openai==2.8.1
 google-generativeai==0.8.5
-edge_tts==7.2.3
+edge_tts==7.2.6
 httpx==0.28.1
 aiohttp==3.13.2
 aiohttp_cors==0.8.1

main/xiaozhi-server/test/js/core/audio/recorder.js

@@ -240,6 +240,24 @@ export class AudioRecorder {
         if (this.isRecording) return false;
 
         try {
+            // 检查是否有WebSocketHandler实例
+            const { getWebSocketHandler } = await import('../network/websocket.js');
+            const wsHandler = getWebSocketHandler();
+
+            // 如果机器正在说话，发送打断消息
+            if (wsHandler && wsHandler.isRemoteSpeaking && wsHandler.currentSessionId) {
+                const abortMessage = {
+                    session_id: wsHandler.currentSessionId,
+                    type: 'abort',
+                    reason: 'wake_word_detected'
+                };
+
+                if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+                    this.websocket.send(JSON.stringify(abortMessage));
+                    log('发送打断消息', 'info');
+                }
+            }
+
             if (!this.initEncoder()) {
                 log('无法启动录音: Opus编码器初始化失败', 'error');
                 return false;