@jsenv/server 10.1.6 → 12.0.0

package/README.md

@@ -70,7 +70,10 @@ const notFoundService = (request) => {
 }
 
 const server = await startServer({
-  requestToResponse: composeServices(indexService, notFoundService),
+  requestToResponse: composeServices({
+    index: indexService,
+    otherwise: notFoundService,
+  }),
 })
 
 const fetch = await import("node-fetch")

package/main.js

@@ -5,11 +5,8 @@
  */
 
 export { startServer } from "./src/startServer.js"
-export {
-  composeServices,
-  composeServicesWithTiming,
-  redirectRequest,
-} from "./src/service_composition/service_composition.js"
+export { composeServices } from "./src/service_composition/service_composition.js"
+export { setupRoutes } from "./src/service_composition/routing.js"
 export { jsenvServerInternalErrorToResponse } from "./src/jsenvServerInternalErrorToResponse.js"
 export { readRequestBody } from "./src/readRequestBody.js"
 export { fetchFileSystem } from "./src/fetch_filesystem.js"
@@ -46,6 +43,7 @@ export { pluginContentNegotiationCheck } from "./src/content_negotiation/plugin_
 // others
 export { fetchUrl } from "./src/fetch_url.js"
 export { composeTwoResponses } from "./src/internal/response_composition.js"
+export { pluginRessourceAliases } from "./src/ressource_aliases/plugin_ressource_aliases.js"
 export { pluginRequestWaitingCheck } from "./src/plugin_request_waiting_check.js"
 export { findFreePort } from "./src/internal/listen.js"
 export { urlToContentType } from "./src/urlToContentType.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "10.1.6",
+  "version": "12.0.0",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -13,7 +13,7 @@
     "url": "https://github.com/jsenv/server"
   },
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16.12.0"
   },
   "publishConfig": {
     "access": "public"
@@ -25,13 +25,14 @@
     },
     "./*": "./*"
   },
+  "main": "./main.js",
   "files": [
     "/src/",
     "/main.js"
   ],
   "scripts": {
     "eslint-check": "node ./node_modules/eslint/bin/eslint.js . --ext=.js,.mjs",
-    "generate-importmap": "node ./script/importmap/generate_importmap.mjs",
+    "importmap-generate": "node ./script/importmap/generate_importmap.mjs",
     "measure-performances": "node --expose-gc ./script/performance/generate_performance_report.mjs --log",
     "test": "node --unhandled-rejections=strict ./script/test/test.mjs",
     "test-with-coverage": "npm run test -- --coverage",
@@ -47,28 +48,27 @@
   "dependencies": {
     "@jsenv/abort": "4.1.1",
     "@jsenv/logger": "4.0.1",
-    "node-fetch": "2.6.2"
+    "@jsenv/url-meta": "6.0.1",
+    "node-fetch": "2.6.2",
+    "path-to-regexp": "6.2.0"
   },
   "devDependencies": {
-    "@babel/core": "7.16.0",
-    "@babel/eslint-parser": "7.16.0",
     "@jsenv/assert": "2.3.2",
-    "@jsenv/codecov-upload": "3.5.0",
-    "@jsenv/core": "23.7.1",
-    "@jsenv/eslint-config": "16.0.8",
+    "@jsenv/core": "23.10.0",
+    "@jsenv/eslint-config": "16.0.9",
     "@jsenv/filesystem": "2.5.1",
     "@jsenv/github-release-package": "1.2.3",
-    "@jsenv/https-local": "1.0.2",
+    "@jsenv/https-local": "1.0.3",
     "@jsenv/importmap-eslint-resolver": "5.1.2",
-    "@jsenv/importmap-node-module": "2.4.1",
+    "@jsenv/importmap-node-module": "2.7.1",
     "@jsenv/package-publish": "1.6.2",
     "@jsenv/performance-impact": "2.2.1",
     "@jsenv/prettier-check-project": "5.6.1",
-    "eslint": "7.32.0",
-    "eslint-plugin-import": "2.25.2",
+    "eslint": "8.2.0",
+    "eslint-plugin-import": "2.25.3",
     "eventsource": "1.1.0",
-    "fastify": "3.22.1",
-    "fastify-static": "4.4.2",
+    "fastify": "3.24.0",
+    "fastify-static": "4.5.0",
     "playwright": "1.16.3",
     "prettier": "2.4.1"
   }

package/src/internal/{nodeRequestToRequest.js → request_factory.js}

@@ -1,7 +1,7 @@
 import { nodeStreamToObservable } from "./nodeStreamToObservable.js"
 import { headersFromObject } from "./headersFromObject.js"
 
-export const nodeRequestToRequest = (nodeRequest, { signal, serverOrigin }) => {
+export const fromNodeRequest = (nodeRequest, { serverOrigin, signal }) => {
   const headers = headersFromObject(nodeRequest.headers)
   const body = nodeStreamToObservable(nodeRequest)
 
@@ -18,67 +18,88 @@ export const nodeRequestToRequest = (nodeRequest, { signal, serverOrigin }) => {
     requestOrigin = serverOrigin
   }
 
-  const urlObject = new URL(nodeRequest.url, requestOrigin)
-
   return Object.freeze({
     signal,
     http2: Boolean(nodeRequest.stream),
-    url: String(urlObject),
     origin: requestOrigin,
-    pathname: urlObject.pathname,
-    ressource: nodeRequest.url,
+    ...getPropertiesFromRessource({
+      ressource: nodeRequest.url,
+      baseUrl: requestOrigin,
+    }),
     method: nodeRequest.method,
     headers,
     body,
   })
 }
 
-export const createPushRequest = (request, { signal, pathname, method }) => {
-  const childHeaders = { ...request.headers }
-  // mtime sent by the client in request headers concerns the main request
-  // Time remains valid for request to other ressources so we keep it
-  // in child requests
-  // delete childHeaders["if-modified-since"]
+export const applyRedirectionToRequest = (
+  request,
+  { ressource, pathname, ...rest },
+) => {
+  return {
+    ...request,
+    ...(ressource
+      ? getPropertiesFromRessource({
+          ressource,
+          baseUrl: request.url,
+        })
+      : pathname
+      ? getPropertiesFromPathname({
+          pathname,
+          baseUrl: request.url,
+        })
+      : {}),
+    ...rest,
+  }
+}
 
-  // eTag sent by the client in request headers concerns the main request
-  // A request made to an other ressource must not inherit the eTag
-  delete childHeaders["if-none-match"]
+const getPropertiesFromRessource = ({ ressource, baseUrl }) => {
+  const urlObject = new URL(ressource, baseUrl)
+  let pathname = urlObject.pathname
+
+  return {
+    url: String(urlObject),
+    pathname,
+    ressource,
+  }
+}
 
+const getPropertiesFromPathname = ({ pathname, baseUrl }) => {
+  return getPropertiesFromRessource({
+    ressource: `${pathname}${new URL(baseUrl).search}`,
+    baseUrl,
+  })
+}
+
+export const createPushRequest = (request, { signal, pathname, method }) => {
   const pushRequest = Object.freeze({
     ...request,
     parent: request,
     signal,
     http2: true,
-    ...(pathname ? getRequestRedirectionProperties(request, { pathname }) : {}),
+    ...(pathname
+      ? getPropertiesFromPathname({
+          pathname,
+          baseUrl: request.url,
+        })
+      : {}),
     method: method || request.method,
-    headers: childHeaders,
+    headers: getHeadersInheritedByPushRequest(request),
     body: undefined,
   })
-
   return pushRequest
 }
 
-const getRequestRedirectionProperties = (request, { ressource, pathname }) => {
-  if (ressource === undefined) {
-    const search = new URL(request.url).search
-    ressource = `${pathname}${search}`
-  }
-  const url = `${request.origin}${ressource}`
-  const urlObject = new URL(url)
-  return {
-    url,
-    pathname: urlObject.pathname,
-    ressource,
-  }
-}
+const getHeadersInheritedByPushRequest = (request) => {
+  const headersInherited = { ...request.headers }
+  // mtime sent by the client in request headers concerns the main request
+  // Time remains valid for request to other ressources so we keep it
+  // in child requests
+  // delete childHeaders["if-modified-since"]
 
-export const applyRedirectionToRequest = (
-  request,
-  { ressource, pathname, ...rest },
-) => {
-  return {
-    ...request,
-    ...getRequestRedirectionProperties(request, { ressource, pathname }),
-    ...rest,
-  }
+  // eTag sent by the client in request headers concerns the main request
+  // A request made to an other ressource must not inherit the eTag
+  delete headersInherited["if-none-match"]
+
+  return headersInherited
 }

package/src/plugin_request_waiting_check.js

@@ -16,8 +16,6 @@ export const pluginRequestWaitingCheck = ({
 } = {}) => {
   return {
     plugin_request_waiting_check: {
-      init: () => {},
-
       onRequest: (request, { logger }) => {
         const timeout = setTimeout(
           () => requestWaitingCallback({ request, logger, requestWaitingMs }),

package/src/ressource_aliases/plugin_ressource_aliases.js

@@ -0,0 +1,55 @@
+import { urlToMeta, normalizeStructuredMetaMap } from "@jsenv/url-meta"
+
+export const pluginRessourceAliases = (ressourceAliases) => {
+  const ressourceAliasMap = {}
+  Object.keys(ressourceAliases).forEach((key) => {
+    ressourceAliasMap[ressourceAliases[key]] = 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) {
+          return
+        }
+
+        const urlObjectAfterAlias = replaceUrlRessource(
+          request.url,
+          ressourceAlias,
+        )
+        const ressource = `${urlObjectAfterAlias.pathname}${urlObjectAfterAlias.search}`
+        redirectRequest({
+          ressourceBeforeAlias: request.ressource,
+          ressource,
+        })
+      },
+    },
+  }
+}
+
+const replaceUrlRessource = (url, ressource) => {
+  const urlObject = new URL(url)
+
+  const searchSeparatorIndex = ressource.indexOf("?")
+  if (searchSeparatorIndex === -1) {
+    urlObject.pathname = ressource
+    return urlObject
+  }
+
+  const pathname = ressource.slice(0, searchSeparatorIndex)
+  urlObject.pathname = pathname
+  return urlObject
+}

package/src/service_composition/routing.js

@@ -0,0 +1,35 @@
+import { createRequire } from "node:module"
+
+const require = createRequire(import.meta.url)
+
+export const setupRoutes = (routes) => {
+  const { match } = require("path-to-regexp")
+
+  const candidates = Object.keys(routes).map((pathPattern) => {
+    const applyPatternMatching = match(pathPattern, {
+      decode: decodeURIComponent,
+    })
+    return {
+      applyPatternMatching,
+      requestHandler: routes[pathPattern],
+    }
+  })
+
+  return (request, { pushResponse, redirectRequest }) => {
+    let result
+    const found = candidates.find((candidate) => {
+      result = candidate.applyPatternMatching(request.pathname)
+      return Boolean(result)
+    })
+    if (found) {
+      return found.requestHandler(
+        {
+          ...request,
+          routeParams: result.params,
+        },
+        { pushResponse, redirectRequest },
+      )
+    }
+    return null
+  }
+}

package/src/service_composition/service_composition.js

@@ -1,37 +1,13 @@
 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/nodeRequestToRequest.js"
+import { applyRedirectionToRequest } from "@jsenv/server/src/internal/request_factory.js"
 
-const requestRedirectionSymbol = Symbol("request_redirection")
-
-export const redirectRequest = (redirection) => {
-  return {
-    [requestRedirectionSymbol]: redirection,
-  }
-}
-
-export const composeServices = (...callbacks) => {
-  return (request, ...rest) => {
-    return firstOperationMatching({
-      array: callbacks,
-      start: (callback) => callback(request, ...rest),
-      predicate: (returnValue) => {
-        if (returnValue === null || typeof returnValue !== "object") {
-          return false
-        }
-        const requestRedirection = returnValue[requestRedirectionSymbol]
-        if (requestRedirection) {
-          request = applyRedirectionToRequest(request, requestRedirection)
-          return false
-        }
-        return true
-      },
-    })
-  }
-}
+export const composeServices = (namedServices) => {
+  return async (request, { pushResponse }) => {
+    const redirectRequest = (requestRedirection) => {
+      request = applyRedirectionToRequest(request, requestRedirection)
+    }
 
-export const composeServicesWithTiming = (namedServices) => {
-  return async (request, ...rest) => {
     const servicesTiming = {}
     const response = await firstOperationMatching({
       array: Object.keys(namedServices).map((serviceName) => {
@@ -39,7 +15,7 @@ export const composeServicesWithTiming = (namedServices) => {
       }),
       start: async ({ serviceName, serviceFn }) => {
         const [serviceTiming, value] = await timeFunction(serviceName, () =>
-          serviceFn(request, ...rest),
+          serviceFn(request, { pushResponse, redirectRequest }),
         )
         Object.assign(servicesTiming, serviceTiming)
         return value
@@ -48,11 +24,6 @@ export const composeServicesWithTiming = (namedServices) => {
         if (returnValue === null || typeof returnValue !== "object") {
           return false
         }
-        const requestRedirection = returnValue[requestRedirectionSymbol]
-        if (requestRedirection) {
-          request = applyRedirectionToRequest(request, requestRedirection)
-          return false
-        }
         return true
       },
     })

package/src/startServer.js

@@ -12,9 +12,10 @@ import { createPolyglotServer } from "./internal/server-polyglot.js"
 import { trackServerPendingConnections } from "./internal/trackServerPendingConnections.js"
 import { trackServerPendingRequests } from "./internal/trackServerPendingRequests.js"
 import {
-  nodeRequestToRequest,
+  fromNodeRequest,
   createPushRequest,
-} from "./internal/nodeRequestToRequest.js"
+  applyRedirectionToRequest,
+} from "./internal/request_factory.js"
 import { populateNodeResponse } from "./internal/populateNodeResponse.js"
 import { colorizeResponseStatus } from "./internal/colorizeResponseStatus.js"
 import { getServerOrigins } from "./internal/getServerOrigins.js"
@@ -265,9 +266,9 @@ export const startServer = async ({
       return stopCallbackList.add(abort)
     })
 
-    const request = nodeRequestToRequest(nodeRequest, {
-      signal: receiveRequestOperation.signal,
+    const request = fromNodeRequest(nodeRequest, {
       serverOrigin,
+      signal: receiveRequestOperation.signal,
     })
 
     // Handling request is asynchronous, we buffer logs for that request
@@ -417,6 +418,7 @@ export const startServer = async ({
           pathname: path,
           method,
         })
+
         try {
           const responseProperties = await handleRequest(pushRequest, {
             requestNode,
@@ -473,12 +475,17 @@ export const startServer = async ({
       const shortcircuitResponse = (value) => {
         responseFromShortcircuit = value
       }
+      const redirectRequest = (requestRedirection) => {
+        request = applyRedirectionToRequest(request, requestRedirection)
+      }
       Object.keys(plugins).forEach((pluginName) => {
         const { onRequest } = plugins[pluginName]
         if (onRequest) {
           const returnValue = onRequest(request, {
             warn,
+            logger,
             shortcircuitResponse,
+            redirectRequest,
           })
           if (returnValue) {
             requestPlugins.push(returnValue)
@@ -725,7 +732,9 @@ const generateResponseDescription = async ({
   pushResponse,
 }) => {
   try {
-    const returnValue = await requestToResponse(request, { pushResponse })
+    const returnValue = await requestToResponse(request, {
+      pushResponse,
+    })
     return {
       responseProperties: returnValue,
     }