ruiyun-human 1.0.14 → 1.0.16

package/dist/ruiyun-human.cjs.js

@@ -400,35 +400,36 @@ const _sfc_main = {
   },
   emits: ["loaded", "changed", "paused", "resumed", "audio-ready"],
   setup(__props, { expose: __expose, emit: __emit }) {
-    const TTS_URL = "http://localhost:6039";
-    const ASR_URL = "http://localhost:6039";
+    const TTS_URL = "https://sqsyky.xzspj.suqian.gov.cn:8443";
+    const ASR_URL = "/api";
+    const szrUrl = `${TTS_URL}szrimage/`;
     const HUMAN_PRESETS = {
       1: {
         humanId: 1,
         title: "西装动漫男",
         // TODO: 替换为真实资源
-        folder: "http://192.168.3.107:8088/img/xiangyu-green-suit",
-        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-green-suit-header",
+        folder: `${szrUrl}/xiangyu-green-suit`,
+        folder_mobile: `${szrUrl}/xiangyu-green-suit-header`,
         standby: { interval: 100, standbyNum: 11 },
         speak: { interval: 30, speakNum: 0 },
         humanType: 1,
-        timbre: 1
+        timbre: 47
       },
       2: {
         humanId: 2,
         title: "西装动漫女",
-        folder: "http://192.168.3.107:8088/img/anime-woman",
-        folder_mobile: "http://192.168.3.107:8088/img/anime-woman-header",
+        folder: `${szrUrl}/anime-woman`,
+        folder_mobile: `${szrUrl}/anime-woman-header`,
         standby: { interval: 100, standbyNum: 1 },
         speak: { interval: 30, speakNum: 75 },
         humanType: 1,
-        timbre: 3
+        timbre: 45
       },
       3: {
         humanId: 3,
         title: "真人形象男",
-        folder: "http://192.168.3.107:8088/img/real-man",
-        folder_mobile: "http://192.168.3.107:8088/img/real-man-header",
+        folder: `${szrUrl}/real-man`,
+        folder_mobile: `${szrUrl}/real-man-header`,
         standby: { interval: 100, standbyNum: 1 },
         speak: { interval: 30, speakNum: 139 },
         humanType: 1,
@@ -437,8 +438,8 @@ const _sfc_main = {
       4: {
         humanId: 4,
         title: "真人形象女",
-        folder: "http://192.168.3.107:8088/img/real-woman",
-        folder_mobile: "http://192.168.3.107:8088/img/real-woman-header",
+        folder: `${szrUrl}/real-woman`,
+        folder_mobile: `${szrUrl}/real-woman-header`,
         standby: { interval: 100, standbyNum: 2 },
         speak: { interval: 40, speakNum: 139 },
         humanType: 1,
@@ -447,12 +448,12 @@ const _sfc_main = {
       5: {
         humanId: 5,
         title: "Q版形象",
-        folder: "http://192.168.3.107:8088/img/xiangyu-q",
-        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-q-header",
+        folder: `${szrUrl}/xiangyu-q`,
+        folder_mobile: `${szrUrl}/xiangyu-q-header`,
         standby: { interval: 100, standbyNum: 28 },
         speak: { interval: 30, speakNum: 118 },
         humanType: 1,
-        timbre: 34
+        timbre: 47
       }
     };
     const isMobile = () => {
@@ -721,6 +722,7 @@ const _sfc_main = {
         timestamp.value = null;
         frameIndex.value = 1;
         currentHuman.value = human;
+        console.log("init", currentHuman.value);
         const canvas = canvasRef.value;
         const dpr = window.devicePixelRatio || 1;
         const width = containerRef.value.clientWidth;
@@ -797,10 +799,11 @@ const _sfc_main = {
       return pcmToWavBlob(buf);
     };
     const requestTTSAudio = async (text, signal) => {
-      var _a;
+      var _a, _b;
       let lastError = null;
       for (let attempt = 1; attempt <= TTS_MAX_RETRIES; attempt++) {
         if (signal == null ? void 0 : signal.aborted) throw new DOMException("Aborted", "AbortError");
+        console.log("[TTS] 提交合成请求1111:", ((_a = currentHuman.value) == null ? void 0 : _a.timbre) ?? 1);
         const res = await fetch(`${TTS_URL}/web/voice/jd/text-to-speech`, {
           method: "POST",
           headers: {
@@ -808,7 +811,7 @@ const _sfc_main = {
             clientid: VOICE_CLIENT_ID,
             "tenant-id": VOICE_TENANT_ID
           },
-          body: JSON.stringify({ text, user: TTS_USER, timbre: ((_a = currentHuman.value) == null ? void 0 : _a.timbre) ?? 1 }),
+          body: JSON.stringify({ text, user: TTS_USER, timbre: ((_b = currentHuman.value) == null ? void 0 : _b.timbre) ?? 1 }),
           signal
         });
         if (!res.ok) {
@@ -879,8 +882,12 @@ const _sfc_main = {
       }
     };
     const playTTS = async (text) => {
-      var _a;
-      if (!text || !((_a = currentHuman.value) == null ? void 0 : _a.isMuted)) return;
+      if (!text) return;
+      const latest = props.human ? resolveHuman(props.human) : null;
+      if (latest) {
+        if (!latest.isMuted) return;
+        Object.assign(currentHuman.value || {}, latest);
+      }
       abortTTS();
       ttsAbortController = new AbortController();
       const { signal } = ttsAbortController;
@@ -889,7 +896,7 @@ const _sfc_main = {
       try {
         const cleanText = text.replace(/```[\s\S]*?```/g, "").replace(/`[^`]+`/g, "").replace(/[#*_~]/g, "").replace(/\n+/g, "，").replace(/\s+/g, " ").replace(/[，。！？]{2,}/g, "，").trim();
         if (!cleanText) return;
-        console.log("[TTS] 提交合成请求:", { text: cleanText, length: cleanText.length });
+        console.log("[TTS] 提交合成请求:", { human: currentHuman.value, text: cleanText, length: cleanText.length });
         const audioBlob = await requestTTSAudio(cleanText, signal);
         if (signal.aborted || currentTtsRequestId.value !== requestId) return;
         if (!audioBlob || audioBlob.size === 0) {
@@ -1002,6 +1009,7 @@ const _sfc_main = {
       switchHuman
     });
     vue.onMounted(() => {
+      console.log("onMounted", props.human);
       initRecorder();
       init();
     });
@@ -1026,7 +1034,7 @@ const _sfc_main = {
     };
   }
 };
-const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb00f641"]]);
+const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-97ef7e2a"]]);
 DigitalHuman.install = (app) => app.component("DigitalHuman", DigitalHuman);
 const components = [DemoButton, DemoInput, DigitalHuman];
 const install = (app) => {

package/dist/ruiyun-human.es.js

@@ -398,35 +398,36 @@ const _sfc_main = {
   },
   emits: ["loaded", "changed", "paused", "resumed", "audio-ready"],
   setup(__props, { expose: __expose, emit: __emit }) {
-    const TTS_URL = "http://localhost:6039";
-    const ASR_URL = "http://localhost:6039";
+    const TTS_URL = "https://sqsyky.xzspj.suqian.gov.cn:8443";
+    const ASR_URL = "/api";
+    const szrUrl = `${TTS_URL}szrimage/`;
     const HUMAN_PRESETS = {
       1: {
         humanId: 1,
         title: "西装动漫男",
         // TODO: 替换为真实资源
-        folder: "http://192.168.3.107:8088/img/xiangyu-green-suit",
-        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-green-suit-header",
+        folder: `${szrUrl}/xiangyu-green-suit`,
+        folder_mobile: `${szrUrl}/xiangyu-green-suit-header`,
         standby: { interval: 100, standbyNum: 11 },
         speak: { interval: 30, speakNum: 0 },
         humanType: 1,
-        timbre: 1
+        timbre: 47
       },
       2: {
         humanId: 2,
         title: "西装动漫女",
-        folder: "http://192.168.3.107:8088/img/anime-woman",
-        folder_mobile: "http://192.168.3.107:8088/img/anime-woman-header",
+        folder: `${szrUrl}/anime-woman`,
+        folder_mobile: `${szrUrl}/anime-woman-header`,
         standby: { interval: 100, standbyNum: 1 },
         speak: { interval: 30, speakNum: 75 },
         humanType: 1,
-        timbre: 3
+        timbre: 45
       },
       3: {
         humanId: 3,
         title: "真人形象男",
-        folder: "http://192.168.3.107:8088/img/real-man",
-        folder_mobile: "http://192.168.3.107:8088/img/real-man-header",
+        folder: `${szrUrl}/real-man`,
+        folder_mobile: `${szrUrl}/real-man-header`,
         standby: { interval: 100, standbyNum: 1 },
         speak: { interval: 30, speakNum: 139 },
         humanType: 1,
@@ -435,8 +436,8 @@ const _sfc_main = {
       4: {
         humanId: 4,
         title: "真人形象女",
-        folder: "http://192.168.3.107:8088/img/real-woman",
-        folder_mobile: "http://192.168.3.107:8088/img/real-woman-header",
+        folder: `${szrUrl}/real-woman`,
+        folder_mobile: `${szrUrl}/real-woman-header`,
         standby: { interval: 100, standbyNum: 2 },
         speak: { interval: 40, speakNum: 139 },
         humanType: 1,
@@ -445,12 +446,12 @@ const _sfc_main = {
       5: {
         humanId: 5,
         title: "Q版形象",
-        folder: "http://192.168.3.107:8088/img/xiangyu-q",
-        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-q-header",
+        folder: `${szrUrl}/xiangyu-q`,
+        folder_mobile: `${szrUrl}/xiangyu-q-header`,
         standby: { interval: 100, standbyNum: 28 },
         speak: { interval: 30, speakNum: 118 },
         humanType: 1,
-        timbre: 34
+        timbre: 47
       }
     };
     const isMobile = () => {
@@ -719,6 +720,7 @@ const _sfc_main = {
         timestamp.value = null;
         frameIndex.value = 1;
         currentHuman.value = human;
+        console.log("init", currentHuman.value);
         const canvas = canvasRef.value;
         const dpr = window.devicePixelRatio || 1;
         const width = containerRef.value.clientWidth;
@@ -795,10 +797,11 @@ const _sfc_main = {
       return pcmToWavBlob(buf);
     };
     const requestTTSAudio = async (text, signal) => {
-      var _a;
+      var _a, _b;
       let lastError = null;
       for (let attempt = 1; attempt <= TTS_MAX_RETRIES; attempt++) {
         if (signal == null ? void 0 : signal.aborted) throw new DOMException("Aborted", "AbortError");
+        console.log("[TTS] 提交合成请求1111:", ((_a = currentHuman.value) == null ? void 0 : _a.timbre) ?? 1);
         const res = await fetch(`${TTS_URL}/web/voice/jd/text-to-speech`, {
           method: "POST",
           headers: {
@@ -806,7 +809,7 @@ const _sfc_main = {
             clientid: VOICE_CLIENT_ID,
             "tenant-id": VOICE_TENANT_ID
           },
-          body: JSON.stringify({ text, user: TTS_USER, timbre: ((_a = currentHuman.value) == null ? void 0 : _a.timbre) ?? 1 }),
+          body: JSON.stringify({ text, user: TTS_USER, timbre: ((_b = currentHuman.value) == null ? void 0 : _b.timbre) ?? 1 }),
           signal
         });
         if (!res.ok) {
@@ -877,8 +880,12 @@ const _sfc_main = {
       }
     };
     const playTTS = async (text) => {
-      var _a;
-      if (!text || !((_a = currentHuman.value) == null ? void 0 : _a.isMuted)) return;
+      if (!text) return;
+      const latest = props.human ? resolveHuman(props.human) : null;
+      if (latest) {
+        if (!latest.isMuted) return;
+        Object.assign(currentHuman.value || {}, latest);
+      }
       abortTTS();
       ttsAbortController = new AbortController();
       const { signal } = ttsAbortController;
@@ -887,7 +894,7 @@ const _sfc_main = {
       try {
         const cleanText = text.replace(/```[\s\S]*?```/g, "").replace(/`[^`]+`/g, "").replace(/[#*_~]/g, "").replace(/\n+/g, "，").replace(/\s+/g, " ").replace(/[，。！？]{2,}/g, "，").trim();
         if (!cleanText) return;
-        console.log("[TTS] 提交合成请求:", { text: cleanText, length: cleanText.length });
+        console.log("[TTS] 提交合成请求:", { human: currentHuman.value, text: cleanText, length: cleanText.length });
         const audioBlob = await requestTTSAudio(cleanText, signal);
         if (signal.aborted || currentTtsRequestId.value !== requestId) return;
         if (!audioBlob || audioBlob.size === 0) {
@@ -1000,6 +1007,7 @@ const _sfc_main = {
       switchHuman
     });
     onMounted(() => {
+      console.log("onMounted", props.human);
       initRecorder();
       init();
     });
@@ -1024,7 +1032,7 @@ const _sfc_main = {
     };
   }
 };
-const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb00f641"]]);
+const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-97ef7e2a"]]);
 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-eb00f641]{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.digital-human canvas[data-v-eb00f641]{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-97ef7e2a]{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.digital-human canvas[data-v-97ef7e2a]{max-width:100%;max-height:100%}

package/package.json

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