@whatwg-node/server 0.9.64-rc-20241217131723-ff31d6accae8af9e276eb3d79387d28fb11b6b5f → 0.9.65-alpha-20241224144308-cda07d199da2a29f42043448a40e85b64d51d8a4

package/README.md

@@ -40,7 +40,7 @@ nodeServer.listen(4000)
 ### AWS Lambda
 
 AWS Lambda is a serverless computing platform that makes it easy to build applications that run on
-the AWS cloud. Our adaoter is platform agnostic so they can fit together easily. In order to reduce
+the AWS cloud. Our adapter is platform agnostic so they can fit together easily. In order to reduce
 the boilerplate we prefer to use
 [Serverless Express from Vendia](https://github.com/vendia/serverless-express).
 

package/cjs/createServerAdapter.js

@@ -48,14 +48,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     }
     function waitUntil(promiseLike) {
         // 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 ((0, utils_js_1.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) {
         for (const plugin of options.plugins) {
@@ -149,6 +151,10 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     // TODO: Remove this on the next major version
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? (0, utils_js_1.completeAssign)(...ctx) : ctx[0] || {};
+        // Ensure `waitUntil` is available in the server context
+        if (!serverContext.waitUntil) {
+            serverContext.waitUntil = waitUntil;
+        }
         const request = (0, utils_js_1.normalizeNodeRequest)(nodeRequest, fetchAPI);
         return handleRequest(request, serverContext);
     }

package/esm/createServerAdapter.js

@@ -44,14 +44,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     }
     function waitUntil(promiseLike) {
         // 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) {
         for (const plugin of options.plugins) {
@@ -145,6 +147,10 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     // TODO: Remove this on the next major version
     function handleNodeRequest(nodeRequest, ...ctx) {
         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);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.64-rc-20241217131723-ff31d6accae8af9e276eb3d79387d28fb11b6b5f",
+  "version": "0.9.65-alpha-20241224144308-cda07d199da2a29f42043448a40e85b64d51d8a4",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {