Project update. [p][robotic]

clevercanyon · Mar 8, 2024 · f01a873 · f01a873
1 parent e89bf8f
commit f01a873
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 64 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM UTC.
 
 [production]
 node >= 20.9.0

diff --git a/.dockerignore b/.dockerignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM UTC.
 
 # Locals
 

diff --git a/.env.vault b/.env.vault
@@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="3rfi+ClkONvfHPiU9FTBcC1+Um/L8QeM9dRw1jFzEqzZXw=="
 DOTENV_VAULT_MAIN_VERSION=1
 
 # dev
-DOTENV_VAULT_DEV="j0pdIMi5eRbQg/VAF6SUfeZszgx4kmG2tqXiXo9Ilk2vD3cqqKRCC5RtZyENE+9O6ri7JOl2VRK/jv8GjFTwcOyJgqWiaApmZaTNcKfGy/5S+3eE7Ggz8d1J5LdLzT1v81x2bp3OsbZ0CJiMNbZRjQE6i6no0WgjLNTMxzod9oXMQY/I4xoY09sXPK4pmiK057PFnsmjjhcdEw8BW65ZH8q8SZsGHvTERJWX02Ycv106NotbYeV7HBvjrEqY9BqKjYhvoHT5NasnsBKVVAKmI41neV+X/+oQAJlMLbDe6G3V0rMZR9ii+bMVxfLtizPfQYr703znG07XzrSiFUgYPobsxvirDHXSuSTLju38K78qy5dT+DTA7olK8ksGhC/u1nryWUX+RG1CKuaRpMEa32DUtN4EKoI3NCa8jWfDEIsujm7pTJmt8vo6D/DkKC5K/6I9PBFV4Axh4HNOtll7q/bynqDEfyO/RENuSKvqbkSPctC6qMpqMH5OjAE8EM3hqKOW9wOre0LMl3tr13hkmDbufcKA8BrEb7Z1Mzecj/08sBVM7O5L4fR1gGCQp5dCV9ZvmkkF5GjHZAs+xiC2LyTXwMihhO4oPEYbQqd4RWtjwEyhEN11RQIwIPGUOCBf17/NsXRpXSTucO5xcw+PkaawSckpzkqI+VxAKKZU56pVMBsEJEbQBD2y3SF1OSPfKQ3HSgqgMOGO3qN9mKIJ1nlFIosaTcjqVRhCBsdB+oNUbPfpZqziG02VSKpXzCXAvzSgMMuc3l4Ex/vw4zInqTUc3JeEyIJeJpXoqsycjy4RUZ3rj8s40Frznz4lbZkMA5flnRepTh0II5oitKae1y3c87Kl2CNdiN+7ZLf2rwxxJ0NFm99q+3eFYvoM"
-DOTENV_VAULT_DEV_VERSION=259
+DOTENV_VAULT_DEV="8wFgSA71pNNzKURW0n4zwLyUrmKQLbrgMJFoyLosPmlnQM9rAVvwQC0z07TmUPgzF1Ix9caQhKUC0xETYSSJE/9AgCeG4m29KbGHb1lYXiKdOIDZteKNnsr0XUSni5AJPAHO+vim1fJjCkIA7tIJ1gSzNNsBlykvWevVKcGkk2dsP0e/x6bsik53EbveIeS7rB0ZMNLh098npyEGb3sbinW2F0qORELmKc0T+ejQ5U3hz85AXpZRuh/cTWA9q0gMgaFHDCPY4Q+FRF9nc7kSVsX/rP/pRGJQiiJIcR9rnTIxww2YuqCN+eV/xoXPBcxeDWab+0Lrd157TZk+Ksq7TycX+LH1UqQn9x5VV0pI76Qhqt9ugmiz+3hg5Anl8GcyKgFkf6BtIbeZ6Y7XNkhXCfJn2lZwdSlgZ3ZgxQ/tRT22po7RnqyRvWwAOygLuASPMy5UEBSz+v7NAftvNBefOvL94RW4Lj66IOGaPaadEXHjWA7jmzswTwLGuPmAqnwZXzgLWpmWKTREi1CpIVSIpbalE1igg2vc8Wb9uoTxbleTEI3fmxSrA2E7+y6iKEu1FYuByyCrTI651AGDENY35hA9TdBSR/qXbnh0idaEuJau0s23H37gbkLsa8YURSsIL0RIp8NJAGIrUeceTNQz2PblII8vK+1whNt8gfaCSuRbi8056qGpBBpplM7afI/sQ68Hdyrx/EVPeuFbWGQMeEzeLvGWYjAPmMyn62ACafNbZO8R2yqz+Rzp4uvZ9W77xl6/65krBeZpdlYPsxjaj2ETXjHbJ/LUJkFGYBdwqn8s9BtB+s+gzugZrwQB4Btf1/ApcohQ3ihG2C9yUaR6z9b6bQvC5JbS/QWLZ4cVjjUR1iSRF3s84n55B7UU"
+DOTENV_VAULT_DEV_VERSION=261
 
 # ci
-DOTENV_VAULT_CI="AxWEiINIggdK0Ogakoxkj46YOosq1qpAf630IDArBDfKR0g9S9UwxvAiYnSzNPsrTSYdfGSHUtzlKIAC3OVLzCMQqHIkJM5u689mJ+K4mimW9Bb3npjoVtLveb4J7cqmoTyPyRfYPIY8rrA2ZQReO8D01/axrSehy9PE1nvAXz6tJNXvpn+5pm59wOwD5k68dtPmo7eLsgRAa2fzpm/tA58fgPmfhUplVtgFj2Y+DwDa2f8nnE9oHKiUbn35B04Bloi4YDwpJ7iJsozLIAuxWygl00h9Fb3OpSe3v50OM4dA1vHKBpd/lgw0zc8Se+TL3ACIDwYiW0EE9DkI+yB3irkqNButelqjTfKxc3fRHt6NTI7MBqrTSLieg1NQkU0HDOz+JoqRqGFiu4dlf9+tgy0Lp1hQq8ne4u9FL9yqmGFspIuiOgxoY8bqZKxYbpXAzJ9hGOCSOHSja+SeOG57xQD2XCFv/ECoz8swWSMdY20yIqQY8Vn5/DWLL8xdUg1b7cF47qNs1sGlAmLfX4Ryo1If5B8K9SS93sNlTZcodXp0+QsBQsjYyVl2knMsBl5uxnGPfyAAFfxzs+AfQU7Ci6+3XbIm0VFMj0GZSMKYUvLS2B3dcKUklyXZFPparGhbCAL0bf6UM4A18WDJ+8fCEMpfoZ/lyv2NCGhDVzhLOLTR4qwSD9A5vzqA0U/KVBykxsltLNJ/DwsJsTghrfVMpb2S/oPNcNoUsrj1MbAjJtqav43Sayq/11OEWedcmZn45eQdsyzXUq+ztbM8BBK2UQNXI1Rjx59s9Xz6aUw4YuVFcXB4rb1NS+qUTUEzG1YZSWXD/xMoZNgJu7oKH7kiVGKq6Lfcqhh/1a4HI5cWq3X0TCKvcrFXnW8xGZua"
-DOTENV_VAULT_CI_VERSION=259
+DOTENV_VAULT_CI="cnC7+l8ER9i4RJIGOIdH9VTdbjBSzjFiSQZTlaQD7vgWp7r1grofbiDugQYRFev0HAxooIueVov/R3/7oGn09F7SS1LplxfCuh7mgboPM6LxytxjsLkjbQ1fnitbOz0mRsugFWIILzppVIYFd4zxAzkWx8jYg8gAx2iHswXpLkajvwqKAGpc7PSs/sCAlcwwbgWpT/wu+W0mGBe3I+bEFggCtKSFxqmiayNjontJcOQcALKakbFZv5L/2qLFf8TZsLufFyHYHeEOu2IWJYDqWq93J9oqA5tPekuz06hSIcNtkxI8x8ie2Tw8RXlxNTGA8/1jvUH5LwQKN3p0eN6w+gSTj0+2YQDb/g91nBGbXbJ0b5Tg+73cXYwaqDw3TG2WB8aWH7/NP2Zzl747cRmBemrV3yhF84lluYIuoEtV0WjKNIWIAS5S8OeE/EaoKwsm/KD64nvNjfnQpjMXKXc3RF8wSBAy3iP/YP9mS77NQ+YPwJAuFvejDAA1DaXK/O3lQ0kw9DF1LmF0v+Otr6jULJLhNNnV3z7P5JBPUhv0eJfNOUm/Z6ts7OPLArm0THPt6UrSxprqGoDRGIwRNe88J+1qjDlBt7X7+UYh9+h2wVkrdDmQkqRP7oE5s1QaD6EDo8/ZxRuiMw/v6p5wH9YOfDxZQslKY9eBpztxocttqqqK5Q7/XyfNRG1LrJWCSPWnUlEZSAxPOFP1KBEcdMh+Y5uws+GjEr9NpSNj17fn88et9yhrmquKIA8N+69W/xrfqftlDSVd0JXUPxM39rCRAH2lMBgUaNTRV2IWdj8gbBWKwfFhowadEena93XxLfkFcmIzhMyfv5dfTXL84xuTJBNjjGpLmBrj8K/1lE8fKDOJtztbf+WTbi+0HOF5"
+DOTENV_VAULT_CI_VERSION=261
 
 # stage
 DOTENV_VAULT_STAGE="bfqZYD8oVLWMZ0JR5LICV+sB/btaXavszxZLxTfwSH8U5fg="

diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM UTC.
 
 # Default
 

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM UTC.
 
 # Locals
 

diff --git a/.npmignore b/.npmignore
@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM UTC.
 
 # Locals
 

diff --git a/.prettierignore b/.prettierignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM 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` Mar 7, 2024 9:03 PM UTC.
+ * Last generated using `./settings.mjs` Mar 8, 2024 10:49 PM UTC.
  */
 {
     "editor.formatOnType": false,

diff --git a/.vscodeignore b/.vscodeignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 7, 2024 9:03 PM UTC.
+# Last generated Mar 8, 2024 10:49 PM 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.283",
+    "version": "1.0.284",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities.cfw",
     "description": "Utilities for JavaScript apps running in a Cloudflare Worker environment.",
@@ -64,7 +64,7 @@
     },
     "dependencies": {},
     "peerDependencies": {
-        "@clevercanyon/utilities": "^1.0.890",
+        "@clevercanyon/utilities": "^1.0.891",
         "@cloudflare/ai": "1.0.53",
         "@upstash/ratelimit": "1.0.0",
         "@upstash/redis": "1.28.0"

diff --git a/src/cfw.ts b/src/cfw.ts
@@ -106,28 +106,31 @@ const maybeInitializeGlobals = async (ircData: InitialRequestContextData): Promi
  * @returns         Response promise.
  */
 export const handleFetchEvent = async (ircData: InitialRequestContextData): Promise<$type.cfw.Response> => {
-    const { scheduledEvent, ctx, env, routes } = ircData;
-    let { request } = ircData; // Extracts wwritable irc data.
+    let { request } = ircData; // Extracts writable data.
+    const { scheduledEvent, ctx, env, routes } = ircData,
+        subrequestCounter = { value: 0 };
 
     await maybeInitializeGlobals(ircData); // Initializes worker globals.
 
     const Logger = $class.getLogger(), // Initializes base audit and consent loggers.
-        baseAuditLogger = new Logger({ endpointToken: $env.get('APP_AUDIT_LOGGER_BEARER_TOKEN', { type: 'string', require: true }) }),
-        baseConsentLogger = new Logger({ endpointToken: $env.get('APP_CONSENT_LOGGER_BEARER_TOKEN', { type: 'string', require: true }) });
+        //
+        auditLoggerBearerToken = $env.get('APP_AUDIT_LOGGER_BEARER_TOKEN', { type: 'string', require: true }),
+        consentLoggerBearerToken = $env.get('APP_CONSENT_LOGGER_BEARER_TOKEN', { type: 'string', require: true }),
+        //
+        baseAuditLogger = new Logger({ cfw: { ctx, subrequestCounter }, endpointToken: auditLoggerBearerToken }),
+        baseConsentLogger = new Logger({ cfw: { ctx, subrequestCounter }, endpointToken: consentLoggerBearerToken });
 
-    // Initializes audit logger early so it’s available for any errors below.
-    // However, `request` is potentially rewritten, so reinitialize if it changes.
-    let auditLogger = baseAuditLogger.withContext({}, { cfw: { ctx }, request });
+    let auditLogger = baseAuditLogger.withContext({}, { request });
 
     try {
         let originalRequest = request; // Potentially rewritten.
         request = (await $http.prepareRequest(request, {})) as $type.cfw.Request;
 
         if (request !== originalRequest /* Reinitializes using rewritten request. */) {
-            auditLogger = baseAuditLogger.withContext({}, { cfw: { ctx }, request });
+            auditLogger = baseAuditLogger.withContext({}, { request });
         }
         const url = $url.parse(request.url) as $type.cfw.URL,
-            consentLogger = baseConsentLogger.withContext({}, { cfw: { ctx }, request }),
+            consentLogger = baseConsentLogger.withContext({}, { request }),
             rcData = $obj.freeze({
                 scheduledEvent,
 
@@ -140,7 +143,7 @@ export const handleFetchEvent = async (ircData: InitialRequestContextData): Prom
 
                 auditLogger,
                 consentLogger,
-                subrequestCounter: { value: 0 },
+                subrequestCounter,
             });
         let response: Promise<$type.cfw.Response>; // Initialize.
 

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` Mar 7, 2024 9:03 PM UTC.
+ * Last generated using `./tsconfig.mjs` Mar 8, 2024 10:49 PM 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` Mar 7, 2024 9:03 PM UTC.
+# Last generated using `./wrangler.mjs` Mar 8, 2024 10:49 PM UTC.
 ##
 
 send_metrics = false