@koi-design/callkit 1.0.24-beta.20 → 1.0.24-beta.22

package/dist/index.global.js

@@ -18980,8 +18980,16 @@ var WebCall = (() => {
       this.isConnected = true;
       this.lastPingTime = Date.now();
       this.checkPing();
-      if (this.reconnectTimer) {
-        clearTimeout(this.reconnectTimer);
+      if (this.isReconnecting) {
+        this.callKit.logger.debug(ConnectEvent.INCALL_RECONNECT_SUCCESS);
+        this.callKit.trigger(KitEvent.CONNECT_EVENT, {
+          event: ConnectEvent.INCALL_RECONNECT_SUCCESS
+        });
+        this.isReconnecting = false;
+        if (this.reconnectTimer) {
+          clearTimeout(this.reconnectTimer);
+          this.reconnectTimer = void 0;
+        }
       }
       this.reconnectAttempts = 0;
     }
@@ -19209,25 +19217,25 @@ var WebCall = (() => {
       }
     }
     attemptReconnect() {
-      if (this.isReconnecting) {
+      if (this.isReconnecting || this.reconnectAttempts >= this.socketConfig.maxAttempts) {
         return;
       }
       this.isReconnecting = true;
-      const delay = this.socketConfig.delay * this.socketConfig.backoffMultiplier ** this.reconnectAttempts;
+      this.reconnectAttempts += 1;
+      const { delay } = this.socketConfig;
       this.callKit.logger.debug(
-        `Preparing reconnection attempt ${this.reconnectAttempts + 1}, delay: ${delay}ms`
+        `Preparing reconnection attempt ${this.reconnectAttempts}/${this.socketConfig.maxAttempts}, delay: ${delay}ms`
       );
       this.reconnectTimer = setTimeout(() => {
-        try {
-          const { socket } = this.callKit.config.getConfig();
-          this.connect(socket);
+        const { socket } = this.callKit.config.getConfig();
+        this.connect(socket);
+        this.callKit.logger.debug("Reconnection attempt failed");
+        if (this.reconnectAttempts >= this.socketConfig.maxAttempts) {
           this.callKit.trigger(KitEvent.CONNECT_EVENT, {
-            event: ConnectEvent.INCALL_RECONNECT_SUCCESS
+            event: ConnectEvent.INCALL_RECONNECT_ERROR
           });
-          this.reconnectAttempts += 1;
           this.isReconnecting = false;
-        } catch (err) {
-          this.callKit.logger.error(err);
+          this.reset();
         }
       }, delay);
     }