@superhero/http-server 4.1.0 → 4.2.1

package/config.json

@@ -6,9 +6,9 @@
   "locator":
   {
     "@superhero/http-server": true,
-    "@superhero/http-server/middleware/*/*": "./middleware/*/*.js",
-    "@superhero/http-server/middleware/*/*/*": "./middleware/*/*/*.js",
-    "@superhero/http-server/middleware/*/*/*/*/*": "./middleware/*/*/*/*/*.js"
+    "@superhero/http-server/dispatcher/*/*": "./dispatcher/*/*.js",
+    "@superhero/http-server/dispatcher/*/*/*": "./dispatcher/*/*/*.js",
+    "@superhero/http-server/dispatcher/*/*/*/*/*": "./dispatcher/*/*/*/*/*.js"
   },
   "http-server":
   {

package/{middleware → dispatcher}/upstream/header/accept.js

@@ -1,24 +1,33 @@
 /**
- * @memberof @superhero/http-server:middleware/upstream/header
+ * @memberof @superhero/http-server:dispatcher/upstream/header
  */
-export default new class AcceptHeaderUpstreamMiddleware
+export default new class AcceptHeaderUpstreamDispatcher
 {
   #listFormat = new Intl.ListFormat('en', { style:'long', type:'disjunction' })
   #normalize  = (route) => route.replace('accept.', '').trim()
 
   dispatch(request, session)
   {
+    if(false === !!request.headers['accept'])
+    {
+      const error   = new Error(`The requested resource "${request.method} ${request.url}" requires a accept header`)
+      error.code    = 'E_HTTP_SERVER_ACCEPT_HEADER_MISSING'
+      error.status  = 406
+      error.cause   = `The requested resource requires a accept header to be set`
+      return session.abortion.abort(error)
+    }
+
     const
       splitHeader = request.headers['accept']?.toLowerCase().split(',') || [],
       accepts     = splitHeader.map(this.#normalize),
       routes      = Object.keys(session.route).filter((key) => key.startsWith('accept.') && session.route[key]),
-      supports    = routes.map((route) => [this.#normalize(route), route])
+      supports    = routes.map((route) => [ this.#normalize(route), route ])
 
     for(let accepted of accepts)
     {
       accepted = accepted.split(';')[0].split('*')[0]
 
-      for(let [supported, route] in supports)
+      for(let [ supported, route ] of supports)
       {
         supported = supported.split('*')[0]
 
@@ -42,7 +51,7 @@ export default new class AcceptHeaderUpstreamMiddleware
       allowed = supports.map(([ supported ]) => supported),
       error   = new Error(`The requested resource "${request.method} ${request.url}" can not be delivered in requested header accept media types: ${this.#listFormat.format(accepts) || 'none are defined'}`)
 
-    error.code    = 'E_HTTP_SERVER_MIDDLEWARE_ACCEPT_HEADER_NO_MATCHING_DISPATCHER'
+    error.code    = 'E_HTTP_SERVER_ACCEPT_HEADER_NO_ROUTE'
     error.status  = 406
     error.headers = { accept:allowed.join(',') }
     error.cause   = `Supported accept header media types are: ${this.#listFormat.format(allowed) || 'none are defined'}`

package/{middleware → dispatcher}/upstream/header/content-type/application/json.js

@@ -1,9 +1,9 @@
 /**
  * Does not validate headers, just assumes that the body is a JSON string
  * 
- * @memberof @superhero/http-server:middleware/upstream/header/content-type/application
+ * @memberof @superhero/http-server:dispatcher/upstream/header/content-type/application
  */
-export default new class ContentTypeApplicationJsonHeaderUpstreamMiddleware
+export default new class ContentTypeApplicationJsonHeaderUpstreamDispatcher
 {
   async dispatch(request, session)
   {
@@ -13,16 +13,15 @@ export default new class ContentTypeApplicationJsonHeaderUpstreamMiddleware
     {
       try
       {
-        request.body = JSON.parse(body)
+        request.body = JSON.parse(String(body) || '{}')
       }
       catch(reason)
       {
         const error   = new Error('The body is not a valid JSON string')
-        error.code    = 'E_HTTP_SERVER_MIDDLEWARE_CONTENT_TYPE_APPLICATION_JSON_INVALID_BODY'
+        error.code    = 'E_HTTP_SERVER_CONTENT_TYPE_HEADER_APPLICATION_JSON'
         error.status  = 400
-        error.cause   = 'The buffered body could not be parsed as a JSON string'
-
-        session.abortion.abort(error)
+        error.cause   = reason
+        return session.abortion.abort(error)
       }
     }
   }

package/{middleware → dispatcher}/upstream/header/content-type.js

@@ -1,18 +1,27 @@
 /**
- * @memberof @superhero/http-server:middleware/upstream/header
+ * @memberof @superhero/http-server:dispatcher/upstream/header
  */
-export default new class ContentTypeHeaderUpstreamMiddleware
+export default new class ContentTypeHeaderUpstreamDispatcher
 {
   #listFormat = new Intl.ListFormat('en', { style:'long', type:'disjunction' })
 
   dispatch(request, session)
   {
+    if(false === !!request.headers['content-type'])
+    {
+      const error   = new Error(`The requested resource "${request.method} ${request.url}" requires a content-type header`)
+      error.code    = 'E_HTTP_SERVER_CONTENT_TYPE_HEADER_MISSING'
+      error.status  = 415
+      error.cause   = `The requested resource requires a content-type header to be set`
+      return session.abortion.abort(error)
+    }
+
     const
-      contentType = request.headers['content-type']?.toLowerCase().split(';')[0].split('*')[0].trim(),
+      contentType = request.headers['content-type'].toLowerCase().split(';')[0].split('*')[0].trim(),
       routes      = Object.keys(session.route).filter((key) => key.startsWith('content-type.') && session.route[key]),
-      supports    = routes.map((route) => [route.replace('content-type.', '').trim(), route])
+      supports    = routes.map((route) => [ route.replace('content-type.', '').trim(), route ])
 
-    for(let [supported, route] in supports)
+    for(let [ supported, route ] of supports)
     {
       supported = supported.split('*')[0]
 
@@ -30,12 +39,12 @@ export default new class ContentTypeHeaderUpstreamMiddleware
         return
       }
     }
-    
+
     const
       allowed = supports.map(([ supported ]) => supported),
       error   = new Error(`The requested resource "${request.method} ${request.url}" does not support content-type "${request.headers['content-type']}"`)
 
-    error.code    = 'E_HTTP_SERVER_MIDDLEWARE_CONTENT_TYPE_NO_MATCHING_DISPATCHER'
+    error.code    = 'E_HTTP_SERVER_CONTENT_TYPE_HEADER_NO_ROUTE'
     error.status  = 415
     error.headers = { accept:allowed.join(',') }
     error.cause   = `Supported content-type headers are: ${this.#listFormat.format(allowed) || 'none are defined'}`

package/{middleware → dispatcher}/upstream/method.js

@@ -1,7 +1,7 @@
 /**
- * @memberof @superhero/http-server:middleware/upstream
+ * @memberof @superhero/http-server:dispatcher/upstream
  */
-export default new class MethodUpstreamMiddleware
+export default new class MethodUpstreamDispatcher
 {
   #listFormat = new Intl.ListFormat('en', { style:'long', type:'disjunction' })
 
@@ -28,7 +28,7 @@ export default new class MethodUpstreamMiddleware
       allowed  = supports.map((supported) => supported.replace('method.', '').toUpperCase()).sort(),
       error    = new Error(`The requested resource "${request.url}" does not support method "${request.method}"`)
 
-    error.code    = 'E_HTTP_SERVER_MIDDLEWARE_METHOD_NO_MATCHING_DISPATCHER'
+    error.code    = 'E_HTTP_SERVER_METHOD_NO_ROUTE'
     error.status  = 405
     error.headers = { allow:allowed.join(',') }
     error.cause   = `Supported methods are: ${this.#listFormat.format(allowed) || 'none are defined'}`

package/index.test.js

@@ -75,12 +75,12 @@ suite('@superhero/http-server', () =>
       assert.ok(config.find('http-server/router/routes'))
 
       await locator.eagerload(config.find('locator'))
-      
+
       assert.ok(locator.has('@superhero/http-server'))
-      assert.ok(locator.has('@superhero/http-server/middleware/upstream/method'))
-      assert.ok(locator.has('@superhero/http-server/middleware/upstream/header/accept'))
-      assert.ok(locator.has('@superhero/http-server/middleware/upstream/header/content-type'))
-      assert.ok(locator.has('@superhero/http-server/middleware/upstream/header/content-type/application/json'))
+      assert.ok(locator.has('@superhero/http-server/dispatcher/upstream/method'))
+      assert.ok(locator.has('@superhero/http-server/dispatcher/upstream/header/accept'))
+      assert.ok(locator.has('@superhero/http-server/dispatcher/upstream/header/content-type'))
+      assert.ok(locator.has('@superhero/http-server/dispatcher/upstream/header/content-type/application/json'))
     })
 
     test('Listens and closes the server as expected', async () => 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/http-server",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "description": "HTTP(S) server component supporting both HTTP 1.1 and HTTP 2.0",
   "keywords": [
     "http server",
@@ -22,7 +22,8 @@
     "./*/*/*/*/*/*": "./*/*/*/*/*/*.js"
   },
   "dependencies": {
-    "@superhero/router": "^4.1.0"
+    "@superhero/router": "^4.1.0",
+    "@superhero/deep": "^4.1.0"
   },
   "devDependencies": {
     "@superhero/config": "^4.1.2",

package/view.js

@@ -1,4 +1,5 @@
-import { Transform } from 'stream'
+import deepmerge     from '@superhero/deep/merge'
+import { Transform } from 'node:stream'
 
 /**
  * A view model is a data model specifically designed for the view layer to 
@@ -48,7 +49,7 @@ export default class View
     Object.defineProperties(this,
     {
       // The body property is an object that represents the response body.
-      body    : { enumerable: true, value: {} },
+      body    : { enumerable: true, value: {}, set: (value) => deepmerge(this.body, value) },
       // The stream property is a transform stream in object mode that by default encodes objects 
       // as stringified JSON data records according to HTML5 standard Server-Sent Events (SSE).
       stream  : { enumerable: true, configurable: true, get: () => this.#lazyloadStream },