@koi-design/callkit 2.0.0-beta.9 → 2.0.1

package/dist/index.js

@@ -187,6 +187,10 @@ var KitEvent = {
    * Mute status change
    */
   KIT_SET_MUTE: "muteChange",
+  /**
+   * Call id change
+   */
+  KIT_CALL_ID_CHANGE: "callIdChange",
   /**
    * Error
    */
@@ -448,7 +452,8 @@ var SocketReceiveEvent = {
   /**
    * Error
    */
-  ERROR: "ERROR"
+  ERROR: "ERROR",
+  SESSION_ERROR: "SESSION_ERROR"
 };
 var EncryptionMethod = {
   NONE: "NONE",
@@ -540,6 +545,14 @@ var Call = class {
       return;
     if (!this.callKit.config.check())
       return;
+    this.callKit.logger.info("callEnd", {
+      caller: "Call.callEnd",
+      content: {
+        isUnprompted,
+        isError,
+        connectStatus: this.callKit.connect.connectStatus
+      }
+    });
     this.callKit.connect.hangup(isUnprompted, isError);
   }
   async callHold() {
@@ -604,6 +617,59 @@ var Call = class {
   }
 };
 
+// package.json
+var package_default = {
+  name: "@koi-design/callkit",
+  version: "2.0.1",
+  description: "callkit",
+  author: "koi",
+  license: "ISC",
+  scripts: {
+    build: "tsup",
+    start: "tsup --watch",
+    dev: "vite",
+    lint: "eslint -c .eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
+    prepare: "husky install",
+    release: "tsup && node scripts/pkg.js"
+  },
+  exports: {
+    ".": {
+      require: "./dist/index.js",
+      import: "./dist/index.mjs"
+    }
+  },
+  main: "./dist/index.js",
+  module: "./dist/index.mjs",
+  types: "./dist/index.d.ts",
+  files: [
+    "dist"
+  ],
+  dependencies: {
+    axios: "~0.26.1",
+    "blueimp-md5": "^2.12.0",
+    "eslint-plugin-jsonc": "^2.21.0",
+    "json-stringify-safe": "^5.0.1",
+    "sip.js": "^0.21.2"
+  },
+  devDependencies: {
+    "@commitlint/cli": "^9.1.2",
+    "@commitlint/config-conventional": "^9.1.2",
+    "@koi-design/eslint-config-ts": "^0.0.14",
+    "@types/blueimp-md5": "^2.18.2",
+    archiver: "^5.3.1",
+    consola: "^3.4.2",
+    eslint: "~8.29.0",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-prettier": "^5.5.0",
+    husky: "^8.0.3",
+    "lint-staged": "^10.5.4",
+    prettier: "^2.6.2",
+    tsup: "6.6.3",
+    typescript: "^4.6.3",
+    vite: "^4"
+  }
+};
+
 // package/config.ts
 var Config = class {
   callKit;
@@ -611,7 +677,7 @@ var Config = class {
     this.callKit = callKit;
   }
   config = {
-    version: "1.0.27",
+    version: `V${package_default.version}`,
     host: "",
     log: "info",
     trackLogs: trackLogsDefaultConfig,
@@ -700,7 +766,7 @@ var Config = class {
     return true;
   }
   getTrackLogsConfig() {
-    return this.getConfig().trackLogs ?? trackLogsDefaultConfig;
+    return this.config?.trackLogs ?? trackLogsDefaultConfig;
   }
   enableTrackLogs(enabled) {
     this.config.trackLogs.enabled = enabled;
@@ -732,8 +798,8 @@ var Logger = class {
     this.startTrackLogsTimer();
   }
   startTrackLogsTimer() {
-    const { interval, enabled } = this.callKit.config.getConfig().trackLogs;
-    if (!enabled || this.trackLogsTimer) {
+    const { interval } = this.callKit.config.getTrackLogsConfig();
+    if (this.trackLogsTimer) {
       return;
     }
     this.trackLogsTimer = setInterval(() => {
@@ -803,7 +869,7 @@ var Logger = class {
       console.log(`%c${logString}`, `color: orange;`);
     }
   }
-  error(msg, extra) {
+  error(msg, extra, noTrigger = false) {
     const errorMsg = msg instanceof Error ? msg.message : msg;
     const logString = this.catchLog(errorMsg, extra, "error");
     if (getLevel(this.level) >= getLevel("error")) {
@@ -811,11 +877,13 @@ var Logger = class {
     }
     const { errCode, ...rest } = extra?.content ?? {};
     const errorCode = errCode ?? ErrorCode.UNKNOWN_ERROR;
-    this.callKit.trigger(KitEvent.KIT_ERROR, {
-      code: errorCode,
-      msg: errorMsg,
-      data: rest
-    });
+    if (!noTrigger) {
+      this.callKit.trigger(KitEvent.KIT_ERROR, {
+        code: errorCode,
+        msg: errorMsg,
+        data: rest
+      });
+    }
     const error = new Error(errorMsg);
     error.name = "CallKitError";
     error.code = errorCode;
@@ -837,7 +905,7 @@ var Logger = class {
     if (enabled) {
       this.pendingTrackLogs.push(logString);
     }
-    this.callKit.trigger(KitEvent.KIT_LOG, logString);
+    this.callKit.trigger(KitEvent.KIT_LOG, logString, true);
     return logString;
   }
 };
@@ -897,43 +965,46 @@ var initUserMedia = () => {
 var Connect = class {
   callKit;
   /**
-   * connectStatus:  init registered connecting calling
+   *@description  Reconnect config
+   */
+  reconnectConfig;
+  /**
+   *@description  Whether muted
+   */
+  isMute = false;
+  /**
+   *@description  Whether registered
+   */
+  isRegister = false;
+  /**
+   *@description  Whether holding
+   */
+  isHold = false;
+  /**
+   *@description  Connect status:  init registered connecting calling
    */
   connectStatus = CallStatus.init;
   currentSession;
   mediaStream;
   userAgent;
   registerer;
-  // current call id for invite data
-  currentCallId;
   /**
-   * Whether it's a re-connected
+   *@description  Whether it's a re-connected
    */
   isReConnected = false;
-  observeOptionsHeartbeatHandler = null;
   // sipConnected = false;
   /**
-   * Whether it's an outgoing call
+   *@description  Whether it's an outgoing call
    */
   isOutgoing = false;
   /**
-   * Whether it's an active hangup
+   *@description  Whether it's an active hangup
    */
   isUnprompted = false;
-  isCurrentSessionInvited = false;
-  reconnectConfig;
-  /**
-   * Whether muted
-   */
-  isMute = false;
-  /**
-   * Whether registered
-   */
-  isRegister = false;
   /**
-   * Whether holding
+   *@description  Whether the current session is invited
    */
-  isHold = false;
+  hasInvite = false;
   constructor(callKit) {
     this.callKit = callKit;
     const { reconnect = {} } = this.callKit.config.getConfig();
@@ -942,15 +1013,33 @@ var Connect = class {
       ...reconnect
     };
   }
+  // current call id for invite data
+  currentCallId = null;
+  setCallId(callId) {
+    this.callKit.logger.info("setCallId", {
+      caller: "Connect.setCallId",
+      content: {
+        callId
+      }
+    });
+    this.currentCallId = callId;
+    this.callKit.trigger(KitEvent.KIT_CALL_ID_CHANGE, callId);
+  }
   async reset() {
     if (this.isHolding()) {
-      this.setHold(false);
+      await this.setHold(false);
+    }
+    if (this.isMuted()) {
+      await this.setMute(false);
     }
     if (this.connectStatus !== CallStatus.init) {
       this.setConnectStatus(CallStatus.init);
     }
     if (this.isRegistered()) {
-      this.unregister();
+      await this.unregister();
+    }
+    if (this.currentCallId) {
+      this.setCallId(null);
     }
     this.currentSession = void 0;
     this.mediaStream = void 0;
@@ -958,7 +1047,7 @@ var Connect = class {
     this.registerer = void 0;
     this.isOutgoing = false;
     this.isUnprompted = false;
-    this.currentCallId = void 0;
+    this.hasInvite = false;
     if (this.mediaStream) {
       try {
         closeStream(this.mediaStream);
@@ -975,7 +1064,7 @@ var Connect = class {
       }
     }
     this.setConnectStatus(CallStatus.init);
-    this.clearObserveOptionsHeartbeatInterval();
+    this.clearHeartbeat();
   }
   getAduioReference() {
     const { audioRef } = this.callKit.config.getConfig();
@@ -1040,16 +1129,19 @@ var Connect = class {
   isInit() {
     return this.connectStatus === CallStatus.init;
   }
-  clearObserveOptionsHeartbeatInterval() {
-    if (this.observeOptionsHeartbeatHandler !== null) {
-      clearInterval(this.observeOptionsHeartbeatHandler);
-      this.observeOptionsHeartbeatHandler = null;
+  heartbeatInterval;
+  heartbeatFlag = MAX_HEARTBEAT_COUNT;
+  clearHeartbeat() {
+    if (this.heartbeatInterval) {
+      clearInterval(this.heartbeatInterval);
+      this.heartbeatInterval = null;
     }
+    this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
   }
-  heartbeatFlag = MAX_HEARTBEAT_COUNT;
   startHeartbeat() {
     this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
-    setTimeout(() => {
+    this.clearHeartbeat();
+    this.heartbeatInterval = setInterval(() => {
       this.heartbeatFlag -= 1;
       if (this.heartbeatFlag <= 0) {
         this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
@@ -1082,13 +1174,13 @@ var Connect = class {
         });
         return;
       }
+      this.callKit.reset();
       this.callKit.logger.error("connectStatus is not init", {
         caller: "Connect.register",
         content: {
           errCode: ErrorCode.CONNECT_CALL_STATUS_ERROR
         }
       });
-      this.callKit.reset();
       return;
     }
     this.callKit.logger.info("connect register", {
@@ -1098,13 +1190,13 @@ var Connect = class {
       }
     });
     await this.permission().catch((err) => {
+      this.callKit.reset();
       this.callKit.logger.error(err, {
         caller: "Connect.register",
         content: {
           errCode: ErrorCode.WEBRTC_USER_MEDIA_ERROR
         }
       });
-      this.callKit.reset();
     });
     const { userInfo, constrains } = this.callKit.config.getConfig();
     const localStreamFactory = async () => {
@@ -1170,19 +1262,19 @@ var Connect = class {
     const observeSocketStatus = (userAgent, extra) => {
       const { that = this } = extra;
       const core = userAgent.userAgentCore;
-      const originalReceiveRequest = core.receiveRequest.bind(core);
-      core.receiveRequest = (request2) => {
+      const originalReceiveIncomingRequestFromTransport = core.receiveIncomingRequestFromTransport.bind(core);
+      core.receiveIncomingRequestFromTransport = (request2) => {
         if (request2.method === "OPTIONS") {
           that.startHeartbeat();
         }
-        that.callKit.logger.info(`SIP Receive Request: ${request2.method}`, {
-          caller: "Connect.register.observeSocketStatus",
+        that.callKit.logger.info(`SIP Receive: ${request2?.method}`, {
+          caller: "Connect.register.observeSocketStatus.receiveRequest",
           type: "SIP",
           content: {
             request: request2
           }
         });
-        return originalReceiveRequest(request2);
+        return originalReceiveIncomingRequestFromTransport(request2);
       };
       const { transport } = userAgent;
       if (transport) {
@@ -1281,9 +1373,6 @@ var Connect = class {
           }
         });
         this.currentSession = invite;
-        if (this.isOutgoing) {
-          this.isCurrentSessionInvited = false;
-        }
         this.currentSession.stateChange.addListener((state) => {
           switch (state) {
             case import_sip.SessionState.Establishing:
@@ -1329,11 +1418,8 @@ var Connect = class {
                   sessionState: state
                 }
               });
-              if (this.isUnprompted) {
-                if (this.isCurrentSessionInvited) {
-                  this.currentSession.reject();
-                }
-              } else {
+              this.hasInvite = false;
+              if (!this.isUnprompted) {
                 this.callKit.callCenter.callEnd();
               }
               this.isUnprompted = false;
@@ -1368,14 +1454,17 @@ var Connect = class {
         const info = getInviteData();
         try {
           const inviteData = formatGetInviteData(info);
-          this.currentCallId = inviteData?.callUuid;
-          this.callKit.logger.info("get invite data", {
-            caller: "Connect.register.onInvite",
-            content: {
-              inviteData,
-              currentCallId: this.currentCallId
-            }
-          });
+          if (inviteData?.callUuid) {
+            this.setCallId(inviteData.callUuid);
+          } else {
+            this.setCallId(null);
+            this.callKit.logger.error("call id is not exist", {
+              caller: "Connect.register.onInvite",
+              content: {
+                inviteData
+              }
+            });
+          }
         } catch (error) {
           this.callKit.logger.info(error, {
             caller: "Connect.register.onInvite",
@@ -1388,14 +1477,18 @@ var Connect = class {
             getInviteData
           });
         } else {
+          this.hasInvite = true;
           const reject = () => {
-            this.currentSession.reject();
+            if (this.currentSession?.state !== import_sip.SessionState.Terminated && this.currentSession?.state !== import_sip.SessionState.Terminating) {
+              this.currentSession.reject();
+            }
+            this.hasInvite = false;
             this.callKit.callCenter.callEnd(true, false);
           };
           this.callKit.trigger(KitEvent.KIT_INVITE, {
             accept: () => {
-              this.isCurrentSessionInvited = true;
               this.callKit.trigger(KitEvent.CALL_CONNECTING, /* @__PURE__ */ new Date());
+              this.hasInvite = false;
               this.currentSession.accept(options);
             },
             reject,
@@ -1410,15 +1503,13 @@ var Connect = class {
           caller: "Connect.register",
           type: "SIP",
           content: {
-            version: `V${this.callKit.config.getConfig().version}`
+            version: `${this.callKit.config.getConfig().version}`
           }
         });
-        const version = `V${this.callKit.config.getConfig().version}`;
         await this.registerer.register().then(() => {
-          this.callKit.socket.send(SocketSendEvent.START, {
-            version
-          });
+          this.callKit.socket.send(SocketSendEvent.START);
         }).catch(async (err) => {
+          this.callKit.reset();
           this.callKit.logger.error(err?.message, {
             caller: "Connect.register",
             type: "SIP",
@@ -1426,7 +1517,6 @@ var Connect = class {
               errCode: ErrorCode.WEBRTC_REGISTER_ERROR
             }
           });
-          this.callKit.reset();
         });
       },
       onDisconnect: (error) => {
@@ -1458,6 +1548,7 @@ var Connect = class {
       that: this
     });
     await this.userAgent.start().catch((err) => {
+      this.callKit.reset();
       this.callKit.logger.error(err, {
         caller: "Connect.register",
         type: "SIP",
@@ -1465,13 +1556,13 @@ var Connect = class {
           errCode: ErrorCode.WEBRTC_USER_AGENT_ERROR
         }
       });
-      this.callKit.reset();
     });
   }
   reconnectTimer;
   reconnectAttempts = 0;
   startReconnectTimer() {
-    if (this.reconnectAttempts >= this.reconnectConfig.maxAttempts) {
+    if (this.reconnectAttempts >= this.reconnectConfig.maxAttempts && this.callKit.config.isLogin()) {
+      this.callKit.reset();
       this.callKit.logger.error("Reconnect failed max attempts", {
         caller: "Connect.startReconnectTimer",
         type: "SIP",
@@ -1481,7 +1572,6 @@ var Connect = class {
           delay: this.reconnectConfig.delay
         }
       });
-      this.callKit.reset();
       return;
     }
     this.callKit.logger.info("Reconnect timer started", {
@@ -1495,8 +1585,8 @@ var Connect = class {
     });
     this.reconnectAttempts += 1;
     this.reconnectTimer = setTimeout(() => {
-      if (this.reconnectTimer) {
-        this.userAgent.reconnect();
+      if (this.reconnectTimer && this.callKit.config.isLogin()) {
+        this.userAgent?.reconnect();
         this.callKit.logger.info("Reconnect attempt", {
           caller: "Connect.startReconnectTimer",
           type: "SIP",
@@ -1541,6 +1631,7 @@ var Connect = class {
       return;
     }
     await this.registerer.unregister({ all: true }).catch((err) => {
+      this.callKit.reset();
       this.callKit.logger.error(err, {
         caller: "Connect.unregister",
         type: "SIP",
@@ -1548,7 +1639,6 @@ var Connect = class {
           errCode: ErrorCode.WEBRTC_CANCEL_REGISTER_ERROR
         }
       });
-      this.callKit.reset();
     });
   }
   async call(callback) {
@@ -1614,18 +1704,24 @@ var Connect = class {
         connectStatus: this.connectStatus
       }
     });
-    if (this.connectStatus === CallStatus.init)
-      return;
     this.isOutgoing = false;
     this.isUnprompted = isUnprompted;
+    this.setHold(false);
+    this.setMute(false);
+    if (this.connectStatus === CallStatus.init)
+      return;
     try {
       if (isUnprompted) {
-        const shouldSendBye = (
-          // this.sipConnected ||
-          this.isRinging() || this.isCalling() || this.isHolding()
-        );
+        const shouldSendBye = this.isRinging() || this.isCalling();
         if (shouldSendBye) {
-          await this.currentSession?.bye();
+          if (this.hasInvite) {
+            if (this.currentSession?.state !== import_sip.SessionState.Terminated && this.currentSession?.state !== import_sip.SessionState.Terminating) {
+              this.currentSession.reject();
+            }
+            this.hasInvite = false;
+          } else {
+            await this.currentSession?.bye();
+          }
         }
       }
       closeStream(this.mediaStream);
@@ -1637,6 +1733,8 @@ var Connect = class {
       this.setConnectStatus(CallStatus.init);
       this.callKit.trigger(KitEvent.CALL_END, /* @__PURE__ */ new Date());
     } catch (err) {
+      this.callKit.trigger(KitEvent.CALL_END, /* @__PURE__ */ new Date());
+      this.callKit.reset();
       this.callKit.logger.error(err, {
         caller: "Connect.hangup",
         type: "SIP",
@@ -1646,8 +1744,6 @@ var Connect = class {
           isUnprompted
         }
       });
-      this.callKit.trigger(KitEvent.CALL_END, /* @__PURE__ */ new Date());
-      this.callKit.reset();
     }
   }
   /**
@@ -1743,61 +1839,6 @@ var Connect = class {
     });
     this.callKit.trigger(KitEvent.KIT_SET_HOLD, hold);
   }
-  // /**
-  //  * Set mute
-  //  * @param mute Whether to mute
-  //  * @deprecated just send socket event to server to mute or unmute
-  //  */
-  // async setMute(mute: boolean) {
-  //   this.callKit.logger.info('connect setMute', {
-  //     caller: 'Connect.setMute',
-  //     type: 'SIP',
-  //     content: {
-  //       mute
-  //     }
-  //   });
-  //   if (!this.currentSession) {
-  //     this.callKit.logger.error('No active session', {
-  //       caller: 'Connect.setMute',
-  //       type: 'SIP',
-  //       content: {
-  //         errCode: ErrorCode.WEBRTC_MUTE_STATUS_ERROR
-  //       }
-  //     });
-  //     this.callKit.reset();
-  //     return;
-  //   }
-  //   try {
-  //     // Get SessionDescriptionHandler
-  //     const sdh = this.currentSession.sessionDescriptionHandler;
-  //     if (!sdh || !('peerConnection' in sdh)) {
-  //       throw new Error('Invalid session description handler');
-  //     }
-  //     // Get PeerConnection
-  //     const pc = (sdh as any).peerConnection as RTCPeerConnection;
-  //     // Get local audio track and set status
-  //     const audioSender = pc
-  //       .getSenders()
-  //       .find((sender) => sender.track?.kind === 'audio');
-  //     if (audioSender && audioSender.track) {
-  //       audioSender.track.enabled = !mute;
-  //       // Update status and trigger event
-  //       this.isMute = mute;
-  //       this.callKit.trigger(KitEvent.KIT_SET_MUTE, mute);
-  //     } else {
-  //       throw new Error('No audio track found');
-  //     }
-  //   } catch (error) {
-  //     this.callKit.logger.error('Failed to set mute state', {
-  //       caller: 'Connect.setMute',
-  //       type: 'SIP',
-  //       content: {
-  //         err: error.message,
-  //         errCode: ErrorCode.WEBRTC_MUTE_ERROR
-  //       }
-  //     });
-  //   }
-  // }
   async setMute(mute) {
     if (this.isMute === mute) {
       this.callKit.logger.warn("Already muted", {
@@ -1931,16 +1972,17 @@ var Socket = class {
       type: "INCALL",
       content: { ev }
     });
-    this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
-      event: "INCALL_CONNECT_ERROR",
-      err: ev
-    });
     if (this.socketError) {
       return;
     }
     this.handleDisconnect();
   }
   onError(ev) {
+    this.socketError = true;
+    this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
+      event: "INCALL_CONNECT_ERROR",
+      err: ev
+    });
     this.callKit.logger.error("socket onError", {
       caller: "Socket.onError",
       type: "INCALL",
@@ -1949,7 +1991,6 @@ var Socket = class {
         data: ev
       }
     });
-    this.socketError = true;
   }
   confirmAck(data) {
     const { ack, messageId } = data;
@@ -1961,11 +2002,26 @@ var Socket = class {
   }
   onMessage(ev) {
     const data = JSON.parse(ev.data);
+    let content = {};
+    try {
+      if (data.data) {
+        content = JSON.parse(data.data);
+      }
+    } catch (error) {
+      this.callKit.logger.info("socket onMessage parse error", {
+        caller: "Socket.onMessage",
+        type: "INCALL",
+        content: {
+          data: data.data
+        }
+      });
+      content = data.data;
+    }
     this.callKit.logger.info("socket onMessage", {
       caller: "Socket.onMessage",
       type: "INCALL",
       content: {
-        data: data.data,
+        data: content,
         event: data.event
       }
     });
@@ -1979,7 +2035,7 @@ var Socket = class {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.START_CONFIRM
         }
       });
@@ -1990,7 +2046,7 @@ var Socket = class {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.CALL_SUCCESS
         }
       });
@@ -2000,20 +2056,28 @@ var Socket = class {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           errCode: ErrorCode.SOCKET_CALL_ERROR
         }
       });
     }
     if (data.event === SocketReceiveEvent.CUSTOMER_RINGING) {
       this.callKit.trigger(KitEvent.CALL_RINGING, /* @__PURE__ */ new Date());
+      this.callKit.logger.info(data.msg, {
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
+        content: {
+          data: content,
+          event: SocketReceiveEvent.CUSTOMER_RINGING
+        }
+      });
     }
     if (data.event === SocketReceiveEvent.CUSTOMER_PICK_UP) {
       this.callKit.logger.info(data.msg, {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.CUSTOMER_PICK_UP
         }
       });
@@ -2024,7 +2088,7 @@ var Socket = class {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.AGENT_PICK_UP
         }
       });
@@ -2032,16 +2096,16 @@ var Socket = class {
     }
     if (data.event === SocketReceiveEvent.CUSTOMER_HANG_UP) {
       this.callKit.logger.info(data.msg, {
-        caller: "Socket.onMessage",
+        caller: `Socket.onMessage:${data.event}`,
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.CUSTOMER_HANG_UP
         }
       });
       this.callKit.trigger(KitEvent.CALL_HANG_UP, /* @__PURE__ */ new Date());
-      if (data.data?.callUuid) {
-        this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+      if (content?.callUuid) {
+        this.callKit.connect.socketTriggerHangup(content.callUuid);
       }
     }
     if (data.event === SocketReceiveEvent.CUSTOMER_NO_ANSWER) {
@@ -2049,30 +2113,32 @@ var Socket = class {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.CUSTOMER_NO_ANSWER
         }
       });
       this.callKit.trigger(KitEvent.CALL_NO_ANSWER);
-      if (data.data?.callUuid) {
-        this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+      if (content?.callUuid) {
+        this.callKit.connect.socketTriggerHangup(content.callUuid);
       }
     }
     if (data.event === SocketReceiveEvent.CALL_CDR) {
       this.callKit.logger.info(data.msg, {
-        caller: "Socket.onMessage",
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.CALL_CDR
         }
       });
-      this.callKit.trigger(KitEvent.CALL_CDR, data.data);
+      this.callKit.trigger(KitEvent.CALL_CDR, content);
     }
     if (data.event === SocketReceiveEvent.STOP_CONFIRM) {
       this.callKit.logger.info(data.msg, {
-        caller: "Socket.onMessage",
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.STOP_CONFIRM
         }
       });
@@ -2080,9 +2146,10 @@ var Socket = class {
     if (data.event === SocketReceiveEvent.CLOSE) {
       const { userInfo } = this.callKit.config.getConfig();
       this.callKit.logger.info(data.msg, {
-        caller: "Socket.onMessage",
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.CLOSE
         }
       });
@@ -2091,26 +2158,40 @@ var Socket = class {
       });
     }
     if (data.event === SocketReceiveEvent.ERROR) {
+      this.socketError = true;
+      this.callKit.reset();
       this.callKit.logger.error(data.msg, {
-        caller: "Socket.onMessage",
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
         content: {
           errCode: ErrorCode.SOKET_SERVER_ERROR,
-          data: data.data
+          data: content
         }
       });
+    }
+    if (data.event === SocketReceiveEvent.SESSION_ERROR) {
       this.socketError = true;
       this.callKit.reset();
+      this.callKit.logger.error(data.msg, {
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
+        content: {
+          data: content,
+          event: SocketReceiveEvent.SESSION_ERROR
+        }
+      });
     }
     if (data.event === SocketReceiveEvent.AGENT_NO_ANSWER) {
       this.callKit.logger.info(data.msg, {
-        caller: "Socket.onMessage",
+        caller: `Socket.onMessage:${data.event}`,
+        type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: SocketReceiveEvent.AGENT_NO_ANSWER
         }
       });
-      if (data.data?.callUuid) {
-        this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+      if (content?.callUuid) {
+        this.callKit.connect.socketTriggerHangup(content.callUuid);
       }
     }
     this.callKit.trigger(KitEvent.SERVER_SOCKET_EVENT, data);
@@ -2120,6 +2201,7 @@ var Socket = class {
       this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_NOT_CONNECTED"
       });
+      this.callKit.reset();
       this.callKit.logger.error("socket not connected", {
         caller: "Socket.send",
         type: "INCALL",
@@ -2127,10 +2209,9 @@ var Socket = class {
           errCode: ErrorCode.SOCKET_CONNECT_ERROR
         }
       });
-      this.callKit.reset();
       return;
     }
-    const { userInfo } = this.callKit.config.getConfig();
+    const { userInfo, version } = this.callKit.config.getConfig();
     const { sessionId, extno, agentId } = userInfo;
     if (!sessionId) {
       this.callKit.logger.error("sessionId is empty", {
@@ -2145,6 +2226,7 @@ var Socket = class {
     const msg = {
       event,
       sessionId,
+      version,
       ...message
     };
     if (SocketSendEvent.CALL === event) {
@@ -2160,8 +2242,7 @@ var Socket = class {
       caller: "Socket.send",
       type: "INCALL",
       content: {
-        event,
-        message
+        ...msg
       }
     });
     switch (event) {
@@ -2174,24 +2255,6 @@ var Socket = class {
         break;
     }
   }
-  async sendMessage(event, message) {
-    if (!this.isConnected) {
-      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
-        event: "INCALL_NOT_CONNECTED"
-      });
-      this.callKit.logger.error("socket not connected", {
-        caller: "Socket.sendMessage",
-        type: "INCALL",
-        content: {
-          errCode: ErrorCode.SOCKET_CONNECT_ERROR
-        }
-      });
-      return;
-    }
-    const { userInfo } = this.callKit.config.getConfig();
-    const { sessionId } = userInfo;
-    this.ws?.send(JSON.stringify({ event, sessionId, ...message }));
-  }
   ping() {
     if (!this.isConnected)
       return;
@@ -2206,6 +2269,11 @@ var Socket = class {
     const now = Date.now();
     const { pingInterval, pingTimeout } = this.socketConfig;
     if (now - this.lastPingTime > pingInterval + pingTimeout) {
+      if (this.ws && this.isConnected) {
+        this.ws.close(4001, "ping timeout");
+      } else {
+        this.reset();
+      }
       this.callKit.logger.error("socket ping timeout", {
         caller: "Socket.ping",
         type: "INCALL",
@@ -2213,11 +2281,6 @@ var Socket = class {
           errCode: ErrorCode.SOCKET_PING_TIMEOUT
         }
       });
-      if (this.ws && this.isConnected) {
-        this.ws.close(4001, "ping timeout");
-      } else {
-        this.reset();
-      }
     }
   }
   checkPing() {
@@ -2253,6 +2316,10 @@ var Socket = class {
   }
   attemptReconnect() {
     if (this.reconnectAttempts >= this.socketConfig.maxAttempts) {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
+        event: "INCALL_RECONNECT_ERROR"
+      });
+      this.reset();
       this.callKit.logger.error("Maximum reconnection attempts reached", {
         caller: "Socket.attemptReconnect",
         type: "INCALL",
@@ -2261,10 +2328,6 @@ var Socket = class {
           reconnectAttempts: this.reconnectAttempts
         }
       });
-      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
-        event: "INCALL_RECONNECT_ERROR"
-      });
-      this.reset();
       return;
     }
     if (this.reconnectAttempts === 0) {
@@ -2557,9 +2620,16 @@ var CallKit = class {
    */
   async setUserStatus(status) {
     const { agentId } = this.config.getConfig().userInfo;
+    this.logger.info("setUserStatus", {
+      caller: "CallKit.setUserStatus",
+      content: {
+        status,
+        agentId
+      }
+    });
     await this.api.updateUserStatus({
       agentId,
-      status
+      userStatus: status
     });
   }
   async reset() {
@@ -2609,13 +2679,19 @@ var CallKit = class {
       }
     });
   }
-  trigger(event, data) {
+  trigger(event, data, noLog = false) {
+    if (!noLog) {
+      this.logger.info(`Trigger Event: ${event}`, {
+        caller: "CallKit.trigger",
+        content: data
+      });
+    }
     this.listener.forEach((item) => {
       if (item.event === event) {
         try {
           item.callback(data);
         } catch (err) {
-          this.logger.error("Event callback error:", err);
+          this.logger.error("Event callback error:", err, true);
         }
       }
     });