ruiyun-human 1.0.4 → 1.0.6

package/dist/ruiyun-human.cjs.js

@@ -452,20 +452,24 @@ const _sfc_main = {
       const y = canvas.height - height;
       ctx.value.drawImage(image, x, y, width, height);
     };
-    const stop = () => {
+    const stop = (keepAudio = false) => {
+      var _a;
       if (animationId.value) {
         cancelAnimationFrame(animationId.value);
         animationId.value = null;
       }
-      try {
-        currentAudio.value.pause();
-      } catch (error) {
+      if (!keepAudio) {
+        try {
+          (_a = currentAudio.value) == null ? void 0 : _a.pause();
+        } catch (error) {
+        }
       }
       frameIndex.value = 1;
       animationState.value = "standby";
     };
     const runAnimation = (state) => {
-      stop();
+      const keepAudio = state === "speak" || state === "speakLoop" || state === "speakEnd";
+      stop(keepAudio);
       animationState.value = state;
       loopDirection.value = 1;
       let currentFrames;
@@ -550,6 +554,7 @@ const _sfc_main = {
       runAnimation("speak");
     };
     const stopSpeaking = () => {
+      abortTTS();
       if (animationState.value === "speak" || animationState.value === "speakLoop") {
         runAnimation("speakEnd");
       } else {
@@ -625,13 +630,44 @@ const _sfc_main = {
     };
     const currentAudio = vue.ref(null);
     const currentTtsRequestId = vue.ref(null);
-    const playTTS = async (text) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
-      if (!text || !((_a = currentHuman.value) == null ? void 0 : _a.isMuted)) return;
+    let ttsAbortController = null;
+    function abortTTS() {
+      currentTtsRequestId.value = null;
+      if (ttsAbortController) {
+        try {
+          ttsAbortController.abort();
+        } catch {
+        }
+        ttsAbortController = null;
+      }
       if (currentAudio.value) {
-        currentAudio.value.pause();
+        try {
+          currentAudio.value.pause();
+        } catch {
+        }
         currentAudio.value = null;
       }
+    }
+    function waitWithSignal(ms, signal) {
+      return new Promise((resolve, reject) => {
+        if (signal == null ? void 0 : signal.aborted) {
+          reject(new DOMException("Aborted", "AbortError"));
+          return;
+        }
+        const timer = setTimeout(resolve, ms);
+        const onAbort = () => {
+          clearTimeout(timer);
+          reject(new DOMException("Aborted", "AbortError"));
+        };
+        signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+      });
+    }
+    const playTTS = async (text) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if (!text || !((_a = currentHuman.value) == null ? void 0 : _a.isMuted)) return;
+      abortTTS();
+      ttsAbortController = new AbortController();
+      const { signal } = ttsAbortController;
       currentTtsRequestId.value = Date.now();
       const requestId = currentTtsRequestId.value;
       try {
@@ -647,7 +683,8 @@ const _sfc_main = {
         const joinRes = await fetch(`${baseUrl}/gradio_api/queue/join`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ data, session_hash: sessionHash, fn_index: 1, trigger_id: 50 })
+          body: JSON.stringify({ data, session_hash: sessionHash, fn_index: 1, trigger_id: 50 }),
+          signal
         });
         const joinData = await joinRes.json();
         console.log("[OmniVoice] Step1 响应:", joinData);
@@ -656,10 +693,13 @@ const _sfc_main = {
         let maxPolls = 60;
         let pollInterval = 1e3;
         while (!audioUrl && maxPolls > 0) {
-          await new Promise((resolve) => setTimeout(resolve, pollInterval));
+          if (signal.aborted || currentTtsRequestId.value !== requestId) return;
+          await waitWithSignal(pollInterval, signal);
           maxPolls--;
           try {
-            const pollRes = await fetch(`${baseUrl}/gradio_api/queue/data?session_hash=${sessionHash}`);
+            const pollRes = await fetch(`${baseUrl}/gradio_api/queue/data?session_hash=${sessionHash}`, {
+              signal
+            });
             const pollText = await pollRes.text();
             const lines = pollText.split("\n");
             for (const line of lines) {
@@ -686,7 +726,7 @@ const _sfc_main = {
                       }
                       const wavBlob = createWavBlob(audioBuffer, samplingRate, 1, 16);
                       const audioObjectUrl = URL.createObjectURL(wavBlob);
-                      if (currentTtsRequestId.value !== requestId) {
+                      if (signal.aborted || currentTtsRequestId.value !== requestId) {
                         URL.revokeObjectURL(audioObjectUrl);
                         return;
                       }
@@ -722,16 +762,21 @@ const _sfc_main = {
               }
             }
           } catch (e) {
+            if ((e == null ? void 0 : e.name) === "AbortError") throw e;
             console.warn("[OmniVoice] 轮询失败:", e.message);
           }
         }
         if (audioUrl) {
           if (audioUrl.startsWith("/")) audioUrl = baseUrl + audioUrl;
           console.log("[OmniVoice] 下载音频:", audioUrl);
-          if (currentTtsRequestId.value !== requestId) return;
-          const audioRes = await fetch(audioUrl);
+          if (signal.aborted || currentTtsRequestId.value !== requestId) return;
+          const audioRes = await fetch(audioUrl, { signal });
           const audioBlob = await audioRes.blob();
           const audioObjectUrl = URL.createObjectURL(audioBlob);
+          if (signal.aborted || currentTtsRequestId.value !== requestId) {
+            URL.revokeObjectURL(audioObjectUrl);
+            return;
+          }
           currentAudio.value = new Audio(audioObjectUrl);
           currentAudio.value.onplaying = () => {
             console.log("[OmniVoice] 音频开始播放");
@@ -755,6 +800,10 @@ const _sfc_main = {
           standby();
         }
       } catch (e) {
+        if ((e == null ? void 0 : e.name) === "AbortError") {
+          console.log("[OmniVoice] TTS已取消");
+          return;
+        }
         console.error("[OmniVoice] TTS失败:", e);
         standby();
       }
@@ -866,6 +915,7 @@ const _sfc_main = {
       init();
     });
     vue.onUnmounted(() => {
+      abortTTS();
       stop();
       if (recorder2.value) {
         recorder2.value.stop();
@@ -885,7 +935,7 @@ const _sfc_main = {
     };
   }
 };
-const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-dd386539"]]);
+const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-90fb7a29"]]);
 DigitalHuman.install = (app) => app.component("DigitalHuman", DigitalHuman);
 const components = [DemoButton, DemoInput, DigitalHuman];
 const install = (app) => {

package/dist/ruiyun-human.es.js

@@ -450,20 +450,24 @@ const _sfc_main = {
       const y = canvas.height - height;
       ctx.value.drawImage(image, x, y, width, height);
     };
-    const stop = () => {
+    const stop = (keepAudio = false) => {
+      var _a;
       if (animationId.value) {
         cancelAnimationFrame(animationId.value);
         animationId.value = null;
       }
-      try {
-        currentAudio.value.pause();
-      } catch (error) {
+      if (!keepAudio) {
+        try {
+          (_a = currentAudio.value) == null ? void 0 : _a.pause();
+        } catch (error) {
+        }
       }
       frameIndex.value = 1;
       animationState.value = "standby";
     };
     const runAnimation = (state) => {
-      stop();
+      const keepAudio = state === "speak" || state === "speakLoop" || state === "speakEnd";
+      stop(keepAudio);
       animationState.value = state;
       loopDirection.value = 1;
       let currentFrames;
@@ -548,6 +552,7 @@ const _sfc_main = {
       runAnimation("speak");
     };
     const stopSpeaking = () => {
+      abortTTS();
       if (animationState.value === "speak" || animationState.value === "speakLoop") {
         runAnimation("speakEnd");
       } else {
@@ -623,13 +628,44 @@ const _sfc_main = {
     };
     const currentAudio = ref(null);
     const currentTtsRequestId = ref(null);
-    const playTTS = async (text) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
-      if (!text || !((_a = currentHuman.value) == null ? void 0 : _a.isMuted)) return;
+    let ttsAbortController = null;
+    function abortTTS() {
+      currentTtsRequestId.value = null;
+      if (ttsAbortController) {
+        try {
+          ttsAbortController.abort();
+        } catch {
+        }
+        ttsAbortController = null;
+      }
       if (currentAudio.value) {
-        currentAudio.value.pause();
+        try {
+          currentAudio.value.pause();
+        } catch {
+        }
         currentAudio.value = null;
       }
+    }
+    function waitWithSignal(ms, signal) {
+      return new Promise((resolve, reject) => {
+        if (signal == null ? void 0 : signal.aborted) {
+          reject(new DOMException("Aborted", "AbortError"));
+          return;
+        }
+        const timer = setTimeout(resolve, ms);
+        const onAbort = () => {
+          clearTimeout(timer);
+          reject(new DOMException("Aborted", "AbortError"));
+        };
+        signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+      });
+    }
+    const playTTS = async (text) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if (!text || !((_a = currentHuman.value) == null ? void 0 : _a.isMuted)) return;
+      abortTTS();
+      ttsAbortController = new AbortController();
+      const { signal } = ttsAbortController;
       currentTtsRequestId.value = Date.now();
       const requestId = currentTtsRequestId.value;
       try {
@@ -645,7 +681,8 @@ const _sfc_main = {
         const joinRes = await fetch(`${baseUrl}/gradio_api/queue/join`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ data, session_hash: sessionHash, fn_index: 1, trigger_id: 50 })
+          body: JSON.stringify({ data, session_hash: sessionHash, fn_index: 1, trigger_id: 50 }),
+          signal
         });
         const joinData = await joinRes.json();
         console.log("[OmniVoice] Step1 响应:", joinData);
@@ -654,10 +691,13 @@ const _sfc_main = {
         let maxPolls = 60;
         let pollInterval = 1e3;
         while (!audioUrl && maxPolls > 0) {
-          await new Promise((resolve) => setTimeout(resolve, pollInterval));
+          if (signal.aborted || currentTtsRequestId.value !== requestId) return;
+          await waitWithSignal(pollInterval, signal);
           maxPolls--;
           try {
-            const pollRes = await fetch(`${baseUrl}/gradio_api/queue/data?session_hash=${sessionHash}`);
+            const pollRes = await fetch(`${baseUrl}/gradio_api/queue/data?session_hash=${sessionHash}`, {
+              signal
+            });
             const pollText = await pollRes.text();
             const lines = pollText.split("\n");
             for (const line of lines) {
@@ -684,7 +724,7 @@ const _sfc_main = {
                       }
                       const wavBlob = createWavBlob(audioBuffer, samplingRate, 1, 16);
                       const audioObjectUrl = URL.createObjectURL(wavBlob);
-                      if (currentTtsRequestId.value !== requestId) {
+                      if (signal.aborted || currentTtsRequestId.value !== requestId) {
                         URL.revokeObjectURL(audioObjectUrl);
                         return;
                       }
@@ -720,16 +760,21 @@ const _sfc_main = {
               }
             }
           } catch (e) {
+            if ((e == null ? void 0 : e.name) === "AbortError") throw e;
             console.warn("[OmniVoice] 轮询失败:", e.message);
           }
         }
         if (audioUrl) {
           if (audioUrl.startsWith("/")) audioUrl = baseUrl + audioUrl;
           console.log("[OmniVoice] 下载音频:", audioUrl);
-          if (currentTtsRequestId.value !== requestId) return;
-          const audioRes = await fetch(audioUrl);
+          if (signal.aborted || currentTtsRequestId.value !== requestId) return;
+          const audioRes = await fetch(audioUrl, { signal });
           const audioBlob = await audioRes.blob();
           const audioObjectUrl = URL.createObjectURL(audioBlob);
+          if (signal.aborted || currentTtsRequestId.value !== requestId) {
+            URL.revokeObjectURL(audioObjectUrl);
+            return;
+          }
           currentAudio.value = new Audio(audioObjectUrl);
           currentAudio.value.onplaying = () => {
             console.log("[OmniVoice] 音频开始播放");
@@ -753,6 +798,10 @@ const _sfc_main = {
           standby();
         }
       } catch (e) {
+        if ((e == null ? void 0 : e.name) === "AbortError") {
+          console.log("[OmniVoice] TTS已取消");
+          return;
+        }
         console.error("[OmniVoice] TTS失败:", e);
         standby();
       }
@@ -864,6 +913,7 @@ const _sfc_main = {
       init();
     });
     onUnmounted(() => {
+      abortTTS();
       stop();
       if (recorder2.value) {
         recorder2.value.stop();
@@ -883,7 +933,7 @@ const _sfc_main = {
     };
   }
 };
-const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-dd386539"]]);
+const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-90fb7a29"]]);
 DigitalHuman.install = (app) => app.component("DigitalHuman", DigitalHuman);
 const components = [DemoButton, DemoInput, DigitalHuman];
 const install = (app) => {

package/dist/style.css

@@ -1 +1 @@
-.demo-btn[data-v-9a48516a]{padding:6px 14px;border-radius:4px;border:none;cursor:pointer;font-size:14px}.primary[data-v-9a48516a]{background:#409eff;color:#fff}.success[data-v-9a48516a]{background:#67c23a;color:#fff}.warning[data-v-9a48516a]{background:#e6a23c;color:#fff}.demo-input-wrap[data-v-28a3493c]{display:inline-flex;align-items:center;border:1px solid #dcdcdc;border-radius:4px;padding:0 10px}.demo-input-wrap[data-v-28a3493c]:focus-within{border-color:#409eff}.demo-input[data-v-28a3493c]{border:none;outline:none;padding:8px 6px;flex:1}.prefix[data-v-28a3493c],.suffix[data-v-28a3493c]{color:#909399}.digital-human[data-v-dd386539]{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.digital-human canvas[data-v-dd386539]{max-width:100%;max-height:100%}
+.demo-btn[data-v-9a48516a]{padding:6px 14px;border-radius:4px;border:none;cursor:pointer;font-size:14px}.primary[data-v-9a48516a]{background:#409eff;color:#fff}.success[data-v-9a48516a]{background:#67c23a;color:#fff}.warning[data-v-9a48516a]{background:#e6a23c;color:#fff}.demo-input-wrap[data-v-28a3493c]{display:inline-flex;align-items:center;border:1px solid #dcdcdc;border-radius:4px;padding:0 10px}.demo-input-wrap[data-v-28a3493c]:focus-within{border-color:#409eff}.demo-input[data-v-28a3493c]{border:none;outline:none;padding:8px 6px;flex:1}.prefix[data-v-28a3493c],.suffix[data-v-28a3493c]{color:#909399}.digital-human[data-v-90fb7a29]{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.digital-human canvas[data-v-90fb7a29]{max-width:100%;max-height:100%}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruiyun-human",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "description": "数字人初步实现",
   "main": "./dist/ruiyun-human.cjs.js",