@jsenv/server 15.4.1 → 15.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "15.4.1",
+  "version": "15.5.1",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -32,7 +32,7 @@
   "dependencies": {
     "@jsenv/abort": "4.3.0",
     "@jsenv/humanize": "1.2.8",
-    "@jsenv/url-meta": "8.5.2",
+    "@jsenv/url-meta": "8.5.3",
     "@jsenv/utils": "2.1.2",
     "ws": "8.18.0"
   },

package/src/interfacing_with_node/request_factory.js

@@ -1,3 +1,4 @@
+import { Abort } from "@jsenv/abort";
 import { headersFromObject } from "../internal/headersFromObject.js";
 import { observableFromNodeStream } from "./observable_from_node_stream.js";
 
@@ -5,6 +6,17 @@ export const fromNodeRequest = (
   nodeRequest,
   { serverOrigin, signal, requestBodyLifetime },
 ) => {
+  const handleRequestOperation = Abort.startOperation();
+  if (signal) {
+    handleRequestOperation.addAbortSignal(signal);
+  }
+  handleRequestOperation.addAbortSource((abort) => {
+    nodeRequest.once("close", abort);
+    return () => {
+      nodeRequest.removeListener("close", abort);
+    };
+  });
+
   const headers = headersFromObject(nodeRequest.headers);
   const body = observableFromNodeStream(nodeRequest, {
     readableStreamLifetime: requestBodyLifetime,
@@ -26,7 +38,7 @@ export const fromNodeRequest = (
   }
 
   return Object.freeze({
-    signal,
+    signal: handleRequestOperation.signal,
     http2: Boolean(nodeRequest.stream),
     origin: requestOrigin,
     ...getPropertiesFromResource({

package/src/start_server.js

@@ -298,6 +298,15 @@ export const startServer = async ({
     status = "stopped";
     stoppedResolve(reason);
   });
+  let stopAbortSignal;
+  stop_signal: {
+    let stopAbortController = new AbortController();
+    stopCallbackSet.add(() => {
+      stopAbortController.abort();
+      stopAbortController = undefined;
+    });
+    stopAbortSignal = stopAbortController.signal;
+  }
 
   const cancelProcessTeardownRace = raceProcessTeardownEvents(
     processTeardownEvents,
@@ -365,6 +374,9 @@ export const startServer = async ({
       }
 
       const receiveRequestOperation = Abort.startOperation();
+      receiveRequestOperation.addAbortSignal(stopAbortSignal);
+      const sendResponseOperation = Abort.startOperation();
+      sendResponseOperation.addAbortSignal(stopAbortSignal);
       receiveRequestOperation.addAbortSource((abort) => {
         const closeEventCallback = () => {
           if (nodeRequest.complete) {
@@ -379,19 +391,11 @@ export const startServer = async ({
           nodeRequest.removeListener("close", closeEventCallback);
         };
       });
-      receiveRequestOperation.addAbortSource((abort) => {
-        return stopCallbackSet.add(abort);
-      });
-
-      const sendResponseOperation = Abort.startOperation();
       sendResponseOperation.addAbortSignal(receiveRequestOperation.signal);
-      sendResponseOperation.addAbortSource((abort) => {
-        return stopCallbackSet.add(abort);
-      });
 
       const request = fromNodeRequest(nodeRequest, {
+        signal: stopAbortSignal,
         serverOrigin,
-        signal: receiveRequestOperation.signal,
       });
 
       // Handling request is asynchronous, we buffer logs for that request
@@ -965,13 +969,16 @@ export const startServer = async ({
           socket,
           head,
           async (websocket) => {
+            const websocketAbortController = new AbortController();
             websocketClients.add(websocket);
+            websocket.signal = websocketAbortController.signal;
             websocket.once("close", () => {
               websocketClients.delete(websocket);
+              websocketAbortController.abort();
             });
             const request = fromNodeRequest(nodeRequest, {
+              signal: stopAbortSignal,
               serverOrigin: websocketOrigin,
-              signal: new AbortController().signal,
               requestBodyLifetime,
             });
             serviceController.callAsyncHooksUntil(