@xmov/avatar 2.0.0-alpha.47 → 2.0.0-alpha.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmov/avatar",
-  "version": "2.0.0-alpha.47",
+  "version": "2.0.0-alpha.49",
   "description": "魔珐数字人 JS-SDK",
   "type": "module",
   "source": "src/index.ts",

package/src/control/RenderScheduler.ts

@@ -338,9 +338,10 @@ export default class RenderScheduler {
           } else {
             nowFaceData.push(faceData[i]);
           }
-          nowFaceData.length && this.dataCacheQueue._updateFacial(nowFaceData);
-          realFaceData.length && this.dataCacheQueue._updateRealFacial(realFaceData);
         }
+        // 分类完成后一次性入队，避免循环内对累加数组重复 push 导致队列数据重复
+        nowFaceData.length && this.dataCacheQueue._updateFacial(nowFaceData);
+        realFaceData.length && this.dataCacheQueue._updateRealFacial(realFaceData);
         break;
       case EFrameDataType.AUDIO:
         const audioData = data as IRawAudioFrameData[];
@@ -493,6 +494,15 @@ export default class RenderScheduler {
             message: 'WARNING: 有新的speak_start事件，但是上一轮仍未结束，触发兜底结束',
           });
           this.interrupt('new_speak_start');
+          // 新 speak_start 已到来，立即复位 interrupt 并更新轮次状态，
+          // 避免依赖 UIRenderer 在 sf 帧处理事件时（sf==当前帧且事件在 compose 后被处理）被漏处理，
+          // 导致新轮次实际说话期间仍被强制渲染为闭嘴表情
+          const currentSpeakStart = d.flatMap(item => item.e ?? []).find(ev => ev.type === 'speak_start');
+          if (currentSpeakStart) {
+            this.currentSpeechId = currentSpeakStart.speech_id ?? 0;
+            this.avatarRenderer.setInterrupt(false);
+            this.uiRenderer.lastSpeechId = currentSpeakStart.speech_id ?? 0;
+          }
         }
 
         // 2. 处理过期speak_start
@@ -854,6 +864,16 @@ export default class RenderScheduler {
     this.audioRenderer.resume();
   }
 
+  /**
+   * app 切后台时暂停音频并清空对齐状态（复用断网离线时的 pause()）
+   * 不能保留缓存续播：Android 后台视频帧号持续递增而音频停留在暂停位置，
+   * 恢复后音画基准脱节；且后台期间可能下发新 speak 数据，旧缓存与新 sf 冲突。
+   * 恢复后依赖新下发音频的 sf 作为 firstFrameIndex 重新对齐
+   */
+  pauseForBackground() {
+    this.audioRenderer.pause();
+  }
+
   /**
    * 设置数字人canvas的显隐状态
    * @param visible 是否可见

package/src/index.ts

@@ -1040,12 +1040,28 @@ export default class XmovAvatar {
 
   visibilitychange() {
     if (document.hidden) {
-      // this.offlineMode()
-      // tab 回来时，强制同步解帧队列
-      // this.renderScheduler.forceSyncDecoder();
+      // 进入后台：暂停渲染循环和解码器（省电）、清空音频与表情数据
+      // 仅渲染中暂停（resumeRender 要求 paused 状态才能恢复），
+      // 其他状态（init/stopped/隐身 paused）只停止音频，避免强制暂停后无法恢复
+      const rs = this.renderScheduler?.getRenderState();
+      if (rs === RenderState.rendering || rs === RenderState.resumed) {
+        this.renderScheduler?.pauseRender();
+      } else {
+        this.renderScheduler?.pauseForBackground();
+      }
     } else {
-      if (this.ttsa?.getStatus()) {
-        this.renderScheduler.forceSyncDecoder();
+      // 回到前台：若处于暂停态则恢复渲染（内部已 forceSyncDecoder 对齐最新帧）
+      if (this.renderScheduler?.getRenderState() === RenderState.paused) {
+        this.renderScheduler?.resumeRender();
+      } else if (this.ttsa?.getStatus()) {
+        // 未暂停但连接正常：兜底同步解帧队列
+        this.renderScheduler?.forceSyncDecoder();
+      }
+      // WebSocket 在后台断开且已进入离线模式，网络可用则主动触发重连，
+      // 否则用户切回前台续播时无响应且无任何报错
+      if (!this.ttsa?.getStatus() && this.status === AvatarStatus.offline && NetworkMonitor.ONLINE) {
+        (window as any).avatarSDKLogger.warn(this.TAG, "切回前台发现连接已断开，主动触发重连");
+        this.onlineMode();
       }
       // tab 切换回来时，恢复音频捕获的 AudioContext
       if (this.captureAudioCtx && this.captureAudioCtx.state === 'suspended') {
@@ -1351,7 +1367,7 @@ export default class XmovAvatar {
     // 薄客户端模式：通知 server 端销毁，然后清理本地资源
     if (this._isClientMode) {
       this._apiForwarder?.destroy(stop_reason);
-      this.destroyClient();
+      await this.destroyClient();
       this.onStatusChange(AvatarStatus.close);
       return;
     }
@@ -1359,8 +1375,8 @@ export default class XmovAvatar {
     this.ttsa?.sendSdkPoint('close_session', {
       reason: stop_reason,
     });
-    this.destroyClient();
     const res = await this.resourceManager.stopSession(stop_reason);
+    await this.destroyClient();
     if(res) {
       this.onStatusChange(AvatarStatus.close);
     }
@@ -1481,6 +1497,8 @@ export default class XmovAvatar {
     });
     this.incompleteInitializationCleanupPromise = (async () => {
       try {
+        // 先等待房间释放完成，再清理本地资源，避免房间泄漏
+        await stopSessionPromise;
         await this.destroyClient();
       } catch (error) {
         (window as any).avatarSDKLogger.warn(this.TAG, '清理初始化未完成的本地资源时出错', error);

package/src/modules/ResourceManager.ts

@@ -205,7 +205,7 @@ export default class ResourceManager {
   private isProcessingVideo = false; // 防止在视频处理过程中清理缓存
   private cacheServer?: CacheManager;
   private startSessionTimer: any = null;
-  private audioOnlyMode: boolean;
+  private audioOnlyMode: boolean = false;
 
   // 新增：正在下载的视频跟踪
   private downloadingVideos = new Map<string, Promise<ArrayBuffer | undefined>>();
@@ -305,9 +305,15 @@ export default class ResourceManager {
     }, 100);
     // http 请求算 10 进度
     const result = await this.startSession();
-    // 如果在 startSession 过程中被销毁了，直接返回，避免继续加载资源
+    const res = result as unknown as ISessionResponse;
+    // 先记录 session_id，确保后续 stopSession 能正确释放房间
+    if (res?.session_id) {
+      this.session_id = res.session_id;
+    }
+    // 如果在 startSession 过程中被销毁了，释放刚创建的房间并返回，避免房间泄漏
     if (this.destroyed) {
       (window as any).avatarSDKLogger.warn(this.TAG, "sdk destroyed during load, aborting after startSession");
+      await this.stopSession("destroy_during_init");
       return null;
     }
     if (!result) {
@@ -320,8 +326,6 @@ export default class ResourceManager {
     this.startSessionTimer = null;
     this.progress = 15;
     onDownloadProgress?.(this.progress);
-    const res = result as unknown as ISessionResponse;
-    this.session_id = res?.session_id;
     this.resource_pack = res.resource_pack;
     this.config = res.config as any;
     this.offlineIdle = res.resource_pack?.offline_idle || []
@@ -842,6 +846,11 @@ export default class ResourceManager {
     }
     const res = result as unknown as ISessionResponse;
     this.session_id = res?.session_id;
+    // 重连过程中被销毁，释放刚创建的房间，避免房间泄漏
+    if (this.destroyed) {
+      await this.stopSession("destroy_during_reload");
+      return null;
+    }
     this.resource_pack = res.resource_pack;
     this.config = res.config as any;
     this.offlineIdle = res.resource_pack?.offline_idle || []