@odatnurd/cf-requests 0.1.4 → 0.1.6

package/aegis/index.js

@@ -68,26 +68,78 @@ export async function schemaTest(dataType, schema, data, validator) {
   // not throw an error.
   const next = () => {};
 
+  // For form data, we need to create a single, shared request object *before*
+  // we build the context, so that both the header and the body can be derived
+  // from the same source, ensuring the multipart boundary matches.
+  let tempRequest = null;
+  if (dataType === 'form') {
+    const formData = new FormData();
+    for (const key in data) {
+      formData.append(key, data[key]);
+    }
+    tempRequest = new Request('http://localhost', {
+      method: 'POST',
+      body: formData,
+    });
+  }
+
+
   // In order to run the test we need to create a fake Hono context object to
   // pass to the middleware; this mimics the smallest possible footprint of
   // Hono context for our purposes.
   const ctx = {
     req: {
       // These methods are used by the validator to pull the parsed data out of
-      // the request in order to validate it.
+      // the request in order to validate it, except for when the data type is
+      // header, in which case it invokes the header() function with no name.
       param: () => data,
       json: async () => data,
-      query: () => data,
-      header: () => data,
+      query: (key) => data[key],
+      queries: (key) => {
+        const result = {};
+        for(const [k, v] of Object.entries(data)) {
+          result[k] = Array.isArray(v) ? v : [v];
+        }
+        return key ? result[key] : result;
+      },
       cookie: () => data,
-      form: async () => data,
+      formData: async () => {
+        if (dataType === 'form') {
+           return tempRequest.formData();
+        }
+        // Fallback for other types, though not strictly needed by the validator
+        const formData = new FormData();
+        for (const key in data) {
+          formData.append(key, data[key]);
+        }
+        return formData;
+      },
+      // For form data, the validator expects to be able to get the raw body
+      // as an ArrayBuffer. We can simulate this by URL-encoding the data.
+      arrayBuffer: async () => tempRequest ? tempRequest.arrayBuffer() : new ArrayBuffer(0),
+      // The validator also uses a bodyCache property to store parsed bodies.
+      bodyCache: {},
+
+
+      // We need to populate an actual cookie header in headers for it the
+      // validator to be able to pull cookie data because it wants to parse it
+      // itself.
+      headers: new Headers(dataType === 'cookie'
+        ? { 'Cookie': Object.entries(data).map(([k,v]) => `${k}=${v}`).join('; ') }
+        : {}),
 
       // The validator invokes this to get headers out of the request when the
       // data type is JSON.
       header: (name) => {
+        // If there is no name, return the data back directly; this call pattern
+        // happens when the data type is header.
+        if (name === undefined) {
+          return data;
+        }
+
         return name.toLowerCase() !== 'content-type' ? undefined : {
           json: 'application/json',
-          form: 'multipart/form-data',
+          form: tempRequest?.headers.get('Content-Type'),
         }[dataType];
       },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odatnurd/cf-requests",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Simple Cloudflare Hono request wrapper",
   "author": "OdatNurd (https://odatnurd.net)",
   "homepage": "https://github.com/OdatNurd/cf-requests",