@xmov/avatar 2.4.0-beta.3 → 2.4.0-beta.5

package/dist/utils/request.d.ts

@@ -4,6 +4,7 @@ interface RequestOptions {
     data?: Record<string, any>;
     headers?: Record<string, string>;
     keepalive?: boolean;
+    signal?: AbortSignal;
 }
 export default function request(url: string, options?: RequestOptions): Promise<Response>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmov/avatar",
-  "version": "2.4.0-beta.3",
+  "version": "2.4.0-beta.5",
   "description": "魔珐数字人 JS-SDK",
   "type": "module",
   "source": "src/index.ts",

package/src/index.ts

@@ -643,6 +643,9 @@ export default class XmovAvatar {
       this.pendingInvisibleMode = true;
     }
 
+    // Session 请求和资源下载期间也需要处理页面刷新。
+    window.addEventListener('beforeunload', this.handleBeforeUnload);
+
     // 加载资源（sdk.resource_load：资源包下载/解析耗时）
     (window as any).performanceTracker.markStart(performanceConstant.load_resource);
     (window as any).performanceTracker.markStart(performanceConstant.first_avatar_render);
@@ -675,7 +678,6 @@ export default class XmovAvatar {
     // 设置上报使用ttsa
     (window as any).performanceTracker.setReportFunc(this.ttsa);
 
-    window.addEventListener('beforeunload', this.handleBeforeUnload);
     document.addEventListener('visibilitychange', this.boundVisibilityChange);
     initSpan?.end();
     return sessionInfo;
@@ -1318,7 +1320,9 @@ export default class XmovAvatar {
   private handleBeforeUnload = () => {
     if (!this._isClientMode && (this.resourceManager?.session_id || this.resourceManager?.session_request_id)) {
       // Page dismissal cannot wait for E2E and TTSA shutdown before starting DELETE.
-      this.beforeUnloadStopSessionPromise ??= this.resourceManager.stopSession("beforeunload", { keepalive: true });
+      this.beforeUnloadStopSessionPromise ??= this.resourceManager.stopSession("beforeunload", { keepalive: true }).catch((error) => {
+        (window as any).avatarSDKLogger.warn(this.TAG, "页面卸载时停止会话失败", error);
+      });
     }
     void this.destroy("beforeunload");
   };
@@ -1464,9 +1468,10 @@ export default class XmovAvatar {
     this.ttsa?.sendSdkPoint('close_session', {
       reason: stop_reason,
     });
-    const res = await (this.beforeUnloadStopSessionPromise ?? this.resourceManager.stopSession(stop_reason));
+    // An unload DELETE is already in flight; neither await nor cancel it.
+    const res = this.beforeUnloadStopSessionPromise ? undefined : await this.resourceManager.stopSession(stop_reason);
     await this.destroyClient();
-    if(res) {
+    if(res || this.beforeUnloadStopSessionPromise) {
       this.onStatusChange(AvatarStatus.close);
     }
     return res
@@ -1487,8 +1492,8 @@ export default class XmovAvatar {
       (window as any).avatarSDKLogger.warn(this.TAG, "TTSA client_quit 未确认，继续释放本地资源", error);
     } finally {
       try {
-        if (!this._isClientMode) {
-          await (this.beforeUnloadStopSessionPromise ?? this.resourceManager.stopSession(stopReason));
+        if (!this._isClientMode && !this.beforeUnloadStopSessionPromise) {
+          await this.resourceManager.stopSession(stopReason);
         }
       } finally {
         await this.destroyClient();

package/src/modules/ResourceManager.ts

@@ -10,6 +10,8 @@ import { headersNeedSign, generateRequestId } from "../utils/encodeToken";
 // import { isDEV } from "../utils";
 import CacheManager from './cache-manager';
 
+const STOP_SESSION_TIMEOUT_MS = 3000;
+
 /**
  * 资源处理模块，加载并存储资源
  */
@@ -407,6 +409,7 @@ export default class ResourceManager {
   }
 
   async stopSession(stop_reason: string, options: { keepalive?: boolean } = {}) {
+    let timeout: ReturnType<typeof setTimeout> | undefined;
     try {
       const url = `${this.options.gatewayServer}`;
       // session_id 尚未返回时（如 init 未完成就 destroy），只要有 request_id 仍发请求，
@@ -424,7 +427,19 @@ export default class ResourceManager {
         data.request_id = this.session_request_id;
       }
       const { headers, data: signedData } = headersNeedSign(this.options.appId, this.options.appSecret, "DELETE", url, data);
-      const response = await request(url, { method: "DELETE", data: signedData, headers: { ...headers, ...this.options.headers }, keepalive: options.keepalive });
+      // Unload requests must be allowed to outlive the document. Ordinary
+      // DELETEs have a deadline covering both response headers and body.
+      const controller = options.keepalive ? undefined : new AbortController();
+      if (controller) {
+        timeout = setTimeout(() => controller.abort(), STOP_SESSION_TIMEOUT_MS);
+      }
+      const response = await request(url, {
+        method: "DELETE",
+        data: signedData,
+        headers: { ...headers, ...this.options.headers },
+        keepalive: options.keepalive,
+        signal: controller?.signal,
+      });
       return await response.json();
     } catch (error) {
       this.sdk.onMessage({
@@ -432,6 +447,8 @@ export default class ResourceManager {
         message: `Error: 停止会话失败`,
         e: error,
       });
+    } finally {
+      if (timeout !== undefined) clearTimeout(timeout);
     }
   }
 

package/src/utils/request.ts

@@ -5,6 +5,7 @@ interface RequestOptions {
   data?: Record<string, any>
   headers?: Record<string, string>
   keepalive?: boolean
+  signal?: AbortSignal
 }
 
 interface ErrorResponse {
@@ -23,6 +24,7 @@ export default async function request(
   const config: RequestInit = {
     method,
     keepalive: options.keepalive,
+    signal: options.signal,
     // headers,
     headers: {
       'Content-Type': 'application/json',