Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-29 14:53:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化mqtt启用

Browse Source
This commit is contained in:
FAN-yeB
2025-09-10 17:46:55 +08:00
parent 0b22f4bbd2
commit f81be33539
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/core/connection.py
+4 -5
View File
@@ -282,14 +282,13 @@ class ConnectionHandler:
if self.asr is None: if self.asr is None:
return return
# 检查是否需要处理头部（只有当mqtt_gateway有实际值时才处理头部） # 检查是否需要处理头部（只有当websocket URL以"?from=mqtt"为结尾时才处理头部）
mqtt_gateway = self.config.get("server", {}).get("mqtt_gateway") request_path = self.websocket.request.path
# 当mqtt_gateway为None, "null", "", 或实际的null值时，不处理头部 need_header_processing = request_path.endswith("?from=mqtt")
need_header_processing = mqtt_gateway and mqtt_gateway not in [None, "null", ""] and str(mqtt_gateway).strip() != ""
# 调试日志：首次连接时记录配置 # 调试日志：首次连接时记录配置
if not hasattr(self, '_logged_mqtt_config'): if not hasattr(self, '_logged_mqtt_config'):
self.logger.bind(tag=TAG).info(f"MQTT Gateway配置: '{mqtt_gateway}', 头部处理: {need_header_processing}") self.logger.bind(tag=TAG).info(f"WebSocket URL路径: '{request_path}', 头部处理: {need_header_processing}")
self._logged_mqtt_config = True self._logged_mqtt_config = True
if need_header_processing and len(message) >= 16: if need_header_processing and len(message) >= 16:
main/xiaozhi-server/core/handle/sendAudioHandle.py
+6 -9
View File
@@ -42,11 +42,9 @@ async def sendAudio(conn, audios, frame_duration=60):
""" """
if audios is None or len(audios) == 0: if audios is None or len(audios) == 0:
return return
# 检查是否需要处理头部（只有当websocket URL以"?from=mqtt"为结尾时才处理头部）
# 检查是否需要添加头部（只有当mqtt_gateway有实际值时才添加头部） request_path = conn.websocket.request.path
mqtt_gateway = conn.config.get("server", {}).get("mqtt_gateway") need_header = request_path.endswith("?from=mqtt")
# 当mqtt_gateway为None, "null", "", 或实际的null值时，不添加头部
need_header = mqtt_gateway and mqtt_gateway not in [None, "null", ""] and str(mqtt_gateway).strip() != ""
if isinstance(audios, bytes): if isinstance(audios, bytes):
if conn.client_abort: if conn.client_abort:
@@ -99,10 +97,9 @@ async def sendAudio(conn, audios, frame_duration=60):
start_time = time.perf_counter() start_time = time.perf_counter()
play_position = 0 play_position = 0
# 检查是否需要添加头部（只有当mqtt_gateway有实际值时才添加头部） # 检查是否需要添加头部（只有当websocket URL以"?from=mqtt"为结尾时才添加头部）
mqtt_gateway = conn.config.get("server", {}).get("mqtt_gateway") request_path = conn.websocket.request.path
# 当mqtt_gateway为None, "null", "", 或实际的null值时，不添加头部 need_header = request_path.endswith("?from=mqtt")
need_header = mqtt_gateway and mqtt_gateway not in [None, "null", ""] and str(mqtt_gateway).strip() != ""
# 执行预缓冲 # 执行预缓冲
pre_buffer_frames = min(3, len(audios)) pre_buffer_frames = min(3, len(audios))