@koi-design/callkit 2.0.0-beta.12 → 2.0.0-beta.15

package/dist/index.d.ts

@@ -189,6 +189,10 @@ declare const KitEvent: {
      * Mute status change
      */
     KIT_SET_MUTE: string;
+    /**
+     * Call id change
+     */
+    KIT_CALL_ID_CHANGE: string;
     /**
      * Error
      */
@@ -346,42 +350,49 @@ type CallStatusType = (typeof CallStatus)[keyof typeof CallStatus];
 declare class Connect {
     callKit: CallKit;
     /**
-     * connectStatus:  init registered connecting calling
+     *@description  Reconnect config
+     */
+    private reconnectConfig;
+    /**
+     *@description  Whether muted
+     */
+    private isMute;
+    /**
+     *@description  Whether registered
+     */
+    private isRegister;
+    /**
+     *@description  Whether holding
+     */
+    private isHold;
+    /**
+     *@description  Connect status:  init registered connecting calling
      */
     connectStatus: number;
     currentSession?: Invitation;
     mediaStream?: MediaStream;
     userAgent?: UserAgent;
     registerer?: Registerer;
-    currentCallId?: string;
     /**
-     * Whether it's a re-connected
+     *@description  Whether it's a re-connected
      */
     isReConnected: boolean;
     observeOptionsHeartbeatHandler: ReturnType<typeof setTimeout> | null;
     /**
-     * Whether it's an outgoing call
+     *@description  Whether it's an outgoing call
      */
     isOutgoing: boolean;
     /**
-     * Whether it's an active hangup
+     *@description  Whether it's an active hangup
      */
     isUnprompted: boolean;
-    isCurrentSessionInvited: boolean;
-    private reconnectConfig;
     /**
-     * Whether muted
+     *@description  Whether the current session is invited
      */
-    private isMute;
-    /**
-     * Whether registered
-     */
-    private isRegister;
-    /**
-     * Whether holding
-     */
-    private isHold;
+    hasInvite: boolean;
     constructor(callKit: CallKit);
+    currentCallId: string | null;
+    setCallId(callId: string | null): void;
     reset(): Promise<void>;
     private getAduioReference;
     permission(): Promise<void>;

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
      */
@@ -18461,43 +18465,47 @@ 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
-     */
-    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();
@@ -18506,15 +18514,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;
@@ -18522,7 +18548,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);
@@ -18845,9 +18871,6 @@ var WebCall = (() => {
             }
           });
           this.currentSession = invite;
-          if (this.isOutgoing) {
-            this.isCurrentSessionInvited = false;
-          }
           this.currentSession.stateChange.addListener((state) => {
             switch (state) {
               case SessionState2.Establishing:
@@ -18893,11 +18916,10 @@ var WebCall = (() => {
                     sessionState: state
                   }
                 });
-                if (this.isUnprompted) {
-                  if (this.isCurrentSessionInvited) {
-                    this.currentSession.reject();
-                  }
-                } else {
+                if (this.hasInvite) {
+                  this.currentSession.reject();
+                  this.hasInvite = false;
+                } else if (!this.isUnprompted) {
                   this.callKit.callCenter.callEnd();
                 }
                 this.isUnprompted = false;
@@ -18932,14 +18954,9 @@ 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);
+            }
           } catch (error) {
             this.callKit.logger.info(error, {
               caller: "Connect.register.onInvite",
@@ -18952,14 +18969,16 @@ var WebCall = (() => {
               getInviteData
             });
           } else {
+            this.hasInvite = true;
             const reject = () => {
               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,
@@ -19178,18 +19197,22 @@ 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) {
+              this.currentSession?.reject();
+              this.hasInvite = false;
+            } else {
+              await this.currentSession?.bye();
+            }
           }
         }
         closeStream(this.mediaStream);
@@ -19307,61 +19330,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", {