[email protected] - [email protected]

Author: wangzongming

package.json

@@ -1,6 +1,6 @@
 {
     "name": "esp-ai",
-    "version": "2.46.32",
+    "version": "2.48.34",
     "description": "Provide a complete set of AI dialogue solutions for your development board, including but not limited to the IAT+LLM+TTS integration solution for the ESP32 series development board. | 为你的开发板提供全套的AI对话方案，包括但不限于 `ESP32` 系列开发板的 `IAT+LLM+TTS` 集成方案。",
     "repository": "https://github.com/wangzongming/esp-ai",
     "main": "src/index.js",

src/audio_temp/play_audio.js

@@ -97,7 +97,7 @@ function play_audio(url, client_ws, task_id, session_id, device_id, seek, on_end
             // 真正结束
             const end_time = Date.now(); // 结束时间
             const play_time = end_time - start_audio_time; // 播放时间
-            const end_res = await on_end({
+            const end_res = on_end && await on_end({
                 start_time: start_audio_time,
                 end_time: end_time,
                 play_time: Math.floor(play_time / 1000),
@@ -107,7 +107,7 @@ function play_audio(url, client_ws, task_id, session_id, device_id, seek, on_end
             }) 
 
             // 特殊发一组标志 
-            this.ws.send(Buffer.from(G_session_ids.tts_all_end, 'utf-8')); 
+            client_ws.send(Buffer.from(G_session_ids.tts_all_end, 'utf-8')); 
 
             G_devices.set(device_id, {
                 ...G_devices.get(device_id),
@@ -126,7 +126,7 @@ function play_audio(url, client_ws, task_id, session_id, device_id, seek, on_end
             ...G_devices.get(device_id),
             play_audio_ing: true,
             play_audio_on_end: (...arg) => { 
-                this.ws.send(Buffer.from(G_session_ids.tts_all_end, 'utf-8'));  
+                client_ws.send(Buffer.from(G_session_ids.tts_all_end, 'utf-8'));  
                 return on_end && on_end(...arg);
             },
             play_audio_seek: seek || 0,

src/instrance_fns/matchIntention.js

@@ -42,7 +42,7 @@ async function matchIntention(device_id, text, reply) {
     intention_for: for (const item of intention) {
         const { key = [] } = item;
         if (typeof key === "function") {
-            const res = await key(text, { llm_historys, prev_play_audio_ing });
+            const res = await key(text, { llm_historys, prev_play_audio_ing, instance: G_Instance, device_id });
             if (res) {
                 task_info = item;
                 task_info["__name__"] = res;
@@ -164,7 +164,7 @@ async function matchIntention(device_id, text, reply) {
                     });
                     // 不延时不能保证播放队列
                     setTimeout(async () => {
-                        const { url, seek, message: errMessage } = await music_server(__name__, { user_config });
+                        const { url, seek, message: errMessage } = await music_server(__name__, { user_config, instance: G_Instance, device_id });
                         if (!url) {
                             await TTS_FN(device_id, {
                                 text: errMessage || "没有找到相关的结果，换个关键词试试吧！",

src/instrance_fns/tts.js

@@ -41,7 +41,8 @@ async function tts(device_id, text, opts) {
             need_record: false, 
             ...opts
         }) 
-        ws && ws.send("session_end");
+        // 这里不应发送这个标志。
+        // ws && ws.send("session_end");
         return true;
     } catch (err) {
         console.log(err);