@koi-design/callkit 1.0.24-beta.16 → 1.0.24-beta.18

package/dist/index.d.ts

@@ -451,7 +451,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

@@ -18472,8 +18472,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 +18500,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
               };
@@ -18585,7 +18604,7 @@ var WebCall = (() => {
             this.reconnect();
           } else {
             const data = {
-              event: ConnectEvent.SIP_CONNECT_ERROR,
+              kitEvent: ConnectEvent.SIP_CONNECT_ERROR,
               err: error
             };
             this.callKit.trigger(KitEvent.CONNECT_EVENT, data);
@@ -18611,13 +18630,13 @@ 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,
+          kitEvent: ConnectEvent.USER_AGENT_START_ERROR,
           err
         };
         this.callKit.user.sendHangUpReason(data);
@@ -18654,7 +18673,7 @@ var WebCall = (() => {
               await scheduleReconnect();
             } else {
               const data = {
-                event: ConnectEvent.SIP_RECONNECT_ERROR
+                kitEvent: ConnectEvent.SIP_RECONNECT_ERROR
               };
               this.callKit.trigger(KitEvent.CONNECT_EVENT, data);
               this.callKit.user.sendHangUpReason(data);
@@ -19228,15 +19247,8 @@ var WebCall = (() => {
     }
     async sendHangUpReason(data) {
       try {
-        const { userInfo } = this.callKit.config.getConfig();
-        const { username } = userInfo;
-        const sendData = {
-          username,
-          userInfo,
-          ...data
-        };
-        const sendDataStr = JSON.stringify(sendData);
-        this.callKit.socket.send(SocketSendEvent.CALL, sendDataStr);
+        const sendData = data || {};
+        this.callKit.socket.send(SocketSendEvent.CALL, sendData);
       } catch (error) {
         this.callKit.logger.debug(error);
       }
@@ -19252,7 +19264,6 @@ var WebCall = (() => {
     connect;
     socket;
     user;
-    reconnect;
     listener = [];
     constructor(options) {
       this.config = new Config(this);