@mmstack/resource 20.0.3 → 20.0.5

package/fesm2022/mmstack-resource.mjs

@@ -244,7 +244,17 @@ function setCacheContext(ctx = new HttpContext(), opt) {
 function getCacheContext(ctx) {
     return ctx.get(CACHE_CONTEXT);
 }
-function parseCacheControlHeader(req) {
+function parseCacheControlHeader(req, ignoreCacheControl = false) {
+    if (ignoreCacheControl) {
+        return {
+            noStore: false,
+            noCache: false,
+            mustRevalidate: false,
+            immutable: false,
+            maxAge: null,
+            staleWhileRevalidate: null,
+        };
+    }
     const header = req.headers.get('Cache-Control');
     let sMaxAge = null;
     const directives = {
@@ -322,30 +332,25 @@ function parseCacheControlHeader(req) {
         };
     return directives;
 }
-function resolveTimings(cacheControl, staleTime, ttl) {
-    const timings = {
-        staleTime,
-        ttl,
-    };
+function resolveTimings(cacheControl, optStaleTime, optTTL) {
+    let staleTime = optStaleTime;
+    let ttl = optTTL;
     if (cacheControl.immutable)
         return {
             staleTime: Infinity,
             ttl: Infinity,
         };
+    if (cacheControl.maxAge !== null)
+        ttl = cacheControl.maxAge * 1000;
+    if (cacheControl.staleWhileRevalidate !== null)
+        staleTime = cacheControl.staleWhileRevalidate * 1000;
     // if no-cache is set, we must always revalidate
     if (cacheControl.noCache || cacheControl.mustRevalidate)
-        timings.staleTime = 0;
-    if (cacheControl.staleWhileRevalidate !== null)
-        timings.staleTime = cacheControl.staleWhileRevalidate;
-    if (cacheControl.maxAge !== null)
-        timings.ttl = cacheControl.maxAge * 1000;
-    // if stale-while-revalidate is set, we must revalidate after that time at the latest, but we can still serve the stale data
-    if (cacheControl.staleWhileRevalidate !== null) {
-        const ms = cacheControl.staleWhileRevalidate * 1000;
-        if (timings.staleTime === undefined || timings.staleTime > ms)
-            timings.staleTime = ms;
+        staleTime = 0;
+    if (ttl !== undefined && staleTime !== undefined && ttl < staleTime) {
+        staleTime = ttl;
     }
-    return timings;
+    return { staleTime, ttl };
 }
 /**
  * Creates an `HttpInterceptorFn` that implements caching for HTTP requests. This interceptor
@@ -397,12 +402,19 @@ function createCacheInterceptor(allowedMethods = ['GET', 'HEAD', 'OPTIONS']) {
         if (lastModified) {
             req = req.clone({ setHeaders: { 'If-Modified-Since': lastModified } });
         }
+        if (opt.bustBrowserCache) {
+            req = req.clone({
+                setParams: { _cb: Date.now().toString() },
+            });
+        }
         return next(req).pipe(tap((event) => {
             if (event instanceof HttpResponse && event.ok) {
-                const cacheControl = parseCacheControlHeader(event);
+                const cacheControl = parseCacheControlHeader(event, opt.ignoreCacheControl);
                 if (cacheControl.noStore)
                     return;
                 const { staleTime, ttl } = resolveTimings(cacheControl, opt.staleTime, opt.ttl);
+                if (opt.ttl === 0)
+                    return; // no point
                 cache.store(key, event, staleTime, ttl);
             }
         }), map((event) => {
@@ -852,6 +864,10 @@ function queryResource(request, options) {
             return null;
         return hashFn(r);
     });
+    const bustBrowserCache = typeof options?.cache === 'object' &&
+        options.cache.bustBrowserCache === true;
+    const ignoreCacheControl = typeof options?.cache === 'object' &&
+        options.cache.ignoreCacheControl === true;
     const cachedRequest = options?.cache
         ? computed(() => {
             const r = stableRequest();
@@ -863,6 +879,8 @@ function queryResource(request, options) {
                     staleTime,
                     ttl,
                     key: cacheKey() ?? hashFn(r),
+                    bustBrowserCache,
+                    ignoreCacheControl,
                 }),
             };
         })