feat: add request header support

Author: ascorbic

demos/middleware/middleware.ts

@@ -8,9 +8,16 @@ import type { ElementHandlers } from './html_rewriter'
 class NetlifyResponse {
   static async next(request: NextRequest): Promise<NetlifyNextResponse> {
     const context = (request.geo as any).__nf_context
+    const originalRequest: Request = (request.geo as any).__nf_request
+
     if (!context) {
       throw new Error('NetlifyResponse can only be used with Netlify Edge Functions')
     }
+
+    request.headers.forEach((value, key) => {
+      originalRequest.headers.set(key, value)
+    })
+
     const response: Response = await context.next()
     return new NetlifyNextResponse(response)
   }
@@ -88,6 +95,11 @@ export async function middleware(request: NextRequest) {
     return res
   }
 
+  if (pathname.startsWith('/api/hello')) {
+    request.headers.set('x-hello', 'world')
+    return NetlifyResponse.next(request)
+  }
+
   if (pathname.startsWith('/cookies')) {
     response = NextResponse.next()
     response.cookies.set('netlifyCookie', 'true')

demos/middleware/pages/api/hello.js

@@ -1,5 +1,5 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 
 export default function handler(req, res) {
-  res.status(200).json({ name: 'John Doe' })
+  res.status(200).json({ name: 'John Doe', headers: req.headers })
 }

plugin/src/templates/edge/runtime.ts

@@ -45,13 +45,18 @@ const handler = async (req: Request, context: Context) => {
   }
 
   // The geo object is passed through to the middleware unchanged
-  // so we're smuggling the Netlify context object inside it
+  // so we're smuggling the Request and Netlify context object inside it
 
   Object.defineProperty(geo, '__nf_context', {
     value: context,
     enumerable: false,
   })
 
+  Object.defineProperty(geo, '__nf_request', {
+    value: req,
+    enumerable: false,
+  })
+
   const request: RequestData = {
     headers: Object.fromEntries(req.headers.entries()),
     geo,

plugin/src/templates/edge/utils.ts

@@ -99,11 +99,6 @@ export const buildResponse = async ({
   }
   const res = new Response(result.response.body, result.response)
   request.headers.set('x-nf-next-middleware', 'skip')
-  res.headers.forEach((value, key) => {
-    if (key.startsWith('x-request-header-')) {
-      request.headers.set(key.slice(17), value)
-    }
-  })
 
   const rewrite = res.headers.get('x-middleware-rewrite')
   if (rewrite) {