Project update. [p][robotic]

clevercanyon · Apr 11, 2024 · 25f1d4a · 25f1d4a
1 parent a5f5c86
commit 25f1d4a
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 65 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 AM UTC.
 
 [production]
 node >= 20.9.0

diff --git a/.dockerignore b/.dockerignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 AM UTC.
 
 # Locals
 

diff --git a/.env.vault b/.env.vault
@@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="7GW98NfL4hM4N6HbfeDXCKreVxKvcVPupFRnZ8XJ+pomaQ=="
 DOTENV_VAULT_MAIN_VERSION=1
 
 # dev
-DOTENV_VAULT_DEV="tx+AF0/wIv83wy2NXqUftMKOwPA1DFytmxZ9Qky7IxAqLsi6pHx8YZJL2Nz/mQWeimEiKyE9+P059dZv30rsfoSUj1isROf1Prt0Mt7/u5BMTjxL1FUnTGbow9DH/ux2mcetcNWgsAzt6SX2t4piGaJoNFaMcV51x7FNYtmdvzXz64Fb0XhaoHORtFzzty9W11ck8FEsp5WtPoOgCVcUfAYOhqqOTwdpA+DwU81yfdEbG5y3N2MeRW/LLpLxC4YzBQ=="
-DOTENV_VAULT_DEV_VERSION=539
+DOTENV_VAULT_DEV="X+sBdBmkwgJE/a/hzf6jSJu91xivh5yPbDNjPHIN3kUWGKlzjbWh6bKCNmzpT2sC0owFgZ/R7R4f3mwgWHfg9Xf+zwEaMek24/V551CUyid79ysq7xOse2yFkelm9SsscG+ML6zHHAYv1Cw7alr4zvmXMgyl6U+B9BgM2DA+tLHMJpQApUp+3yNSWSUp/Wf3UBysI/femwWj72pU/VGo/fHtBQ0IdiWYQXXzpYbZWEt4/M3AogkMahPEEiNXEQPl2g=="
+DOTENV_VAULT_DEV_VERSION=541
 
 # ci
-DOTENV_VAULT_CI="cWnpmjrAeOsw2xSVnQFnDj/H6XTg6kMqKNm8AjGhu0KotThxUmQk0DKO6Xje2/KzBiTB4h49AAAeDSFx6L9B663iJHXAqjEUtw4Qf3fnn9tSNAthc9IgQdBvdt4aOF+QkxXv6kVSKPQc6wlEaMFebpfZ6A/OS4NNe2dekNB8Jw=="
-DOTENV_VAULT_CI_VERSION=539
+DOTENV_VAULT_CI="vnrCPcwxExEIa5nOZsOGKL4xAg7nw4caLK2cbtUxo6WoFNfpONcC13+AY10qCZJAjori3/GB32FQwQbYx5k76SJow7i6cuFXLQ2Ww3S2Ahcr98jeCA19ssjFZ+gDll77ErMrsgBr+3loK95alJvHaDTgKTeICEpxw4p+qBk7vA=="
+DOTENV_VAULT_CI_VERSION=541
 
 # stage
 DOTENV_VAULT_STAGE="aRP8su2YV4jZu3w1HZ/SLaots0IwJDFw75TCpvXEFeNp7tw="

diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 AM UTC.
 
 # Default
 

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 AM UTC.
 
 # Locals
 

diff --git a/.npmignore b/.npmignore
@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 AM UTC.
 
 # Locals
 

diff --git a/.prettierignore b/.prettierignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 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` Apr 11, 2024 10:22 AM UTC.
+ * Last generated using `./settings.mjs` Apr 11, 2024 11:08 AM UTC.
  */
 {
     "editor.formatOnType": false,

diff --git a/.vscodeignore b/.vscodeignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 10:22 AM UTC.
+# Last generated Apr 11, 2024 11:08 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.956",
+    "version": "1.0.957",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities",
     "description": "Utilities for JavaScript apps running in any environment.",
@@ -326,7 +326,7 @@
         "ignore": "5.3.0",
         "ip-regex": "5.0.0",
         "micro-memoize": "4.1.2",
-        "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.146",
+        "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.147",
         "parse-css-color": "0.2.1",
         "preact": "10.20.1",
         "preact-render-to-string": "6.4.1",
@@ -337,7 +337,7 @@
     "optionalDependencies": {},
     "bundleDependencies": [],
     "devDependencies": {
-        "@clevercanyon/dev-deps": "^1.0.381"
+        "@clevercanyon/dev-deps": "^1.0.382"
     },
     "overrides": {},
     "cpu": ["x64", "arm64"],

diff --git a/src/http.ts b/src/http.ts
@@ -757,7 +757,13 @@ const prepareResponseHeaders = async (request: $type.Request, url: $type.URL, cf
                 cacheHeaders['cache-control'] = 'no-store';
                 cacheHeaders['cdn-cache-control'] = 'no-store';
             } else {
-                if ('none' === cfg.cacheVersion) {
+                if (
+                    'none' === cfg.cacheVersion ||
+                    !requestHasCacheableMethod(request) ||
+                    requestPathIsInAdmin(request, url) ||
+                    requestPathIsInAccount(request, url) ||
+                    (!cfg.cacheUsers && requestIsFromUser(request))
+                ) {
                     sMaxAge = 0; // No server-side cache.
                 } else {
                     // 1h minimum on Cloudflare paid workers plan.
@@ -767,9 +773,10 @@ const prepareResponseHeaders = async (request: $type.Request, url: $type.URL, cf
                 }
                 staleAge = Math.max($is.integer(staleAge) ? staleAge : Math.round(maxAge / 2), 0);
                 staleAge = 0 === staleAge ? 0 : $to.integerBetween(staleAge, 0, Math.min(maxAge, $time.dayInSeconds * 90));
+                const staleDirectives = 'stale-while-revalidate=' + String(staleAge) + ', stale-if-error=' + String(staleAge);
 
-                cacheHeaders['cache-control'] = 'public, must-revalidate, max-age=' + String(maxAge) + ', s-maxage=' + String(sMaxAge) + ', stale-while-revalidate=' + String(staleAge) + ', stale-if-error=' + String(staleAge); // prettier-ignore
-                cacheHeaders['cdn-cache-control'] = 0 === sMaxAge ? 'no-store' : 'public, must-revalidate, max-age=' + String(sMaxAge) + ', stale-while-revalidate=' + String(staleAge) + ', stale-if-error=' + String(staleAge); // prettier-ignore
+                cacheHeaders['cache-control'] = 'public, must-revalidate, max-age=' + String(maxAge) + ', s-maxage=' + String(sMaxAge) + ', ' + staleDirectives;
+                cacheHeaders['cdn-cache-control'] = 0 === sMaxAge ? 'no-store' : 'public, must-revalidate, max-age=' + String(sMaxAge) + ', ' + staleDirectives;
             }
             if (cfg.encodeBody && !$is.nul(cfg.body)) {
                 cacheHeaders['cache-control'] += ', no-transform';

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` Apr 11, 2024 10:22 AM UTC.
+ * Last generated using `./tsconfig.mjs` Apr 11, 2024 11:08 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` Apr 11, 2024 10:22 AM UTC.
+# Last generated using `./wrangler.mjs` Apr 11, 2024 11:08 AM UTC.
 ##
 
 send_metrics = false