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

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())
@@ -925,7 +926,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;
@@ -1029,7 +1030,7 @@ 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"
         });
       }
@@ -1193,6 +1194,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 +1210,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 +1226,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;
@@ -1306,7 +1319,6 @@ var Connect = class {
         };
         if (this.isOutgoing) {
           this.currentSession.accept(options);
-          this.setConnectStatus(CallStatus.connecting);
           this.callKit.trigger(KitEvent.KIT_OUTGOING_INVITE, {
             getInviteData: () => {
               const { request: request2 } = this.currentSession;
@@ -1787,7 +1799,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 +1817,7 @@ var Socket = class {
   reconnectTimer;
   isReconnecting = false;
   reconnectAttempts = 0;
+  socketError = false;
   constructor(callKit) {
     this.callKit = callKit;
     const { reconnect } = this.callKit.config.getConfig();
@@ -1828,7 +1841,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 +1861,7 @@ var Socket = class {
       type: "INCALL",
       content: { ev }
     });
+    this.socketError = false;
     this.isConnected = true;
     this.lastPingTime = Date.now();
     this.checkPing();
@@ -1860,7 +1874,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 +1894,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 +1912,7 @@ var Socket = class {
         data: ev
       }
     });
+    this.socketError = true;
   }
   confirmAck(data) {
     const { ack, messageId } = data;
@@ -2052,7 +2070,7 @@ var Socket = class {
   }
   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 +2129,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 +2183,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 +2193,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 +2214,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"
       });
     }