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

package/dist/index.js

@@ -145,10 +145,10 @@ var CallStatus = {
    * Connecting
    */
   connecting: 2,
-  /**
-   * Call on hold
-   */
-  holding: 3,
+  // /**
+  //  * Call on hold
+  //  */
+  // holding: 3,
   /**
    * Ringing
    */
@@ -243,7 +243,8 @@ var KitEvent = {
    * User status change
    */
   USER_STATUS_CHANGE: "userStatusChange",
-  CONNECT_EVENT: "CONNECT_EVENT",
+  INCALL_CONNECT_EVENT: "IncallConnectEvent",
+  SIP_CONNECT_EVENT: "sipConnectEvent",
   SIP_REGISTERER_EVENT: "sipRegistererEvent",
   SIP_SESSION_EVENT: "sipSessionEvent"
 };
@@ -365,6 +366,14 @@ var SocketSendEvent = {
    * Unhold
    */
   UNHOLD: "AGENT_UN_HOLD",
+  /**
+   * Mute
+   */
+  MUTE: "AGENT_MUTE",
+  /**
+   * Unmute
+   */
+  UNMUTE: "AGENT_UN_MUTE",
   /**
    * Call
    */
@@ -539,28 +548,58 @@ var Call = class {
       this.callKit.logger.warn("Current state cannot be held", {
         caller: "Call.callHold",
         content: {
+          isHold: this.callKit.connect.isHolding(),
           isCalling: this.callKit.connect.isCalling()
         }
       });
       return;
     }
-    this.callKit.socket.send(SocketSendEvent.HOLD);
-    this.callKit.connect.setConnectStatus(CallStatus.holding);
+    this.callKit.connect.setHold(true);
   }
   async callUnhold() {
     if (!this.callKit.config.check())
       return;
-    if (!this.callKit.connect.isHolding()) {
+    if (!this.callKit.connect.isCalling()) {
       this.callKit.logger.warn("Current state cannot unhold", {
         caller: "Call.callUnhold",
         content: {
-          isHolding: this.callKit.connect.isHolding()
+          isHold: this.callKit.connect.isHolding(),
+          isCalling: this.callKit.connect.isCalling()
+        }
+      });
+      return;
+    }
+    this.callKit.connect.setHold(false);
+  }
+  async callMute() {
+    if (!this.callKit.config.check())
+      return;
+    if (!this.callKit.connect.isCalling()) {
+      this.callKit.logger.warn("Current state cannot be muted", {
+        caller: "Call.callMute",
+        content: {
+          isMuted: this.callKit.connect.isMuted(),
+          isCalling: this.callKit.connect.isCalling()
+        }
+      });
+      return;
+    }
+    this.callKit.connect.setMute(true);
+  }
+  async callUnmute() {
+    if (!this.callKit.config.check())
+      return;
+    if (!this.callKit.connect.isCalling()) {
+      this.callKit.logger.warn("Current state cannot be unmuted", {
+        caller: "Call.callUnmute",
+        content: {
+          isMuted: this.callKit.connect.isMuted(),
+          isCalling: this.callKit.connect.isCalling()
         }
       });
       return;
     }
-    this.callKit.socket.send(SocketSendEvent.UNHOLD);
-    this.callKit.connect.setConnectStatus(CallStatus.calling);
+    this.callKit.connect.setMute(false);
   }
 };
 
@@ -868,6 +907,10 @@ var Connect = class {
    * Whether registered
    */
   isRegister = false;
+  /**
+   * Whether holding
+   */
+  isHold = false;
   constructor(callKit) {
     this.callKit = callKit;
     const { reconnect = {} } = this.callKit.config.getConfig();
@@ -878,12 +921,12 @@ var Connect = class {
   }
   reset() {
     if (this.isHolding()) {
-      this.setHoldStatus(false);
+      this.setHold(false);
     }
     if (this.connectStatus !== CallStatus.init) {
       this.setConnectStatus(CallStatus.init);
     }
-    if (this.isRegistered) {
+    if (this.isRegistered()) {
       this.unregister();
     }
     this.currentSession = void 0;
@@ -953,7 +996,7 @@ var Connect = class {
    * isHolding
    */
   isHolding() {
-    return this.connectStatus === CallStatus.holding;
+    return this.isHold;
   }
   /**
    * isRegistered
@@ -987,7 +1030,7 @@ var Connect = class {
       this.heartbeatFlag -= 1;
       if (this.heartbeatFlag <= 0) {
         this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
-        this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+        this.callKit.trigger(KitEvent.SIP_CONNECT_EVENT, {
           event: "OPTIONS_HEARTBEAT_EXPIRED"
         });
       }
@@ -1168,8 +1211,8 @@ var Connect = class {
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
-            isRegistered: this.isRegistered(),
-            registererState: state
+            registererState: state,
+            isRegistered: this.isRegistered()
           });
           break;
         case import_sip.RegistererState.Unregistered:
@@ -1184,8 +1227,8 @@ var Connect = class {
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
-            isRegistered: this.isRegistered(),
-            registererState: state
+            registererState: state,
+            isRegistered: this.isRegistered()
           });
           break;
         default:
@@ -1276,7 +1319,6 @@ var Connect = class {
         };
         if (this.isOutgoing) {
           this.currentSession.accept(options);
-          this.setConnectStatus(CallStatus.connecting);
           this.callKit.trigger(KitEvent.KIT_OUTGOING_INVITE, {
             getInviteData: () => {
               const { request: request2 } = this.currentSession;
@@ -1640,133 +1682,102 @@ var Connect = class {
       });
     }
   }
-  /**
-   * Update hold
-   * @param hold
-   */
-  setHoldStatus(hold) {
-    this.callKit.logger.info("connect setHold", {
-      caller: "Connect.setHoldStatus",
-      type: "SIP",
-      content: {
-        hold
-      }
-    });
-    this.callKit.trigger(KitEvent.KIT_SET_HOLD, hold);
-  }
   async setHold(hold) {
-    this.setHoldStatus(hold);
-  }
-  async hold() {
-    this.callKit.logger.info("connect hold", {
-      caller: "Connect.hold",
-      type: "SIP",
-      content: {
-        hold: true
-      }
-    });
-    if (this.connectStatus !== CallStatus.calling || !this.currentSession) {
-      this.callKit.logger.error("Current status is not in call", {
-        caller: "Connect.hold",
+    if (this.isHold === hold) {
+      this.callKit.logger.warn("Already holding", {
+        caller: "Connect.setHold",
         type: "SIP",
         content: {
-          errCode: ErrorCode.WEBRTC_HOLE_STATUS_ERROR
+          isHold: this.isHold
         }
       });
+      return;
     }
-  }
-  async unhold() {
-    this.callKit.logger.info("connect unhold", {
-      caller: "Connect.unhold",
+    this.callKit.socket.send(
+      hold ? SocketSendEvent.HOLD : SocketSendEvent.UNHOLD
+    );
+    this.isHold = hold;
+    this.callKit.logger.info("connect setHold", {
+      caller: "Connect.setHold",
       type: "SIP",
       content: {
-        hold: false
+        hold
       }
     });
+    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) {
-    this.callKit.logger.info("connect setMute", {
-      caller: "Connect.setMute",
-      type: "SIP",
-      content: {
-        mute
-      }
-    });
-    if (!this.currentSession) {
-      this.callKit.logger.error("No active session", {
+    if (this.isMute === mute) {
+      this.callKit.logger.warn("Already muted", {
         caller: "Connect.setMute",
         type: "SIP",
         content: {
-          errCode: ErrorCode.WEBRTC_MUTE_STATUS_ERROR
+          isCalling: this.isCalling(),
+          isMuted: this.isMuted()
         }
       });
-      this.callKit.reset();
       return;
     }
-    try {
-      const sdh = this.currentSession.sessionDescriptionHandler;
-      if (!sdh || !("peerConnection" in sdh)) {
-        throw new Error("Invalid session description handler");
-      }
-      const pc = sdh.peerConnection;
-      const audioSender = pc.getSenders().find((sender) => sender.track?.kind === "audio");
-      if (audioSender && audioSender.track) {
-        audioSender.track.enabled = !mute;
-        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 mute() {
-    this.callKit.logger.info("connect mute", {
-      caller: "Connect.mute",
-      type: "SIP",
-      content: {
-        mute: true
-      }
-    });
-    if (this.connectStatus !== CallStatus.calling || !this.currentSession) {
-      this.callKit.logger.warn("Current status is not in call", {
-        caller: "Connect.mute",
-        type: "SIP",
-        content: {
-          errCode: ErrorCode.WEBRTC_MUTE_STATUS_ERROR
-        }
-      });
-      return;
-    }
-    await this.setMute(true);
-  }
-  async unmute() {
-    this.callKit.logger.info("connect unmute", {
-      caller: "Connect.unmute",
-      type: "SIP",
-      content: {
-        mute: false
-      }
-    });
-    if (this.connectStatus !== CallStatus.calling || !this.currentSession) {
-      this.callKit.logger.warn("Current status is not in call", {
-        caller: "Connect.unmute",
-        type: "SIP",
-        content: {
-          errCode: ErrorCode.WEBRTC_MUTE_STATUS_ERROR
-        }
-      });
-      return;
-    }
-    await this.setMute(false);
+    this.callKit.socket.send(
+      mute ? SocketSendEvent.MUTE : SocketSendEvent.UNMUTE
+    );
+    this.isMute = mute;
+    this.callKit.trigger(KitEvent.KIT_SET_MUTE, mute);
   }
   async refer(referTo, extra) {
     this.callKit.logger.info("connect refer", {
@@ -1788,7 +1799,7 @@ var Connect = class {
 // package/socket.ts
 var RECONNECT_CONFIG = {
   enabled: true,
-  maxAttempts: 1,
+  maxAttempts: 3,
   delay: 500,
   backoffMultiplier: 1.5,
   pingInterval: 3e4,
@@ -1806,6 +1817,7 @@ var Socket = class {
   reconnectTimer;
   isReconnecting = false;
   reconnectAttempts = 0;
+  socketError = false;
   constructor(callKit) {
     this.callKit = callKit;
     const { reconnect } = this.callKit.config.getConfig();
@@ -1829,7 +1841,7 @@ var Socket = class {
     this.isConnected = false;
     if (!this.callKit.config.isLogin() || !this.socketConfig.enabled) {
       this.reset();
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_NOT_CONNECTED"
       });
       return;
@@ -1849,6 +1861,7 @@ var Socket = class {
       type: "INCALL",
       content: { ev }
     });
+    this.socketError = false;
     this.isConnected = true;
     this.lastPingTime = Date.now();
     this.checkPing();
@@ -1861,7 +1874,7 @@ var Socket = class {
           reconnectAttempts: this.reconnectAttempts
         }
       });
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_RECONNECT_SUCCESS"
       });
     }
@@ -1881,10 +1894,13 @@ var Socket = class {
       type: "INCALL",
       content: { ev }
     });
-    this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+    this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
       event: "INCALL_CONNECT_ERROR",
       err: ev
     });
+    if (this.socketError) {
+      return;
+    }
     this.handleDisconnect();
   }
   onError(ev) {
@@ -1896,6 +1912,7 @@ var Socket = class {
         data: ev
       }
     });
+    this.socketError = true;
   }
   confirmAck(data) {
     const { ack, messageId } = data;
@@ -2053,7 +2070,7 @@ var Socket = class {
   }
   send(event, message) {
     if (!this.isConnected) {
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_NOT_CONNECTED"
       });
       this.callKit.logger.error("socket not connected", {
@@ -2112,7 +2129,7 @@ var Socket = class {
   }
   async sendMessage(event, message) {
     if (!this.isConnected) {
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_NOT_CONNECTED"
       });
       this.callKit.logger.error("socket not connected", {
@@ -2166,8 +2183,7 @@ var Socket = class {
     }, this.socketConfig.pingInterval);
   }
   /**
-   * 重置 socket 连接和所有状态
-   * @param isWaitConfirm Whether need to wait for close confirmation
+   * reset socket connection and all states
    */
   async reset() {
     if (this.pingTimer) {
@@ -2177,6 +2193,7 @@ var Socket = class {
     this.resetReconnectState();
     this.lastPingTime = void 0;
     this.satrtConfirm = false;
+    this.socketError = false;
     if (this.ws && this.isConnected) {
       this.callKit.logger.info("Closing socket connection", {
         caller: "Socket.reset",
@@ -2197,14 +2214,14 @@ var Socket = class {
           reconnectAttempts: this.reconnectAttempts
         }
       });
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_RECONNECT_ERROR"
       });
       this.reset();
       return;
     }
     if (this.reconnectAttempts === 0) {
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_RECONNECT_START"
       });
     }
@@ -2466,6 +2483,28 @@ var CallKit = class {
     });
     this.callCenter.callUnhold();
   }
+  mute() {
+    if (!this.config.check())
+      return;
+    this.logger.info("mute", {
+      caller: "CallKit.mute",
+      content: {
+        connectStatus: this.connect.connectStatus
+      }
+    });
+    this.callCenter.callMute();
+  }
+  unmute() {
+    if (!this.config.check())
+      return;
+    this.logger.info("unmute", {
+      caller: "CallKit.unmute",
+      content: {
+        connectStatus: this.connect.connectStatus
+      }
+    });
+    this.callCenter.callUnmute();
+  }
   /**
    * set userstatus
    * @param status