@jsenv/server 14.0.0 → 14.1.2

package/README.md

@@ -43,7 +43,7 @@ const server = await startServer({
     {
       name: "index",
       handleRequest: (request) => {
-        if (request.ressource === "/") {
+        if (request.resource === "/") {
           return { status: 200 }
         }
         return null
@@ -104,7 +104,7 @@ await startServer({
   services: [
     {
       handleRequest: async (request) => {
-        const fileUrl = new URL(request.ressource.slice(1), import.meta.url)
+        const fileUrl = new URL(request.resource.slice(1), import.meta.url)
         const response = await fetchFileSystem(fileUrl, request)
         return response
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "14.0.0",
+  "version": "14.1.2",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -34,8 +34,8 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/abort": "4.2.3",
-    "@jsenv/log": "3.1.0",
+    "@jsenv/abort": "4.2.4",
+    "@jsenv/log": "3.2.0",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/utils": "2.0.1",
     "ws": "8.8.1"

package/src/fetch_filesystem.js

@@ -64,7 +64,7 @@ export const fetchFileSystem = async (
   }
 
   // here you might be tempted to add || cacheControl === 'no-cache'
-  // but no-cache means ressource can be cache but must be revalidated (yeah naming is strange)
+  // but no-cache means resource can be cache but must be revalidated (yeah naming is strange)
   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#Cacheability
   if (cacheControl === "no-store") {
     if (etagEnabled) {
@@ -206,7 +206,7 @@ const getClientCacheResponse = async ({
   sourceUrl,
 }) => {
   // here you might be tempted to add || headers["cache-control"] === "no-cache"
-  // but no-cache means ressource can be cache but must be revalidated (yeah naming is strange)
+  // but no-cache means resource can be cache but must be revalidated (yeah naming is strange)
   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#Cacheability
 
   if (

package/src/internal/nodeStreamToObservable.js

@@ -38,7 +38,7 @@ export const nodeStreamToObservable = (nodeStream) => {
     // used in the next ${readableStreamLifetimeInSeconds} otherwise destroys it
     const timeout = setTimeout(() => {
       process.emitWarning(
-        `Readable stream not used after ${readableStreamLifetimeInSeconds} seconds. It will be destroyed to release ressources`,
+        `Readable stream not used after ${readableStreamLifetimeInSeconds} seconds. It will be destroyed to release resources`,
         {
           CODE: "READABLE_STREAM_TIMEOUT",
           // url is for http client request

package/src/internal/request_factory.js

@@ -24,8 +24,8 @@ export const fromNodeRequest = (nodeRequest, { serverOrigin, signal }) => {
     signal,
     http2: Boolean(nodeRequest.stream),
     origin: requestOrigin,
-    ...getPropertiesFromRessource({
-      ressource: nodeRequest.url,
+    ...getPropertiesFromResource({
+      resource: nodeRequest.url,
       baseUrl: requestOrigin,
     }),
     method: nodeRequest.method,
@@ -36,13 +36,13 @@ export const fromNodeRequest = (nodeRequest, { serverOrigin, signal }) => {
 
 export const applyRedirectionToRequest = (
   request,
-  { ressource, pathname, ...rest },
+  { resource, pathname, ...rest },
 ) => {
   return {
     ...request,
-    ...(ressource
-      ? getPropertiesFromRessource({
-          ressource,
+    ...(resource
+      ? getPropertiesFromResource({
+          resource,
           baseUrl: request.url,
         })
       : pathname
@@ -55,20 +55,20 @@ export const applyRedirectionToRequest = (
   }
 }
 
-const getPropertiesFromRessource = ({ ressource, baseUrl }) => {
-  const urlObject = new URL(ressource, baseUrl)
+const getPropertiesFromResource = ({ resource, baseUrl }) => {
+  const urlObject = new URL(resource, baseUrl)
   let pathname = urlObject.pathname
 
   return {
     url: String(urlObject),
     pathname,
-    ressource,
+    resource,
   }
 }
 
 const getPropertiesFromPathname = ({ pathname, baseUrl }) => {
-  return getPropertiesFromRessource({
-    ressource: `${pathname}${new URL(baseUrl).search}`,
+  return getPropertiesFromResource({
+    resource: `${pathname}${new URL(baseUrl).search}`,
     baseUrl,
   })
 }
@@ -95,12 +95,12 @@ export const createPushRequest = (request, { signal, pathname, method }) => {
 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
+  // Time remains valid for request to other resources so we keep it
   // in child requests
   // delete childHeaders["if-modified-since"]
 
   // eTag sent by the client in request headers concerns the main request
-  // A request made to an other ressource must not inherit the eTag
+  // A request made to an other resource must not inherit the eTag
   delete headersInherited["if-none-match"]
 
   return headersInherited

package/src/main.js

@@ -42,5 +42,5 @@ export { jsenvServiceResponseAcceptanceCheck } from "./services/response_accepta
 export { serveDirectory } from "./serve_directory.js"
 export { fromFetchResponse } from "./from_fetch_response.js"
 export { composeTwoResponses } from "./internal/response_composition.js"
-export { jsenvServiceRessourceAliases } from "./services/ressource_aliases/jsenv_service_ressource_aliases.js"
+export { jsenvServiceRequestAliases } from "./services/request_aliases/jsenv_service_request_aliases.js"
 export { findFreePort } from "./internal/listen.js"

package/src/services/request_aliases/jsenv_service_request_aliases.js

@@ -0,0 +1,37 @@
+import { URL_META } from "@jsenv/url-meta"
+
+export const jsenvServiceRequestAliases = (resourceAliases) => {
+  const aliases = {}
+  Object.keys(resourceAliases).forEach((key) => {
+    aliases[asFileUrl(key)] = asFileUrl(resourceAliases[key])
+  })
+  return {
+    name: "jsenv:request_aliases",
+    redirectRequest: (request) => {
+      const resourceBeforeAlias = request.resource
+      const urlAfterAliasing = URL_META.applyAliases({
+        url: asFileUrl(request.pathname),
+        aliases,
+      })
+      const resourceAfterAlias = urlAfterAliasing.slice("file://".length)
+      if (resourceBeforeAlias === resourceAfterAlias) {
+        return null
+      }
+      const resource = replaceResource(resourceBeforeAlias, resourceAfterAlias)
+      return { resource }
+    },
+  }
+}
+
+const asFileUrl = (specifier) => new URL(specifier, "file:///").href
+
+const replaceResource = (resourceBeforeAlias, newValue) => {
+  const urlObject = new URL(resourceBeforeAlias, "file://")
+  const searchSeparatorIndex = newValue.indexOf("?")
+  if (searchSeparatorIndex > -1) {
+    return newValue // let new value override search params
+  }
+  urlObject.pathname = newValue
+  const resource = `${urlObject.pathname}${urlObject.search}`
+  return resource
+}

package/src/sse/sse_room.js

@@ -37,9 +37,7 @@ export const createSSERoom = ({
 
     const lastKnownId =
       request.headers["last-event-id"] ||
-      new URL(request.ressource, request.origin).searchParams.get(
-        "last-event-id",
-      )
+      new URL(request.url).searchParams.get("last-event-id")
 
     if (clients.size >= maxClientAllowed) {
       return {

package/src/start_server.js

@@ -81,7 +81,7 @@ export const startServer = async ({
       createDetailedMessage(
         `still no response found for request after ${requestWaitingMs} ms`,
         {
-          "request url": `${request.origin}${request.ressource}`,
+          "request url": request.url,
           "request headers": JSON.stringify(request.headers, null, "  "),
         },
       ),
@@ -467,7 +467,7 @@ export const startServer = async ({
           addRequestLog(requestNode, {
             type: "error",
             value: createDetailedMessage(
-              `An error occured while pushing a stream to the response for ${request.ressource}`,
+              `An error occured while pushing a stream to the response for ${request.resource}`,
               {
                 "error stack": e.stack,
               },
@@ -572,8 +572,8 @@ export const startServer = async ({
         addRequestLog(requestNode, {
           type: "info",
           value: request.parent
-            ? `Push ${request.ressource}`
-            : `${request.method} ${request.origin}${request.ressource}`,
+            ? `Push ${request.resource}`
+            : `${request.method} ${request.url}`,
         })
         const warn = (value) => {
           addRequestLog(requestNode, {

package/src/services/ressource_aliases/jsenv_service_ressource_aliases.js

@@ -1,40 +0,0 @@
-import { URL_META } from "@jsenv/url-meta"
-
-export const jsenvServiceRessourceAliases = (ressourceAliases) => {
-  const aliases = {}
-  Object.keys(ressourceAliases).forEach((key) => {
-    aliases[asFileUrl(key)] = asFileUrl(ressourceAliases[key])
-  })
-  return {
-    name: "jsenv:ressource_aliases",
-    redirectRequest: (request) => {
-      const ressourceBeforeAlias = request.ressource
-      const urlAfterAliasing = URL_META.applyAliases({
-        url: asFileUrl(request.pathname),
-        aliases,
-      })
-      const ressourceAfterAlias = urlAfterAliasing.slice("file://".length)
-      if (ressourceBeforeAlias === ressourceAfterAlias) {
-        return null
-      }
-      const ressource = replaceRessource(
-        ressourceBeforeAlias,
-        ressourceAfterAlias,
-      )
-      return { ressource }
-    },
-  }
-}
-
-const asFileUrl = (specifier) => new URL(specifier, "file:///").href
-
-const replaceRessource = (ressourceBeforeAlias, newValue) => {
-  const urlObject = new URL(ressourceBeforeAlias, "file://")
-  const searchSeparatorIndex = newValue.indexOf("?")
-  if (searchSeparatorIndex > -1) {
-    return newValue // let new value override search params
-  }
-  urlObject.pathname = newValue
-  const ressource = `${urlObject.pathname}${urlObject.search}`
-  return ressource
-}