@koi-design/callkit 2.1.0-beta.2 → 2.1.0-beta.3

package/dist/index.js

@@ -318,7 +318,15 @@ var KitEvent = {
   INCALL_CONNECT_EVENT: "IncallConnectEvent",
   SIP_CONNECT_EVENT: "sipConnectEvent",
   SIP_REGISTERER_EVENT: "sipRegistererEvent",
-  SIP_SESSION_EVENT: "sipSessionEvent"
+  SIP_SESSION_EVENT: "sipSessionEvent",
+  /**
+   * Refering change
+   */
+  KIT_REFERING_CHANGE: "referingChange",
+  /**
+   * In call refering change
+   */
+  KIT_IN_CALL_REFERING_CHANGE: "inCallReferingChange"
 };
 var ErrorCode = {
   /**
@@ -705,7 +713,7 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.1.0-beta.2",
+  version: "2.1.0-beta.3",
   description: "callkit",
   author: "koi",
   license: "ISC",
@@ -1094,7 +1102,11 @@ var Connect = class {
   /**
    *@description  Whether it's a referring
    */
-  isRefering = false;
+  _isRefering = false;
+  /**
+   *@description  Whether it's in call refering dealwith disconnect recovery
+   */
+  _isInCallRefering = false;
   // sipConnected = false;
   /**
    *@description  Whether it's an outgoing call
@@ -1119,8 +1131,30 @@ var Connect = class {
   getCurrentCallId() {
     return this.currentCallId;
   }
+  /**
+   *@description  Whether the SIP socket is error
+   */
+  _isError = false;
+  get isError() {
+    return this._isError;
+  }
+  /**
+   *@description  Set whether it's in call refering dealwith disconnect recovery
+   */
+  setInCallRefering(refering) {
+    if (this._isInCallRefering === refering)
+      return;
+    this.callKit.logger.info("setIsInCallRefering", {
+      caller: "Connect.setIsInCallRefering",
+      content: {
+        refering
+      }
+    });
+    this._isInCallRefering = refering;
+    this.callKit.trigger(KitEvent.KIT_IN_CALL_REFERING_CHANGE);
+  }
   setRefering(refering) {
-    if (this.isRefering === refering)
+    if (this._isRefering === refering)
       return;
     this.callKit.logger.info("setRefering", {
       caller: "Connect.setRefering",
@@ -1128,7 +1162,8 @@ var Connect = class {
         refering
       }
     });
-    this.isRefering = refering;
+    this._isRefering = refering;
+    this.callKit.trigger(KitEvent.KIT_REFERING_CHANGE);
   }
   setIsReConnected(isReConnected) {
     if (this.isReConnected === isReConnected)
@@ -1162,13 +1197,19 @@ var Connect = class {
     this.currentCallId = callId;
     this.callKit.trigger(KitEvent.KIT_CALL_ID_CHANGE, callId);
   }
-  async reset() {
+  async reset({ force = false } = { force: false }) {
     this.setOutgoing(false);
     this.isUnprompted = false;
     this.hasInvite = false;
-    if (this.isRefering) {
+    if (force) {
+      this._isError = false;
+    }
+    if (this._isRefering) {
       this.setRefering(false);
     }
+    if (this._isInCallRefering) {
+      this.setInCallRefering(false);
+    }
     if (this.isReConnected) {
       this.setIsReConnected(false);
     }
@@ -1264,6 +1305,18 @@ var Connect = class {
   isMuted() {
     return this.isMute;
   }
+  /**
+   * isRefering
+   */
+  isRefering() {
+    return this._isRefering;
+  }
+  /**
+   * isInCallRefering
+   */
+  isInCallRefering() {
+    return this._isInCallRefering;
+  }
   /**
    * Call ended, call not started
    * @returns
@@ -1313,7 +1366,9 @@ var Connect = class {
             }
           });
           this.setRegister(false);
-          this.setConnectStatus(CallStatus.init);
+          if (!this.isInCallRefering()) {
+            this.setConnectStatus(CallStatus.init);
+          }
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -1344,7 +1399,7 @@ var Connect = class {
                   }
                 }
               );
-              this.refer(selfUri).catch((err) => {
+              this.referInCall(selfUri).catch((err) => {
                 this.callKit.logger.error(err, {
                   caller: "Connect.setupRegisterer.registererStateChange",
                   type: "SIP",
@@ -1382,14 +1437,18 @@ var Connect = class {
             type: "SIP",
             content: {
               registererState: state,
-              isRegistered: this.isRegistered()
+              isRegistered: this.isRegistered(),
+              isInCallRefering: this.isInCallRefering()
             }
           });
           this.setRegister(false);
-          this.setConnectStatus(CallStatus.init);
+          if (!this.isInCallRefering()) {
+            this.setConnectStatus(CallStatus.init);
+          }
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
-            isRegistered: this.isRegistered()
+            isRegistered: this.isRegistered(),
+            isInCallRefering: this.isInCallRefering()
           });
           break;
         case import_sip.RegistererState.Unregistered:
@@ -1398,14 +1457,18 @@ var Connect = class {
             type: "SIP",
             content: {
               isRegistered: this.isRegistered(),
-              registererState: state
+              registererState: state,
+              isInCallRefering: this.isInCallRefering()
             }
           });
           this.setRegister(false);
-          this.setConnectStatus(CallStatus.init);
+          if (!this.isInCallRefering()) {
+            this.setConnectStatus(CallStatus.init);
+          }
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
-            isRegistered: this.isRegistered()
+            isRegistered: this.isRegistered(),
+            isInCallRefering: this.isInCallRefering()
           });
           break;
         default:
@@ -1572,14 +1635,17 @@ var Connect = class {
                 caller: "Connect.register.onInvite",
                 type: "SIP",
                 content: {
-                  sessionState: state
+                  sessionState: state,
+                  isInCallRefering: this.isInCallRefering()
                 }
               });
-              this.setConnectStatus(CallStatus.ringing);
-              this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
-                sessionState: state,
-                isRegistered: this.isRegistered()
-              });
+              if (!this.isInCallRefering()) {
+                this.setConnectStatus(CallStatus.ringing);
+                this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
+                  sessionState: state,
+                  isRegistered: this.isRegistered()
+                });
+              }
               break;
             case import_sip.SessionState.Established:
               this.callKit.logger.info("connect Established", {
@@ -1589,17 +1655,20 @@ var Connect = class {
                   sessionState: state
                 }
               });
-              this.callKit.connect.setConnectStatus(CallStatus.calling);
-              this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
-                sessionState: state,
-                isRegistered: this.isRegistered()
-              });
+              if (!this.isInCallRefering()) {
+                this.callKit.connect.setConnectStatus(CallStatus.calling);
+                this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
+                  sessionState: state,
+                  isRegistered: this.isRegistered()
+                });
+              }
               setupRemoteMedia(this.currentSession);
               break;
             case import_sip.SessionState.Terminating:
               this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
                 sessionState: state,
-                isRegistered: this.isRegistered()
+                isRegistered: this.isRegistered(),
+                isInCallRefering: this.isInCallRefering()
               });
               break;
             case import_sip.SessionState.Terminated:
@@ -1607,7 +1676,8 @@ var Connect = class {
                 caller: "Connect.register.onInvite",
                 type: "SIP",
                 content: {
-                  sessionState: state
+                  sessionState: state,
+                  isInCallRefering: this.isInCallRefering()
                 }
               });
               this.hasInvite = false;
@@ -1617,7 +1687,8 @@ var Connect = class {
               this.isUnprompted = false;
               this.callKit.trigger(KitEvent.SIP_SESSION_EVENT, {
                 sessionState: state,
-                isRegistered: this.isRegistered()
+                isRegistered: this.isRegistered(),
+                isInCallRefering: this.isInCallRefering()
               });
               break;
             default:
@@ -1667,9 +1738,9 @@ var Connect = class {
             }
           });
         }
-        if (this.isRefering) {
+        if (this.isInCallRefering()) {
           this.currentSession.accept(options);
-          this.setRefering(false);
+          this.setInCallRefering(false);
           return;
         }
         if (this.isOutgoing) {
@@ -1756,7 +1827,10 @@ var Connect = class {
   reconnectTimer;
   reconnectAttempts = 0;
   startReconnectTimer() {
+    if (this._isError)
+      return;
     if (this.reconnectAttempts >= this.reconnectConfig.maxAttempts && this.callKit.config.isLogin()) {
+      this._isError = true;
       this.callKit.reset();
       this.callKit.logger.error("Reconnect failed max attempts", {
         caller: "Connect.startReconnectTimer",
@@ -1779,10 +1853,10 @@ var Connect = class {
       }
     });
     this.reconnectAttempts += 1;
+    this.setIsReConnected(true);
     this.reconnectTimer = setTimeout(() => {
       if (this.reconnectTimer && this.callKit.config.isLogin()) {
         this.userAgent?.reconnect();
-        this.setIsReConnected(true);
         this.callKit.logger.info("Reconnect attempt", {
           caller: "Connect.startReconnectTimer",
           type: "SIP",
@@ -2095,6 +2169,35 @@ var Connect = class {
     }
     this.currentSession.refer(target, extra?.sessionReferOptions);
   }
+  async referInCall(referTo, extra) {
+    if (!this.currentSession) {
+      const errorMsg = "Cannot refer in call: currentSession is not available";
+      this.callKit.logger.warn(errorMsg, {
+        caller: "Connect.referInCall",
+        type: "SIP",
+        content: {
+          errCode: ErrorCode.WEBRTC_CALL_INVITE_ERROR,
+          referTo
+        }
+      });
+      return;
+    }
+    this.setInCallRefering(true);
+    this.callKit.logger.info("connect referInCall", {
+      caller: "Connect.referInCall",
+      type: "SIP",
+      content: {
+        referTo,
+        extra,
+        sessionState: this.currentSession.state
+      }
+    });
+    let target;
+    if (referTo) {
+      target = import_sip.UserAgent.makeURI(referTo);
+    }
+    this.currentSession.refer(target, extra?.sessionReferOptions);
+  }
 };
 
 // core/socket.ts
@@ -2402,14 +2505,10 @@ var Socket = class {
         this.callKit.connect.socketTriggerHangup(callUuid);
       }
     }
-    this.callKit.trigger(
-      KitEvent.SERVER_SOCKET_EVENT,
-      {
-        ...data,
-        callUuid
-      },
-      true
-    );
+    this.callKit.trigger(KitEvent.SERVER_SOCKET_EVENT, {
+      ...data,
+      callUuid
+    });
   }
   send(event, message) {
     if (!this.connectAuthState.isConnected) {
@@ -2644,7 +2743,7 @@ var CallKit = class {
         encryptionPassword
       }
     });
-    if (this.socket.isError) {
+    if (this.socket.isError || this.connect.isError) {
       this.logger.warn("socket is error", {
         caller: "CallKit.login",
         content: { username, password, extra, socketError: this.socket.isError }
@@ -2882,7 +2981,7 @@ var CallKit = class {
     if (this.connect.isCalling()) {
       await this.hangup();
     }
-    await this.connect.reset();
+    await this.connect.reset({ force });
     if (this.config.isLogin()) {
       await this.logout({ isReset: false });
     } else {