@trtc/calls-uikit-react 4.2.3 → 4.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trtc/calls-uikit-react",
-  "version": "4.2.3",
+  "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.5",
+    "@trtc/call-engine-lite-js": "~3.4.7",
     "@tencentcloud/lite-chat": "^1.5.0",
-    "@trtc/call-engine-lite-wx": "~3.4.5"
+    "@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.3';
+const version = '4.2.4';
 const frameWork = 'react';
 export { TUIGlobal, TUIStore, uiDesign };
 
@@ -67,7 +67,7 @@ export default class TUICallService {
     }
     return TUICallService.instance;
   }
-  public _loadWasm() {
+  private _loadWasm() {
     TUICallEngine.once('ready', () => this._wasmReadyResolve());
   }
   @avoidRepeatedCall()
@@ -83,7 +83,7 @@ export default class TUICallService {
       this._isInitialized = true;
     }
   }
-  public async _doInit(params: IInitParams) {
+  private async _doInit(params: IInitParams) {
     try {
       if (this._tuiCallEngine) return;
       // @ts-ignore
@@ -674,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.3'; // basic-demo 原来上报使用
+const Version = '4.2.4'; // basic-demo 原来上报使用
 
 // 输出产物
 export {

package/tuicall-uikit-react.es.js

@@ -755,6 +755,8 @@ function Ne() {
       } catch (s) {
         throw i.delete(this), s;
       }
+    }, n.value.clearCallState = function(r) {
+      i.delete(r);
     }, n;
   };
 }
@@ -1716,8 +1718,8 @@ const wr = (Nt = class {
     this._unNormalEventsManager(e, v.LINE_BUSY);
   }
   _handleCallNotConnected(e) {
-    var n;
-    (n = this._callService) == null || n.executeExternalAfterCalling(), this._unNormalEventsManager(e, v.ON_CALL_NOT_CONNECTED);
+    var n, a, i;
+    (a = (n = this == null ? void 0 : this._callService) == null ? void 0 : n._cleanupAvoidRepeatCallState) == null || a.call(n), (i = this._callService) == null || i.executeExternalAfterCalling(), this._unNormalEventsManager(e, v.ON_CALL_NOT_CONNECTED);
   }
   async _handleOnUserInviting(e) {
     const { userID: n } = Be(e);
@@ -1850,7 +1852,7 @@ var Qs = Object.defineProperty, Bs = Object.getOwnPropertyDescriptor, ge = (t, e
 };
 const z = yr.getInstance(), j = ua.getInstance(), mt = oa.getInstance();
 mt.setTUIStore(j);
-const xi = "4.2.3", vi = "react";
+const xi = "4.2.4", vi = "react";
 var gt;
 const Ae = (gt = class {
   constructor() {
@@ -2357,7 +2359,21 @@ const Ae = (gt = class {
   _stopTimer() {
     this._timerId !== -1 && (ra.clearTask(this._timerId), this._timerId = -1);
   }
+  // clear all use avoidRepeatCall decorator state
+  _cleanupAllAvoidRepeatCallState() {
+    var n, a;
+    (a = (n = this._tuiCallEngine) == null ? void 0 : n.reportLog) == null || a.call(n, { name: "TUICallkit._cleanupAllAvoidRepeatCallState", data: {} }), [
+      this.calls,
+      this.accept,
+      this.hangup,
+      this.reject
+    ].forEach((i) => {
+      var r;
+      (r = i == null ? void 0 : i.clearCallState) == null || r.call(i, this);
+    });
+  }
   _resetCallStore() {
+    this._cleanupAllAvoidRepeatCallState();
     const e = Wn();
     this._stopTimer();
     let n = Object.keys(Xn).filter((r) => {
@@ -8158,7 +8174,7 @@ ga.install = qd;
 const sN = {
   AUDIO_CALL: 1,
   VIDEO_CALL: 2
-}, lN = "4.2.3";
+}, lN = "4.2.4";
 export {
   $ as CallMediaType,
   oN as CallMessage,