@jsenv/server 12.3.2 → 12.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.3.2",
+  "version": "12.4.2",
   "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": {
@@ -44,27 +45,27 @@
   "dependencies": {
     "@jsenv/abort": "4.1.2",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/url-meta": "6.0.3",
-    "node-fetch": "2.6.2",
+    "@jsenv/url-meta": "6.2.0",
+    "node-fetch": "2.6.7",
     "path-to-regexp": "6.2.0"
   },
   "devDependencies": {
-    "@jsenv/assert": "2.4.1",
-    "@jsenv/core": "25.1.0",
+    "@jsenv/assert": "2.5.2",
+    "@jsenv/core": "25.4.9",
     "@jsenv/eslint-config": "16.0.9",
-    "@jsenv/filesystem": "2.6.1",
-    "@jsenv/github-release-package": "1.2.3",
-    "@jsenv/https-local": "1.0.3",
-    "@jsenv/importmap-eslint-resolver": "5.2.2",
-    "@jsenv/importmap-node-module": "5.1.0",
-    "@jsenv/package-publish": "1.6.2",
-    "@jsenv/performance-impact": "2.2.1",
+    "@jsenv/filesystem": "2.7.1",
+    "@jsenv/github-release-package": "1.3.4",
+    "@jsenv/https-local": "1.0.7",
+    "@jsenv/importmap-eslint-resolver": "5.2.5",
+    "@jsenv/importmap-node-module": "5.1.3",
+    "@jsenv/package-publish": "1.7.2",
+    "@jsenv/performance-impact": "2.2.7",
     "eslint": "8.7.0",
     "eslint-plugin-import": "2.25.4",
     "eventsource": "1.1.0",
-    "fastify": "3.25.3",
+    "fastify": "3.27.0",
     "fastify-static": "4.5.0",
-    "playwright": "1.17.2",
+    "playwright": "1.18.1",
     "prettier": "2.5.1"
   }
-}
+}

package/src/internal/nodeStreamToObservable.js

@@ -1,12 +1,17 @@
 // https://github.com/jamestalmage/stream-to-observable/blob/master/index.js
 import { Readable } from "node:stream"
-
 import { createObservable } from "./observable.js"
 
 const readableStreamLifetimeInSeconds = 120
 
 export const nodeStreamToObservable = (nodeStream) => {
   const observable = createObservable(({ next, error, complete }) => {
+    if (nodeStream.isPaused()) {
+      nodeStream.resume()
+    } else if (nodeStream.complete) {
+      complete()
+      return null
+    }
     const cleanup = () => {
       nodeStream.removeListener("data", next)
       nodeStream.removeListener("error", error)
@@ -14,13 +19,17 @@ export const nodeStreamToObservable = (nodeStream) => {
       nodeStream.removeListener("close", cleanup)
       nodeStream.destroy()
     }
-
     // should we do nodeStream.resume() in case the stream was paused ?
     nodeStream.once("error", error)
-    nodeStream.on("data", next)
-    nodeStream.once("close", cleanup)
-    nodeStream.once("end", complete)
-
+    nodeStream.on("data", (data) => {
+      next(data)
+    })
+    nodeStream.once("close", () => {
+      cleanup()
+    })
+    nodeStream.once("end", () => {
+      complete()
+    })
     return cleanup
   })
 

package/src/ressource_aliases/plugin_ressource_aliases.js

@@ -1,38 +1,28 @@
-import { urlToMeta, normalizeStructuredMetaMap } from "@jsenv/url-meta"
+import { applyAliases } from "@jsenv/url-meta"
 
 export const pluginRessourceAliases = (ressourceAliases) => {
-  const ressourceAliasMap = {}
+  const aliases = {}
   Object.keys(ressourceAliases).forEach((key) => {
-    ressourceAliasMap[ressourceAliases[key]] = key
+    aliases[asFileUrl(key)] = asFileUrl(ressourceAliases[key])
   })
-  const structuredMetaMap = normalizeStructuredMetaMap(
-    { alias: ressourceAliasMap },
-    "file:///",
-  )
-
-  const getRessourceAlias = (pathname) => {
-    const { alias } = urlToMeta({
-      url: `file://${pathname}`,
-      structuredMetaMap,
-    })
-    return alias
-  }
-
   return {
     ressource_aliases: {
       onRequest: (request, { redirectRequest }) => {
-        const ressourceAlias = getRessourceAlias(request.pathname)
-        if (!ressourceAlias) {
+        const ressourceBeforeAlias = request.ressource
+        const urlAfterAliasing = applyAliases({
+          url: asFileUrl(request.pathname),
+          aliases,
+        })
+        const ressourceAfterAlias = urlAfterAliasing.slice("file://".length)
+        if (ressourceBeforeAlias === ressourceAfterAlias) {
           return
         }
-
-        const urlObjectAfterAlias = replaceUrlRessource(
-          request.url,
-          ressourceAlias,
+        const ressource = replaceRessource(
+          ressourceBeforeAlias,
+          ressourceAfterAlias,
         )
-        const ressource = `${urlObjectAfterAlias.pathname}${urlObjectAfterAlias.search}`
         redirectRequest({
-          ressourceBeforeAlias: request.ressource,
+          ressourceBeforeAlias,
           ressource,
         })
       },
@@ -40,16 +30,15 @@ export const pluginRessourceAliases = (ressourceAliases) => {
   }
 }
 
-const replaceUrlRessource = (url, ressource) => {
-  const urlObject = new URL(url)
+const asFileUrl = (specifier) => new URL(specifier, "file:///").href
 
-  const searchSeparatorIndex = ressource.indexOf("?")
-  if (searchSeparatorIndex === -1) {
-    urlObject.pathname = ressource
-    return urlObject
+const replaceRessource = (ressourceBeforeAlias, newValue) => {
+  const urlObject = new URL(ressourceBeforeAlias, "file://")
+  const searchSeparatorIndex = newValue.indexOf("?")
+  if (searchSeparatorIndex > -1) {
+    return newValue // let new value override search params
   }
-
-  const pathname = ressource.slice(0, searchSeparatorIndex)
-  urlObject.pathname = pathname
-  return urlObject
+  urlObject.pathname = newValue
+  const ressource = `${urlObject.pathname}${urlObject.search}`
+  return ressource
 }

package/src/startServer.js

@@ -230,6 +230,10 @@ export const startServer = async ({
   })
 
   const requestCallback = async (nodeRequest, nodeResponse) => {
+    // pause the stream to let a chance to "requestToResponse"
+    // to call "requestRequestBody". Without this the request body readable stream
+    // might be closed when we'll try to attach "data" and "end" listeners to it
+    nodeRequest.pause()
     if (!nagle) {
       nodeRequest.connection.setNoDelay(true)
     }
@@ -309,7 +313,6 @@ export const startServer = async ({
 
       visitRequestNodeToLog(rootRequestNode, 0)
     }
-
     nodeRequest.on("error", (error) => {
       if (error.message === "aborted") {
         addRequestLog(rootRequestNode, {
@@ -683,6 +686,7 @@ export const startServer = async ({
       const responseProperties = await handleRequest(request, {
         requestNode: rootRequestNode,
       })
+      nodeRequest.resume()
       if (receiveRequestOperation.signal.aborted) {
         return
       }