http-request-manager 18.15.9 → 18.15.10

package/fesm2022/http-request-manager.mjs

@@ -1906,6 +1906,7 @@ class WebSocketManagerService {
         }
         // Store jwt token for retry
         WebSocketManagerService.lastJwtToken = jwtToken;
+        WebSocketManagerService.lastOptions = options;
         WebSocketManagerService.jwtInvalidClose = false;
         // Mark as connecting
         WebSocketManagerService.isConnecting = true;
@@ -1925,7 +1926,6 @@ class WebSocketManagerService {
             WebSocketManagerService.connectionStatus.next(true);
             WebSocketManagerService.isConnecting = false;
             WebSocketManagerService.connectionInitialized = true;
-            WebSocketManagerService.lastOptions = options;
             // Emit reconnect event - MessageTrackerService will handle subscriptions with lastSeenId
             console.log(`🔄 Emitting reconnect event for MessageTrackerService`);
             WebSocketManagerService.onReconnect.next();
@@ -1957,7 +1957,7 @@ class WebSocketManagerService {
             WebSocketManagerService.subscribedChannels.next(new Set());
             console.log('✅ subscribedChannels cleared');
             if (WebSocketManagerService.jwtInvalidClose) {
-                console.error('🚫 WebSocket closed due to JWT_INVALID. Not retrying.');
+                console.error('🚫 WebSocket closed due to authentication block/invalid token. Not retrying.');
                 WebSocketManagerService.retryCount = 0;
                 return;
             }
@@ -7754,46 +7754,24 @@ class HTTPManagerStateService extends ComponentStore {
             else {
                 this.logger.debug('StateStore', '🔴 WebSocket connection is closed');
             }
-        }), switchMap(status => {
+        }), map(status => {
             if (status === true) {
                 this.shouldRetry = true;
                 this.wsRetryAttempts.next(0);
                 this.wsNextRetry.next(0);
-                return of(true);
-            }
-            if (!this.shouldRetry)
-                return of(false);
-            const countdownEnder$ = new Subject();
-            // Immediately reflect upcoming retry delay in seconds on UI
-            const seconds = this.retryDelay / 1000;
-            this.wsNextRetry.next(seconds);
-            return timer(0, this.retryDelay)
-                .pipe(take(this.maxRetries), tap(i => {
-                const attempt = i + 1;
-                this.wsRetryAttempts.next(attempt);
-                countdownEnder$.next();
-                // Validate WS options; abort retries if invalid
-                const hasValidWS = !!(this.apiOptions.ws && this.apiOptions.ws.wsServer && this.apiOptions.ws.wsServer !== '');
-                if (!hasValidWS) {
-                    this.shouldRetry = false;
-                    this.wsNextRetry.next(0);
-                    this.wsRetryAttempts.next(0);
-                    return; // Skip connect and countdown
-                }
-                console.log(`🔄 Retry attempt #${attempt}/${this.maxRetries}`);
-                this.httpManagerService.connect(this.apiOptions.ws, this.apiOptions.ws.jwtToken || '');
-                if (attempt === this.maxRetries) {
-                    this.wsNextRetry.next(0);
-                    //   console.error(`🚨 FAILED CONNECTION: Tried #${attempt} times`);
-                }
-                else {
-                    //   console.log(`⚠️ Retry Attempt #${attempt}: Retrying in ${this.retryDelay / 1000}s`);
-                    const seconds = this.retryDelay / 1000;
-                    timer(0, 1000).pipe(map(tick => seconds - tick), takeWhile(val => val >= 0), takeUntil(countdownEnder$)).subscribe(remaining => {
-                        this.wsNextRetry.next(remaining);
-                    });
-                }
-            }), map(() => false));
+                return true;
+            }
+            // Retry orchestration is centralized in WebSocketManagerService.connect/onclose
+            // and uses ws.retry from request options. Keep this stream as status/state only.
+            if (!this.shouldRetry) {
+                this.wsRetryAttempts.next(0);
+                this.wsNextRetry.next(0);
+                return false;
+            }
+            const nextAttempt = Math.min(this.wsRetryAttempts.value + 1, this.maxRetries);
+            this.wsRetryAttempts.next(nextAttempt);
+            this.wsNextRetry.next(nextAttempt >= this.maxRetries ? 0 : this.retryDelay / 1000);
+            return false;
         }));
     }
     appendMessages(message) {