语音发送新增同步机制

jiangtao · jiangtao · commit 96a3555e6aa7 · 2025-02-26T21:10:05.000+08:00
diff --git a/core/connection.py b/core/connection.py
@@ -299,14 +299,24 @@ def _priority_thread(self):
                     self.logger.bind(tag=TAG).error(f"TTS 任务出错: {e}")
                     continue
                 if not self.client_abort:
-                    with self.lock:  # 使用实例锁来确保顺序传输
-                        self.logger.bind(tag=TAG).info(f"发送TTS语音: {text}")
+                    with self.lock:
+                        #sleep_time = max(duration, 1 if len(text) <= 3 else len(text) * 0.2)
+                        # 使用实例锁来确保顺序传输
+                        self.logger.bind(tag=TAG).info(f"发送TTS语音: {text}, 时长:{duration}, sleep_time:{duration}")
                         text = '';
-                        asyncio.run_coroutine_threadsafe(
-                            sendAudioMessage(self, opus_datas, duration, text), self.loop
+                        #asyncio.run_coroutine_threadsafe(
+                        #    sendAudioMessage(self, opus_datas, duration, text), self.loop
+                        #)
+                        future = asyncio.run_coroutine_threadsafe(
+                            sendAudioMessage(self, opus_datas, duration, text),
+                            self.loop
                         )
-                    sleep_time = 1 if len(text) <= 3 else len(text) * 0.7
-                    time.sleep(sleep_time) # 在每次发送后引入2秒的延迟
+                        # 等待异步操作完成
+                        future.result()
+                        # 等待一段时间，确保音频播放完成
+
+                        time.sleep(duration)
+
                 #if self.tts.delete_audio_file and os.path.exists(tts_file):
                 #    os.remove(tts_file)
             except Exception as e:
diff --git a/core/handle/audioHandle.py b/core/handle/audioHandle.py
@@ -78,7 +78,7 @@ async def startToChat(conn, text):
 
 async def sendAudioMessage(conn, audios, duration, text):
     base_delay = conn.tts_duration
-    base_delay = 1 if len(text) <= 3 else len(text) * 0.35
+    #base_delay = 1 if len(text) <= 3 else len(text) * 0.35
     # 发送 tts.start
     if text == conn.tts_first_text:
         logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
