@nocobase/plugin-mcp-server 2.3.0-beta.12 → 2.3.0-beta.13

package/dist/node_modules/fast-uri/test/urn-full-input.test.js

@@ -0,0 +1,29 @@
+'use strict'
+
+const test = require('tape')
+const fastURI = require('..')
+
+test('URN parsing validates the complete scheme-specific input', (t) => {
+  const embedded = fastURI.parse('urn:x|foo:bar')
+  t.equal(embedded.error, 'URN can not be parsed.', 'does not search for a later nid:nss substring')
+  t.equal(embedded.nid, undefined, 'does not adopt the later nid')
+  t.equal(embedded.nss, undefined, 'does not adopt the later nss')
+
+  const trailing = fastURI.parse('urn:foo:bar|ignored')
+  t.equal(trailing.error, 'URN can not be parsed.', 'rejects trailing input outside the RFC 2141 NSS grammar')
+  t.equal(trailing.nid, undefined, 'does not return an nid from a partial match')
+  t.equal(trailing.nss, undefined, 'does not return a truncated nss')
+
+  t.end()
+})
+
+test('URN parsing preserves the complete RFC 2141 NSS', (t) => {
+  const parsed = fastURI.parse('urn:foo:allowed/evil')
+  t.equal(parsed.error, undefined, 'accepts slash in an RFC 2141 NSS')
+  t.equal(parsed.nid, 'foo', 'parses the nid')
+  t.equal(parsed.nss, 'allowed/evil', 'preserves the complete NSS')
+  t.equal(fastURI.normalize('urn:foo:allowed/evil'), 'urn:foo:allowed/evil', 'normalization retains slash data')
+  t.equal(fastURI.equal('urn:foo:allowed/evil', 'urn:foo:allowed'), false, 'distinct NSS values do not compare equal')
+
+  t.end()
+})

package/dist/node_modules/fast-uri/test/util.test.js

@@ -2,22 +2,37 @@
 
 const test = require('tape')
 const {
-  stringArrayToHexStripped
+  stringArrayToHexStripped,
+  removeDotSegments
 } = require('../lib/utils')
 
 test('stringArrayToHexStripped', (t) => {
   const testCases = [
-    [[['0', '0', '0', '0']], ''],
-    [[['0', '0', '0', '0'], false], ''],
-    [[['0', '0', '0', '0'], true], '0'],
-    [[['0', '1', '0', '0'], false], '100'],
-    [[['1', '0', '0', '0'], false], '1000'],
-    [[['1', '0', '0', '0'], true], '1000']
+    [['0', '0', '0', '0'], ''],
+    [['0', '0', '0', '1'], '1'],
+    [['0', '0', '1', '0'], '10'],
+    [['0', '1', '0', '0'], '100'],
+    [['1', '0', '0', '0'], '1000'],
+    [['1', '0', '0', '1'], '1001'],
   ]
 
   t.plan(testCases.length)
 
   testCases.forEach(([input, expected]) => {
-    t.same(stringArrayToHexStripped(input[0], input[1]), expected)
+    t.same(stringArrayToHexStripped(input), expected)
+  })
+})
+
+// Just fixtures, because this function already tested by resolve
+test('removeDotSegments', (t) => {
+  const testCases = []
+  // https://github.com/fastify/fast-uri/issues/139
+  testCases.push(['WS:/WS://1305G130505:1&%0D:1&C(XXXXX*)))))))XXX130505:UUVUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaa13a',
+    'WS:/WS://1305G130505:1&%0D:1&C(XXXXX*)))))))XXX130505:UUVUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaa13a'])
+
+  t.plan(testCases.length)
+
+  testCases.forEach(([input, expected]) => {
+    t.same(removeDotSegments(input), expected)
   })
 })

package/dist/node_modules/fast-uri/test/websocket-query-preservation.test.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const test = require('tape')
+const fastURI = require('..')
+
+test('WebSocket queries preserve additional question marks', (t) => {
+  for (const scheme of ['ws', 'wss']) {
+    const uri = `${scheme}://example.com/chat?a?b`
+    const truncatedURI = `${scheme}://example.com/chat?a`
+    const parsed = fastURI.parse(uri)
+
+    t.equal(parsed.resourceName, '/chat?a?b', `${scheme} parse preserves the resource name`)
+    t.equal(fastURI.serialize(parsed), uri, `${scheme} parsed components round-trip`)
+    t.equal(
+      fastURI.serialize({ scheme, host: 'example.com', resourceName: '/chat?a?b' }),
+      uri,
+      `${scheme} resource name serializes without truncation`
+    )
+    t.equal(fastURI.normalize(uri), uri, `${scheme} normalization preserves the full query`)
+    t.equal(fastURI.equal(uri, truncatedURI), false, `${scheme} equality distinguishes the full query`)
+  }
+
+  t.end()
+})

package/dist/node_modules/fast-uri/tsconfig.json

@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "allowJs": true,
+        "checkJs": true,
+        "strict": true,
+        "noImplicitAny": true,
+        "target": "es2015"
+    }
+}

package/dist/node_modules/fast-uri/types/index.d.ts

@@ -10,6 +10,11 @@ declare namespace fastUri {
     query?: string;
     fragment?: string;
     reference?: string;
+    nid?: string;
+    nss?: string;
+    resourceName?: string;
+    secure?: boolean;
+    uuid?: string;
     error?: string;
   }
   export interface Options {
@@ -19,6 +24,8 @@ declare namespace fastUri {
     domainHost?: boolean;
     absolutePath?: boolean;
     tolerant?: boolean;
+    skipEscape?: boolean;
+    nid?: string;
   }
 
   /**
@@ -30,21 +37,21 @@ declare namespace fastUri {
    */
   export type URIComponents = URIComponent
 
-  export function normalize(uri: string, opts?: Options): string;
-  export function normalize(uri: URIComponent, opts?: Options): URIComponent;
-  export function normalize(uri: any, opts?: Options): any;
+  export function normalize (uri: string, opts?: Options): string
+  export function normalize (uri: URIComponent, opts?: Options): URIComponent
+  export function normalize (uri: any, opts?: Options): any
 
-  export function resolve(baseURI: string, relativeURI: string, options?: Options): string
+  export function resolve (baseURI: string, relativeURI: string, options?: Options): string
 
-  export function resolveComponent(base: URIComponent, relative: URIComponent, options?: Options, skipNormalization?: boolean): URIComponent
+  export function resolveComponent (base: URIComponent, relative: URIComponent, options?: Options, skipNormalization?: boolean): URIComponent
 
-  export function parse(uri: string, opts?: Options): URIComponent;
+  export function parse (uri: string, opts?: Options): URIComponent
 
-  export function serialize(component: URIComponent, opts?: Options): string;
+  export function serialize (component: URIComponent, opts?: Options): string
 
-  export function equal(uriA: string, uriB: string): boolean;
+  export function equal (uriA: string, uriB: string): boolean
 
-  export function resolve(base: string, path: string): string;
+  export function resolve (base: string, path: string): string
 
   export const fastUri: FastUri
   export { fastUri as default }

package/dist/node_modules/fast-uri/types/index.test-d.ts

@@ -1,14 +1,14 @@
-import uri, { URIComponents, URIComponent, Options, options } from "..";
-import { expectDeprecated, expectType } from "tsd";
+import uri, { URIComponents, URIComponent, Options, options } from '..'
+import { expectDeprecated, expectType } from 'tsd'
 
-const parsed = uri.parse("foo");
-expectType<URIComponents>(parsed);
-const parsed2 = uri.parse("foo", {
-    domainHost: true,
-    scheme: 'https',
-    unicodeSupport: false
+const parsed = uri.parse('foo')
+expectType<URIComponents>(parsed)
+const parsed2 = uri.parse('foo', {
+  domainHost: true,
+  scheme: 'https',
+  unicodeSupport: false
 })
-expectType<URIComponents>(parsed2);
+expectType<URIComponents>(parsed2)
 
 expectType<URIComponent>({} as URIComponents)
 expectDeprecated({} as URIComponents)

package/dist/node_modules/hono/dist/adapter/aws-lambda/handler.js

@@ -62,8 +62,15 @@ var streamHandle = (app) => {
 var handle = (app, { isContentTypeBinary } = { isContentTypeBinary: void 0 }) => {
   return async (event, lambdaContext) => {
     const processor = getProcessor(event);
-    const req = processor.createRequest(event);
-    const requestContext = getRequestContext(event);
+    let req, requestContext;
+    try {
+      req = processor.createRequest(event);
+      requestContext = getRequestContext(event);
+    } catch (error) {
+      console.error("Error processing request:", error);
+      const errorResponse = error instanceof TypeError ? new Response("Invalid request", { status: 400 }) : new Response("Internal Server Error", { status: 500 });
+      return processor.createResult(event, errorResponse, { isContentTypeBinary });
+    }
     const res = await app.fetch(req, {
       event,
       requestContext,
@@ -102,7 +109,9 @@ var EventProcessor = class {
       method
     };
     if (event.body) {
-      requestInit.body = event.isBase64Encoded ? decodeBase64(event.body) : event.body;
+      const body = event.isBase64Encoded ? decodeBase64(event.body) : new TextEncoder().encode(event.body);
+      requestInit.body = body;
+      headers.set("content-length", body.length.toString());
     }
     return new Request(url, requestInit);
   }
@@ -200,21 +209,17 @@ var EventV1Processor = class extends EventProcessor {
   getHeaders(event) {
     const headers = new Headers();
     this.getCookies(event, headers);
-    if (event.headers) {
-      for (const [k, v] of Object.entries(event.headers)) {
-        if (v) {
-          headers.set(k, sanitizeHeaderValue(v));
-        }
-      }
-    }
     if (event.multiValueHeaders) {
       for (const [k, values] of Object.entries(event.multiValueHeaders)) {
         if (values) {
-          const foundK = headers.get(k);
-          values.forEach((v) => {
-            const sanitizedValue = sanitizeHeaderValue(v);
-            return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
-          });
+          values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
+        }
+      }
+    }
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v && !headers.has(k)) {
+          headers.set(k, sanitizeHeaderValue(v));
         }
       }
     }
@@ -274,7 +279,7 @@ var ALBProcessor = class extends EventProcessor {
     if (result.multiValueHeaders) {
       result.multiValueHeaders["set-cookie"] = cookies;
     } else {
-      result.headers["set-cookie"] = cookies.join(", ");
+      result.headers["set-cookie"] = cookies[0];
     }
   }
 };
@@ -294,11 +299,7 @@ var LatticeV2Processor = class extends EventProcessor {
     if (event.headers) {
       for (const [k, values] of Object.entries(event.headers)) {
         if (values) {
-          const foundK = headers.get(k);
-          values.forEach((v) => {
-            const sanitizedValue = sanitizeHeaderValue(v);
-            return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
-          });
+          values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
         }
       }
     }
@@ -309,7 +310,7 @@ var LatticeV2Processor = class extends EventProcessor {
   setCookiesToResult(result, cookies) {
     result.headers = {
       ...result.headers,
-      "set-cookie": cookies.join(", ")
+      "set-cookie": cookies
     };
   }
 };
@@ -333,7 +334,7 @@ var isProxyEventALB = (event) => {
   return false;
 };
 var isProxyEventV2 = (event) => {
-  return Object.hasOwn(event, "rawPath");
+  return Object.hasOwn(event, "rawPath") && Object.hasOwn(event.requestContext ?? {}, "http");
 };
 var isLatticeEventV2 = (event) => {
   if (event.requestContext) {
@@ -347,10 +348,7 @@ var defaultIsContentTypeBinary = (contentType) => {
   );
 };
 var isContentEncodingBinary = (contentEncoding) => {
-  if (contentEncoding === null) {
-    return false;
-  }
-  return /^(gzip|deflate|compress|br)/.test(contentEncoding);
+  return !!contentEncoding && !/^identity$/i.test(contentEncoding);
 };
 export {
   ALBProcessor,

package/dist/node_modules/hono/dist/adapter/bun/serve-static.js

@@ -2,7 +2,7 @@
 import { stat } from "node:fs/promises";
 import { join } from "node:path";
 import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
-var serveStatic = (options) => {
+var serveStatic = (options = {}) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
       const file = Bun.file(path);

package/dist/node_modules/hono/dist/adapter/bun/websocket.js

@@ -24,7 +24,9 @@ var upgradeWebSocket = defineWebSocketHelper((c, events) => {
     data: {
       events,
       url: new URL(c.req.url),
-      protocol: c.req.url
+      // The first requested subprotocol, exposed via WSContext.protocol to
+      // match the deno and cloudflare adapters.
+      protocol: c.req.header("sec-websocket-protocol")?.split(",")[0]?.trim() ?? ""
     }
   });
   if (upgradeResult) {

package/dist/node_modules/hono/dist/adapter/cloudflare-workers/serve-static.js

@@ -1,7 +1,7 @@
 // src/adapter/cloudflare-workers/serve-static.ts
 import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
 import { getContentFromKVAsset } from "./utils.js";
-var serveStatic = (options) => {
+var serveStatic = (options = {}) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
       return getContentFromKVAsset(path, {

package/dist/node_modules/hono/dist/adapter/deno/serve-static.js

@@ -2,7 +2,7 @@
 import { join } from "node:path";
 import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
 var { open, lstatSync, errors } = Deno;
-var serveStatic = (options) => {
+var serveStatic = (options = {}) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
       try {

package/dist/node_modules/hono/dist/adapter/deno/websocket.js

@@ -4,7 +4,11 @@ var upgradeWebSocket = defineWebSocketHelper(async (c, events, options) => {
   if (c.req.header("upgrade") !== "websocket") {
     return;
   }
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options ?? {});
+  const subprotocol = c.req.header("sec-websocket-protocol")?.split(",")[0]?.trim();
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, {
+    ...subprotocol ? { protocol: subprotocol } : {},
+    ...options
+  });
   const wsContext = new WSContext({
     close: (code, reason) => socket.close(code, reason),
     get protocol() {

package/dist/node_modules/hono/dist/adapter/lambda-edge/handler.js

@@ -15,21 +15,31 @@ var convertHeaders = (headers) => {
 var handle = (app) => {
   return async (event, ...args) => {
     const [context, callback] = args;
+    let callbackError = null;
+    let callbackResult;
     const res = await app.fetch(createRequest(event), {
       event,
       context,
       callback: (err, result) => {
+        if (!callbackError && !callbackResult) {
+          callbackError = err;
+          callbackResult = result;
+        }
         callback?.(err, result);
       },
       config: event.Records[0].cf.config,
       request: event.Records[0].cf.request,
       response: event.Records[0].cf.response
     });
-    return createResult(res);
+    if (callbackError) {
+      throw callbackError;
+    }
+    return callbackResult ?? createResult(res);
   };
 };
 var createResult = async (res) => {
-  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
+  const contentEncoding = res.headers.get("content-encoding");
+  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "") || !!contentEncoding && !/^identity$/i.test(contentEncoding);
   const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
   return {
     status: res.status.toString(),
@@ -45,11 +55,17 @@ var createRequest = (event) => {
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
-    v.forEach((header) => headers.set(k, header.value));
+    v.forEach((header) => headers.append(k, header.value));
   });
   const requestBody = event.Records[0].cf.request.body;
   const method = event.Records[0].cf.request.method;
-  const body = createBody(method, requestBody);
+  const rawBody = createBody(method, requestBody);
+  let body = rawBody;
+  if (rawBody !== void 0) {
+    const bytes = typeof rawBody === "string" ? new TextEncoder().encode(rawBody) : rawBody;
+    body = bytes;
+    headers.set("content-length", bytes.length.toString());
+  }
   return new Request(url, {
     headers,
     method,

package/dist/node_modules/hono/dist/cjs/adapter/aws-lambda/handler.js

@@ -92,8 +92,15 @@ const streamHandle = (app) => {
 const handle = (app, { isContentTypeBinary } = { isContentTypeBinary: void 0 }) => {
   return async (event, lambdaContext) => {
     const processor = getProcessor(event);
-    const req = processor.createRequest(event);
-    const requestContext = getRequestContext(event);
+    let req, requestContext;
+    try {
+      req = processor.createRequest(event);
+      requestContext = getRequestContext(event);
+    } catch (error) {
+      console.error("Error processing request:", error);
+      const errorResponse = error instanceof TypeError ? new Response("Invalid request", { status: 400 }) : new Response("Internal Server Error", { status: 500 });
+      return processor.createResult(event, errorResponse, { isContentTypeBinary });
+    }
     const res = await app.fetch(req, {
       event,
       requestContext,
@@ -132,7 +139,9 @@ class EventProcessor {
       method
     };
     if (event.body) {
-      requestInit.body = event.isBase64Encoded ? (0, import_encode.decodeBase64)(event.body) : event.body;
+      const body = event.isBase64Encoded ? (0, import_encode.decodeBase64)(event.body) : new TextEncoder().encode(event.body);
+      requestInit.body = body;
+      headers.set("content-length", body.length.toString());
     }
     return new Request(url, requestInit);
   }
@@ -230,21 +239,17 @@ class EventV1Processor extends EventProcessor {
   getHeaders(event) {
     const headers = new Headers();
     this.getCookies(event, headers);
-    if (event.headers) {
-      for (const [k, v] of Object.entries(event.headers)) {
-        if (v) {
-          headers.set(k, sanitizeHeaderValue(v));
-        }
-      }
-    }
     if (event.multiValueHeaders) {
       for (const [k, values] of Object.entries(event.multiValueHeaders)) {
         if (values) {
-          const foundK = headers.get(k);
-          values.forEach((v) => {
-            const sanitizedValue = sanitizeHeaderValue(v);
-            return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
-          });
+          values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
+        }
+      }
+    }
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v && !headers.has(k)) {
+          headers.set(k, sanitizeHeaderValue(v));
         }
       }
     }
@@ -304,7 +309,7 @@ class ALBProcessor extends EventProcessor {
     if (result.multiValueHeaders) {
       result.multiValueHeaders["set-cookie"] = cookies;
     } else {
-      result.headers["set-cookie"] = cookies.join(", ");
+      result.headers["set-cookie"] = cookies[0];
     }
   }
 }
@@ -324,11 +329,7 @@ class LatticeV2Processor extends EventProcessor {
     if (event.headers) {
       for (const [k, values] of Object.entries(event.headers)) {
         if (values) {
-          const foundK = headers.get(k);
-          values.forEach((v) => {
-            const sanitizedValue = sanitizeHeaderValue(v);
-            return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
-          });
+          values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
         }
       }
     }
@@ -339,7 +340,7 @@ class LatticeV2Processor extends EventProcessor {
   setCookiesToResult(result, cookies) {
     result.headers = {
       ...result.headers,
-      "set-cookie": cookies.join(", ")
+      "set-cookie": cookies
     };
   }
 }
@@ -363,7 +364,7 @@ const isProxyEventALB = (event) => {
   return false;
 };
 const isProxyEventV2 = (event) => {
-  return Object.hasOwn(event, "rawPath");
+  return Object.hasOwn(event, "rawPath") && Object.hasOwn(event.requestContext ?? {}, "http");
 };
 const isLatticeEventV2 = (event) => {
   if (event.requestContext) {
@@ -377,10 +378,7 @@ const defaultIsContentTypeBinary = (contentType) => {
   );
 };
 const isContentEncodingBinary = (contentEncoding) => {
-  if (contentEncoding === null) {
-    return false;
-  }
-  return /^(gzip|deflate|compress|br)/.test(contentEncoding);
+  return !!contentEncoding && !/^identity$/i.test(contentEncoding);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/node_modules/hono/dist/cjs/adapter/bun/serve-static.js

@@ -23,7 +23,7 @@ module.exports = __toCommonJS(serve_static_exports);
 var import_promises = require("node:fs/promises");
 var import_node_path = require("node:path");
 var import_serve_static = require("../../middleware/serve-static");
-const serveStatic = (options) => {
+const serveStatic = (options = {}) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
       const file = Bun.file(path);

package/dist/node_modules/hono/dist/cjs/adapter/bun/websocket.js

@@ -48,7 +48,9 @@ const upgradeWebSocket = (0, import_websocket.defineWebSocketHelper)((c, events)
     data: {
       events,
       url: new URL(c.req.url),
-      protocol: c.req.url
+      // The first requested subprotocol, exposed via WSContext.protocol to
+      // match the deno and cloudflare adapters.
+      protocol: c.req.header("sec-websocket-protocol")?.split(",")[0]?.trim() ?? ""
     }
   });
   if (upgradeResult) {

package/dist/node_modules/hono/dist/cjs/adapter/cloudflare-workers/serve-static.js

@@ -22,7 +22,7 @@ __export(serve_static_exports, {
 module.exports = __toCommonJS(serve_static_exports);
 var import_serve_static = require("../../middleware/serve-static");
 var import_utils = require("./utils");
-const serveStatic = (options) => {
+const serveStatic = (options = {}) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
       return (0, import_utils.getContentFromKVAsset)(path, {

package/dist/node_modules/hono/dist/cjs/adapter/deno/serve-static.js

@@ -23,7 +23,7 @@ module.exports = __toCommonJS(serve_static_exports);
 var import_node_path = require("node:path");
 var import_serve_static = require("../../middleware/serve-static");
 const { open, lstatSync, errors } = Deno;
-const serveStatic = (options) => {
+const serveStatic = (options = {}) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
       try {

package/dist/node_modules/hono/dist/cjs/adapter/deno/websocket.js

@@ -25,7 +25,11 @@ const upgradeWebSocket = (0, import_websocket.defineWebSocketHelper)(async (c, e
   if (c.req.header("upgrade") !== "websocket") {
     return;
   }
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options ?? {});
+  const subprotocol = c.req.header("sec-websocket-protocol")?.split(",")[0]?.trim();
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, {
+    ...subprotocol ? { protocol: subprotocol } : {},
+    ...options
+  });
   const wsContext = new import_websocket.WSContext({
     close: (code, reason) => socket.close(code, reason),
     get protocol() {

package/dist/node_modules/hono/dist/cjs/adapter/lambda-edge/handler.js

@@ -48,21 +48,31 @@ const convertHeaders = (headers) => {
 const handle = (app) => {
   return async (event, ...args) => {
     const [context, callback] = args;
+    let callbackError = null;
+    let callbackResult;
     const res = await app.fetch(createRequest(event), {
       event,
       context,
       callback: (err, result) => {
+        if (!callbackError && !callbackResult) {
+          callbackError = err;
+          callbackResult = result;
+        }
         callback?.(err, result);
       },
       config: event.Records[0].cf.config,
       request: event.Records[0].cf.request,
       response: event.Records[0].cf.response
     });
-    return createResult(res);
+    if (callbackError) {
+      throw callbackError;
+    }
+    return callbackResult ?? createResult(res);
   };
 };
 const createResult = async (res) => {
-  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
+  const contentEncoding = res.headers.get("content-encoding");
+  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "") || !!contentEncoding && !/^identity$/i.test(contentEncoding);
   const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
   return {
     status: res.status.toString(),
@@ -78,11 +88,17 @@ const createRequest = (event) => {
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
-    v.forEach((header) => headers.set(k, header.value));
+    v.forEach((header) => headers.append(k, header.value));
   });
   const requestBody = event.Records[0].cf.request.body;
   const method = event.Records[0].cf.request.method;
-  const body = createBody(method, requestBody);
+  const rawBody = createBody(method, requestBody);
+  let body = rawBody;
+  if (rawBody !== void 0) {
+    const bytes = typeof rawBody === "string" ? new TextEncoder().encode(rawBody) : rawBody;
+    body = bytes;
+    headers.set("content-length", bytes.length.toString());
+  }
   return new Request(url, {
     headers,
     method,