@koi-design/callkit 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/index.mjs

@@ -3,7 +3,6 @@ import md5 from "blueimp-md5";
 
 // package/axios.ts
 import axios from "axios";
-import axiosRetry from "axios-retry";
 var instance = axios.create({
   headers: {
     "Content-Type": "application/x-www-form-urlencoded"
@@ -14,23 +13,6 @@ instance.interceptors.response.use(
   (response) => response.data,
   (error) => Promise.reject(error)
 );
-axiosRetry(instance, {
-  retries: 3,
-  // Maximum number of retries, default is 3
-  retryDelay: (retryCount, error) => {
-    console.log(
-      `AJAX Retrying attempt ${retryCount}, error: ${error?.message}`
-    );
-    return retryCount * 1e3;
-  },
-  retryCondition: (error) => {
-    if (!error.response)
-      return true;
-    return error.response.status < 200 || error.response.status >= 300;
-  },
-  shouldResetTimeout: true
-  // Whether to reset axios timeout on retry
-});
 var request = (config) => instance.request(config);
 var axios_default = request;
 
@@ -858,7 +840,7 @@ var Connect = class {
   /**
    * Whether registered
    */
-  isRegistered = false;
+  isRegister = false;
   constructor(callKit) {
     this.callKit = callKit;
     const { reconnect = {} } = this.callKit.config.getConfig();
@@ -898,6 +880,7 @@ var Connect = class {
         });
       }
     }
+    this.callKit.config.reset();
     this.setConnectStatus(CallStatus.init);
     this.clearObserveOptionsHeartbeatInterval();
   }
@@ -940,11 +923,23 @@ var Connect = class {
     return this.connectStatus === CallStatus.ringing;
   }
   /**
-   *
+   * isHolding
    */
   isHolding() {
     return this.connectStatus === CallStatus.holding;
   }
+  /**
+   * isRegistered
+   */
+  isRegistered() {
+    return this.isRegister;
+  }
+  /**
+   * isMute
+   */
+  isMuted() {
+    return this.isMute;
+  }
   /**
    * Call ended, call not started
    * @returns
@@ -973,7 +968,7 @@ var Connect = class {
   }
   async register() {
     if (this.connectStatus !== CallStatus.init) {
-      if (this.isRegistered) {
+      if (this.isRegistered()) {
         this.callKit.logger.warn("connectStatus is registered", {
           caller: "Connect.register",
           content: {
@@ -1109,14 +1104,14 @@ var Connect = class {
             type: "SIP",
             content: {
               registererState: state,
-              isRegistered: this.isRegistered
+              isRegistered: this.isRegistered()
             }
           });
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
-            isRegistered: this.isRegistered
+            isRegistered: this.isRegistered()
           });
           break;
         case RegistererState.Registered:
@@ -1125,13 +1120,13 @@ var Connect = class {
             type: "SIP",
             content: {
               registererState: state,
-              isRegistered: this.isRegistered
+              isRegistered: this.isRegistered()
             }
           });
           this.setRegister(true);
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
-            isRegistered: this.isRegistered
+            isRegistered: this.isRegistered()
           });
           break;
         case RegistererState.Terminated:
@@ -1140,13 +1135,13 @@ var Connect = class {
             type: "SIP",
             content: {
               registererState: state,
-              isRegistered: this.isRegistered
+              isRegistered: this.isRegistered()
             }
           });
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
-            isRegistered: this.isRegistered,
+            isRegistered: this.isRegistered(),
             registererState: state
           });
           break;
@@ -1155,14 +1150,14 @@ var Connect = class {
             caller: "Connect.register.registererStateChange",
             type: "SIP",
             content: {
-              isRegistered: this.isRegistered,
+              isRegistered: this.isRegistered(),
               registererState: state
             }
           });
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
-            isRegistered: this.isRegistered,
+            isRegistered: this.isRegistered(),
             registererState: state
           });
           break;
@@ -1177,7 +1172,7 @@ var Connect = class {
           caller: "Connect.register.onInvite",
           content: {
             invite,
-            isRegistered: this.isRegistered
+            isRegistered: this.isRegistered()
           }
         });
         this.currentSession = invite;
@@ -1197,7 +1192,7 @@ var Connect = class {
               this.setConnectStatus(CallStatus.ringing);
               this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
                 sessionState: state,
-                isRegistered: this.isRegistered
+                isRegistered: this.isRegistered()
               });
               break;
             case SessionState.Established:
@@ -1211,14 +1206,14 @@ var Connect = class {
               this.callKit.connect.setConnectStatus(CallStatus.calling);
               this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
                 sessionState: state,
-                isRegistered: this.isRegistered
+                isRegistered: this.isRegistered()
               });
               setupRemoteMedia(this.currentSession);
               break;
             case SessionState.Terminating:
               this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
                 sessionState: state,
-                isRegistered: this.isRegistered
+                isRegistered: this.isRegistered()
               });
               break;
             case SessionState.Terminated:
@@ -1239,7 +1234,7 @@ var Connect = class {
               this.isUnprompted = false;
               this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
                 sessionState: state,
-                isRegistered: this.isRegistered
+                isRegistered: this.isRegistered()
               });
               break;
             default:
@@ -1426,11 +1421,10 @@ var Connect = class {
       caller: "Connect.unregister",
       type: "SIP",
       content: {
-        isRegistered: this.isRegistered,
-        registerer: this.registerer
+        isRegistered: this.isRegistered()
       }
     });
-    if (!this.isRegistered || !this.registerer) {
+    if (!this.isRegistered() || !this.registerer) {
       this.callKit.logger.warn("No registerer to unregister.", {
         caller: "Connect.unregister",
         type: "SIP",
@@ -1460,7 +1454,7 @@ var Connect = class {
       }
     });
     this.isOutgoing = true;
-    if (!this.isRegistered) {
+    if (!this.isRegistered()) {
       await this.register();
     }
     this.setConnectStatus(CallStatus.connecting);
@@ -1480,7 +1474,7 @@ var Connect = class {
         register
       }
     });
-    this.isRegistered = register;
+    this.isRegister = register;
     this.callKit.trigger(KitEvent.KIT_REGISTER_CHANGE, register);
   }
   /**
@@ -2042,7 +2036,6 @@ var Socket = class {
           errCode: ErrorCode.SOCKET_CONNECT_ERROR
         }
       });
-      this.callKit.config.reset();
       this.callKit.reset();
       return;
     }
@@ -2149,7 +2142,7 @@ var Socket = class {
    * 重置 socket 连接和所有状态
    * @param isWaitConfirm Whether need to wait for close confirmation
    */
-  async reset(isWaitConfirm = true) {
+  async reset() {
     if (this.pingTimer) {
       clearInterval(this.pingTimer);
       this.pingTimer = void 0;
@@ -2161,9 +2154,7 @@ var Socket = class {
       this.callKit.logger.info("Closing socket connection", {
         caller: "Socket.reset",
         type: "INCALL",
-        content: {
-          isWaitConfirm
-        }
+        content: {}
       });
       this.ws.close();
       this.isConnected = false;
@@ -2335,8 +2326,8 @@ var CallKit = class {
       }
     }
     await this.hangup();
-    this.socket.reset(false);
     this.connect.reset();
+    this.socket.reset();
     this.config.reset();
     this.trigger(KitEvent.KIT_LOGIN_CHANGE, false);
   }
@@ -2452,9 +2443,9 @@ var CallKit = class {
    * set userstatus
    * @param status
    */
-  setUserStatus(status) {
+  async setUserStatus(status) {
     const { agentId } = this.config.getConfig().userInfo;
-    this.api.updateUserStatus({
+    await this.api.updateUserStatus({
       agentId,
       status
     });