@jsenv/server 12.7.0 → 12.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.7.0",
+  "version": "12.7.3",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -35,9 +35,10 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/abort": "4.2.2",
-    "@jsenv/logger": "4.1.1",
-    "@jsenv/url-meta": "7.0.0"
+    "@jsenv/abort": "4.2.3",
+    "@jsenv/log": "2.1.0",
+    "@jsenv/url-meta": "7.0.0",
+    "@jsenv/utils": "2.0.1"
   },
   "devDependencies": {
     "@jsenv/fetch": "../fetch/",

package/src/fetch_filesystem.js

@@ -4,23 +4,17 @@
  * 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 {
-  isFileSystemPath,
-  urlToFileSystemPath,
-  fileSystemPathToUrl,
-} from "@jsenv/server/src/internal/filesystem.js"
-import { bufferToEtag } from "@jsenv/server/src/internal/etag.js"
+import { createReadStream, statSync, readFile } from "node:fs"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+
+import { isFileSystemPath, fileSystemPathToUrl } from "./internal/filesystem.js"
+import { bufferToEtag } from "./internal/etag.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 +89,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 +275,7 @@ const getEtagResponse = async ({
   }
 }
 
+const ETAG_MEMORY_MAP = new Map()
 const computeEtag = async ({
   etagMemory,
   etagMemoryMaxSize,
@@ -298,9 +291,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 +385,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())
   },
 }

package/src/internal/server-polyglot.js

@@ -69,7 +69,7 @@ const createSecureServer = async ({
   http1Allowed,
 }) => {
   if (http2) {
-    const { createSecureServer } = await import("http2")
+    const { createSecureServer } = await import("node:http2")
     return createSecureServer({
       cert: certificate,
       key: privateKey,
@@ -77,7 +77,7 @@ const createSecureServer = async ({
     })
   }
 
-  const { createServer } = await import("https")
+  const { createServer } = await import("node:https")
   return createServer({
     cert: certificate,
     key: privateKey,

package/src/service_composition/service_composition.js

@@ -1,6 +1,6 @@
-import { timeFunction } from "@jsenv/server/src/server_timing/timing_measure.js"
-import { composeTwoResponses } from "@jsenv/server/src/internal/response_composition.js"
-import { applyRedirectionToRequest } from "@jsenv/server/src/internal/request_factory.js"
+import { timeFunction } from "../server_timing/timing_measure.js"
+import { composeTwoResponses } from "../internal/response_composition.js"
+import { applyRedirectionToRequest } from "../internal/request_factory.js"
 
 export const composeServices = (namedServices) => {
   return async (request, { pushResponse }) => {

package/src/startServer.js

@@ -6,6 +6,7 @@ import {
   raceProcessTeardownEvents,
   createCallbackListNotifiedOnce,
 } from "@jsenv/abort"
+import { memoize } from "@jsenv/utils/src/memoize/memoize.js"
 
 import { createPolyglotServer } from "./internal/server-polyglot.js"
 import { trackServerPendingConnections } from "./internal/trackServerPendingConnections.js"
@@ -25,7 +26,6 @@ import { listen, stopListening } from "./internal/listen.js"
 import { composeTwoResponses } from "./internal/response_composition.js"
 import { listenRequest } from "./internal/listenRequest.js"
 import { listenServerConnectionError } from "./internal/listenServerConnectionError.js"
-import { memoize } from "./internal/memoize.js"
 import { applyDefaultErrorToResponse } from "./error_to_response_default.js"
 import {
   STOP_REASON_INTERNAL_ERROR,
@@ -804,7 +804,7 @@ const createNodeServer = async ({
     })
   }
 
-  const { createServer } = await import("https")
+  const { createServer } = await import("node:https")
   return createServer({
     cert: certificate,
     key: privateKey,

package/src/internal/memoize.js

@@ -1,24 +0,0 @@
-export const memoize = (compute) => {
-  let memoized = false
-  let memoizedValue
-
-  const fnWithMemoization = (...args) => {
-    if (memoized) {
-      return memoizedValue
-    }
-    // if compute is recursive wait for it to be fully done before storing the value
-    // so set memoized boolean after the call
-    memoizedValue = compute(...args)
-    memoized = true
-    return memoizedValue
-  }
-
-  fnWithMemoization.forget = () => {
-    const value = memoizedValue
-    memoized = false
-    memoizedValue = undefined
-    return value
-  }
-
-  return fnWithMemoization
-}