@jsenv/server 11.0.0 → 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,10 +5,8 @@
  */
 
 export { startServer } from "./src/startServer.js"
-export {
-  composeServices,
-  composeServicesWithTiming,
-} 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"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "11.0.0",
+  "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,6 +25,7 @@
     },
     "./*": "./*"
   },
+  "main": "./main.js",
   "files": [
     "/src/",
     "/main.js"
@@ -48,28 +49,26 @@
     "@jsenv/abort": "4.1.1",
     "@jsenv/logger": "4.0.1",
     "@jsenv/url-meta": "6.0.1",
-    "node-fetch": "2.6.2"
+    "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/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/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

@@ -2,27 +2,7 @@ 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"
 
-export const composeServices = (...callbacks) => {
-  return (request, { pushResponse }) => {
-    const redirectRequest = (requestRedirection) => {
-      request = applyRedirectionToRequest(request, requestRedirection)
-      return null
-    }
-
-    return firstOperationMatching({
-      array: callbacks,
-      start: (callback) => callback(request, { pushResponse, redirectRequest }),
-      predicate: (returnValue) => {
-        if (returnValue === null || typeof returnValue !== "object") {
-          return false
-        }
-        return true
-      },
-    })
-  }
-}
-
-export const composeServicesWithTiming = (namedServices) => {
+export const composeServices = (namedServices) => {
   return async (request, { pushResponse }) => {
     const redirectRequest = (requestRedirection) => {
       request = applyRedirectionToRequest(request, requestRedirection)

package/src/startServer.js

@@ -483,6 +483,7 @@ export const startServer = async ({
         if (onRequest) {
           const returnValue = onRequest(request, {
             warn,
+            logger,
             shortcircuitResponse,
             redirectRequest,
           })
@@ -729,12 +730,10 @@ const generateResponseDescription = async ({
   requestToResponse,
   request,
   pushResponse,
-  requestFactory,
 }) => {
   try {
     const returnValue = await requestToResponse(request, {
       pushResponse,
-      requestFactory,
     })
     return {
       responseProperties: returnValue,