@koi-design/callkit 2.0.2 → 2.0.4

package/dist/index.mjs

@@ -1,12 +1,13 @@
-// package/index.ts
+// core/index.ts
 import md5 from "blueimp-md5";
 
-// package/axios.ts
+// core/axios.ts
 import axios from "axios";
 var instance = axios.create({
   headers: {
     "Content-Type": "application/x-www-form-urlencoded"
-  }
+  },
+  timeout: 6e4
 });
 instance.interceptors.request.use((config) => config);
 instance.interceptors.response.use(
@@ -16,25 +17,49 @@ instance.interceptors.response.use(
 var request = (config) => instance.request(config);
 var axios_default = request;
 
-// package/api.ts
+// core/api.ts
 var Api = class {
   callKit;
   constructor(callKit) {
     this.callKit = callKit;
   }
+  isLogining = false;
+  isLoginOuting = false;
   async login(params) {
-    return this.post({
-      url: "/auth/agentUser/login",
-      method: "post",
-      data: params
-    });
+    if (this.isLogining) {
+      return;
+    }
+    this.isLogining = true;
+    try {
+      const res = await this.post({
+        url: "/auth/agentUser/login",
+        method: "post",
+        data: params
+      });
+      this.isLogining = false;
+      return res;
+    } catch (error) {
+      this.isLogining = false;
+      throw error;
+    }
   }
   async loginOut(params) {
-    return this.post({
-      url: "/auth/agentUser/loginOut",
-      method: "post",
-      data: params
-    });
+    if (this.isLoginOuting) {
+      return;
+    }
+    this.isLoginOuting = true;
+    try {
+      const res = await this.post({
+        url: "/auth/agentUser/loginOut",
+        method: "post",
+        data: params
+      });
+      this.isLoginOuting = false;
+      return res;
+    } catch (error) {
+      this.isLoginOuting = false;
+      throw error;
+    }
   }
   async trackLogs(log) {
     return this.post(
@@ -97,7 +122,7 @@ var Api = class {
   }
 };
 
-// package/const.ts
+// core/const.ts
 var CallStatus = {
   /**
    * Initial state/Hang up
@@ -446,7 +471,7 @@ var trackLogsDefaultConfig = {
   maxSize: 8192
 };
 
-// package/call.ts
+// core/call.ts
 var Call = class {
   callKit;
   constructor(callKit) {
@@ -587,20 +612,20 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.0.2",
+  version: "2.0.4",
   description: "callkit",
   author: "koi",
   license: "ISC",
   scripts: {
     build: "tsup",
-    start: "tsup --watch",
+    "build:watch": "tsup --watch",
     dev: "vite",
-    lint: "eslint -c .eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
-    prepare: "husky install",
+    lint: "eslint -c ../../.eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
     release: "tsup && node scripts/pkg.js"
   },
   exports: {
     ".": {
+      types: "./dist/index.d.ts",
       require: "./dist/index.js",
       import: "./dist/index.mjs"
     }
@@ -637,7 +662,7 @@ var package_default = {
   }
 };
 
-// package/config.ts
+// core/config.ts
 var Config = class {
   callKit;
   constructor(callKit) {
@@ -653,6 +678,7 @@ var Config = class {
     socket: "",
     userInfo: {
       wsUrl: "",
+      logGather: false,
       sessionId: "",
       // User
       username: "",
@@ -707,7 +733,8 @@ var Config = class {
         fsPort: "",
         iceInfo: [],
         iceGatheringTimeout: this.config.userInfo.iceGatheringTimeout,
-        encryptionMethod: EncryptionMethod.INTERNAL
+        encryptionMethod: EncryptionMethod.INTERNAL,
+        logGather: false
       };
       this.callKit.trigger(KitEvent.KIT_LOGIN_CHANGE, false);
     }
@@ -740,7 +767,7 @@ var Config = class {
   }
 };
 
-// package/logger.ts
+// core/logger.ts
 import stringify from "json-stringify-safe";
 function getLevel(level) {
   return LoggerLevelMap[level];
@@ -877,7 +904,7 @@ var Logger = class {
   }
 };
 
-// package/connect.ts
+// core/connect.ts
 import {
   UserAgent,
   Web,
@@ -886,7 +913,7 @@ import {
   RegistererState
 } from "sip.js";
 
-// package/utils.ts
+// core/utils.ts
 var formatGetInviteData = (inviteData) => {
   const extendInfoStr = inviteData["x-antaios-manual-extend_info"] || inviteData["x-antaios-manual-extend-info"];
   let extendInfoObj = null;
@@ -901,7 +928,7 @@ var formatGetInviteData = (inviteData) => {
   }
 };
 
-// package/connect.ts
+// core/connect.ts
 var DEFAULT_RECONNECT_CONFIG = {
   maxAttempts: 3,
   delay: 500
@@ -1431,7 +1458,7 @@ var Connect = class {
             this.setCallId(inviteData.callUuid);
           } else {
             this.setCallId(null);
-            this.callKit.logger.error("call id is not exist", {
+            this.callKit.logger.warn("call id is not exist", {
               caller: "Connect.register.onInvite",
               content: {
                 inviteData
@@ -1495,9 +1522,7 @@ var Connect = class {
       onDisconnect: (error) => {
         console.log("onDisconnect", error);
         if (error) {
-          this.startReconnectTimer();
-        } else {
-          this.callKit.logger.info("SIP User Agent Disconnected", {
+          this.callKit.logger.info("SIP User Agent Disconnected with error", {
             caller: "Connect.register",
             type: "SIP",
             content: {
@@ -1505,6 +1530,13 @@ var Connect = class {
               errCode: ErrorCode.WEBRTC_USER_AGENT_ERROR
             }
           });
+          this.startReconnectTimer();
+        } else {
+          this.callKit.logger.info("SIP User Agent Disconnected", {
+            caller: "Connect.register",
+            type: "SIP",
+            content: {}
+          });
         }
       },
       onRegister: () => {
@@ -1613,6 +1645,15 @@ var Connect = class {
         }
       });
     });
+    await this.userAgent?.stop().catch((err) => {
+      this.callKit.logger.warn(err, {
+        caller: "Connect.unregister",
+        type: "SIP",
+        content: {
+          errCode: ErrorCode.WEBRTC_CANCEL_REGISTER_ERROR
+        }
+      });
+    });
   }
   async call(callback) {
     this.callKit.logger.info("connect call", {
@@ -1847,12 +1888,11 @@ var Connect = class {
   }
 };
 
-// package/socket.ts
+// core/socket.ts
 var RECONNECT_CONFIG = {
   enabled: true,
   maxAttempts: 3,
-  delay: 500,
-  backoffMultiplier: 1.5,
+  delay: 1e3,
   pingInterval: 3e4,
   pingTimeout: 5e3
 };
@@ -1897,6 +1937,9 @@ var Socket = class {
       });
       return;
     }
+    if (this.socketError) {
+      return;
+    }
     if (this.isReconnecting) {
       return;
     }
@@ -1909,8 +1952,8 @@ var Socket = class {
       this.ws.onerror = null;
       this.ws.onmessage = null;
     }
-    if (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.OPEN) {
-      this.ws.close();
+    if (this.ws?.readyState === WebSocket.CONNECTING || this.ws?.readyState === WebSocket.OPEN) {
+      this.ws?.close(1e3, "socket close");
       this.callKit.logger.info("socket clear", {
         caller: "Socket.clearWebSocket",
         type: "INCALL",
@@ -1969,9 +2012,6 @@ var Socket = class {
       type: "INCALL",
       content: { ev }
     });
-    if (this.socketError) {
-      return;
-    }
     this.handleDisconnect();
   }
   onError(ev) {
@@ -2300,7 +2340,6 @@ var Socket = class {
     this.resetReconnectState();
     this.lastPingTime = void 0;
     this.satrtConfirm = false;
-    this.socketError = false;
     this.clearWebSocket();
   }
   attemptReconnect() {
@@ -2350,7 +2389,7 @@ var Socket = class {
   }
 };
 
-// package/index.ts
+// core/index.ts
 var CallKit = class {
   api;
   config;