From 4aa4e89be40bbf65ddf6c4c09a78c76fc8b2db66 Mon Sep 17 00:00:00 2001
From: Arda TANRIKULU <ardatanrikulu@gmail.com>
Date: Tue, 24 Dec 2024 17:40:20 +0300
Subject: [PATCH 1/2] fix(server): add `waitUntil` to the server context in
 Fastify integration

---
 .changeset/blue-pugs-provide.md            |  7 ++++++
 packages/server/src/createServerAdapter.ts | 28 +++++++++++++---------
 packages/server/test/fastify.spec.ts       | 27 +++++++++++++++++++++
 3 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/blue-pugs-provide.md

diff --git a/.changeset/blue-pugs-provide.md b/.changeset/blue-pugs-provide.md
new file mode 100644
index 00000000000..cd86edcbca4
--- /dev/null
+++ b/.changeset/blue-pugs-provide.md
@@ -0,0 +1,7 @@
+---
+'@whatwg-node/server': patch
+---
+
+While calling \`handleNodeRequest\` or \`handleNodeRequestAndResponse\`
+
+Fixes the issue with Fastify integration that uses the mentioned methods
\ No newline at end of file
diff --git a/packages/server/src/createServerAdapter.ts b/packages/server/src/createServerAdapter.ts
index 9eca3c134c1..fef9f223600 100644
--- a/packages/server/src/createServerAdapter.ts
+++ b/packages/server/src/createServerAdapter.ts
@@ -133,17 +133,19 @@ function createServerAdapter<
 
   function waitUntil(promiseLike: PromiseLike<unknown>) {
     // Ensure that the disposable stack is created
-    ensureDisposableStack();
-    waitUntilPromises.add(promiseLike);
-    promiseLike.then(
-      () => {
-        waitUntilPromises.delete(promiseLike);
-      },
-      err => {
-        console.error(`Unexpected error while waiting: ${err.message || err}`);
-        waitUntilPromises.delete(promiseLike);
-      },
-    );
+    if (isPromise(promiseLike)) {
+      ensureDisposableStack();
+      waitUntilPromises.add(promiseLike);
+      promiseLike.then(
+        () => {
+          waitUntilPromises.delete(promiseLike);
+        },
+        err => {
+          console.error(`Unexpected error while waiting: ${err.message || err}`);
+          waitUntilPromises.delete(promiseLike);
+        },
+      );
+    }
   }
 
   if (options?.plugins != null) {
@@ -250,6 +252,10 @@ function createServerAdapter<
   // TODO: Remove this on the next major version
   function handleNodeRequest(nodeRequest: NodeRequest, ...ctx: Partial<TServerContext>[]) {
     const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
+    // Ensure `waitUntil` is available in the server context
+    if (!serverContext.waitUntil) {
+      serverContext.waitUntil = waitUntil;
+    }
     const request = normalizeNodeRequest(nodeRequest, fetchAPI);
     return handleRequest(request, serverContext);
   }
diff --git a/packages/server/test/fastify.spec.ts b/packages/server/test/fastify.spec.ts
index aa0b1ce1628..87fe3717fcb 100644
--- a/packages/server/test/fastify.spec.ts
+++ b/packages/server/test/fastify.spec.ts
@@ -212,6 +212,33 @@ describe('Fastify', () => {
           reqBody: 'TEST',
         });
       });
+
+      it('handles waitUntil', async () => {
+        const backgroundJob$ = createDeferredPromise<void>();
+        let backgroundJobDone = false;
+        backgroundJob$.promise.finally(() => {
+          backgroundJobDone = true;
+        });
+        serverAdapter = createServerAdapter((_request: Request, ctx) => {
+          ctx.waitUntil(backgroundJob$.promise);
+          return new Response('OK');
+        });
+        const res = await fastifyServer.inject({
+          url: '/mypath',
+        });
+        expect(res.body).toEqual('OK');
+        const dispose$ = Promise.resolve(serverAdapter.dispose());
+        let disposeDone = false;
+        dispose$.then(() => {
+          disposeDone = true;
+        });
+        expect(backgroundJobDone).toBe(false);
+        expect(disposeDone).toBe(false);
+        backgroundJob$.resolve();
+        await dispose$;
+        expect(backgroundJobDone).toBe(true);
+        expect(disposeDone).toBe(true);
+      });
     },
   );
 });

From cda07d199da2a29f42043448a40e85b64d51d8a4 Mon Sep 17 00:00:00 2001
From: Arda TANRIKULU <ardatanrikulu@gmail.com>
Date: Tue, 24 Dec 2024 17:41:33 +0300
Subject: [PATCH 2/2] Changeset

---
 .changeset/blue-pugs-provide.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.changeset/blue-pugs-provide.md b/.changeset/blue-pugs-provide.md
index cd86edcbca4..dd222967ef4 100644
--- a/.changeset/blue-pugs-provide.md
+++ b/.changeset/blue-pugs-provide.md
@@ -2,6 +2,7 @@
 '@whatwg-node/server': patch
 ---
 
-While calling \`handleNodeRequest\` or \`handleNodeRequestAndResponse\`
+While calling `handleNodeRequest` or `handleNodeRequestAndResponse`, `waitUntil` is not added automatically as in `requestListener` for Node.js integration.
+This change adds `waitUntil` into the `serverContext` if not present.
 
 Fixes the issue with Fastify integration that uses the mentioned methods
\ No newline at end of file