Project update. [p][robotic]

clevercanyon · Dec 18, 2023 · da84a9b · da84a9b
1 parent bbbc990
commit da84a9b
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 105 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 [production]
 node >= 20.9.0

diff --git a/.dockerignore b/.dockerignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 # Locals
 

diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 # Default
 

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 # Locals
 

diff --git a/.npmignore b/.npmignore
@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 # Locals
 

diff --git a/.prettierignore b/.prettierignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 # Packages
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,7 @@
  * @note This entire file will be updated automatically.
  * @note Instead of editing here, please review `./settings.mjs`.
  *
- * Last generated using `./settings.mjs` Dec 18, 2023 2:30 AM UTC.
+ * Last generated using `./settings.mjs` Dec 18, 2023 6:09 AM UTC.
  */
 {
     "editor.formatOnType": false,

diff --git a/.vscodeignore b/.vscodeignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Dec 18, 2023 2:30 AM UTC.
+# Last generated Dec 18, 2023 6:09 AM UTC.
 
 # Locals
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "1.0.143",
+    "version": "1.0.144",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities.cfw",
     "description": "Utilities for JavaScript apps running in a Cloudflare Worker environment.",
@@ -54,14 +54,14 @@
     },
     "dependencies": {},
     "peerDependencies": {
-        "@clevercanyon/utilities": "^1.0.622",
+        "@clevercanyon/utilities": "^1.0.624",
         "@cloudflare/kv-asset-handler": "0.2.0"
     },
     "peerDependenciesMeta": {},
     "optionalDependencies": {},
     "bundleDependencies": [],
     "devDependencies": {
-        "@clevercanyon/dev-deps": "^1.0.304"
+        "@clevercanyon/dev-deps": "^1.0.305"
     },
     "overrides": {},
     "cpu": ["x64", "arm64"],

diff --git a/src/cfw.ts b/src/cfw.ts
@@ -4,7 +4,7 @@
 
 import '#@initialize.ts';
 
-import { $env, $error, $http, $json, $mime, $mm, $str, $url, type $type } from '@clevercanyon/utilities';
+import { $app, $env, $error, $http, $json, $mime, $mm, $str, $url, type $type } from '@clevercanyon/utilities';
 import * as cfKVA from '@cloudflare/kv-asset-handler';
 
 /**
@@ -113,35 +113,47 @@ export const handleFetchEvent = async (ifeData: InitialFetchEventData): Promise<
  * @returns        Response promise.
  */
 export const handleFetchCache = async (route: Route, feData: FetchEventData): Promise<$type.cf.Response> => {
-    const { request, ctx } = feData;
-    let cachedResponse; // Initialize.
+    let key, cachedResponse; // Initialize.
+    const { request, ctx, url } = feData;
+
+    // Populates cache key.
 
-    if (!$http.requestHasCacheableMethod(request)) {
-        return route(feData); // Not applicable.
+    key = 'v=' + $app.buildTime().unix().toString();
+    if (request.headers.has('origin') /* Possibly empty. */) {
+        key += '&origin=' + (request.headers.get('origin') || '');
     }
-    if ((cachedResponse = await cache.match(request, { ignoreMethod: true }))) {
-        if (!$http.requestNeedsContentBody(request, cachedResponse.status)) {
-            cachedResponse = new Response(null /* No response body. */, {
-                status: cachedResponse.status,
-                statusText: cachedResponse.statusText,
-                headers: cachedResponse.headers,
-            }) as unknown as $type.cf.Response;
+    const keyURL = $url.removeCSOQueryVars(url); // e.g., `ut[mx]_`, `_ck`, etc.
+    keyURL.searchParams.set('_ck', key), keyURL.searchParams.sort(); // Optimizes cache.
+    const keyRequest = new Request(keyURL.toString(), request as unknown as Request) as unknown as $type.cf.Request;
+
+    // Checks if request is cacheable.
+
+    if (!['HEAD', 'GET'].includes(keyRequest.method) || !$http.requestHasCacheableMethod(keyRequest)) {
+        return route(feData); // Not cacheable; use async route.
+    }
+    // Reads response for this request from HTTP cache.
+
+    if ((cachedResponse = await cache.match(keyRequest, { ignoreMethod: true }))) {
+        if (!$http.requestNeedsContentBody(keyRequest, cachedResponse.status)) {
+            cachedResponse = new Response(null, cachedResponse) as unknown as $type.cf.Response;
         }
         return cachedResponse;
     }
-    const response = await route(feData);
+    // Routes request and writes response to HTTP cache.
+
+    const response = await route(feData); // Awaits response so we can cache.
 
-    if ('GET' === request.method && 206 !== response.status && '*' !== response.headers.get('vary') && !response.webSocket) {
+    if ('GET' === keyRequest.method && 206 !== response.status && '*' !== response.headers.get('vary') && !response.webSocket) {
         if ($env.isCFWViaMiniflare() && 'no-store' === response.headers.get('cdn-cache-control')) {
             // Miniflare doesn’t currently support `cdn-cache-control`, so we implement basic support for it here.
             response.headers.set('cf-cache-status', 'c10n.miniflare.cdn-cache-control.BYPASS');
         } else {
             // Cloudflare will not actually cache if response headers say not to cache.
             // For further details regarding `cache.put()`; {@see https://o5p.me/gMv7W2}.
-            ctx.waitUntil(cache.put(request, response.clone()));
+            ctx.waitUntil(cache.put(keyRequest, response.clone()));
         }
     }
-    return response;
+    return response; // Potentially cached async.
 };
 
 /**
@@ -165,7 +177,7 @@ export const handleFetchDynamics = async (feData: FetchEventData): Promise<$type
         $env.get('__STATIC_CONTENT' /* Worker site? */) && //
         $mm.test(url.pathname, $url.pathFromAppBase('./assets/') + '**')
     ) {
-        return handleFetchCache(handleFetchStaticAssets, feData);
+        return handleFetchStaticAssets(feData);
     }
     return $http.prepareResponse(request, { status: 404 }) as $type.cf.Response;
 };

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
  * @note This entire file will be updated automatically.
  * @note Instead of editing here, please review `./tsconfig.mjs`.
  *
- * Last generated using `./tsconfig.mjs` Dec 18, 2023 2:30 AM UTC.
+ * Last generated using `./tsconfig.mjs` Dec 18, 2023 6:09 AM UTC.
  */
 {
     "include": ["./src/**/*", "./dev-types.d.ts"],

diff --git a/wrangler.toml b/wrangler.toml
@@ -7,7 +7,7 @@
 # @note This entire file will be updated automatically.
 # @note Instead of editing here, please review `./wrangler.mjs`.
 #
-# Last generated using `./wrangler.mjs` Dec 18, 2023 2:30 AM UTC.
+# Last generated using `./wrangler.mjs` Dec 18, 2023 6:09 AM UTC.
 ##
 
 send_metrics = false