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

package/dist/index.d.ts

@@ -74,7 +74,7 @@ declare class Socket {
     /**
      * @description connect auth state
      * @default {
-     *   satrtConfirm: false,
+     *   startConfirm: false,
      *   isConnected: false,
      *   isReconnecting: false,
      *   isAuthenticated: false,
@@ -82,7 +82,7 @@ declare class Socket {
      * }
      */
     private connectAuthState;
-    get satrtConfirm(): boolean;
+    get startConfirm(): boolean;
     get isError(): boolean;
     constructor(callKit: CallKit);
     get reconnectConfig(): {
@@ -98,6 +98,7 @@ declare class Socket {
     private clearWebSocket;
     private connect;
     private onOpen;
+    private cleanReconnectState;
     private resetConnectState;
     private onClose;
     private onError;
@@ -110,7 +111,7 @@ declare class Socket {
      * reset socket connection and all states
      */
     reset(config?: {
-        focus?: boolean;
+        force?: boolean;
     }): Promise<void>;
     private attemptReconnect;
 }
@@ -558,11 +559,11 @@ declare class CallKit {
     /**
      * 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
      */
     reset(config?: {
-        focus?: boolean;
+        force?: boolean;
     }): Promise<void>;
     on(event: kitEventType, callback: (...args: any[]) => void): void;
     off(event: kitEventType, callback?: (...args: any[]) => void): void;

package/dist/index.global.js

@@ -3225,6 +3225,10 @@ var WebCall = (() => {
     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;
@@ -3234,15 +3238,17 @@ var WebCall = (() => {
           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;
@@ -3252,11 +3258,9 @@ var WebCall = (() => {
           method: "post",
           data: params
         });
-        this.isLoginOuting = false;
         return res;
-      } catch (error) {
+      } finally {
         this.isLoginOuting = false;
-        throw error;
       }
     }
     async trackLogs(log) {
@@ -3693,14 +3697,14 @@ var WebCall = (() => {
       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;
@@ -3822,7 +3826,7 @@ var WebCall = (() => {
   // 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",
@@ -19111,9 +19115,7 @@ var WebCall = (() => {
               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",
@@ -19512,7 +19514,7 @@ var WebCall = (() => {
     /**
      * @description connect auth state
      * @default {
-     *   satrtConfirm: false,
+     *   startConfirm: false,
      *   isConnected: false,
      *   isReconnecting: false,
      *   isAuthenticated: false,
@@ -19520,14 +19522,13 @@ var WebCall = (() => {
      * }
      */
     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;
@@ -19567,6 +19568,9 @@ var WebCall = (() => {
       if (this.connectAuthState.isReconnecting) {
         return;
       }
+      if (this.connectAuthState.isError) {
+        return;
+      }
       this.attemptReconnect();
     }
     clearWebSocket() {
@@ -19606,6 +19610,7 @@ var WebCall = (() => {
       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", {
@@ -19621,19 +19626,23 @@ var WebCall = (() => {
         });
       }
     }
+    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",
@@ -19704,7 +19713,8 @@ var WebCall = (() => {
         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());
@@ -19859,20 +19869,19 @@ var WebCall = (() => {
      * 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() {
@@ -20223,16 +20232,16 @@ var WebCall = (() => {
     /**
      * 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()) {
@@ -20244,7 +20253,7 @@ var WebCall = (() => {
       } else {
         await this.config.reset();
       }
-      await this.socket.reset({ focus });
+      await this.socket.reset({ force });
     }
     on(event, callback) {
       this.listener.push({