Unique execution context with the correct request object

.changeset/graphql-yoga-3237-dependencies.md

@@ -0,0 +1,7 @@
+---
+'graphql-yoga': patch
+---
+dependencies updates:
+  - Updated dependency [`@whatwg-node/server@^0.9.33`
+    ↗︎](https://www.npmjs.com/package/@whatwg-node/server/v/0.9.33) (from `^0.9.32`, in
+    `dependencies`)

.changeset/smart-melons-beam.md

@@ -0,0 +1,6 @@
+---
+'graphql-yoga': patch
+---
+
+In such environments like CloudFlare Workers, the `request` object in the context always has the initial request object, so it was impossible to access the actual `Request` object from the execution context.
+Now Yoga ensures that the `request` in the context is the same with the actual `Request`.

packages/graphql-yoga/__tests__/requests.spec.ts

@@ -1,4 +1,6 @@
-import { createSchema, createYoga } from '../src';
+import { Request } from '@whatwg-node/fetch';
+import { YogaInitialContext, createSchema, createYoga } from '../src';
+import { OnExecuteHook } from '@envelop/core';
 
 describe('requests', () => {
   const schema = createSchema({
@@ -453,4 +455,58 @@ describe('requests', () => {
     const body = await response.text();
     expect(body).toBeFalsy();
   });
+
+  it('contains the correct request object in the unique execution context', async () => {
+    const onExecuteFn = jest.fn((() => { }) as OnExecuteHook<YogaInitialContext>);
+    const yoga = createYoga({
+      schema: createSchema({
+        typeDefs: /* GraphQL */ `
+          type Query {
+            greetings: String
+          }
+        `,
+        resolvers: {
+          Query: {
+            greetings: (_, __, ctx) => {
+              return `Hello world!`;
+            },
+          },
+        }
+      }),
+      plugins: [
+        {
+          onExecute: onExecuteFn,
+        }
+      ]
+    });
+    const env = {};
+    const extraCtx = {};
+    const firstReq = new Request('http://yoga/graphql', {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({ query: '{ greetings }' }),
+    });
+    const firstRes = await yoga.fetch(firstReq, env, extraCtx);
+    expect(firstRes.status).toBe(200);
+    const firstResBody = await firstRes.json();
+    expect(firstResBody.data.greetings).toBe('Hello world!');
+    expect(onExecuteFn).toHaveBeenCalledTimes(1);
+    expect(onExecuteFn.mock.calls[0][0].args.contextValue.request).toBe(firstReq);
+    const secondReq = new Request('http://yoga/graphql', {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({ query: '{ greetings }' }),
+    });
+    const secondRes = await yoga.fetch(secondReq, env, extraCtx);
+    expect(secondRes.status).toBe(200);
+    const secondResBody = await secondRes.json();
+    expect(secondResBody.data.greetings).toBe('Hello world!');
+    expect(onExecuteFn).toHaveBeenCalledTimes(2);
+    expect(onExecuteFn.mock.calls[1][0].args.contextValue.request).toBe(secondReq);
+    expect(onExecuteFn.mock.calls[1][0].args.contextValue).not.toBe(onExecuteFn.mock.calls[0][0].args.contextValue);
+  })
 });

packages/graphql-yoga/package.json

@@ -56,7 +56,7 @@
     "@graphql-yoga/logger": "^2.0.0",
     "@graphql-yoga/subscription": "^5.0.0",
     "@whatwg-node/fetch": "^0.9.17",
-    "@whatwg-node/server": "^0.9.32",
+    "@whatwg-node/server": "^0.9.33",
     "dset": "^3.1.1",
     "lru-cache": "^10.0.0",
     "tslib": "^2.5.2"

packages/graphql-yoga/src/server.ts

@@ -463,7 +463,7 @@ export class YogaServer<
       }
 
       if (result == null) {
-        const additionalContext = args[0]?.request
+        const additionalContext = args[0]?.request === request
           ? {
               params,
             }