@xmov/avatar 2.0.0-alpha.63 → 2.0.0-alpha.65

package/dist/modules/ResourceManager.d.ts

@@ -99,6 +99,8 @@ export default class ResourceManager {
     options: TOptions;
     sdk: XmovAvatar;
     session_id?: string;
+    /** 单次 init 生命周期内的稳定 request_id，由 generateRequestId 生成；session_id 未返回时也能用于 stopSession 兜底销毁 */
+    session_request_id?: string;
     mouthShapeLib: any;
     offlineIdle: IOfflineIdle[];
     offlineCache: Map<string, {

package/dist/utils/encodeToken.d.ts

@@ -1,3 +1,10 @@
+/**
+ * 生成 request_id：用于 startSession / stopSession 的幂等与兜底销毁。
+ * 组成：md5(机器指纹 + 毫秒时间戳 + appId)
+ * 同一次 init → destroy 生命周期内始终不变，即使 session_id 尚未返回
+ * 也能用 request_id 让服务端销毁已占用的房间资源。
+ */
+export declare function generateRequestId(appId: string): string;
 export interface Headers {
     [key: string]: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmov/avatar",
-  "version": "2.0.0-alpha.63",
+  "version": "2.0.0-alpha.65",
   "description": "魔珐数字人 JS-SDK",
   "type": "module",
   "source": "src/index.ts",
@@ -47,7 +47,7 @@
     "build:core": "microbundle --workers --define ENV=production,VERSION=$npm_package_version,ENABLE_SENTRY=true,SENTRY_DSN='https://aabed165326fc7a2a276b49aa4043be3@xmovsentry.xmov.ai/32' --external none --tsconfig tsconfig.json",
     "build:agent": "microbundle --entry src/agent/index.ts --output dist/agent --format modern,esm,cjs,umd --external @xmov/avatar --alias ../index=@xmov/avatar --globals @xmov/avatar=XmovAvatar --name XingyunAvatarAgentModule --tsconfig tsconfig.agent.json --no-sourcemap --define ENV=production,VERSION=$npm_package_version,ENABLE_SENTRY=true,SENTRY_DSN='https://aabed165326fc7a2a276b49aa4043be3@xmovsentry.xmov.ai/32' && node scripts/build-agent-entry.mjs",
     "build:private": "microbundle --workers --define ENV=production,VERSION=$npm_package_version,ENABLE_SENTRY=false,SENTRY_DSN='' --external @sentry/browser --tsconfig tsconfig.json && node scripts/strip-sentry-imports.mjs && pnpm run build:agent",
-    "build:e2e:cdn": "microbundle --entry src/agent/cdn-entry.ts --output cdn-dist/xmovAvatar_e2e.js --format iife --external none --workers --define ENV=production,VERSION=$npm_package_version --tsconfig tsconfig.agent.json --no-pkg-main --no-sourcemap",
+    "build:e2e:cdn": "microbundle --entry src/agent/cdn-entry.ts --output cdn-dist/xmovAvatar_e2e.js --format iife --external none --workers --define ENV=production,VERSION=$npm_package_version,ENABLE_SENTRY=true,SENTRY_DSN='https://aabed165326fc7a2a276b49aa4043be3@xmovsentry.xmov.ai/32' --tsconfig tsconfig.agent.json --no-pkg-main --no-sourcemap",
     "sdk": "pnpm --filter @xmov/avatar run --parallel --no-bail \"/^sdk:.+$/\"",
     "sdk:core": "microbundle watch --workers --define ENV=development,VERSION=$npm_package_version,ENABLE_SENTRY=true,SENTRY_DSN='https://aabed165326fc7a2a276b49aa4043be3@xmovsentry.xmov.ai/32' --external none --tsconfig tsconfig.json",
     "sdk:agent": "node scripts/build-agent-entry.mjs && microbundle watch --entry src/agent/index.ts --output dist/agent --format modern,esm,cjs,umd --external @xmov/avatar --alias ../index=@xmov/avatar --globals @xmov/avatar=XmovAvatar --name XingyunAvatarAgentModule --tsconfig tsconfig.agent.json --define ENV=development,VERSION=$npm_package_version,ENABLE_SENTRY=true,SENTRY_DSN='https://aabed165326fc7a2a276b49aa4043be3@xmovsentry.xmov.ai/32'",

package/src/index.ts

@@ -1629,13 +1629,13 @@ export default class XmovAvatar {
     const e = Errors(params)
     if(params.code !== EErrorCode.RENDER_BODY_ERROR && params.code !== EErrorCode.RENDER_FACE_ERROR && params.code !== EErrorCode.BODY_DATA_EXPIRED) {
       this.options.onMessage(e)
-    }
-    // Sentry 错误上报（仅公有云构建时生效）
-    if (ENABLE_SENTRY && this.sentryReporter) {
-      try {
-        this.sentryReporter.captureError(e);
-      } catch (err) {
-        (window as any).avatarSDKLogger.warn(this.TAG, 'Sentry 上报失败', err);
+      // Sentry 错误上报（仅公有云构建时生效）
+      if (ENABLE_SENTRY && this.sentryReporter) {
+        try {
+          this.sentryReporter.captureError(e);
+        } catch (err) {
+          (window as any).avatarSDKLogger.warn(this.TAG, 'Sentry 上报失败', err);
+        }
       }
     }
 

package/src/modules/ResourceManager.ts

@@ -6,7 +6,7 @@ import {
 } from "../utils/DataInterface";
 import XmovAvatar from "../index";
 import { EErrorCode } from "../types/error";
-import { headersNeedSign } from "../utils/encodeToken";
+import { headersNeedSign, generateRequestId } from "../utils/encodeToken";
 // import { isDEV } from "../utils";
 import CacheManager from './cache-manager';
 
@@ -121,6 +121,8 @@ export default class ResourceManager {
   options: TOptions;
   sdk: XmovAvatar;
   session_id?: string;
+  /** 单次 init 生命周期内的稳定 request_id，由 generateRequestId 生成；session_id 未返回时也能用于 stopSession 兜底销毁 */
+  session_request_id?: string;
   mouthShapeLib: any;
   offlineIdle: IOfflineIdle[] = []
   offlineCache = new Map<string, {
@@ -304,6 +306,7 @@ export default class ResourceManager {
       onDownloadProgress?.(this.progress);
     }, 100);
     // http 请求算 10 进度
+    this.session_request_id = generateRequestId(this.options.appId);
     const result = await this.startSession();
     const res = result as unknown as ISessionResponse;
     // 先记录 session_id，确保后续 stopSession 能正确释放房间
@@ -365,6 +368,7 @@ export default class ResourceManager {
 
 
     const data = {
+      request_id: this.session_request_id,
       tag: this.options.tag,
       gateway_type: this.options.gateway_type,
       ...(this.options.asr_id !== undefined ? { asr_id: this.options.asr_id } : {}),
@@ -404,12 +408,19 @@ export default class ResourceManager {
   async stopSession(stop_reason: string) {
     try {
       const url = `${this.options.gatewayServer}`;
-      if (!this.session_id) {
+      // session_id 尚未返回时（如 init 未完成就 destroy），只要有 request_id 仍发请求，
+      // 让服务端用 request_id 匹配并销毁房间占用，避免 init 失败后的资源泄漏。
+      if (!this.session_id && !this.session_request_id) {
         return;
       }
-      const data = {
-        session_id: this.session_id,
+      const data: Record<string, any> = {
         stop_reason,
+      };
+      if (this.session_id) {
+        data.session_id = this.session_id;
+      }
+      if (this.session_request_id) {
+        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 } });
@@ -908,5 +919,7 @@ export default class ResourceManager {
       this.bg = null;
     }
     this.progress = 0
+    this.session_id = undefined;
+    this.session_request_id = undefined;
   }
 }

package/src/utils/encodeToken.ts

@@ -1,9 +1,24 @@
 import md5 from 'blueimp-md5';
+import { generateFingerprint } from './index';
 
 function encodeWithMd5(s: string): string {
   return md5(s);
 }
 
+/**
+ * 生成 request_id：用于 startSession / stopSession 的幂等与兜底销毁。
+ * 组成：md5(机器指纹 + 毫秒时间戳 + appId)
+ * 同一次 init → destroy 生命周期内始终不变，即使 session_id 尚未返回
+ * 也能用 request_id 让服务端销毁已占用的房间资源。
+ */
+export function generateRequestId(appId: string): string {
+  const fingerprint = (() => {
+    try { return generateFingerprint(); } catch { return 'unknown'; }
+  })();
+  const payload = `${fingerprint}|${Date.now()}|${appId}`;
+  return md5(payload);
+}
+
 function escapeNonAsciiForPythonJson(value: string): string {
   return value.replace(/[^\u0000-\u007E]/g, character => {
     return `\\u${character.charCodeAt(0).toString(16).padStart(4, '0')}`;