From 7479c698ad8ee6559a877db37f48b8fcdb0d3184 Mon Sep 17 00:00:00 2001
From: Zack Tanner <1939140+ztanner@users.noreply.github.com>
Date: Tue, 4 Jun 2024 18:51:45 -0700
Subject: [PATCH] fix NextRequest proxy in edge runtime

---
 .../server/route-modules/app-route/module.ts  | 59 +++++--------------
 1 file changed, 16 insertions(+), 43 deletions(-)

diff --git a/packages/next/src/server/route-modules/app-route/module.ts b/packages/next/src/server/route-modules/app-route/module.ts
index 6caa67e243dc6..63e76265104bf 100644
--- a/packages/next/src/server/route-modules/app-route/module.ts
+++ b/packages/next/src/server/route-modules/app-route/module.ts
@@ -55,6 +55,7 @@ import { cleanURL } from './helpers/clean-url'
 import { StaticGenBailoutError } from '../../../client/components/static-generation-bailout'
 import { isStaticGenEnabled } from './helpers/is-static-gen-enabled'
 import { trackDynamicDataAccessed } from '../../app-render/dynamic-rendering'
+import { ReflectAdapter } from '../../web/spec-extension/adapters/reflect'
 
 /**
  * The AppRouteModule is the type of the module exported by the bundled App
@@ -598,11 +599,7 @@ const forceStaticRequestHandlers = {
             ))
         )
       default:
-        const result = Reflect.get(target, prop, receiver)
-        if (typeof result === 'function') {
-          return result.bind(target)
-        }
-        return result
+        return ReflectAdapter.get(target, prop, receiver)
     }
   },
   // We don't need to proxy set because all the properties we proxy are ready only
@@ -649,11 +646,7 @@ const forceStaticNextUrlHandlers = {
             new Proxy(target.clone(), forceStaticNextUrlHandlers))
         )
       default:
-        const result = Reflect.get(target, prop, receiver)
-        if (typeof result === 'function') {
-          return result.bind(target)
-        }
-        return result
+        return ReflectAdapter.get(target, prop, receiver)
     }
   },
 }
@@ -677,11 +670,7 @@ function proxyNextRequest(
         case 'toString':
         case 'origin': {
           trackDynamicDataAccessed(staticGenerationStore, `nextUrl.${prop}`)
-          const result = Reflect.get(target, prop, receiver)
-          if (typeof result === 'function') {
-            return result.bind(target)
-          }
-          return result
+          return ReflectAdapter.get(target, prop, receiver)
         }
         case 'clone':
           return (
@@ -690,11 +679,7 @@ function proxyNextRequest(
               new Proxy(target.clone(), nextUrlHandlers))
           )
         default:
-          const result = Reflect.get(target, prop, receiver)
-          if (typeof result === 'function') {
-            return result.bind(target)
-          }
-          return result
+          return ReflectAdapter.get(target, prop, receiver)
       }
     },
   }
@@ -702,8 +687,7 @@ function proxyNextRequest(
   const nextRequestHandlers = {
     get(
       target: NextRequest & RequestSymbolTarget,
-      prop: string | symbol,
-      receiver: any
+      prop: string | symbol
     ): unknown {
       switch (prop) {
         case 'nextUrl':
@@ -721,12 +705,10 @@ function proxyNextRequest(
         case 'arrayBuffer':
         case 'formData': {
           trackDynamicDataAccessed(staticGenerationStore, `request.${prop}`)
-
-          const result = Reflect.get(target, prop, receiver)
-          if (typeof result === 'function') {
-            return result.bind(target)
-          }
-          return result
+          // The receiver arg is intentionally the same as the target to fix an issue with
+          // edge runtime, where attempting to access internal slots with the wrong `this` context
+          // results in an error.
+          return ReflectAdapter.get(target, prop, target)
         }
         case 'clone':
           return (
@@ -745,11 +727,10 @@ function proxyNextRequest(
               ))
           )
         default:
-          const result = Reflect.get(target, prop, receiver)
-          if (typeof result === 'function') {
-            return result.bind(target)
-          }
-          return result
+          // The receiver arg is intentionally the same as the target to fix an issue with
+          // edge runtime, where attempting to access internal slots with the wrong `this` context
+          // results in an error.
+          return ReflectAdapter.get(target, prop, target)
       }
     },
     // We don't need to proxy set because all the properties we proxy are ready only
@@ -803,11 +784,7 @@ const requireStaticRequestHandlers = {
             ))
         )
       default:
-        const result = Reflect.get(target, prop, receiver)
-        if (typeof result === 'function') {
-          return result.bind(target)
-        }
-        return result
+        return ReflectAdapter.get(target, prop, receiver)
     }
   },
   // We don't need to proxy set because all the properties we proxy are ready only
@@ -838,11 +815,7 @@ const requireStaticNextUrlHandlers = {
             new Proxy(target.clone(), requireStaticNextUrlHandlers))
         )
       default:
-        const result = Reflect.get(target, prop, receiver)
-        if (typeof result === 'function') {
-          return result.bind(target)
-        }
-        return result
+        return ReflectAdapter.get(target, prop, receiver)
     }
   },
 }