@koi-design/callkit 1.0.24-beta.17 → 1.0.24-beta.19

package/dist/index.d.ts

@@ -179,6 +179,10 @@ declare const SocketSendEvent: {
      * AGENT_TRANSFER
      */
     AGENT_TRANSFER: string;
+    /**
+     * AGENT_TRANSFER
+     */
+    HANG_UP_REASON: string;
 };
 declare const EncryptionMethod: {
     NONE: string;
@@ -451,7 +455,6 @@ declare class CallKit {
     connect: Connect;
     socket: Socket;
     user: User;
-    reconnect?: SocketConfig;
     listener: Listener[];
     constructor(options: ConfigEntity);
     login(username: string, password: string, extra?: {

package/dist/index.global.js

@@ -3510,7 +3510,11 @@ var WebCall = (() => {
     /**
      * AGENT_TRANSFER
      */
-    AGENT_TRANSFER: "AGENT_TRANSFER"
+    AGENT_TRANSFER: "AGENT_TRANSFER",
+    /**
+     * AGENT_TRANSFER
+     */
+    HANG_UP_REASON: "HANG_UP_REASON"
   };
   var SocketReceiveEvent = {
     /**
@@ -3592,8 +3596,10 @@ var WebCall = (() => {
   var ConnectEvent = {
     SIP_CONNECT_ERROR: "SIP_CONNECT_ERROR",
     SIP_RECONNECT_ERROR: "SIP_RECONNECT_ERROR",
+    SIP_RECONNECT_SUCCESS: "SIP_RECONNECT_SUCCESS",
     INCALL_CONNECT_ERROR: "INCALL_CONNECT_ERROR",
     INCALL_RECONNECT_ERROR: "INCALL_RECONNECT_ERROR",
+    INCALL_RECONNECT_SUCCESS: "INCALL_RECONNECT_SUCCESS",
     OPTIONS_HEARTBEAT_EXPIRED: "OPTIONS_HEARTBEAT_EXPIRED",
     USER_AGENT_START_ERROR: "USER_AGENT_START_ERROR"
   };
@@ -18472,8 +18478,27 @@ var WebCall = (() => {
           });
         }
       };
-      const observeOptionsHeartbeat = (userAgent, extra) => {
+      const observeSocketStatus = (userAgent, extra) => {
         const { that = this } = extra;
+        that.userAgent.transport.onDisconnect = (error) => {
+          if (error) {
+            that.callKit.logger.debug("connect onDisconnect");
+            if (that.isRegistered() && !(that.sipConnected || that.isRinging() || that.isCalling() || that.isHolding())) {
+              that.reconnect();
+            } else {
+              const data = {
+                kitEvent: ConnectEvent.SIP_CONNECT_ERROR,
+                err: error
+              };
+              that.callKit.logger.debug("SIP WebSocket closed with error", data);
+              that.callKit.trigger(KitEvent.CONNECT_EVENT, data);
+              that.callKit.user.sendHangUpReason(data);
+              that.callKit.callCenter.callEnd();
+            }
+          } else {
+            that.callKit.logger.debug("SIP WebSocket closed normally");
+          }
+        };
         that.clearObserveOptionsHeartbeatInterval();
         setInterval(() => {
           if (that.lastOptionsUpdateTime !== 0) {
@@ -18481,7 +18506,7 @@ var WebCall = (() => {
             const diff = now - that.lastOptionsUpdateTime;
             if (diff > 6e4) {
               const data = {
-                event: ConnectEvent.OPTIONS_HEARTBEAT_EXPIRED,
+                kitEvent: ConnectEvent.OPTIONS_HEARTBEAT_EXPIRED,
                 lastOptionsUpdateTime: that.lastOptionsUpdateTime,
                 now
               };
@@ -18584,12 +18609,14 @@ var WebCall = (() => {
           if (this.isRegistered() && !(this.sipConnected || this.isRinging() || this.isCalling() || this.isHolding())) {
             this.reconnect();
           } else {
-            const data = {
+            this.callKit.trigger(KitEvent.CONNECT_EVENT, {
               event: ConnectEvent.SIP_CONNECT_ERROR,
               err: error
-            };
-            this.callKit.trigger(KitEvent.CONNECT_EVENT, data);
-            this.callKit.user.sendHangUpReason(data);
+            });
+            this.callKit.user.sendHangUpReason({
+              eventType: ConnectEvent.SIP_RECONNECT_ERROR,
+              err: error
+            });
             this.callKit.callCenter.callEnd();
           }
         },
@@ -18611,16 +18638,15 @@ var WebCall = (() => {
         //   });
         // }
       };
-      observeOptionsHeartbeat(this.userAgent, {
+      observeSocketStatus(this.userAgent, {
         that: this
       });
       await this.userAgent.start().catch((err) => {
         this.callKit.callCenter.callEnd(false, true);
-        const data = {
-          event: ConnectEvent.USER_AGENT_START_ERROR,
+        this.callKit.user.sendHangUpReason({
+          eventType: ConnectEvent.USER_AGENT_START_ERROR,
           err
-        };
-        this.callKit.user.sendHangUpReason(data);
+        });
         this.callKit.logger.error(err, {
           errCode: ErrorCode.WEBRTC_USER_AGENT_ERROR
         });
@@ -18639,25 +18665,31 @@ var WebCall = (() => {
         reconnectTimer = setTimeout(async () => {
           try {
             currentRetry += 1;
-            console.log(
+            this.callKit.logger.debug(
               `Attempting to reconnect SIP... (Attempt ${currentRetry}/${this.reconnectConfig.maxAttempts})`
             );
             await this.unregister();
             await this.stop();
             await this.register();
-            console.log("Reconnection successful");
+            this.callKit.logger.debug("Reconnection successful");
+            this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+              event: ConnectEvent.SIP_RECONNECT_SUCCESS
+            });
             reconnectTimer = null;
           } catch (err) {
-            console.error("Reconnection failed:", err);
+            this.callKit.logger.debug("Reconnection failed:", err);
             reconnectTimer = null;
             if (currentRetry < this.reconnectConfig.maxAttempts) {
               await scheduleReconnect();
             } else {
-              const data = {
-                event: ConnectEvent.SIP_RECONNECT_ERROR
-              };
-              this.callKit.trigger(KitEvent.CONNECT_EVENT, data);
-              this.callKit.user.sendHangUpReason(data);
+              this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+                event: ConnectEvent.SIP_RECONNECT_ERROR,
+                error: err
+              });
+              this.callKit.user.sendHangUpReason({
+                eventType: ConnectEvent.SIP_RECONNECT_ERROR,
+                error: err
+              });
               this.callKit.logger.error("No registerer to unregister.");
             }
           }
@@ -19177,10 +19209,17 @@ var WebCall = (() => {
         `Preparing reconnection attempt ${this.reconnectAttempts + 1}, delay: ${delay}ms`
       );
       this.reconnectTimer = setTimeout(() => {
-        const { socket } = this.callKit.config.getConfig();
-        this.connect(socket);
-        this.reconnectAttempts += 1;
-        this.isReconnecting = false;
+        try {
+          const { socket } = this.callKit.config.getConfig();
+          this.connect(socket);
+          this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+            event: ConnectEvent.INCALL_RECONNECT_SUCCESS
+          });
+          this.reconnectAttempts += 1;
+          this.isReconnecting = false;
+        } catch (err) {
+          this.callKit.logger.error(err);
+        }
       }, delay);
     }
   };
@@ -19229,7 +19268,7 @@ var WebCall = (() => {
     async sendHangUpReason(data) {
       try {
         const sendData = data || {};
-        this.callKit.socket.send(SocketSendEvent.CALL, sendData);
+        this.callKit.socket.send(SocketSendEvent.HANG_UP_REASON, sendData);
       } catch (error) {
         this.callKit.logger.debug(error);
       }
@@ -19245,7 +19284,6 @@ var WebCall = (() => {
     connect;
     socket;
     user;
-    reconnect;
     listener = [];
     constructor(options) {
       this.config = new Config(this);