@jsenv/server 12.7.0 → 12.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.7.0",
+  "version": "12.7.1",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -37,7 +37,8 @@
   "dependencies": {
     "@jsenv/abort": "4.2.2",
     "@jsenv/logger": "4.1.1",
-    "@jsenv/url-meta": "7.0.0"
+    "@jsenv/url-meta": "7.0.0",
+    "@jsenv/utils": "2.0.0"
   },
   "devDependencies": {
     "@jsenv/fetch": "../fetch/",

package/src/fetch_filesystem.js

@@ -4,23 +4,20 @@
  * It is meant to be used inside "requestToResponse"
  */
 
-import { createReadStream, statSync, promises } from "node:fs"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
-
+import { createReadStream, statSync, readFile } from "node:fs"
 import {
   isFileSystemPath,
-  urlToFileSystemPath,
   fileSystemPathToUrl,
 } from "@jsenv/server/src/internal/filesystem.js"
 import { bufferToEtag } from "@jsenv/server/src/internal/etag.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+
 import { composeTwoResponses } from "./internal/response_composition.js"
 import { convertFileSystemErrorToResponseProperties } from "./internal/convertFileSystemErrorToResponseProperties.js"
 import { timeFunction } from "./server_timing/timing_measure.js"
 import { negotiateContentEncoding } from "./content_negotiation/negotiateContentEncoding.js"
 import { serveDirectory } from "./serve_directory.js"
 
-const ETAG_MEMORY_MAP = new Map()
-
 export const fetchFileSystem = async (
   filesystemUrl,
   {
@@ -95,13 +92,11 @@ export const fetchFileSystem = async (
     }
   }
 
-  let sourceUrl = `file://${new URL(urlString).pathname}`
-  const sourceFilesystemPath = urlToFileSystemPath(filesystemUrl)
-
+  const sourceUrl = `file://${new URL(urlString).pathname}`
   try {
     const [readStatTiming, sourceStat] = await timeFunction(
       "file service>read file stat",
-      () => statSync(sourceFilesystemPath),
+      () => statSync(new URL(sourceUrl)),
     )
     if (sourceStat.isDirectory()) {
       if (canReadDirectory) {
@@ -283,6 +278,7 @@ const getEtagResponse = async ({
   }
 }
 
+const ETAG_MEMORY_MAP = new Map()
 const computeEtag = async ({
   etagMemory,
   etagMemoryMaxSize,
@@ -298,9 +294,15 @@ const computeEtag = async ({
       return etagMemoryEntry.eTag
     }
   }
-  const fileContentAsBuffer = await promises.readFile(
-    urlToFileSystemPath(sourceUrl),
-  )
+  const fileContentAsBuffer = await new Promise((resolve, reject) => {
+    readFile(new URL(sourceUrl), (error, buffer) => {
+      if (error) {
+        reject(error)
+      } else {
+        resolve(buffer)
+      }
+    })
+  })
   const eTag = bufferToEtag(fileContentAsBuffer)
   if (etagMemory) {
     if (ETAG_MEMORY_MAP.size >= etagMemoryMaxSize) {
@@ -386,20 +388,23 @@ const getCompressedResponse = async ({ sourceUrl, headers }) => {
 }
 
 const fileUrlToReadableStream = (fileUrl) => {
-  return createReadStream(urlToFileSystemPath(fileUrl), { emitClose: true })
+  return createReadStream(new URL(fileUrl), {
+    emitClose: true,
+    autoClose: true,
+  })
 }
 
 const availableCompressionFormats = {
   br: async (fileReadableStream) => {
-    const { createBrotliCompress } = await import("zlib")
+    const { createBrotliCompress } = await import("node:zlib")
     return fileReadableStream.pipe(createBrotliCompress())
   },
   deflate: async (fileReadableStream) => {
-    const { createDeflate } = await import("zlib")
+    const { createDeflate } = await import("node:zlib")
     return fileReadableStream.pipe(createDeflate())
   },
   gzip: async (fileReadableStream) => {
-    const { createGzip } = await import("zlib")
+    const { createGzip } = await import("node:zlib")
     return fileReadableStream.pipe(createGzip())
   },
 }