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

package/dist/index.global.js

@@ -3352,6 +3352,10 @@ var WebCall = (() => {
      * Mute status change
      */
     KIT_SET_MUTE: "muteChange",
+    /**
+     * Call id change
+     */
+    KIT_CALL_ID_CHANGE: "callIdChange",
     /**
      * Error
      */
@@ -3613,7 +3617,8 @@ var WebCall = (() => {
     /**
      * Error
      */
-    ERROR: "ERROR"
+    ERROR: "ERROR",
+    SESSION_ERROR: "SESSION_ERROR"
   };
   var EncryptionMethod = {
     NONE: "NONE",
@@ -3705,6 +3710,14 @@ var WebCall = (() => {
         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() {
@@ -3769,6 +3782,59 @@ var WebCall = (() => {
     }
   };
 
+  // package.json
+  var package_default = {
+    name: "@koi-design/callkit",
+    version: "2.0.0",
+    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;
@@ -3776,7 +3842,7 @@ var WebCall = (() => {
       this.callKit = callKit;
     }
     config = {
-      version: "1.0.27",
+      version: `v${package_default.version}`,
       host: "",
       log: "info",
       trackLogs: trackLogsDefaultConfig,
@@ -3865,7 +3931,7 @@ var WebCall = (() => {
       return true;
     }
     getTrackLogsConfig() {
-      return this.getConfig().trackLogs ?? trackLogsDefaultConfig;
+      return this.config?.trackLogs ?? trackLogsDefaultConfig;
     }
     enableTrackLogs(enabled) {
       this.config.trackLogs.enabled = enabled;
@@ -3897,8 +3963,8 @@ var WebCall = (() => {
       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(() => {
@@ -3968,7 +4034,7 @@ var WebCall = (() => {
         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")) {
@@ -3976,11 +4042,13 @@ var WebCall = (() => {
       }
       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;
@@ -4002,7 +4070,7 @@ var WebCall = (() => {
       if (enabled) {
         this.pendingTrackLogs.push(logString);
       }
-      this.callKit.trigger(KitEvent.KIT_LOG, logString);
+      this.callKit.trigger(KitEvent.KIT_LOG, logString, true);
       return logString;
     }
   };
@@ -18460,43 +18528,46 @@ var WebCall = (() => {
   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
+     *@description  Whether the current session is invited
      */
-    isMute = false;
-    /**
-     * Whether registered
-     */
-    isRegister = false;
-    /**
-     * Whether holding
-     */
-    isHold = false;
+    hasInvite = false;
     constructor(callKit) {
       this.callKit = callKit;
       const { reconnect = {} } = this.callKit.config.getConfig();
@@ -18505,15 +18576,33 @@ var WebCall = (() => {
         ...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;
@@ -18521,7 +18610,7 @@ var WebCall = (() => {
       this.registerer = void 0;
       this.isOutgoing = false;
       this.isUnprompted = false;
-      this.currentCallId = void 0;
+      this.hasInvite = false;
       if (this.mediaStream) {
         try {
           closeStream(this.mediaStream);
@@ -18538,7 +18627,7 @@ var WebCall = (() => {
         }
       }
       this.setConnectStatus(CallStatus.init);
-      this.clearObserveOptionsHeartbeatInterval();
+      this.clearHeartbeat();
     }
     getAduioReference() {
       const { audioRef } = this.callKit.config.getConfig();
@@ -18603,16 +18692,19 @@ var WebCall = (() => {
     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;
@@ -18645,13 +18737,13 @@ var WebCall = (() => {
           });
           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", {
@@ -18661,13 +18753,13 @@ var WebCall = (() => {
         }
       });
       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 () => {
@@ -18733,19 +18825,19 @@ var WebCall = (() => {
       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) {
@@ -18844,9 +18936,6 @@ var WebCall = (() => {
             }
           });
           this.currentSession = invite;
-          if (this.isOutgoing) {
-            this.isCurrentSessionInvited = false;
-          }
           this.currentSession.stateChange.addListener((state) => {
             switch (state) {
               case SessionState2.Establishing:
@@ -18892,11 +18981,8 @@ var WebCall = (() => {
                     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;
@@ -18931,14 +19017,17 @@ var WebCall = (() => {
           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",
@@ -18951,14 +19040,18 @@ var WebCall = (() => {
               getInviteData
             });
           } else {
+            this.hasInvite = true;
             const reject = () => {
-              this.currentSession.reject();
+              if (this.currentSession?.state !== SessionState2.Terminated && this.currentSession?.state !== SessionState2.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,
@@ -18982,6 +19075,7 @@ var WebCall = (() => {
               version
             });
           }).catch(async (err) => {
+            this.callKit.reset();
             this.callKit.logger.error(err?.message, {
               caller: "Connect.register",
               type: "SIP",
@@ -18989,7 +19083,6 @@ var WebCall = (() => {
                 errCode: ErrorCode.WEBRTC_REGISTER_ERROR
               }
             });
-            this.callKit.reset();
           });
         },
         onDisconnect: (error) => {
@@ -19021,6 +19114,7 @@ var WebCall = (() => {
         that: this
       });
       await this.userAgent.start().catch((err) => {
+        this.callKit.reset();
         this.callKit.logger.error(err, {
           caller: "Connect.register",
           type: "SIP",
@@ -19028,13 +19122,13 @@ var WebCall = (() => {
             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",
@@ -19044,7 +19138,6 @@ var WebCall = (() => {
             delay: this.reconnectConfig.delay
           }
         });
-        this.callKit.reset();
         return;
       }
       this.callKit.logger.info("Reconnect timer started", {
@@ -19058,8 +19151,8 @@ var WebCall = (() => {
       });
       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",
@@ -19104,6 +19197,7 @@ var WebCall = (() => {
         return;
       }
       await this.registerer.unregister({ all: true }).catch((err) => {
+        this.callKit.reset();
         this.callKit.logger.error(err, {
           caller: "Connect.unregister",
           type: "SIP",
@@ -19111,7 +19205,6 @@ var WebCall = (() => {
             errCode: ErrorCode.WEBRTC_CANCEL_REGISTER_ERROR
           }
         });
-        this.callKit.reset();
       });
     }
     async call(callback) {
@@ -19177,18 +19270,24 @@ var WebCall = (() => {
           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 !== SessionState2.Terminated && this.currentSession?.state !== SessionState2.Terminating) {
+                this.currentSession.reject();
+              }
+              this.hasInvite = false;
+            } else {
+              await this.currentSession?.bye();
+            }
           }
         }
         closeStream(this.mediaStream);
@@ -19200,6 +19299,8 @@ var WebCall = (() => {
         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",
@@ -19209,8 +19310,6 @@ var WebCall = (() => {
             isUnprompted
           }
         });
-        this.callKit.trigger(KitEvent.CALL_END, /* @__PURE__ */ new Date());
-        this.callKit.reset();
       }
     }
     /**
@@ -19306,61 +19405,6 @@ var WebCall = (() => {
       });
       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", {
@@ -19504,6 +19548,7 @@ var WebCall = (() => {
       this.handleDisconnect();
     }
     onError(ev) {
+      this.socketError = true;
       this.callKit.logger.error("socket onError", {
         caller: "Socket.onError",
         type: "INCALL",
@@ -19512,7 +19557,6 @@ var WebCall = (() => {
           data: ev
         }
       });
-      this.socketError = true;
     }
     confirmAck(data) {
       const { ack, messageId } = data;
@@ -19524,11 +19568,26 @@ var WebCall = (() => {
     }
     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
         }
       });
@@ -19542,7 +19601,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.START_CONFIRM
           }
         });
@@ -19553,7 +19612,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CALL_SUCCESS
           }
         });
@@ -19563,20 +19622,28 @@ var WebCall = (() => {
           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
           }
         });
@@ -19587,7 +19654,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.AGENT_PICK_UP
           }
         });
@@ -19595,16 +19662,16 @@ var WebCall = (() => {
       }
       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) {
@@ -19612,30 +19679,32 @@ var WebCall = (() => {
           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
           }
         });
@@ -19643,9 +19712,10 @@ var WebCall = (() => {
       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
           }
         });
@@ -19654,26 +19724,40 @@ var WebCall = (() => {
         });
       }
       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);
@@ -19683,6 +19767,7 @@ var WebCall = (() => {
         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",
@@ -19690,10 +19775,9 @@ var WebCall = (() => {
             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", {
@@ -19708,6 +19792,7 @@ var WebCall = (() => {
       const msg = {
         event,
         sessionId,
+        version,
         ...message
       };
       if (SocketSendEvent.CALL === event) {
@@ -19723,8 +19808,7 @@ var WebCall = (() => {
         caller: "Socket.send",
         type: "INCALL",
         content: {
-          event,
-          message
+          ...msg
         }
       });
       switch (event) {
@@ -19737,24 +19821,6 @@ var WebCall = (() => {
           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;
@@ -19769,6 +19835,11 @@ var WebCall = (() => {
       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",
@@ -19776,11 +19847,6 @@ var WebCall = (() => {
             errCode: ErrorCode.SOCKET_PING_TIMEOUT
           }
         });
-        if (this.ws && this.isConnected) {
-          this.ws.close(4001, "ping timeout");
-        } else {
-          this.reset();
-        }
       }
     }
     checkPing() {
@@ -19816,6 +19882,10 @@ var WebCall = (() => {
     }
     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",
@@ -19824,10 +19894,6 @@ var WebCall = (() => {
             reconnectAttempts: this.reconnectAttempts
           }
         });
-        this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
-          event: "INCALL_RECONNECT_ERROR"
-        });
-        this.reset();
         return;
       }
       if (this.reconnectAttempts === 0) {
@@ -20120,9 +20186,16 @@ var WebCall = (() => {
      */
     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() {
@@ -20172,13 +20245,19 @@ var WebCall = (() => {
         }
       });
     }
-    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);
           }
         }
       });