@koi-design/callkit 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/index.js

@@ -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"
 };
@@ -568,7 +569,7 @@ var Call = class {
       });
       return;
     }
-    this.callKit.connect.setHold(true);
+    this.callKit.connect.setHold(false);
   }
   async callMute() {
     if (!this.callKit.config.check())
@@ -837,6 +838,23 @@ var Logger = class {
 
 // package/connect.ts
 var import_sip = require("sip.js");
+
+// package/utils.ts
+var formatGetInviteData = (inviteData) => {
+  const extendInfoStr = inviteData["x-antaios-manual-extend_info"] || inviteData["x-antaios-manual-extend-info"];
+  let extendInfoObj = null;
+  try {
+    if (extendInfoStr && typeof extendInfoStr === "string") {
+      const cleanedStr = extendInfoStr.replace(/\\/g, "");
+      extendInfoObj = JSON.parse(cleanedStr);
+      return extendInfoObj;
+    }
+  } catch (error) {
+    return {};
+  }
+};
+
+// package/connect.ts
 var DEFAULT_RECONNECT_CONFIG = {
   maxAttempts: 3,
   delay: 500
@@ -925,7 +943,7 @@ var Connect = class {
     if (this.connectStatus !== CallStatus.init) {
       this.setConnectStatus(CallStatus.init);
     }
-    if (this.isRegistered) {
+    if (this.isRegistered()) {
       this.unregister();
     }
     this.currentSession = void 0;
@@ -934,6 +952,7 @@ var Connect = class {
     this.registerer = void 0;
     this.isOutgoing = false;
     this.isUnprompted = false;
+    this.currentCallId = void 0;
     if (this.mediaStream) {
       try {
         closeStream(this.mediaStream);
@@ -1029,12 +1048,24 @@ 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"
         });
       }
     }, 1e3);
   }
+  socketTriggerHangup(callId) {
+    if (!this.isCalling() || callId !== this.currentCallId)
+      return;
+    this.callKit.logger.info("socketHangup trigger hangup", {
+      caller: "Connect.socketHangup",
+      content: {
+        callId,
+        currentCallId: this.currentCallId
+      }
+    });
+    this.callKit.hangup();
+  }
   async register() {
     if (this.connectStatus !== CallStatus.init) {
       if (this.isRegistered()) {
@@ -1193,6 +1224,10 @@ var Connect = class {
             }
           });
           this.setRegister(true);
+          this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
+            registererState: state,
+            isRegistered: this.isRegistered()
+          });
           break;
         case import_sip.RegistererState.Terminated:
           this.callKit.logger.info("registerer stateChange Terminated", {
@@ -1205,6 +1240,10 @@ var Connect = class {
           });
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
+          this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
+            registererState: state,
+            isRegistered: this.isRegistered()
+          });
           break;
         case import_sip.RegistererState.Unregistered:
           this.callKit.logger.info("registerer stateChange Unregistered", {
@@ -1217,6 +1256,10 @@ var Connect = class {
           });
           this.setRegister(false);
           this.setConnectStatus(CallStatus.init);
+          this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
+            registererState: state,
+            isRegistered: this.isRegistered()
+          });
           break;
         default:
           break;
@@ -1304,25 +1347,40 @@ var Connect = class {
             alwaysAcquireMediaFirst: true
           }
         };
+        const getInviteData = () => {
+          const { request: request2 } = this.currentSession;
+          const headerNames = Object.keys(request2.headers);
+          const xHeaders = {};
+          headerNames.filter((name) => name.toLocaleLowerCase().startsWith("x-antaios")).forEach((name) => {
+            xHeaders[name.toLocaleLowerCase()] = request2.getHeader(name);
+          });
+          this.callKit.logger.info("get invite data", {
+            caller: "Connect.register.onInvite",
+            content: xHeaders
+          });
+          return xHeaders;
+        };
+        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
+            }
+          });
+        } catch (error) {
+          this.callKit.logger.info(error, {
+            caller: "Connect.register.onInvite",
+            content: info
+          });
+        }
         if (this.isOutgoing) {
           this.currentSession.accept(options);
-          this.setConnectStatus(CallStatus.connecting);
           this.callKit.trigger(KitEvent.KIT_OUTGOING_INVITE, {
-            getInviteData: () => {
-              const { request: request2 } = this.currentSession;
-              const headerNames = Object.keys(request2.headers);
-              const xHeaders = {};
-              headerNames.filter(
-                (name) => name.toLocaleLowerCase().startsWith("x-antaios")
-              ).forEach((name) => {
-                xHeaders[name.toLocaleLowerCase()] = request2.getHeader(name);
-              });
-              this.callKit.logger.info("get invite data", {
-                caller: "Connect.register.onInvite",
-                content: xHeaders
-              });
-              return xHeaders;
-            }
+            getInviteData
           });
         } else {
           const reject = () => {
@@ -1336,21 +1394,7 @@ var Connect = class {
               this.currentSession.accept(options);
             },
             reject,
-            getInviteData: () => {
-              const { request: request2 } = this.currentSession;
-              const headerNames = Object.keys(request2.headers);
-              const xHeaders = {};
-              headerNames.filter(
-                (name) => name.toLocaleLowerCase().startsWith("x-antaios")
-              ).forEach((name) => {
-                xHeaders[name.toLocaleLowerCase()] = request2.getHeader(name);
-              });
-              this.callKit.logger.info("get invite data", {
-                caller: "Connect.register",
-                content: xHeaders
-              });
-              return xHeaders;
-            }
+            getInviteData
           });
         }
       },
@@ -1787,7 +1831,7 @@ var Connect = class {
 // package/socket.ts
 var RECONNECT_CONFIG = {
   enabled: true,
-  maxAttempts: 1,
+  maxAttempts: 3,
   delay: 500,
   backoffMultiplier: 1.5,
   pingInterval: 3e4,
@@ -1805,6 +1849,7 @@ var Socket = class {
   reconnectTimer;
   isReconnecting = false;
   reconnectAttempts = 0;
+  socketError = false;
   constructor(callKit) {
     this.callKit = callKit;
     const { reconnect } = this.callKit.config.getConfig();
@@ -1828,7 +1873,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;
@@ -1848,6 +1893,7 @@ var Socket = class {
       type: "INCALL",
       content: { ev }
     });
+    this.socketError = false;
     this.isConnected = true;
     this.lastPingTime = Date.now();
     this.checkPing();
@@ -1860,7 +1906,7 @@ var Socket = class {
           reconnectAttempts: this.reconnectAttempts
         }
       });
-      this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_RECONNECT_SUCCESS"
       });
     }
@@ -1880,10 +1926,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) {
@@ -1895,6 +1944,7 @@ var Socket = class {
         data: ev
       }
     });
+    this.socketError = true;
   }
   confirmAck(data) {
     const { ack, messageId } = data;
@@ -1985,6 +2035,9 @@ var Socket = class {
         }
       });
       this.callKit.trigger(KitEvent.CALL_HANG_UP, /* @__PURE__ */ new Date());
+      if (data.data?.callUuid) {
+        this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+      }
     }
     if (data.event === SocketReceiveEvent.CUSTOMER_NO_ANSWER) {
       this.callKit.logger.info(data.msg, {
@@ -1996,6 +2049,9 @@ var Socket = class {
         }
       });
       this.callKit.trigger(KitEvent.CALL_NO_ANSWER);
+      if (data.data?.callUuid) {
+        this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+      }
     }
     if (data.event === SocketReceiveEvent.CALL_CDR) {
       this.callKit.logger.info(data.msg, {
@@ -2047,12 +2103,15 @@ var Socket = class {
           event: SocketReceiveEvent.AGENT_NO_ANSWER
         }
       });
+      if (data.data?.callUuid) {
+        this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+      }
     }
     this.callKit.trigger(KitEvent.SERVER_SOCKET_EVENT, data);
   }
   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", {
@@ -2111,7 +2170,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", {
@@ -2165,8 +2224,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) {
@@ -2176,6 +2234,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",
@@ -2196,14 +2255,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"
       });
     }