@koi-design/callkit 2.0.5-beta.1 → 2.0.5-beta.2

package/dist/index.js

@@ -60,6 +60,10 @@ var Api = class {
   isLoginOuting = false;
   async login(params) {
     if (this.isLogining) {
+      this.callKit.logger.info("login is already in progress cancel", {
+        caller: "Api.login",
+        content: { userName: params.userName }
+      });
       return;
     }
     this.isLogining = true;
@@ -69,15 +73,17 @@ var Api = class {
         method: "post",
         data: params
       });
-      this.isLogining = false;
       return res;
-    } catch (error) {
+    } finally {
       this.isLogining = false;
-      throw error;
     }
   }
   async loginOut(params) {
     if (this.isLoginOuting) {
+      this.callKit.logger.info("loginOut is already in progress cancel", {
+        caller: "Api.loginOut",
+        content: { sessionId: params.sessionId }
+      });
       return;
     }
     this.isLoginOuting = true;
@@ -87,11 +93,9 @@ var Api = class {
         method: "post",
         data: params
       });
-      this.isLoginOuting = false;
       return res;
-    } catch (error) {
+    } finally {
       this.isLoginOuting = false;
-      throw error;
     }
   }
   async trackLogs(log) {
@@ -528,14 +532,14 @@ var Call = class {
     this.callKit.logger.info("callStart", {
       caller: "Call.callStart",
       content: {
-        startConfirm: this.callKit.socket.satrtConfirm
+        startConfirm: this.callKit.socket.startConfirm
       }
     });
-    if (!this.callKit.socket.satrtConfirm) {
+    if (!this.callKit.socket.startConfirm) {
       this.callKit.logger.warn("server not confirm start", {
         caller: "Call.callStart",
         content: {
-          startConfirm: this.callKit.socket.satrtConfirm
+          startConfirm: this.callKit.socket.startConfirm
         }
       });
       return;
@@ -657,7 +661,7 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.0.5-beta.1",
+  version: "2.0.5-beta.2",
   description: "callkit",
   author: "koi",
   license: "ISC",
@@ -1548,9 +1552,7 @@ var Connect = class {
             version: `${this.callKit.config.getConfig().version}`
           }
         });
-        await this.registerer.register().then(() => {
-          this.callKit.socket.send(SocketSendEvent.START);
-        }).catch(async (err) => {
+        await this.registerer.register().catch(async (err) => {
           this.callKit.reset();
           this.callKit.logger.error(err?.message, {
             caller: "Connect.register",
@@ -1949,7 +1951,7 @@ var Socket = class {
   /**
    * @description connect auth state
    * @default {
-   *   satrtConfirm: false,
+   *   startConfirm: false,
    *   isConnected: false,
    *   isReconnecting: false,
    *   isAuthenticated: false,
@@ -1957,14 +1959,13 @@ var Socket = class {
    * }
    */
   connectAuthState = {
-    satrtConfirm: false,
+    startConfirm: false,
     isConnected: false,
     isReconnecting: false,
-    isAuthenticated: false,
     isError: false
   };
-  get satrtConfirm() {
-    return this.connectAuthState.satrtConfirm;
+  get startConfirm() {
+    return this.connectAuthState.startConfirm;
   }
   get isError() {
     return this.connectAuthState.isError;
@@ -2004,6 +2005,9 @@ var Socket = class {
     if (this.connectAuthState.isReconnecting) {
       return;
     }
+    if (this.connectAuthState.isError) {
+      return;
+    }
     this.attemptReconnect();
   }
   clearWebSocket() {
@@ -2043,6 +2047,7 @@ var Socket = class {
     this.setConnectAuthState("isConnected", true);
     this.lastPingTime = Date.now();
     this.checkPing();
+    this.send(SocketSendEvent.START);
     if (this.connectAuthState.isReconnecting) {
       this.setConnectAuthState("isReconnecting", false);
       this.callKit.logger.info("reconnect success", {
@@ -2058,19 +2063,23 @@ var Socket = class {
       });
     }
   }
+  cleanReconnectState() {
+    this.reconnectAttempts = 0;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = void 0;
+    }
+    this.setConnectAuthState("isReconnecting", false);
+    this.setConnectAuthState("isError", false);
+  }
   resetConnectState() {
     this.connectAuthState = {
-      satrtConfirm: false,
+      startConfirm: false,
       isConnected: false,
       isReconnecting: false,
-      isAuthenticated: false,
       isError: false
     };
-    this.reconnectAttempts = 0;
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = void 0;
-    }
+    this.cleanReconnectState();
     this.callKit.logger.info("reset connect state", {
       caller: "Socket.resetConnectState",
       type: "INCALL",
@@ -2141,7 +2150,8 @@ var Socket = class {
       return;
     }
     if (data.event === SocketReceiveEvent.START_CONFIRM) {
-      this.setConnectAuthState("satrtConfirm", true);
+      this.setConnectAuthState("startConfirm", true);
+      this.cleanReconnectState();
     }
     if (data.event === SocketReceiveEvent.CUSTOMER_RINGING) {
       this.callKit.trigger(KitEvent.CALL_RINGING, /* @__PURE__ */ new Date());
@@ -2296,20 +2306,19 @@ var Socket = class {
    * reset socket connection and all states
    */
   async reset(config) {
-    const { focus = false } = config || {};
+    const { force = false } = config || {};
     if (this.pingTimer) {
       clearInterval(this.pingTimer);
       this.pingTimer = void 0;
     }
-    if (focus) {
+    if (force) {
       this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_RESET"
       });
       this.resetConnectState();
-      this.setConnectAuthState("isConnected", false);
     }
     this.lastPingTime = void 0;
-    this.setConnectAuthState("satrtConfirm", false);
+    this.setConnectAuthState("startConfirm", false);
     this.clearWebSocket();
   }
   attemptReconnect() {
@@ -2660,16 +2669,16 @@ var CallKit = class {
   /**
    * reset callkit
    * @description recover the callkit to the initial state
-   * @default focus is false
-   * @param config.focus is true, the callkit reset socket connection and all states
+   * @default force is false
+   * @param config.force is true, the callkit reset socket connection and all states
    */
   async reset(config) {
-    const { focus = false } = config || {};
+    const { force = false } = config || {};
     this.logger.info("reset", {
       caller: "CallKit.reset",
       content: {
         connectStatus: this.connect.connectStatus,
-        focus
+        force
       }
     });
     if (this.connect.isCalling()) {
@@ -2681,7 +2690,7 @@ var CallKit = class {
     } else {
       await this.config.reset();
     }
-    await this.socket.reset({ focus });
+    await this.socket.reset({ force });
   }
   on(event, callback) {
     this.listener.push({