Merge branch 'main' into py_add_protocol

main/xiaozhi-server/core/handle/sendAudioHandle.py

@@ -116,6 +116,7 @@ async def _sendAudio_single(conn, opus_packet, send_delay, frame_duration=60):
     if packet_count < pre_buffer_count or send_delay > 0:
         # 预缓冲阶段或固定延迟模式，直接发送
         await _do_send_audio(conn, opus_packet, flow_control, frame_duration)
+        conn.client_is_speaking = True
 
         if send_delay > 0 and packet_count >= pre_buffer_count:
             await asyncio.sleep(send_delay)
@@ -127,6 +128,7 @@ async def _sendAudio_single(conn, opus_packet, send_delay, frame_duration=60):
             await _do_send_audio(conn, packet, flow_control, frame_duration)
 
         await rate_controller.check_queue(send_callback)
+        conn.client_is_speaking = True
 
     # 更新流控状态
     flow_control["packet_count"] += 1

main/xiaozhi-server/core/websocket_server.py

@@ -1,8 +1,35 @@
 import asyncio
-import json
+import logging
 
 import websockets
 from config.logger import setup_logging
+
+
+class SuppressInvalidHandshakeFilter(logging.Filter):
+    """过滤掉无效握手错误日志（如HTTPS访问WS端口）"""
+
+    def filter(self, record):
+        msg = record.getMessage()
+        suppress_keywords = [
+            "opening handshake failed",
+            "did not receive a valid HTTP request",
+            "connection closed while reading HTTP request",
+            "line without CRLF",
+        ]
+        return not any(keyword in msg for keyword in suppress_keywords)
+
+
+def _setup_websockets_logger():
+    """配置 websockets 相关的所有 logger，过滤无效握手错误"""
+    filter_instance = SuppressInvalidHandshakeFilter()
+    for logger_name in ["websockets", "websockets.server", "websockets.client"]:
+        logger = logging.getLogger(logger_name)
+        logger.addFilter(filter_instance)
+
+
+_setup_websockets_logger()
+
+
 from core.connection import ConnectionHandler
 from config.config_loader import get_config_from_api_async
 from core.auth import AuthManager, AuthenticationError