Project update. [p][robotic]

clevercanyon · Mar 5, 2024 · bf0e93f · bf0e93f
1 parent 9bcfb44
commit bf0e93f
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 106 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 5, 2024 7:09 PM UTC.
+# Last generated Mar 5, 2024 7:54 PM UTC.
 
 [production]
 node >= 20.9.0

diff --git a/.dockerignore b/.dockerignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 5, 2024 7:09 PM UTC.
+# Last generated Mar 5, 2024 7:54 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="5iUNJilhSTYkuldheih4Lejvy/oSQa2LgZCHlU5rEk10sCJ1JlLXxHKlXiWXRJ/BexNBxPM1WgO8qRoGjLVogQDV2WaoPzBH9h6MWmOaNa4+Ly4B8cJ24QD6UxEit0+/EKLLXmAmNCV3R0bPeP+NRtkKHaXjpFplOAwsOLnFMCVxMazQXWNXRceN+Sv+u3sHxgz+C2khvtlMW48Ipz/NrqRz6Pl8WaCIG7JlDzWSyAjslUoc4bMb3PfJ0ZpowzzMC9LKgTjQvfsIw4mP2GhXkVyghCIc58LUnqT+JZmVYrzHcjJ8Mp8HMRr1/5Um1m0Q6ulDahOewRGujhlZPdOe3SoLf0LNsjTg+nhTJw0H+FX97sfMyZ6TcaGQOOO3Ig8wMlnnBxq4e7JJvleG0TVEufnIf2opJ62lg5HclPkF47uf8jXwSe5xDPXfxITPUQM56gevF86fxt9e2nXDYq+9gaq3gzv3cmcsLriYVriF9PHekUsup39ZaDPZqZDFv3e1vqnTp4M6q/5Ufkm2Sjf//DOSMOfK8pvIKfJVIrmLwnvJtdhLsQptuFTnJb7WiEg8jysEoNxbDJ7BMTFbhbZ5wibLDFanLuQRzCdOHR9c5DjKJ8dMhrJFM9YIose6XcN8dCOlGmlXu5Bd1UwrZFb8oxKUGc7goewlXVQbf/sJHUlkdNDrGWs3Uxop75TRzzh5KwxiWxI8G43aFlTIUeStnk7Li7dPnA3SeStlCWxlMUGa93hdoIEpqjbcKcQcIsfM6guGjDTE5ZGzCDaMHFpHtF+i/C+lhPSGk9ckR9I33qP7baH9tybeac4tsa/ofoc22jkC2WyecVbIpwDys9+bnj57Bfl/F7rDqJTpejcRX9sBEXYbob8VozHVUTb/"
-DOTENV_VAULT_DEV_VERSION=237
+DOTENV_VAULT_DEV="OGahLQkcbc6GhOVsAfI6L10rJJadyVnXWiVXRSeMLlYOOpMeu+MNTI329MTFTvLFYb+TkhrPQ9VFRdKq0X+Uy16MdlU+f/FUd7mxOK3nI+XiRaxQd+zajv/jI524UVnKvG1c7Y2PxSJYpajyzqQz/5iH3zYBlRZOA24lrzMOfBAkahfHZf3/0nEDZf0vPhGPgpvO5H1nrxCZvxfsNxc4YY8Or99spmsmDKbReb1sP46ejCDChV9eWDyo6fnUd3cIFOiXFYB65oUoMu6OxTxRUALeOtLRuHdGTv2938x7RNef2nVzCd2Zz3QYouV+rE5QLtANYqPcKEdqHYT6CBlzGFSSlqSGwNVxS2dMdXHTjzUlolrXAO6RgAygS/RXChiYLXyfqJK+J/QJoNfnVxgv3/iOISc1KOk5PsSspwXfF3lWHcMHJdlkWjywZMNz0YAFjPXA9KBnyyuT/VBH5CgTT+d4rJ0GKved1NzoA3Cl1hfQMQMHVkRWpvYUxxjONeH5CPIc31D9i7sHjUdAiECSQ4MOcHUv5zPIJh97Doqxuf2acrjjdVz5EPJYSLgSzG7Q06DiQuEBMW0ot/2mPIhXy8t7vfnbux5hMSagSemuETBSGRiKA7r1vOOf/29AVJs+xOD3QANCaWN6J3aTrHy1K56ZFLmbXe5dl+kxC+WeCqWyzcuHxfZfOp6GdvWdm7UcSmGB8P5xYg0uZYfBLIvvty6sp7Hji3tbMuujH9yNQO6bsONcp1P4CSdCnPI0/QGNMCwrDDRBTSLwe3pHZkA/DbFpArn6tcAuvBvsKv5iRXzg9HJErr4+U0uPPVX+SHMYj4uKixBga5zZAlT6NqeVPQfqB9hLy66s0IrLp5tHxEnOmnb+fgkf54rn15Sj"
+DOTENV_VAULT_DEV_VERSION=239
 
 # ci
-DOTENV_VAULT_CI="DRMbYxdEAhDTh6fMrHKHn0qmdYfV5E7+OonYbbtcP719hvnI0jUrIiDEb1Ymy4EtOOfWH818FGBmxpD11dND7ysEZqgGiOE83NEy+MTpe6TBgoJoImt94dqO0VrBVK55csHrh9Z+zLDUb3fZDj89OPOWui/NVgMOx0M1iWSHv72O3MnGADADMvNw77jdALYKTxRvMdv5v4rBDei/IF7o3F8qI0lOVgsgX6oKVzt+T+8NapKJUtJdGAQUeysOJMzGWbo+5qGeUR32RIOELYwzQOuy04CS3BRnsgW8CUXwSkrLu9jTSf6iHKG6rUGnNO7f/rDwDOLWRsV1mLIBDqj+yAl/OMHbRmPHaNXuzyq9v/y/j4YnCr6NV/FaH7FmuXFGzP7cmSwTCEP173SBx6E+Wi6nCFfyv3uvkOqfEj0202EjopWFscwyT4nKOq0xvsqfZtOlJFdr1yy4S3kwucAKJqX1seRht+PKHK6y/MSCz7C8eVIsvxN8m5GWzElzPkADE0UrCUV6rjP6CgZ2GVhk8nOV0WWPxYyrfoPQnmJ70SZfLRBLzi22Jr/crb5bG/56HkpwH7pfOZy+FggQ6M9+eVxjKr0knHKXWCt2zA+572dm5xrBTFSNw482i6kUcSFfdU1+B8O5rfrL70gKBbApn3pQIBMh944I3hHBPCRk+bvYzHPzuh+7KthgnkplA/hME/0/JO7yrJB6dtJX78U8K/rhs7JKOEN3p6zP3vl5Vw3m3Q4AuxJ6FA+pBJfdZX0c40sO7ZUFpmLj/Z0niSFcvZ+doukVt5cg9NRljehLZ374XhMXO5kt5s3uwymuzo5nsLqZRiSsrHWfkCaCDPSYLHiqjmWn9S143e4yahfmZafex4NA/IDVKy2rFRqM"
-DOTENV_VAULT_CI_VERSION=237
+DOTENV_VAULT_CI="6/PrRH5yNWCcgfVXE9OltF471tAuSnafAAlfv5mFYw6s5i9uX500HXlaY5JY4du1iklCUDS6sCwKK/5dG3tn6/UXywd9k4DjM6p3qWAmwxnlXF4x2nsj6n//uypQINm39a1t59Dn4CpohubvC4VdHqNJefvorCcDmdfrpkbbScHf/FScdz0T8N49m8YMTzOo+R+j4AAsZfSycoJtJLBlgcrw8I9H5ovzYxGeonqHFeqMLPE0G6K1WEX0vynljiwy21fSNLpVbp+l+Du3D2ayyDKXsEA3/jcQhHWg2YF7sUawYi/Af9a6Gs4Woq5GQozLlP4WC4XahXfPQNpjXmz24DnXf4BJ3Kf/dzrJBx+YQMOzZyiWrXffw9IrPXjrgPwT2SVbEY0T7+7YcaviJdoJdBmZAMXAMzn0teghOyP5EGsAbFiRSUwTT1FTXiG+bUgz6oZ+PAtzrKt+GI5mHKub3sWcRMDuVB1WGSt1N2uX43uMHbp1k7vSEoAZ4QAL/LvN+RAdCoFcf9gLC42dATpOl9ivrExSvwLAaZFaoF6j1mjrrNGjo+0/sND62ebOj5tCxhYVImzZxleYMMR47aYK5VdVF0jvBtByFIyqG2k+tI8C2OcyKTilIPWSxa/VtFNxul8SjUaiIS3NTRYSsSOLZuiGzDRQAFGydZ5zt32ME9J+kVpOIPye0TEhq0JXj1dz8EsOE1NtjV+od1T89zDBHdpvzk9ZUlH0z8UQgk8B5PELrzGryBvfkkkL/zxjduM6ZSG/V1TuDWEeK0qWZWHQof5pNLUdT32hTYc4MvX3o6BPkTxTblNbykWaYu8dFM8rk7pE0Pe4QnFflLg4/CeE268bVJMRyWbk3iox7GdUGKlGA0R1l3S/UvteVTAs"
+DOTENV_VAULT_CI_VERSION=239
 
 # stage
 DOTENV_VAULT_STAGE="bfqZYD8oVLWMZ0JR5LICV+sB/btaXavszxZLxTfwSH8U5fg="

diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 5, 2024 7:09 PM UTC.
+# Last generated Mar 5, 2024 7:54 PM UTC.
 
 # Default
 

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 5, 2024 7:09 PM UTC.
+# Last generated Mar 5, 2024 7:54 PM UTC.
 
 # Locals
 

diff --git a/.npmignore b/.npmignore
@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 5, 2024 7:09 PM UTC.
+# Last generated Mar 5, 2024 7:54 PM UTC.
 
 # Locals
 

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

diff --git a/.vscodeignore b/.vscodeignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 5, 2024 7:09 PM UTC.
+# Last generated Mar 5, 2024 7:54 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.272",
+    "version": "1.0.273",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities.cfw",
     "description": "Utilities for JavaScript apps running in a Cloudflare Worker environment.",

diff --git a/src/proxy.ts b/src/proxy.ts
@@ -102,6 +102,113 @@ export const fetch = async (rcData: $cfw.StdRequestContextData, parseable: $type
     return await Promise.race([fetchꓺwaitTimeout(rcData, opts), fetchꓺviaSocket(rcData, url, opts)]);
 };
 
+/**
+ * Fetches worker using another worker as a proxy.
+ *
+ * @param   rcData      Request context data; {@see $cfw.StdRequestContextData}.
+ * @param   requestInfo New request info; {@see $type.cfw.RequestInfo}.
+ * @param   requestInit New request init; {@see $type.cfw.RequestInit}.
+ *
+ * @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> => {
+    const { fetch, Request } = cfw;
+
+    if ($is.string(requestInfo) || $is.url(requestInfo)) {
+        requestInfo = 'https://worker-proxy.c10n.workers.dev/?url=' + $url.encode(requestInfo.toString());
+        //
+    } else if (requestInfo instanceof Request) {
+        requestInfo = new Request('https://worker-proxy.c10n.workers.dev/?url=' + $url.encode(requestInfo.url), requestInfo);
+    }
+    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.
+
 /**
  * Creates a timeout promise.
  *
@@ -260,83 +367,3 @@ const fetchꓺviaSocket = async (rcData: $cfw.StdRequestContextData, url: $type.
         });
     }
 };
-
-/**
- * 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[];
diff --git a/src/root.ts b/src/root.ts
@@ -21,11 +21,7 @@ const rootPkgName = '@clevercanyon/workers.hop.gdn';
  *
  * @returns             Promise of response from root service binding.
  */
-export const fetch = async (
-    rcData: $cfw.StdRequestContextData, //
-    requestInfo: $type.cfw.RequestInfo,
-    requestInit?: $type.cfw.RequestInit,
-): Promise<$type.cfw.Response> => {
+export const fetch = async (rcData: $cfw.StdRequestContextData, requestInfo: $type.cfw.RequestInfo, requestInit?: $type.cfw.RequestInit): Promise<$type.cfw.Response> => {
     const { env } = rcData,
         rt = env.RT;
 
@@ -122,7 +118,7 @@ kv.isAvailable = (rcData: $cfw.StdRequestContextData): boolean => {
 export const counter = async (rcData: $cfw.StdRequestContextData, key: string): Promise<number> => {
     return ((await d1(rcData).prepare('SELECT `value` FROM `counters` WHERE `key` = ?1 LIMIT 1').bind(key).first('value')) as number) || 0;
 };
-counter.isAvailable = d1.isAvailable;
+counter.isAvailable = d1.isAvailable; // Powered by root D1 database.
 
 /**
  * Bumps counter value.

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 5, 2024 7:09 PM UTC.
+ * Last generated using `./tsconfig.mjs` Mar 5, 2024 7:54 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 5, 2024 7:09 PM UTC.
+# Last generated using `./wrangler.mjs` Mar 5, 2024 7:54 PM UTC.
 ##
 
 send_metrics = false