@jsenv/server 7.1.0 → 8.0.0

package/src/{serverTiming.js → server_timing/timing_header.js}

@@ -1,30 +1,7 @@
-import { performance } from "perf_hooks"
-import { parseMultipleHeader, stringifyMultipleHeader } from "./internal/multiple-header.js"
-
-export const timeStart = (name) => {
-  // as specified in https://w3c.github.io/server-timing/#the-performanceservertiming-interface
-  // duration is a https://www.w3.org/TR/hr-time-2/#sec-domhighrestimestamp
-  const startTimestamp = performance.now()
-  const timeEnd = () => {
-    const endTimestamp = performance.now()
-    const timing = {
-      [name]: endTimestamp - startTimestamp,
-    }
-    return timing
-  }
-  return timeEnd
-}
-
-export const timeFunction = (name, fn) => {
-  const timeEnd = timeStart(name)
-  const returnValue = fn()
-  if (returnValue && typeof returnValue.then === "function") {
-    return returnValue.then((value) => {
-      return [timeEnd(), value]
-    })
-  }
-  return [timeEnd(), returnValue]
-}
+import {
+  parseMultipleHeader,
+  stringifyMultipleHeader,
+} from "../internal/multiple-header.js"
 
 // to predict order in chrome devtools we should put a,b,c,d,e or something
 // because in chrome dev tools they are shown in alphabetic order
@@ -41,47 +18,22 @@ export const timingToServerTimingResponseHeaders = (timing) => {
       dur: timing[key],
     }
   })
-  const serverTimingHeaderString = stringifyServerTimingHeader(serverTimingHeader)
+  const serverTimingHeaderString =
+    stringifyServerTimingHeader(serverTimingHeader)
 
   return { "server-timing": serverTimingHeaderString }
 }
 
-const letters = [
-  "a",
-  "b",
-  "c",
-  "d",
-  "e",
-  "f",
-  "g",
-  "h",
-  "i",
-  "j",
-  "k",
-  "l",
-  "m",
-  "n",
-  "o",
-  "p",
-  "q",
-  "r",
-  "s",
-  "t",
-  "u",
-  "v",
-  "w",
-  "x",
-  "y",
-  "z",
-]
-
 export const parseServerTimingHeader = (serverTimingHeaderString) => {
-  const serverTimingHeaderObject = parseMultipleHeader(serverTimingHeaderString, {
-    validateName: validateServerTimingName,
-    validateProperty: ({ name }) => {
-      return name === "desc" || name === "dur"
+  const serverTimingHeaderObject = parseMultipleHeader(
+    serverTimingHeaderString,
+    {
+      validateName: validateServerTimingName,
+      validateProperty: ({ name }) => {
+        return name === "desc" || name === "dur"
+      },
     },
-  })
+  )
 
   const serverTiming = {}
   Object.keys(serverTimingHeaderObject).forEach((key) => {
@@ -114,3 +66,32 @@ const validateServerTimingName = (name) => {
   }
   return true
 }
+
+const letters = [
+  "a",
+  "b",
+  "c",
+  "d",
+  "e",
+  "f",
+  "g",
+  "h",
+  "i",
+  "j",
+  "k",
+  "l",
+  "m",
+  "n",
+  "o",
+  "p",
+  "q",
+  "r",
+  "s",
+  "t",
+  "u",
+  "v",
+  "w",
+  "x",
+  "y",
+  "z",
+]

package/src/server_timing/timing_measure.js

@@ -0,0 +1,26 @@
+import { performance } from "perf_hooks"
+
+export const timeStart = (name) => {
+  // as specified in https://w3c.github.io/server-timing/#the-performanceservertiming-interface
+  // duration is a https://www.w3.org/TR/hr-time-2/#sec-domhighrestimestamp
+  const startTimestamp = performance.now()
+  const timeEnd = () => {
+    const endTimestamp = performance.now()
+    const timing = {
+      [name]: endTimestamp - startTimestamp,
+    }
+    return timing
+  }
+  return timeEnd
+}
+
+export const timeFunction = (name, fn) => {
+  const timeEnd = timeStart(name)
+  const returnValue = fn()
+  if (returnValue && typeof returnValue.then === "function") {
+    return returnValue.then((value) => {
+      return [timeEnd(), value]
+    })
+  }
+  return [timeEnd(), returnValue]
+}

package/src/service_composition/service_composition.js

@@ -0,0 +1,65 @@
+import { firstOperationMatching } from "@jsenv/cancellation"
+
+import { timeFunction } from "@jsenv/server/src/server_timing/timing_measure.js"
+import { composeResponse } from "@jsenv/server/src/internal/composeResponse.js"
+
+const nextSymbol = Symbol("next")
+
+export const nextService = (nextRequest) => {
+  return {
+    [nextSymbol]: nextRequest,
+  }
+}
+
+export const composeServices = (...callbacks) => {
+  return (request) => {
+    return firstOperationMatching({
+      array: callbacks,
+      start: (callback) => callback(request),
+      predicate: (returnValue) => {
+        if (returnValue === null || typeof returnValue !== "object") {
+          return false
+        }
+        const nextRequest = returnValue[nextSymbol]
+        if (nextRequest) {
+          request = nextRequest
+          return false
+        }
+        return true
+      },
+    })
+  }
+}
+
+export const composeServicesWithTiming = (namedServices) => {
+  return async (request) => {
+    const servicesTiming = {}
+    const response = await firstOperationMatching({
+      array: Object.keys(namedServices).map((serviceName) => {
+        return { serviceName, serviceFn: namedServices[serviceName] }
+      }),
+      start: async ({ serviceName, serviceFn }) => {
+        const [serviceTiming, value] = await timeFunction(serviceName, () =>
+          serviceFn(request),
+        )
+        Object.assign(servicesTiming, serviceTiming)
+        return value
+      },
+      predicate: (returnValue) => {
+        if (returnValue === null || typeof returnValue !== "object") {
+          return false
+        }
+        const nextRequest = returnValue[nextSymbol]
+        if (nextRequest) {
+          request = nextRequest
+          return false
+        }
+        return true
+      },
+    })
+    if (response) {
+      return composeResponse({ timing: servicesTiming }, response)
+    }
+    return null
+  }
+}

package/src/{createSSERoom.js → sse/createSSERoom.js}

@@ -1,5 +1,9 @@
 import { createLogger } from "@jsenv/logger"
-import { createObservable, createCompositeProducer } from "./internal/observable.js"
+
+import {
+  createObservable,
+  createCompositeProducer,
+} from "@jsenv/server/src/internal/observable.js"
 
 // https://www.html5rocks.com/en/tutorials/eventsource/basics/
 export const createSSERoom = ({
@@ -35,7 +39,9 @@ export const createSSERoom = ({
 
     const lastKnownId =
       request.headers["last-event-id"] ||
-      new URL(request.ressource, request.origin).searchParams.get("last-event-id")
+      new URL(request.ressource, request.origin).searchParams.get(
+        "last-event-id",
+      )
 
     if (clients.size >= maxClientAllowed) {
       return {
@@ -55,7 +61,9 @@ export const createSSERoom = ({
         complete,
       }
       clients.add(client)
-      logger.debug(`A client has joined. Number of client in room: ${clients.size}`)
+      logger.debug(
+        `A client has joined. Number of client in room: ${clients.size}`,
+      )
 
       if (lastKnownId !== undefined) {
         const previousEvents = getAllEventSince(lastKnownId)
@@ -101,7 +109,11 @@ export const createSSERoom = ({
       }
     })
 
-    const requestSSEObservable = connectRequestAndRoom(request, room, sseRoomObservable)
+    const requestSSEObservable = connectRequestAndRoom(
+      request,
+      room,
+      sseRoomObservable,
+    )
 
     return {
       status: 200,
@@ -128,7 +140,9 @@ export const createSSERoom = ({
 
   const sendEvent = (event) => {
     if (event.type !== "comment") {
-      logger.debug(`send ${event.type} event to ${clients.size} client in the room`)
+      logger.debug(
+        `send ${event.type} event to ${clients.size} client in the room`,
+      )
       addEventToHistory(event)
     }
     write(stringifySourceEvent(event))
@@ -150,7 +164,9 @@ export const createSSERoom = ({
 
   const keepAlive = () => {
     // maybe that, when an event occurs, we can delay the keep alive event
-    logger.debug(`send keep alive event, number of client listening event source: ${clients.size}`)
+    logger.debug(
+      `send keep alive event, number of client listening event source: ${clients.size}`,
+    )
     sendEvent({
       type: "comment",
       data: new Date().toLocaleTimeString(),