@jsenv/server 12.3.1 → 12.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.3.1",
+  "version": "12.3.2",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {

package/src/internal/populateNodeResponse.js

@@ -23,8 +23,8 @@ export const populateNodeResponse = async (
     status,
     statusText,
     headers,
+    onHeadersSent,
   })
-  onHeadersSent()
 
   if (!body) {
     onEnd()
@@ -135,31 +135,31 @@ export const populateNodeResponse = async (
   })
 }
 
-const writeHead = (responseStream, { status, statusText, headers }) => {
+const writeHead = (
+  responseStream,
+  { status, statusText, headers, onHeadersSent },
+) => {
   const responseIsHttp2ServerResponse =
     responseStream instanceof Http2ServerResponse
   const responseIsServerHttp2Stream =
     responseStream.constructor.name === "ServerHttp2Stream"
-
   let nodeHeaders = headersToNodeHeaders(headers, {
     // https://github.com/nodejs/node/blob/79296dc2d02c0b9872bbfcbb89148ea036a546d0/lib/internal/http2/compat.js#L112
     ignoreConnectionHeader:
       responseIsHttp2ServerResponse || responseIsServerHttp2Stream,
   })
-
+  if (statusText === undefined) {
+    statusText = statusTextFromStatus(status)
+  }
   if (responseIsServerHttp2Stream) {
     nodeHeaders = {
       ...nodeHeaders,
       ":status": status,
     }
     responseStream.respond(nodeHeaders)
+    onHeadersSent({ nodeHeaders, status, statusText })
     return
   }
-
-  if (statusText === undefined) {
-    statusText = statusTextFromStatus(status)
-  }
-
   // nodejs strange signature for writeHead force this
   // https://nodejs.org/api/http.html#http_response_writehead_statuscode_statusmessage_headers
   if (
@@ -167,10 +167,11 @@ const writeHead = (responseStream, { status, statusText, headers }) => {
     responseIsHttp2ServerResponse
   ) {
     responseStream.writeHead(status, nodeHeaders)
+    onHeadersSent({ nodeHeaders, status, statusText })
     return
   }
-
   responseStream.writeHead(status, statusText, nodeHeaders)
+  onHeadersSent({ nodeHeaders, status, statusText })
 }
 
 const statusTextFromStatus = (status) =>

package/src/startServer.js

@@ -664,12 +664,10 @@ export const startServer = async ({
           })
           onRequestHandled(requestNode)
         },
-        onHeadersSent: () => {
+        onHeadersSent: ({ status, statusText }) => {
           addRequestLog(requestNode, {
             type: "info",
-            value: `${colorizeResponseStatus(responseProperties.status)} ${
-              responseProperties.statusText
-            }`,
+            value: `${colorizeResponseStatus(status)} ${statusText}`,
           })
         },
         onEnd: () => {