@jsenv/server 12.5.5 → 12.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.5.5",
+  "version": "12.5.8",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -16,7 +16,8 @@
     "node": ">=16.13.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "exports": {
@@ -67,4 +68,4 @@
     "playwright": "1.18.1",
     "prettier": "2.5.1"
   }
-}
+}

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

@@ -291,9 +291,12 @@ export const startServer = async ({
         // keep buffering until root request write logs for everyone
         return
       }
+      const prefixLines = (string, prefix) => {
+        return string.replace(/^(?!\s*$)/gm, prefix)
+      }
       const writeLog = ({ type, value }, depth) => {
         if (depth > 0) {
-          value = value.replace(/^(?!\s*$)/gm, "  ".repeat(depth))
+          value = prefixLines(value, "  ".repeat(depth))
         }
         logger[type](value)
       }
@@ -303,7 +306,7 @@ export const startServer = async ({
         const middleLogs = requestNode.logs
         writeLog(firstLog, depth)
         middleLogs.forEach((log) => {
-          writeLog(log, depth + 1)
+          writeLog(log, depth)
         })
         requestNode.children.forEach((child) => {
           visitRequestNodeToLog(child, depth + 1)
@@ -672,11 +675,11 @@ export const startServer = async ({
           })
           onRequestHandled(requestNode)
         },
-        onHeadersSent: ({ status, statusText, statusMessage }) => {
+        onHeadersSent: ({ status, statusText }) => {
           addRequestLog(requestNode, {
             type: "info",
             value: `${colorizeResponseStatus(status)} ${
-              statusMessage || statusText
+              responseProperties.statusMessage || statusText
             }`,
           })
         },
@@ -725,12 +728,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,
   }
 }