@trtc/calls-uikit-react 4.2.2 → 4.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trtc/calls-uikit-react",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "main": "./tuicall-uikit-react.umd.js",
   "module": "./tuicall-uikit-react.es.js",
   "types": "./types/index.d.ts",
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@tencentcloud/tui-core-lite": "1.0.0",
-    "@trtc/call-engine-lite-js": "~3.4.0",
+    "@trtc/call-engine-lite-js": "~3.4.7",
     "@tencentcloud/lite-chat": "^1.5.0",
-    "@trtc/call-engine-lite-wx": "~3.4.3"
+    "@trtc/call-engine-lite-wx": "~3.4.7"
 },
   "bugs": {
     "url": "https://github.com/tencentyun/TUICallKit/issues"

package/src/TUICallService/CallService/engineEventHandler.ts

@@ -226,6 +226,7 @@ export default class EngineEventHandler {
     this._unNormalEventsManager(event, TUICallEvent.LINE_BUSY);
   }
   private _handleCallNotConnected(event: any): void {
+    this?._callService?._cleanupAvoidRepeatCallState?.();
     this._callService?.executeExternalAfterCalling();
     this._unNormalEventsManager(event, TUICallEvent.ON_CALL_NOT_CONNECTED);
   }
@@ -239,7 +240,6 @@ export default class EngineEventHandler {
   }
   private _handleCallingEnd(event: any): void {
     console.log(`${NAME.PREFIX}callEnd event data: ${JSON.stringify(event)}.`);
-
     this._callService?.executeExternalAfterCalling();
     this._callService?._resetCallStore();
   }

package/src/TUICallService/CallService/index.ts

@@ -26,7 +26,7 @@ const TUIGlobal: ITUIGlobal = TuiGlobal.getInstance();
 const TUIStore: ITUIStore = TuiStore.getInstance();
 const uiDesign = UIDesign.getInstance();
 uiDesign.setTUIStore(TUIStore);
-const version = '4.2.2';
+const version = '4.2.4';
 const frameWork = 'react';
 export { TUIGlobal, TUIStore, uiDesign };
 
@@ -44,9 +44,17 @@ export default class TUICallService {
   private _permissionCheckTimer: any = null;
   private _chatCombine: any = null;
   private _engineEventHandler: any = null;
+  // wasm ready
+  private _wasmReadyPromise;
+  private _wasmReadyResolve;
+  private _isInitialized = false;
 
   constructor() {
     console.log(`${NAME.PREFIX}version: ${version}`);
+    this._wasmReadyPromise = new Promise(resolve => {
+      this._wasmReadyResolve = resolve;
+    }); 
+    this._loadWasm(); 
     this._watchTUIStore();
     this._engineEventHandler = EngineEventHandler.getInstance({ callService: this });
 
@@ -59,8 +67,23 @@ export default class TUICallService {
     }
     return TUICallService.instance;
   }
+  private _loadWasm() {
+    TUICallEngine.once('ready', () => this._wasmReadyResolve());
+  }
   @avoidRepeatedCall()
   public async init(params: IInitParams) {
+    if (this._isInitialized) {
+      console.warn('TUICallKit has already been initialized.');
+      return;
+    }
+    await this._wasmReadyPromise;
+    
+    if (!this._isInitialized) {
+      this._doInit(params);
+      this._isInitialized = true;
+    }
+  }
+  private async _doInit(params: IInitParams) {
     try {
       if (this._tuiCallEngine) return;
       // @ts-ignore
@@ -109,6 +132,7 @@ export default class TUICallService {
   // component destroy
   public async destroyed() {
     try {
+      this._isInitialized = false;
       const currentCallStatus = TUIStore.getData(StoreName.CALL, NAME.CALL_STATUS);
       if (currentCallStatus !== CallStatus.IDLE) {
         throw new Error(`please destroyed when status is idle, current status: ${currentCallStatus}`);
@@ -650,7 +674,23 @@ export default class TUICallService {
       this._timerId = -1;
     }
   }
+  // clear all use avoidRepeatCall decorator state
+  private _cleanupAllAvoidRepeatCallState() {
+    this._tuiCallEngine?.reportLog?.({ name: 'TUICallkit._cleanupAllAvoidRepeatCallState', data: { } });
+    const methodsToClean = [
+      (this as any).calls,
+      (this as any).accept,
+      (this as any).hangup,
+      (this as any).reject,
+    ];
+
+    methodsToClean.forEach(method => {
+      method?.clearCallState?.(this);
+    });
+  }
   private _resetCallStore() {
+    this._cleanupAllAvoidRepeatCallState();
+    
     const oldStatusStr = generateStatusChangeText();
     this._stopTimer();
     // localUserInfo, language 在通话结束后不需要清除

package/src/TUICallService/utils/validate/avoidRepeatedCall.ts

@@ -34,6 +34,11 @@ export function avoidRepeatedCall() {
         throw error;
       }
     };
+
+    descriptor.value.clearCallState = function(instance: any) {
+      isCallingSet.delete(instance);
+    };
+    
     return descriptor;
   };
 }

package/src/index.ts

@@ -35,7 +35,7 @@ const TUICallType = {
   AUDIO_CALL: 1,
   VIDEO_CALL: 2,
 };
-const Version = '4.2.2'; // basic-demo 原来上报使用
+const Version = '4.2.4'; // basic-demo 原来上报使用
 
 // 输出产物
 export {