feat: extended cloudflare context

package.json

@@ -80,8 +80,8 @@
     "mlly": "^1.0.0",
     "mri": "^1.2.0",
     "node-fetch-native": "^1.0.1",
-    "ohash": "^1.0.0",
     "ofetch": "^1.0.0",
+    "ohash": "^1.0.0",
     "pathe": "^1.0.0",
     "perfect-debounce": "^0.1.3",
     "pkg-types": "^1.0.1",
@@ -102,6 +102,7 @@
     "unstorage": "^1.0.1"
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20221111.1",
     "@nuxtjs/eslint-config-typescript": "^11.0.0",
     "@types/aws-lambda": "^8.10.108",
     "@types/etag": "^1.8.1",

src/runtime/entries/cloudflare.ts

@@ -1,6 +1,9 @@
 import '#internal/nitro/virtual/polyfill'
 import { getAssetFromKV, mapRequestToAsset } from '@cloudflare/kv-asset-handler'
 import { withoutBase } from 'ufo'
+import type { RequestInit } from '@cloudflare/workers-types'
+import { createCall } from 'unenv/runtime/fetch/index'
+import { NodeListener, App, createEvent, createError, isError, sendError, H3EventContext } from 'h3'
 import { requestHasBody } from '../utils'
 import { nitroApp } from '../app'
 import { useRuntimeConfig } from '#internal/nitro'
@@ -22,7 +25,11 @@ async function handleEvent (event: FetchEvent) {
     body = Buffer.from(await event.request.arrayBuffer())
   }
 
-  const r = await nitroApp.localCall({
+  const localCall = createCall(toNodeListener(nitroApp.h3App, {
+    cf: (event.request as unknown as RequestInit)?.cf
+  }) as any)
+
+  const r = await localCall({
     event,
     url: url.pathname + url.search,
     host: url.hostname,
@@ -60,3 +67,28 @@ const baseURLModifier = (request: Request) => {
 function normalizeOutgoingHeaders (headers: Record<string, string | string[] | undefined>) {
   return Object.entries(headers).map(([k, v]) => [k, Array.isArray(v) ? v.join(',') : v])
 }
+
+function toNodeListener (app: App, context: H3EventContext): NodeListener {
+  const toNodeHandle: NodeListener = async function (req, res) {
+    const event = createEvent(req, res)
+    event.context.cloudflare = context
+    try {
+      await app.handler(event)
+    } catch (_error: any) {
+      const error = createError(_error)
+      if (!isError(_error)) {
+        error.unhandled = true
+      }
+
+      if (app.options.onError) {
+        await app.options.onError(error, event)
+      } else {
+        if (error.unhandled || error.fatal) {
+          console.error('[h3]', error.fatal ? '[fatal]' : '[unhandled]', error) // eslint-disable-line no-console
+        }
+        await sendError(event, error, !!app.options.debug)
+      }
+    }
+  }
+  return toNodeHandle
+}