Project update. [p][robotic]

.browserslistrc

@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 [production]
 node >= 20.9.0

.dockerignore

@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 # Locals
 

.env.vault

@@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="3rfi+ClkONvfHPiU9FTBcC1+Um/L8QeM9dRw1jFzEqzZXw=="
 DOTENV_VAULT_MAIN_VERSION=1
 
 # dev
-DOTENV_VAULT_DEV="jQzPzFCg4gSEeYluy2ieuSH+VNEgn+/dJhdAwwB7rpybk7pz11snctZc/CiINsDW/RfKWelwXMtIUB5OU8AURGn6jaj189M7N0WPb0A1WELdaw67LCEspJLsZ4dVUJz0rUcUWXogSAFrV8/LBRlC3ImAO+PGnIh+8eR+Dy4l2+5VuvFaUfcI4Qc4GlsjB40AL7N84ONFT4IqvMfBhwptK7Y+1/bOte13MZFzgDCp7qDQaQxTEvbWqAZNTL+M+E9ithPL6FDN92WseDHdT72xPe1f5kT89VN5yq5gcen7ztqZprCKVWOE2kpBMcxK57DyUZMw7c5Hzgy0I0asZ0Sc6YS926iQMCABQSMQQPHX7E3cz3IgBp+l4MohC5S6vGlfUzE0tNkitkTM7f+yzbROGwa2gi7VYY3EXrTAP+xb2cJWV+SAVyyPDALwEayFGXO5xZYWfbKa6oP/dWWxK0HIFJtGIm1+0FRMJ7YZ9PGmQ/lUXaxyqWkCzl/KYdnPbwIpym6BeVSuwPaFZBXMJGaFzK/qtQbWu004/KwnUZf41vR2UKaK0WAvO3gAwEHULZQTKG68qhbPVgaUO+nxCqTcnLWd1Odm3tpfF3yxGYtXTo+cYNOU4aUrSe7wJ5cfTzQRvEwqPSz9csIbQ99/TJfrtBPBkY5iKgPZsN1oWBvnqqxhh0fcJsw9mqLNT3shhPDicJNFCKYf3lwNkfNNdi79KE3xeiic2k1nQosrLpI+LfNX7TEFxR/kycBTOG1FKkhXy8JO+PSkYDOyt5NvpLAOej7Gbt9R1WYkFQo/7HTEsGdtSf9mFNWvhb39cI43DaPaQ7/su6R9aKO7pdrnd0keewjUpW/CYrgOwnTUFdNSKilkAQNpJBaVI3gbE0Ue"
-DOTENV_VAULT_DEV_VERSION=253
+DOTENV_VAULT_DEV="fCmtXbhrizbJN9K3cu3hAX70BvX6I4xCY4ZJxwat0s28QNWyT0A0yoC0jPgC8riX+vlu82DeEc9ZfpwTyyN8B0CXT65Guu3hmdXx76nqiAPeDSNRQbOSMX7uggOIUp+0j7Ue4WcTBP0xQq1+ID7Q/DHNLHqcqP6jyg2cAxHXQ6W7FOfoo2OKMyyCxyWRRQd4N2hEUTo3ByBAYrTxszMBpz7SjwYbcDkP3T9rnOVzXeeiZckWGOpydKvAkaJZQOg8bA0BEip28p31v461MkGGXa08P1c2EX3bCcNnyPOmJal17iRRmzhxDYdGIMJbIhC3FBiocBp/yTdfose7TN6LYm8GSHoze69firTcMHg3ScBhTPiT8s0V2b7Z9dA8jo8J1zD0VJfS20tE76Kt/S6tbcLnqhButsl2my4HMwZYVB4VwxPFqJ0hh8rYgNF12uc3EjwBsqrOM6TI5HItDSMvneFh+JQJA6DdvghnGvCPXWJ1AxVwikHKAw8IcYWVjCBcE5zxNsE5G1CasxUaZKNXt2uOt3GNfDLTlCqlI5anjuCpehY+6IHul5OQkj2OLA0X2vFZWn9NLPtMnyEEMI4UR5U5/bc1oW3Pf77fLbIXKSCwWMah6W3I/IjdPNFLDBVAr4XdRk3Rasd9ObPtLYYeAve+H24zT904wN3qqimikBf7Srv8i06Gvh+nCi1UQsUM9YrXDJi7zGV+gnhsARkU32209Lx5pKeQrOpXWSxDr24xN9iLDZR1KgNA3XBqUXE9E5hL7nT1mo+WECFM+ReUi9sZ8Y64x4ntOsUppD6R7eCkjiB6+3IUl+rxp1xhQulbCFbVAup8/DZrCti4gah6lPSESvjPO2SOtrbvTssx8jYkHuNwik8WnOifGwm6"
+DOTENV_VAULT_DEV_VERSION=255
 
 # ci
-DOTENV_VAULT_CI="EHlxMqx6aDPMSE2i0HAaHXxBDUs+OzebxBFnG9UI6KldkSbPjEUTM4e/gb/S91ed6arSdvgQYPhyqzeNUFJsEg5dkXrrWqJr+K8KyMO9kUxtoAC0SiybS3DYcctgwVwphqUWUVEOWexudS1S3LGAibQBioW6wSXiTCBru4CRYsR91YfStvqxkuG192Sv+T624psKMsfgVsYrasmGRmJCpo8M6O7XQsmnAi4q8U2WG+HmvW1zffHZxs1xgdJ9a5aaYFCeNw10saSH9//ygSKCNoCa/kO3jvZlLlA1Mb1ZQnkc29YY347yPrJ2ZUxNIbJa4Wc0p8FwR/e7S4FgGbJ1nb+tLphf5l7pUkLMWPxKVX64WSzPmaW9q1N1dOFjbQg+PC20krUsTw/oSFTZV0hlbTMhHlDsZRZIOE3ceSzCUfkXG7C5mspSkOzal5Hoa3kH+M42FrdkS79VT2DzBDyecRfEb8W9/JPoYlUoj+t6LeR3FFOfd3lWBrjtCB6F48CCg0VlQGCuS4DWLABVBC8FpGa0TP/3OWYbQiRc4yUUXrPjxDCdqDZGs6JzLiGUbUzB/U/P6CiVQhnpwcwha4OfWZpvVPEYAXWYBWHHnkxyB2fqNhULk/tXc4CZkzztQBFVtfl/Dm9K/11HTHnM2uHe75tSw+upSXLuom8y6ib07O8LtxvgGzyos1TRqMCwxwLDbafMe1TwBl5F1JufLvGlJvmBWIaU08zJlvddAmrwKrcKCWH5q5KCMkxBq8PSKF0syRP4LTylEhWr8yr6mZFWU0a63Mub4v8B6vgLs+wQIPLA0KZPn1au2CXsqxfGU70W5VPPBHZvhms4BtfXrg6ojBWMS08Nc7piX7RTOYI4SMdGVLYbO8URXZxjRnD4"
-DOTENV_VAULT_CI_VERSION=253
+DOTENV_VAULT_CI="TwBy0z8FyLaiAQoCunI1d+T6TG74bhnKBISFSx97p6UdBqHvuiXLcsoRD3trIL7mxBIMMlkfYEchXmfGAu6fAqjVxdVkF+FqH6W2XUyCRBVsSOdr1qHz7oepfvffR13uhYtOIIJRXOJSQPPfLsXao0duMjMKx2AkF/PkDJfo51xoIaicj7j3a3IZxsKNpXGHdvGrIjWgvDyYbM5MUE8iWahbfgAE5bOZMivrBBT4m3EzyQWhUrZIXSwgN+1sGsoyXCJe49V9Jg+Rcrzu15CTelGrBEty2CW/Z86yi3ALVy/dV3MtbN6PjnwGAY4O393iHYuDhJui81FbW08XzUTcxdMApdl1BYryGQdYS1SGV7AmK7vMsAA7uspIuhx12ddxagpt3eMTt/ovb8GdghOmD1u4IIQ4NOT7qL2BkRQGqdlllLcq5rzRHL9wGTZ0z6ItUF1KSMfD0+jYZz3Rty32tug5ErYcgUhdnAKstnk9BabjScUcR9ztHzi78kbewWn2nzHTbJLggl+gkgGRGJQonrGx+2l5GGpC4Pv9t2be+88vRoylQo1zbNhJE1WnJW9CCbd+oc/XgVGdcKy6BWd3RgY0CqMHQXxteok7xbqgLaEXWIml7qi/JIyVwnGK65zb4Ozw+eUHRn59ZZV668WIzu7VOdBdTapxw/FwtjYI3U5oeV+/KHRPg8jHA8EdM04Yvm12CIpCXrhZSJ2RreYVvJ8NmT3e+Xk3mPkNcfV8ZKL2dLKMLgU0bkS8nn5NMD6gMhqdxh9W36nADzhZMmoy0Hg0eU9lHZJdSk2tsYxEpiR4/YqQG9uN5+K66YoH792nU15BNxskPR9zbTj/4Ao6XITDnn+Pei1FkONR7YWXJ8yNTMujbq7uKSNxSxWf"
+DOTENV_VAULT_CI_VERSION=255
 
 # stage
 DOTENV_VAULT_STAGE="bfqZYD8oVLWMZ0JR5LICV+sB/btaXavszxZLxTfwSH8U5fg="

.gitattributes

@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 # Default
 

.gitignore

@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 # Locals
 

.npmignore

@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 # Locals
 

.prettierignore

@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 # Packages
 

.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 6, 2024 9:04 PM UTC.
+ * Last generated using `./settings.mjs` Mar 7, 2024 12:46 PM UTC.
  */
 {
     "editor.formatOnType": false,

.vscodeignore

@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 6, 2024 9:04 PM UTC.
+# Last generated Mar 7, 2024 12:46 PM UTC.
 
 # Locals
 

package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "1.0.280",
+    "version": "1.0.281",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities.cfw",
     "description": "Utilities for JavaScript apps running in a Cloudflare Worker environment.",

src/proxy.ts

@@ -5,7 +5,7 @@
 import '#@initialize.ts';
 
 import { $cfw, $root, cfw } from '#index.ts';
-import { $arr, $crypto, $env, $gzip, $http, $is, $mime, $obj, $str, $time, $to, $url, type $type } from '@clevercanyon/utilities';
+import { $arr, $crypto, $env, $gzip, $http, $is, $mime, $obj, $str, $time, $url, type $type } from '@clevercanyon/utilities';
 
 /**
  * Defines types.
@@ -28,30 +28,6 @@ type RequiredFetchOptions = Required<FetchOptions> & {
     proxy: Required<FetchOptions['proxy']>;
     headers: $type.cfw.Headers;
 };
-export type UAHeaderOptions = {
-    randomIndex?: number;
-};
-export type UAHeaders = $type.ReadonlyDeep<{
-    'user-agent': string;
-
-    'accept': string;
-    'accept-encoding': string;
-    'accept-language': string;
-
-    'sec-ch-ua': string;
-    'sec-ch-ua-mobile': string;
-    'sec-ch-ua-platform': string;
-    'sec-fetch-site': string;
-    'sec-fetch-mod': string;
-    'sec-fetch-user': string;
-
-    'upgrade-insecure-requests': string;
-}>;
-type UAHeadersResponsePayload = $type.ReadonlyDeep<{
-    ok: boolean;
-    error?: { message: string };
-    data?: UAHeaders;
-}>;
 
 /**
  * Performs an HTTP fetch using a proxy.
@@ -86,7 +62,7 @@ export const fetch = async (rcData: $cfw.StdRequestContextData, parseable: $type
     opts.headers = $http.parseHeaders(opts.headers) as $type.cfw.Headers;
 
     if (!opts.headers.has('user-agent'))
-        for (const [name, value] of Object.entries(await uaHeaders(rcData))) {
+        for (const [name, value] of Object.entries(await $root.uaHeaders(rcData))) {
             opts.headers.set(name, value);
         }
     if (opts.uaBotAppend /* e.g., `SomeCoolBot/1.0.0` */) {
@@ -111,9 +87,9 @@ export const fetch = async (rcData: $cfw.StdRequestContextData, parseable: $type
  *
  * @returns             Promise of response from worker using another worker as a proxy.
  */
-export const fetchWorker = async (rcData: $cfw.StdRequestContextData, requestInfo: $type.cfw.RequestInfo, requestInit?: $type.cfw.RequestInit): Promise<$type.cfw.Response> => {
+export const worker = async (rcData: $cfw.StdRequestContextData, requestInfo: $type.cfw.RequestInfo, requestInit?: $type.cfw.RequestInit): Promise<$type.cfw.Response> => {
     const { fetch, Request } = cfw,
-        proxyRoute = 'https://workers.o5p.me/worker-proxy/';
+        proxyRoute = 'https://proxy.c11n.workers.dev/';
 
     if ($is.string(requestInfo) || $is.url(requestInfo)) {
         requestInfo = $url.addQueryVar('url', requestInfo.toString(), proxyRoute);
@@ -124,89 +100,6 @@ export const fetchWorker = async (rcData: $cfw.StdRequestContextData, requestInf
     return fetch(requestInfo, requestInit);
 };
 
-// ---
-// Misc exports.
-
-/**
- * Fetches UA headers.
- *
- * @param   rcData  Request context data; {@see $cfw.StdRequestContextData}.
- * @param   options All optional; {@see UAHeaderOptions}.
- *
- * @returns         Promise of UA headers.
- */
-export const uaHeaders = async (rcData: $cfw.StdRequestContextData, options?: UAHeaderOptions): Promise<UAHeaders> => {
-    const { fetch } = cfw,
-        { url, auditLogger } = rcData,
-        //
-        opts = $obj.defaults({}, options || {}, {
-            randomIndex: $crypto.randomNumber(1, 100),
-        }) as Required<UAHeaderOptions>,
-        //
-        apiRoute = $url.addQueryVars(
-            { random_index: String(opts.randomIndex) }, //
-            new URL('https://workers.hop.gdn/api/ua-headers/v1'),
-        ),
-        defaultHeaders = {
-            'upgrade-insecure-requests': '1',
-            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36',
-            'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-            'sec-ch-ua': 'Google Chrome;v="80", "Chromium";v="80", ";Not A Brand";v="99"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': 'Windows',
-            'sec-fetch-site': 'none',
-            'sec-fetch-mod': '',
-            'sec-fetch-user': '?1',
-            'accept-encoding': 'gzip, deflate',
-            'accept-language': 'en-US,en;q=0.9',
-        };
-    if ($root.kv.isAvailable(rcData)) {
-        const kvKey = 'ua-headers:' + String(opts.randomIndex),
-            headers = (await $root.kv(rcData).get(kvKey, { type: 'json' })) as UAHeaders;
-
-        if (!$is.plainObject(headers)) {
-            void auditLogger.warn('UA headers failure.', { headers, error: Error('q9UTub4N') });
-            return defaultHeaders;
-        }
-        return headers;
-    }
-    if ($root.fetch.isAvailable(rcData)) {
-        let thrown: unknown;
-
-        const payload = await $root
-            .fetch(rcData, apiRoute)
-            .then(async (response): Promise<UAHeadersResponsePayload> => {
-                return $to.plainObject(await response.json()) as UAHeadersResponsePayload;
-            })
-            .catch((unknownThrown: unknown): void => {
-                thrown = unknownThrown;
-            });
-        if (!payload?.ok || !$is.plainObject(payload.data) || thrown) {
-            void auditLogger.warn('UA headers failure.', { payload, error: Error('DkkbNUJr'), thrown });
-            return defaultHeaders;
-        }
-        return payload.data;
-    }
-    if (url.hostname !== apiRoute.hostname) {
-        let thrown: unknown;
-
-        const payload = await fetch(apiRoute)
-            .then(async (response): Promise<UAHeadersResponsePayload> => {
-                return $to.plainObject(await response.json()) as UAHeadersResponsePayload;
-            })
-            .catch((unknownThrown: unknown): void => {
-                thrown = unknownThrown;
-            });
-        if (!payload?.ok || !$is.plainObject(payload.data) || thrown) {
-            void auditLogger.warn('UA headers failure.', { payload, error: Error('hMG9q7P5'), thrown });
-            return defaultHeaders;
-        }
-        return payload.data;
-    }
-    return defaultHeaders;
-};
-uaHeaders.urlSafeOptionKeys = ['randomIndex'] as string[];
-
 // ---
 // Misc utilities.