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

package/dist/index.d.ts

@@ -142,7 +142,8 @@ declare const KitEvent: {
      * User status change
      */
     USER_STATUS_CHANGE: string;
-    CONNECT_EVENT: string;
+    INCALL_CONNECT_EVENT: string;
+    SIP_CONNECT_EVENT: string;
     SIP_REGISTERER_EVENT: string;
     SIP_SESSION_EVENT: string;
 };
@@ -255,6 +256,7 @@ declare class Socket {
     private reconnectTimer?;
     private isReconnecting;
     private reconnectAttempts;
+    private socketError;
     constructor(callKit: CallKit);
     init(): void;
     private handleDisconnect;
@@ -270,8 +272,7 @@ declare class Socket {
     private ping;
     private checkPing;
     /**
-     * 重置 socket 连接和所有状态
-     * @param isWaitConfirm Whether need to wait for close confirmation
+     * reset socket connection and all states
      */
     reset(): Promise<void>;
     private attemptReconnect;
@@ -404,6 +405,7 @@ declare class Connect {
     clearObserveOptionsHeartbeatInterval(): void;
     heartbeatFlag: number;
     startHeartbeat(): void;
+    socketTriggerHangup(callId: string): void;
     register(): Promise<void>;
     private reconnectTimer?;
     private reconnectAttempts;

package/dist/index.global.js

@@ -3408,7 +3408,8 @@ var WebCall = (() => {
      * 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"
   };
@@ -3733,7 +3734,7 @@ var WebCall = (() => {
         });
         return;
       }
-      this.callKit.connect.setHold(true);
+      this.callKit.connect.setHold(false);
     }
     async callMute() {
       if (!this.callKit.config.check())
@@ -18401,6 +18402,21 @@ var WebCall = (() => {
     }
   };
 
+  // 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,
@@ -18490,7 +18506,7 @@ var WebCall = (() => {
       if (this.connectStatus !== CallStatus.init) {
         this.setConnectStatus(CallStatus.init);
       }
-      if (this.isRegistered) {
+      if (this.isRegistered()) {
         this.unregister();
       }
       this.currentSession = void 0;
@@ -18499,6 +18515,7 @@ var WebCall = (() => {
       this.registerer = void 0;
       this.isOutgoing = false;
       this.isUnprompted = false;
+      this.currentCallId = void 0;
       if (this.mediaStream) {
         try {
           closeStream(this.mediaStream);
@@ -18594,12 +18611,24 @@ var WebCall = (() => {
         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()) {
@@ -18758,6 +18787,10 @@ var WebCall = (() => {
               }
             });
             this.setRegister(true);
+            this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
+              registererState: state,
+              isRegistered: this.isRegistered()
+            });
             break;
           case RegistererState.Terminated:
             this.callKit.logger.info("registerer stateChange Terminated", {
@@ -18770,6 +18803,10 @@ var WebCall = (() => {
             });
             this.setRegister(false);
             this.setConnectStatus(CallStatus.init);
+            this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
+              registererState: state,
+              isRegistered: this.isRegistered()
+            });
             break;
           case RegistererState.Unregistered:
             this.callKit.logger.info("registerer stateChange Unregistered", {
@@ -18782,6 +18819,10 @@ var WebCall = (() => {
             });
             this.setRegister(false);
             this.setConnectStatus(CallStatus.init);
+            this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
+              registererState: state,
+              isRegistered: this.isRegistered()
+            });
             break;
           default:
             break;
@@ -18869,25 +18910,40 @@ var WebCall = (() => {
               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 = () => {
@@ -18901,21 +18957,7 @@ var WebCall = (() => {
                 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
             });
           }
         },
@@ -19352,7 +19394,7 @@ var WebCall = (() => {
   // package/socket.ts
   var RECONNECT_CONFIG = {
     enabled: true,
-    maxAttempts: 1,
+    maxAttempts: 3,
     delay: 500,
     backoffMultiplier: 1.5,
     pingInterval: 3e4,
@@ -19370,6 +19412,7 @@ var WebCall = (() => {
     reconnectTimer;
     isReconnecting = false;
     reconnectAttempts = 0;
+    socketError = false;
     constructor(callKit) {
       this.callKit = callKit;
       const { reconnect } = this.callKit.config.getConfig();
@@ -19393,7 +19436,7 @@ var WebCall = (() => {
       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;
@@ -19413,6 +19456,7 @@ var WebCall = (() => {
         type: "INCALL",
         content: { ev }
       });
+      this.socketError = false;
       this.isConnected = true;
       this.lastPingTime = Date.now();
       this.checkPing();
@@ -19425,7 +19469,7 @@ var WebCall = (() => {
             reconnectAttempts: this.reconnectAttempts
           }
         });
-        this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+        this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
           event: "INCALL_RECONNECT_SUCCESS"
         });
       }
@@ -19445,10 +19489,13 @@ var WebCall = (() => {
         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) {
@@ -19460,6 +19507,7 @@ var WebCall = (() => {
           data: ev
         }
       });
+      this.socketError = true;
     }
     confirmAck(data) {
       const { ack, messageId } = data;
@@ -19550,6 +19598,9 @@ var WebCall = (() => {
           }
         });
         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, {
@@ -19561,6 +19612,9 @@ var WebCall = (() => {
           }
         });
         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, {
@@ -19612,12 +19666,15 @@ var WebCall = (() => {
             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", {
@@ -19676,7 +19733,7 @@ var WebCall = (() => {
     }
     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", {
@@ -19730,8 +19787,7 @@ var WebCall = (() => {
       }, this.socketConfig.pingInterval);
     }
     /**
-     * 重置 socket 连接和所有状态
-     * @param isWaitConfirm Whether need to wait for close confirmation
+     * reset socket connection and all states
      */
     async reset() {
       if (this.pingTimer) {
@@ -19741,6 +19797,7 @@ var WebCall = (() => {
       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",
@@ -19761,14 +19818,14 @@ var WebCall = (() => {
             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"
         });
       }