@ethlete/query 5.32.0 → 5.32.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/query
 
+## 5.32.2
+
+### Patch Changes
+
+- [`9c72658`](https://github.com/ethlete-io/ethdk/commit/9c72658eb6a748d2ee7d04e6e06c38a70247ed7f) Thanks [@TomTomB](https://github.com/TomTomB)! - Always retry queries if they error due to being offline
+
+## 5.32.1
+
+### Patch Changes
+
+- [`a59d9f4`](https://github.com/ethlete-io/ethdk/commit/a59d9f4ed95b5fa6471a69e0052399fddac57153) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix queries with route functions not getting auto executed
+
 ## 5.32.0
 
 ### Minor Changes

package/fesm2022/ethlete-query.mjs

@@ -1,5 +1,5 @@
 import * as i1 from '@ethlete/core';
-import { createDestroy, computedTillTruthy, syncSignal, getCookie, setCookie, deleteCookie, DelayableDirective, nextFrame, RuntimeError, isObject, injectRoute, getDomain, previousSignalValue, injectQueryParamChanges, injectQueryParams, clone, equal, ET_PROPERTY_REMOVED } from '@ethlete/core';
+import { createDestroy, computedTillTruthy, syncSignal, getCookie, setCookie, deleteCookie, DelayableDirective, nextFrame, RuntimeError, isObject, injectRoute, getDomain, clamp, previousSignalValue, injectQueryParamChanges, injectQueryParams, clone, equal, ET_PROPERTY_REMOVED } from '@ethlete/core';
 import { Observable, takeUntil, startWith, pairwise, tap, switchMap, of, BehaviorSubject, Subject, fromEvent, timer, take, filter, takeWhile, map, shareReplay, ReplaySubject, combineLatest, interval, skip, withLatestFrom, debounceTime, Subscription, retry, throwError, catchError, merge } from 'rxjs';
 import { HttpStatusCode, HttpErrorResponse, HttpEventType, HttpClient, HttpHeaders } from '@angular/common/http';
 import * as i0 from '@angular/core';
@@ -3035,7 +3035,7 @@ const createBearerAuthProvider = (options) => {
         const isCookieEnabled = cookieEnabled();
         const res = latestExecutedQuery();
         const error = res?.query?.query.error();
-        if (!isCookieEnabled || (error && error.raw.status === 401)) {
+        if (!isCookieEnabled || (error && error.code === 401)) {
             deleteCookie$1();
             return;
         }
@@ -3329,14 +3329,22 @@ const extractExpiresInSeconds = (headers) => {
 const shouldRetryRequest = (options) => {
     const normalizedOptions = options instanceof HttpErrorResponse ? { retryCount: 0, error: options } : options;
     const { retryCount, error } = normalizedOptions;
-    const defaultRetryDelay = 1000 + 1000 * retryCount;
+    const defaultRetryDelay = clamp(1000 + 1000 * retryCount, 1000, 5000);
+    const { status, error: detail, headers } = error;
+    // Code 0 usually means the internet connection is down. We retry in this case.
+    // It could also be a CORS issue but that should not be the case in production.
+    // We will retry in this case until the connection is back.
+    if (status === 0) {
+        return { retry: true, delay: defaultRetryDelay };
+    }
+    // Don't retry if we already retried 3 times
     if (retryCount > 3) {
         return { retry: false };
     }
+    // Don't retry if it's not an http error
     if (!(error instanceof HttpErrorResponse)) {
         return { retry: false };
     }
-    const { status, error: detail, headers } = error;
     // Retry on 5xx errors (except 500 internal server error since those are usually not recoverable)
     if (status >= 501) {
         // Don't retry if a requested page is out of range
@@ -3358,11 +3366,6 @@ const shouldRetryRequest = (options) => {
         }
         return { retry: true, delay: defaultRetryDelay };
     }
-    // Code 0 usually means the internet connection is down. We retry in this case.
-    // It could also be a CORS issue but that should not be the case in production.
-    if (status === 0) {
-        return { retry: true, delay: defaultRetryDelay };
-    }
     return { retry: false };
 };
 const getQueryFeatureUsage = (options) => {
@@ -3373,7 +3376,7 @@ const getQueryFeatureUsage = (options) => {
         : shouldAutoExecuteQuery(options.creatorInternals.method);
     const hasRouteFunction = typeof creatorInternals?.route === 'function' ||
         typeof creator?.route === 'function';
-    const shouldAutoExecute = shouldAutoExecuteMethod && !queryConfig.onlyManualExecution && !hasRouteFunction;
+    const shouldAutoExecute = shouldAutoExecuteMethod && !queryConfig.onlyManualExecution;
     if (hasRouteFunction && !hasWithArgsFeature && !queryConfig.silenceMissingWithArgsFeatureError) {
         throw withArgsQueryFeatureMissingButRouteIsFunction();
     }