@jsenv/server 12.5.6 → 12.5.9

package/package.json

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

package/src/internal/colorizeResponseStatus.js

@@ -11,22 +11,21 @@ const cyan = "\x1b[36m"
 
 export const colorizeResponseStatus = (status) => {
   const statusType = statusToType(status)
-
   if (statusType === "information") return `${cyan}${status}${close}`
   if (statusType === "success") return `${green}${status}${close}`
   if (statusType === "redirection") return `${magenta}${status}${close}`
-  if (statusType === "client-error") return `${yellow}${status}${close}`
-  if (statusType === "server-error") return `${red}${status}${close}`
+  if (statusType === "client_error") return `${yellow}${status}${close}`
+  if (statusType === "server_error") return `${red}${status}${close}`
   return status
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
-const statusToType = (status) => {
+export const statusToType = (status) => {
   if (statusIsInformation(status)) return "information"
   if (statusIsSuccess(status)) return "success"
   if (statusIsRedirection(status)) return "redirection"
-  if (statusIsClientError(status)) return "client-error"
-  if (statusIsServerError(status)) return "server-error"
+  if (statusIsClientError(status)) return "client_error"
+  if (statusIsServerError(status)) return "server_error"
   return "unknown"
 }
 

package/src/internal/populateNodeResponse.js

@@ -44,6 +44,34 @@ export const populateNodeResponse = async (
   }
 
   await new Promise((resolve) => {
+    const observable = bodyMethods.asObservable()
+    const subscription = observable.subscribe({
+      next: (data) => {
+        try {
+          responseStream.write(data)
+        } catch (e) {
+          // Something inside Node.js sometimes puts stream
+          // in a state where .write() throw despites nodeResponse.destroyed
+          // being undefined and "close" event not being emitted.
+          // I have tested if we are the one calling destroy
+          // (I have commented every .destroy() call)
+          // but issue still occurs
+          // For the record it's "hard" to reproduce but can be by running
+          // a lot of tests against a browser in the context of @jsenv/core testing
+          if (e.code === "ERR_HTTP2_INVALID_STREAM") {
+            return
+          }
+          responseStream.emit("error", e)
+        }
+      },
+      error: (value) => {
+        responseStream.emit("error", value)
+      },
+      complete: () => {
+        responseStream.end()
+      },
+    })
+
     raceCallbacks(
       {
         abort: (cb) => {
@@ -104,34 +132,6 @@ export const populateNodeResponse = async (
         raceEffects[winner.name](winner.data)
       },
     )
-
-    const observable = bodyMethods.asObservable()
-    const subscription = observable.subscribe({
-      next: (data) => {
-        try {
-          responseStream.write(data)
-        } catch (e) {
-          // Something inside Node.js sometimes puts stream
-          // in a state where .write() throw despites nodeResponse.destroyed
-          // being undefined and "close" event not being emitted.
-          // I have tested if we are the one calling destroy
-          // (I have commented every .destroy() call)
-          // but issue still occurs
-          // For the record it's "hard" to reproduce but can be by running
-          // a lot of tests against a browser in the context of @jsenv/core testing
-          if (e.code === "ERR_HTTP2_INVALID_STREAM") {
-            return
-          }
-          responseStream.emit("error", e)
-        }
-      },
-      error: (value) => {
-        responseStream.emit("error", value)
-      },
-      complete: () => {
-        responseStream.end()
-      },
-    })
   })
 }
 

package/src/startServer.js

@@ -16,7 +16,10 @@ import {
   applyRedirectionToRequest,
 } from "./internal/request_factory.js"
 import { populateNodeResponse } from "./internal/populateNodeResponse.js"
-import { colorizeResponseStatus } from "./internal/colorizeResponseStatus.js"
+import {
+  statusToType,
+  colorizeResponseStatus,
+} from "./internal/colorizeResponseStatus.js"
 import { getServerOrigins } from "./internal/getServerOrigins.js"
 import { listen, stopListening } from "./internal/listen.js"
 import { composeTwoResponses } from "./internal/response_composition.js"
@@ -676,8 +679,15 @@ export const startServer = async ({
           onRequestHandled(requestNode)
         },
         onHeadersSent: ({ status, statusText }) => {
+          const statusType = statusToType(status)
           addRequestLog(requestNode, {
-            type: "info",
+            type: {
+              information: "info",
+              success: "info",
+              redirection: "info",
+              client_error: "warn",
+              server_error: "error",
+            }[statusType],
             value: `${colorizeResponseStatus(status)} ${
               responseProperties.statusMessage || statusText
             }`,
@@ -728,12 +738,20 @@ export const startServer = async ({
     `${serverName} started at ${serverOrigin} (${serverOrigins.external})`,
   )
 
+  const addEffect = (callback) => {
+    const cleanup = callback()
+    if (typeof cleanup === "function") {
+      stopCallbackList.add(cleanup)
+    }
+  }
+
   return {
     getStatus: () => status,
     origin: serverOrigin,
     nodeServer,
     stop,
     stoppedPromise,
+    addEffect,
   }
 }