@serwist/strategies 8.3.0 → 8.4.1

package/dist/index.cjs

@@ -90,7 +90,7 @@ function toRequest(input) {
             const possiblePreloadResponse = await event.preloadResponse;
             if (possiblePreloadResponse) {
                 if (process.env.NODE_ENV !== "production") {
-                    internal.logger.log(`Using a preloaded navigation response for ` + `'${internal.getFriendlyURL(request.url)}'`);
+                    internal.logger.log(`Using a preloaded navigation response for '${internal.getFriendlyURL(request.url)}'`);
                 }
                 return possiblePreloadResponse;
             }
@@ -122,7 +122,7 @@ function toRequest(input) {
             // See https://github.com/GoogleChrome/workbox/issues/1796
             fetchResponse = await fetch(request, request.mode === "navigate" ? undefined : this._strategy.fetchOptions);
             if (process.env.NODE_ENV !== "production") {
-                internal.logger.debug(`Network request for ` + `'${internal.getFriendlyURL(request.url)}' returned a response with ` + `status '${fetchResponse.status}'.`);
+                internal.logger.debug(`Network request for '${internal.getFriendlyURL(request.url)}' returned a response with status '${fetchResponse.status}'.`);
             }
             for (const callback of this.iterateCallbacks("fetchDidSucceed")){
                 fetchResponse = await callback({
@@ -134,7 +134,7 @@ function toRequest(input) {
             return fetchResponse;
         } catch (error) {
             if (process.env.NODE_ENV !== "production") {
-                internal.logger.log(`Network request for ` + `'${internal.getFriendlyURL(request.url)}' threw an error.`, error);
+                internal.logger.log(`Network request for '${internal.getFriendlyURL(request.url)}' threw an error.`, error);
             }
             // `originalRequest` will only exist if a `fetchDidFail` callback
             // is being used (see above).
@@ -235,12 +235,12 @@ function toRequest(input) {
             // See https://github.com/GoogleChrome/workbox/issues/2818
             const vary = response.headers.get("Vary");
             if (vary) {
-                internal.logger.debug(`The response for ${internal.getFriendlyURL(effectiveRequest.url)} ` + `has a 'Vary: ${vary}' header. ` + `Consider setting the {ignoreVary: true} option on your strategy ` + `to ensure cache matching and deletion works as expected.`);
+                internal.logger.debug(`The response for ${internal.getFriendlyURL(effectiveRequest.url)} has a 'Vary: ${vary}' header. Consider setting the {ignoreVary: true} option on your strategy to ensure cache matching and deletion works as expected.`);
             }
         }
         if (!response) {
             if (process.env.NODE_ENV !== "production") {
-                internal.logger.error(`Cannot cache non-existent response for ` + `'${internal.getFriendlyURL(effectiveRequest.url)}'.`);
+                internal.logger.error(`Cannot cache non-existent response for '${internal.getFriendlyURL(effectiveRequest.url)}'.`);
             }
             throw new internal.SerwistError("cache-put-with-no-response", {
                 url: internal.getFriendlyURL(effectiveRequest.url)
@@ -249,7 +249,7 @@ function toRequest(input) {
         const responseToCache = await this._ensureResponseSafeToCache(response);
         if (!responseToCache) {
             if (process.env.NODE_ENV !== "production") {
-                internal.logger.debug(`Response '${internal.getFriendlyURL(effectiveRequest.url)}' ` + `will not be cached.`, responseToCache);
+                internal.logger.debug(`Response '${internal.getFriendlyURL(effectiveRequest.url)}' will not be cached.`, responseToCache);
             }
             return false;
         }
@@ -396,7 +396,7 @@ function toRequest(input) {
    * `waitUntil()` method), otherwise the service worker thread my be killed
    * prior to your work completing.
    */ async doneWaiting() {
-        let promise;
+        let promise = undefined;
         while(promise = this._extendLifetimePromises.shift()){
             await promise;
         }
@@ -436,9 +436,9 @@ function toRequest(input) {
                 if (responseToCache) {
                     if (responseToCache.status !== 200) {
                         if (responseToCache.status === 0) {
-                            internal.logger.warn(`The response for '${this.request.url}' ` + `is an opaque response. The caching strategy that you're ` + `using will not cache opaque responses by default.`);
+                            internal.logger.warn(`The response for '${this.request.url}' is an opaque response. The caching strategy that you're using will not cache opaque responses by default.`);
                         } else {
-                            internal.logger.debug(`The response for '${this.request.url}' ` + `returned a status code of '${response.status}' and won't ` + `be cached as a result.`);
+                            internal.logger.debug(`The response for '${this.request.url}' returned a status code of '${response.status}' and won't be cached as a result.`);
                         }
                     }
                 }
@@ -561,8 +561,9 @@ function toRequest(input) {
             }
             if (!response) {
                 throw error;
-            } else if (process.env.NODE_ENV !== "production") {
-                throw internal.logger.log(`While responding to '${internal.getFriendlyURL(request.url)}', ` + `an ${error instanceof Error ? error.toString() : ""} error occurred. Using a fallback response provided by ` + `a handlerDidError plugin.`);
+            }
+            if (process.env.NODE_ENV !== "production") {
+                throw internal.logger.log(`While responding to '${internal.getFriendlyURL(request.url)}', an ${error instanceof Error ? error.toString() : ""} error occurred. Using a fallback response provided by a handlerDidError plugin.`);
             }
         }
         for (const callback of handler.iterateCallbacks("handlerWillRespond")){
@@ -575,8 +576,8 @@ function toRequest(input) {
         return response;
     }
     async _awaitComplete(responseDone, handler, request, event) {
-        let response;
-        let error;
+        let response = undefined;
+        let error = undefined;
         try {
             response = await responseDone;
         } catch (error) {
@@ -600,7 +601,7 @@ function toRequest(input) {
             event,
             request,
             response,
-            error: error
+            error
         });
         handler.destroy();
         if (error) {
@@ -613,7 +614,7 @@ const messages = {
     strategyStart: (strategyName, request)=>`Using ${strategyName} to respond to '${internal.getFriendlyURL(request.url)}'`,
     printFinalResponse: (response)=>{
         if (response) {
-            internal.logger.groupCollapsed(`View the final response here.`);
+            internal.logger.groupCollapsed("View the final response here.");
             internal.logger.log(response || "[No response returned]");
             internal.logger.groupEnd();
         }
@@ -650,7 +651,7 @@ const messages = {
         let error = undefined;
         if (!response) {
             if (process.env.NODE_ENV !== "production") {
-                logs.push(`No response found in the '${this.cacheName}' cache. ` + `Will respond with a network request.`);
+                logs.push(`No response found in the '${this.cacheName}' cache. Will respond with a network request.`);
             }
             try {
                 response = await handler.fetchAndCachePut(request);
@@ -661,9 +662,9 @@ const messages = {
             }
             if (process.env.NODE_ENV !== "production") {
                 if (response) {
-                    logs.push(`Got response from network.`);
+                    logs.push("Got response from network.");
                 } else {
-                    logs.push(`Unable to get a response from the network.`);
+                    logs.push("Unable to get a response from the network.");
                 }
             }
         } else {
@@ -715,7 +716,7 @@ const messages = {
         if (process.env.NODE_ENV !== "production") {
             internal.logger.groupCollapsed(messages.strategyStart(this.constructor.name, request));
             if (response) {
-                internal.logger.log(`Found a cached response in the '${this.cacheName}' ` + `cache.`);
+                internal.logger.log(`Found a cached response in the '${this.cacheName}' cache.`);
                 messages.printFinalResponse(response);
             } else {
                 internal.logger.log(`No response found in the '${this.cacheName}' cache.`);
@@ -852,11 +853,12 @@ const messages = {
    * @returns
    * @private
    */ _getTimeoutPromise({ request, logs, handler }) {
+        // biome-ignore lint/suspicious/noImplicitAnyLet: setTimeout is typed with Node.js's typings, so we can't use number | undefined here.
         let timeoutId;
         const timeoutPromise = new Promise((resolve)=>{
             const onNetworkTimeout = async ()=>{
                 if (process.env.NODE_ENV !== "production") {
-                    logs.push(`Timing out the network response at ` + `${this._networkTimeoutSeconds} seconds.`);
+                    logs.push(`Timing out the network response at ${this._networkTimeoutSeconds} seconds.`);
                 }
                 resolve(await handler.cacheMatch(request));
             };
@@ -877,8 +879,8 @@ const messages = {
    *
    * @private
    */ async _getNetworkPromise({ timeoutId, request, logs, handler }) {
-        let error;
-        let response;
+        let error = undefined;
+        let response = undefined;
         try {
             response = await handler.fetchAndCachePut(request);
         } catch (fetchError) {
@@ -891,16 +893,16 @@ const messages = {
         }
         if (process.env.NODE_ENV !== "production") {
             if (response) {
-                logs.push(`Got response from network.`);
+                logs.push("Got response from network.");
             } else {
-                logs.push(`Unable to get a response from the network. Will respond ` + `with a cached response.`);
+                logs.push("Unable to get a response from the network. Will respond " + "with a cached response.");
             }
         }
         if (error || !response) {
             response = await handler.cacheMatch(request);
             if (process.env.NODE_ENV !== "production") {
                 if (response) {
-                    logs.push(`Found a cached response in the '${this.cacheName}'` + ` cache.`);
+                    logs.push(`Found a cached response in the '${this.cacheName}' cache.`);
                 } else {
                     logs.push(`No response found in the '${this.cacheName}' cache.`);
                 }
@@ -951,7 +953,7 @@ const messages = {
             }
             response = await Promise.race(promises);
             if (!response) {
-                throw new Error(`Timed out the network response after ` + `${this._networkTimeoutSeconds} seconds.`);
+                throw new Error(`Timed out the network response after ${this._networkTimeoutSeconds} seconds.`);
             }
         } catch (err) {
             if (err instanceof Error) {
@@ -961,9 +963,9 @@ const messages = {
         if (process.env.NODE_ENV !== "production") {
             internal.logger.groupCollapsed(messages.strategyStart(this.constructor.name, request));
             if (response) {
-                internal.logger.log(`Got response from network.`);
+                internal.logger.log("Got response from network.");
             } else {
-                internal.logger.log(`Unable to get a response from the network.`);
+                internal.logger.log("Unable to get a response from the network.");
             }
             messages.printFinalResponse(response);
             internal.logger.groupEnd();
@@ -1027,14 +1029,14 @@ const messages = {
         });
         void handler.waitUntil(fetchAndCachePromise);
         let response = await handler.cacheMatch(request);
-        let error;
+        let error = undefined;
         if (response) {
             if (process.env.NODE_ENV !== "production") {
-                logs.push(`Found a cached response in the '${this.cacheName}'` + ` cache. Will update with the network response in the background.`);
+                logs.push(`Found a cached response in the '${this.cacheName}' cache. Will update with the network response in the background.`);
             }
         } else {
             if (process.env.NODE_ENV !== "production") {
-                logs.push(`No response found in the '${this.cacheName}' cache. ` + `Will wait for the network response.`);
+                logs.push(`No response found in the '${this.cacheName}' cache. Will wait for the network response.`);
             }
             try {
                 // NOTE(philipwalton): Really annoying that we have to type cast here.

package/dist/index.js

@@ -88,7 +88,7 @@ function toRequest(input) {
             const possiblePreloadResponse = await event.preloadResponse;
             if (possiblePreloadResponse) {
                 if (process.env.NODE_ENV !== "production") {
-                    logger.log(`Using a preloaded navigation response for ` + `'${getFriendlyURL(request.url)}'`);
+                    logger.log(`Using a preloaded navigation response for '${getFriendlyURL(request.url)}'`);
                 }
                 return possiblePreloadResponse;
             }
@@ -120,7 +120,7 @@ function toRequest(input) {
             // See https://github.com/GoogleChrome/workbox/issues/1796
             fetchResponse = await fetch(request, request.mode === "navigate" ? undefined : this._strategy.fetchOptions);
             if (process.env.NODE_ENV !== "production") {
-                logger.debug(`Network request for ` + `'${getFriendlyURL(request.url)}' returned a response with ` + `status '${fetchResponse.status}'.`);
+                logger.debug(`Network request for '${getFriendlyURL(request.url)}' returned a response with status '${fetchResponse.status}'.`);
             }
             for (const callback of this.iterateCallbacks("fetchDidSucceed")){
                 fetchResponse = await callback({
@@ -132,7 +132,7 @@ function toRequest(input) {
             return fetchResponse;
         } catch (error) {
             if (process.env.NODE_ENV !== "production") {
-                logger.log(`Network request for ` + `'${getFriendlyURL(request.url)}' threw an error.`, error);
+                logger.log(`Network request for '${getFriendlyURL(request.url)}' threw an error.`, error);
             }
             // `originalRequest` will only exist if a `fetchDidFail` callback
             // is being used (see above).
@@ -233,12 +233,12 @@ function toRequest(input) {
             // See https://github.com/GoogleChrome/workbox/issues/2818
             const vary = response.headers.get("Vary");
             if (vary) {
-                logger.debug(`The response for ${getFriendlyURL(effectiveRequest.url)} ` + `has a 'Vary: ${vary}' header. ` + `Consider setting the {ignoreVary: true} option on your strategy ` + `to ensure cache matching and deletion works as expected.`);
+                logger.debug(`The response for ${getFriendlyURL(effectiveRequest.url)} has a 'Vary: ${vary}' header. Consider setting the {ignoreVary: true} option on your strategy to ensure cache matching and deletion works as expected.`);
             }
         }
         if (!response) {
             if (process.env.NODE_ENV !== "production") {
-                logger.error(`Cannot cache non-existent response for ` + `'${getFriendlyURL(effectiveRequest.url)}'.`);
+                logger.error(`Cannot cache non-existent response for '${getFriendlyURL(effectiveRequest.url)}'.`);
             }
             throw new SerwistError("cache-put-with-no-response", {
                 url: getFriendlyURL(effectiveRequest.url)
@@ -247,7 +247,7 @@ function toRequest(input) {
         const responseToCache = await this._ensureResponseSafeToCache(response);
         if (!responseToCache) {
             if (process.env.NODE_ENV !== "production") {
-                logger.debug(`Response '${getFriendlyURL(effectiveRequest.url)}' ` + `will not be cached.`, responseToCache);
+                logger.debug(`Response '${getFriendlyURL(effectiveRequest.url)}' will not be cached.`, responseToCache);
             }
             return false;
         }
@@ -394,7 +394,7 @@ function toRequest(input) {
    * `waitUntil()` method), otherwise the service worker thread my be killed
    * prior to your work completing.
    */ async doneWaiting() {
-        let promise;
+        let promise = undefined;
         while(promise = this._extendLifetimePromises.shift()){
             await promise;
         }
@@ -434,9 +434,9 @@ function toRequest(input) {
                 if (responseToCache) {
                     if (responseToCache.status !== 200) {
                         if (responseToCache.status === 0) {
-                            logger.warn(`The response for '${this.request.url}' ` + `is an opaque response. The caching strategy that you're ` + `using will not cache opaque responses by default.`);
+                            logger.warn(`The response for '${this.request.url}' is an opaque response. The caching strategy that you're using will not cache opaque responses by default.`);
                         } else {
-                            logger.debug(`The response for '${this.request.url}' ` + `returned a status code of '${response.status}' and won't ` + `be cached as a result.`);
+                            logger.debug(`The response for '${this.request.url}' returned a status code of '${response.status}' and won't be cached as a result.`);
                         }
                     }
                 }
@@ -559,8 +559,9 @@ function toRequest(input) {
             }
             if (!response) {
                 throw error;
-            } else if (process.env.NODE_ENV !== "production") {
-                throw logger.log(`While responding to '${getFriendlyURL(request.url)}', ` + `an ${error instanceof Error ? error.toString() : ""} error occurred. Using a fallback response provided by ` + `a handlerDidError plugin.`);
+            }
+            if (process.env.NODE_ENV !== "production") {
+                throw logger.log(`While responding to '${getFriendlyURL(request.url)}', an ${error instanceof Error ? error.toString() : ""} error occurred. Using a fallback response provided by a handlerDidError plugin.`);
             }
         }
         for (const callback of handler.iterateCallbacks("handlerWillRespond")){
@@ -573,8 +574,8 @@ function toRequest(input) {
         return response;
     }
     async _awaitComplete(responseDone, handler, request, event) {
-        let response;
-        let error;
+        let response = undefined;
+        let error = undefined;
         try {
             response = await responseDone;
         } catch (error) {
@@ -598,7 +599,7 @@ function toRequest(input) {
             event,
             request,
             response,
-            error: error
+            error
         });
         handler.destroy();
         if (error) {
@@ -611,7 +612,7 @@ const messages = {
     strategyStart: (strategyName, request)=>`Using ${strategyName} to respond to '${getFriendlyURL(request.url)}'`,
     printFinalResponse: (response)=>{
         if (response) {
-            logger.groupCollapsed(`View the final response here.`);
+            logger.groupCollapsed("View the final response here.");
             logger.log(response || "[No response returned]");
             logger.groupEnd();
         }
@@ -648,7 +649,7 @@ const messages = {
         let error = undefined;
         if (!response) {
             if (process.env.NODE_ENV !== "production") {
-                logs.push(`No response found in the '${this.cacheName}' cache. ` + `Will respond with a network request.`);
+                logs.push(`No response found in the '${this.cacheName}' cache. Will respond with a network request.`);
             }
             try {
                 response = await handler.fetchAndCachePut(request);
@@ -659,9 +660,9 @@ const messages = {
             }
             if (process.env.NODE_ENV !== "production") {
                 if (response) {
-                    logs.push(`Got response from network.`);
+                    logs.push("Got response from network.");
                 } else {
-                    logs.push(`Unable to get a response from the network.`);
+                    logs.push("Unable to get a response from the network.");
                 }
             }
         } else {
@@ -713,7 +714,7 @@ const messages = {
         if (process.env.NODE_ENV !== "production") {
             logger.groupCollapsed(messages.strategyStart(this.constructor.name, request));
             if (response) {
-                logger.log(`Found a cached response in the '${this.cacheName}' ` + `cache.`);
+                logger.log(`Found a cached response in the '${this.cacheName}' cache.`);
                 messages.printFinalResponse(response);
             } else {
                 logger.log(`No response found in the '${this.cacheName}' cache.`);
@@ -850,11 +851,12 @@ const messages = {
    * @returns
    * @private
    */ _getTimeoutPromise({ request, logs, handler }) {
+        // biome-ignore lint/suspicious/noImplicitAnyLet: setTimeout is typed with Node.js's typings, so we can't use number | undefined here.
         let timeoutId;
         const timeoutPromise = new Promise((resolve)=>{
             const onNetworkTimeout = async ()=>{
                 if (process.env.NODE_ENV !== "production") {
-                    logs.push(`Timing out the network response at ` + `${this._networkTimeoutSeconds} seconds.`);
+                    logs.push(`Timing out the network response at ${this._networkTimeoutSeconds} seconds.`);
                 }
                 resolve(await handler.cacheMatch(request));
             };
@@ -875,8 +877,8 @@ const messages = {
    *
    * @private
    */ async _getNetworkPromise({ timeoutId, request, logs, handler }) {
-        let error;
-        let response;
+        let error = undefined;
+        let response = undefined;
         try {
             response = await handler.fetchAndCachePut(request);
         } catch (fetchError) {
@@ -889,16 +891,16 @@ const messages = {
         }
         if (process.env.NODE_ENV !== "production") {
             if (response) {
-                logs.push(`Got response from network.`);
+                logs.push("Got response from network.");
             } else {
-                logs.push(`Unable to get a response from the network. Will respond ` + `with a cached response.`);
+                logs.push("Unable to get a response from the network. Will respond " + "with a cached response.");
             }
         }
         if (error || !response) {
             response = await handler.cacheMatch(request);
             if (process.env.NODE_ENV !== "production") {
                 if (response) {
-                    logs.push(`Found a cached response in the '${this.cacheName}'` + ` cache.`);
+                    logs.push(`Found a cached response in the '${this.cacheName}' cache.`);
                 } else {
                     logs.push(`No response found in the '${this.cacheName}' cache.`);
                 }
@@ -949,7 +951,7 @@ const messages = {
             }
             response = await Promise.race(promises);
             if (!response) {
-                throw new Error(`Timed out the network response after ` + `${this._networkTimeoutSeconds} seconds.`);
+                throw new Error(`Timed out the network response after ${this._networkTimeoutSeconds} seconds.`);
             }
         } catch (err) {
             if (err instanceof Error) {
@@ -959,9 +961,9 @@ const messages = {
         if (process.env.NODE_ENV !== "production") {
             logger.groupCollapsed(messages.strategyStart(this.constructor.name, request));
             if (response) {
-                logger.log(`Got response from network.`);
+                logger.log("Got response from network.");
             } else {
-                logger.log(`Unable to get a response from the network.`);
+                logger.log("Unable to get a response from the network.");
             }
             messages.printFinalResponse(response);
             logger.groupEnd();
@@ -1025,14 +1027,14 @@ const messages = {
         });
         void handler.waitUntil(fetchAndCachePromise);
         let response = await handler.cacheMatch(request);
-        let error;
+        let error = undefined;
         if (response) {
             if (process.env.NODE_ENV !== "production") {
-                logs.push(`Found a cached response in the '${this.cacheName}'` + ` cache. Will update with the network response in the background.`);
+                logs.push(`Found a cached response in the '${this.cacheName}' cache. Will update with the network response in the background.`);
             }
         } else {
             if (process.env.NODE_ENV !== "production") {
-                logs.push(`No response found in the '${this.cacheName}' cache. ` + `Will wait for the network response.`);
+                logs.push(`No response found in the '${this.cacheName}' cache. Will wait for the network response.`);
             }
             try {
                 // NOTE(philipwalton): Really annoying that we have to type cast here.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/strategies",
-  "version": "8.3.0",
+  "version": "8.4.1",
   "type": "module",
   "description": "A service worker helper library implementing common caching strategies.",
   "files": [
@@ -19,7 +19,7 @@
   "license": "MIT",
   "repository": "serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
-  "homepage": "https://serwist.vercel.app",
+  "homepage": "https://serwist.pages.dev",
   "module": "./dist/index.js",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -37,15 +37,16 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@serwist/core": "8.3.0"
+    "@serwist/core": "8.4.1"
   },
   "devDependencies": {
     "rollup": "4.9.1",
-    "@serwist/constants": "8.3.0"
+    "@serwist/constants": "8.4.1"
   },
   "scripts": {
     "build": "rimraf dist && cross-env NODE_ENV=production rollup --config rollup.config.js",
-    "lint": "eslint src --ext ts,tsx,js,jsx,cjs,mjs",
+    "dev": "rollup --config rollup.config.js --watch",
+    "lint": "biome lint ./src",
     "typecheck": "tsc"
   }
 }