Fix request usage from context (#99)

* Fix request usage from context

* Remove samples folder from npm package

* Fix import

* Fix tests

* Fix ci install

Author: barddoo

.npmignore

@@ -1,6 +1,7 @@
 *
 !src/**/*
 src/**/__tests__/**
+src/samples/**
 !dist/**/*
 dist/**/__tests__/**
 !package.json

package-lock.json

@@ -33,12 +33,12 @@
     "start:host": "cd src/sample && func start --cors *"
   },
   "dependencies": {
-    "@azure/functions": "^3.5.1",
-    "@azure/functions-v4": "npm:@azure/functions@^4.7.2"
+    "@azure/functions": "^3",
+    "@azure/functions-v4": "npm:@azure/functions@^4"
   },
   "devDependencies": {
-    "@apollo/server": "5.0.0",
-    "@apollo/server-integration-testsuite": "5.0.0",
+    "@apollo/server": "5.2.0",
+    "@apollo/server-integration-testsuite": "5.2.0",
     "@changesets/changelog-github": "0.5.1",
     "@changesets/cli": "2.29.6",
     "@types/jest": "29.5.14",
@@ -59,6 +59,6 @@
     "npm": "11.5.2"
   },
   "peerDependencies": {
-    "@apollo/server": "^4.0.0 || ^5.0.0"
+    "@apollo/server": "^4 || ^5"
   }
 }

package.json

@@ -21,6 +21,49 @@ export function urlForHttpServer(httpServer: Server): string {
   return `http://${hostname}:${port}`;
 }
 
+function createHttpRequest(
+  method: HttpMethod,
+  url: string,
+  headers: Headers,
+  bodyContent: string,
+): HttpRequest {
+  const createRequest = (): HttpRequest => ({
+    method,
+    url,
+    headers,
+    body: new ReadableStream({
+      start(controller) {
+        controller.enqueue(new TextEncoder().encode(bodyContent));
+        controller.close();
+      },
+    }),
+    query: new URLSearchParams(new URL(url).search),
+    params: {},
+    user: null,
+    arrayBuffer: async () => {
+      return Buffer.from(bodyContent).buffer;
+    },
+    text: async () => {
+      return bodyContent;
+    },
+    json: async () => {
+      return JSON.parse(bodyContent);
+    },
+    blob: async () => {
+      throw new Error('Not implemented');
+    },
+    bodyUsed: false,
+    formData: async () => {
+      throw new Error('Not implemented');
+    },
+    clone: () => {
+      return createRequest();
+    },
+  });
+
+  return createRequest();
+}
+
 export const createMockServer = (handler: HttpHandler) => {
   return (req: IncomingMessage, res: ServerResponse) => {
     let body = '';
@@ -32,39 +75,12 @@ export const createMockServer = (handler: HttpHandler) => {
         headers.set(key, value as string);
       }
 
-      const azReq: HttpRequest = {
-        method: (req.method as HttpMethod) || null,
-        url: new URL(req.url || '', 'http://localhost').toString(),
+      const azReq = createHttpRequest(
+        (req.method as HttpMethod) || null,
+        new URL(req.url || '', 'http://localhost').toString(),
         headers,
-        body: new ReadableStream({
-          start(controller) {
-            controller.enqueue(new TextEncoder().encode(body));
-            controller.close();
-          },
-        }),
-        query: new URLSearchParams(req.url),
-        params: {},
-        user: null,
-        arrayBuffer: async () => {
-          return Buffer.from(body).buffer;
-        },
-        text: async () => {
-          return body;
-        },
-        json: async () => {
-          return JSON.parse(body);
-        },
-        blob: async () => {
-          throw new Error('Not implemented');
-        },
-        bodyUsed: false,
-        formData: async () => {
-          throw new Error('Not implemented');
-        },
-        clone: () => {
-          throw new Error('Not implemented');
-        },
-      };
+        body,
+      );
 
       const context = new InvocationContext({
         invocationId: 'mock',

src/__tests__/mockServer-v4.ts

@@ -16,6 +16,13 @@ import type { WithRequired } from '@apollo/utils.withrequired';
 export interface AzureFunctionsContextFunctionArgument {
   context: InvocationContext;
   req: HttpRequest;
+  /**
+   * The parsed request body. This is already parsed from the request stream
+   * and should be used instead of calling `req.json()` for better performance.
+   * For POST requests with `application/json` content-type, this contains the parsed JSON object.
+   * For other requests, this will be `null`.
+   */
+  body: unknown;
 }
 
 export interface AzureFunctionsMiddlewareOptions<TContext extends BaseContext> {
@@ -57,18 +64,16 @@ export function startServerAndCreateHandler<TContext extends BaseContext>(
   return async (req: HttpRequest, context: InvocationContext) => {
     const contextFunction = options?.context ?? defaultContext;
     try {
+      const cloneReq = req.clone();
       const normalizedRequest = await normalizeRequest(req);
 
       const { body, headers, status } = await server.executeHTTPGraphQLRequest({
         httpGraphQLRequest: normalizedRequest,
         context: () =>
           contextFunction({
             context,
-            req: {
-              ...req,
-              // This promise was already used, so we need to create a new one.
-              json: () => Promise.resolve(normalizedRequest.body),
-            },
+            req: cloneReq,
+            body: normalizedRequest.body,
           }),
       });
 

src/func-v4.ts

@@ -0,0 +1,10 @@
+*.js.map
+*.ts
+.git*
+.vscode
+local.settings.json
+test
+getting_started.md
+node_modules/@types/
+node_modules/azure-functions-core-tools/
+node_modules/typescript/

src/samples/v4/.funcignore

@@ -0,0 +1,7 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "node",
+    "AzureWebJobsStorage": ""
+  }
+}