@superhero/http-server 4.7.2 → 4.7.3

package/{conditions → condition}/upstream/header/accept.js

@@ -1,13 +1,13 @@
 export default
 {
-  isValid(request, session)
+  isValid(request, route)
   {
     const
       header      = request.headers['accept'],
       lowerCased  = header.toLowerCase(),
       accept      = lowerCased.split(';')[0].split('*')[0].trim()
 
-    return [session.route['condition.accept']].flat().some(supported =>
+    return [route['condition.accept']].flat().some(supported =>
       supported.startsWith(accept) || accept.startsWith(supported.split('*')[0]))
   }
 }

package/{conditions → condition}/upstream/header/content-type.js

@@ -1,13 +1,13 @@
 export default
 {
-  isValid(request, session)
+  isValid(request, route)
   {
     const
       header      = request.headers['content-type'],
       lowerCased  = header.toLowerCase(),
       contentType = lowerCased.split(';')[0].split('*')[0].trim()
 
-    return [session.route['condition.content-type']].flat().some(supported =>
+    return [route['condition.content-type']].flat().some(supported =>
       supported.startsWith(contentType) || contentType.startsWith(supported.split('*')[0]))
   }
 }

package/condition/upstream/method.js

@@ -0,0 +1,12 @@
+export default
+{
+  isValid(request, route)
+  {
+    const
+      methods = [route['condition.method']].flat(),
+      mapped  = methods.map(method => method.toLowerCase()),
+      isValid = mapped.includes(request.method.toLowerCase())
+
+    return isValid
+  }
+}

package/config.json

@@ -6,10 +6,14 @@
   "locator":
   {
     "@superhero/http-server": true,
+
     "@superhero/http-server/dispatcher/*": "./dispatcher/*.js",
     "@superhero/http-server/dispatcher/*/*": "./dispatcher/*/*.js",
     "@superhero/http-server/dispatcher/*/*/*": "./dispatcher/*/*/*.js",
-    "@superhero/http-server/dispatcher/*/*/*/*/*": "./dispatcher/*/*/*/*/*.js"
+    "@superhero/http-server/dispatcher/*/*/*/*/*": "./dispatcher/*/*/*/*/*.js",
+
+    "@superhero/http-server/condition/*/*": "./condition/*/*.js",
+    "@superhero/http-server/condition/*/*/*": "./condition/*/*/*.js"
   },
   "http-server":
   {

package/dispatcher/upstream/header/content-type.js

@@ -27,8 +27,8 @@ export default new class ContentTypeHeaderUpstreamDispatcher
       {
         const 
           dispatcher  = session.route[route],
-          dispatchers = Array.isArray(dispatcher) ? dispatcher : [dispatcher],
-          uniqueList  = dispatchers.filter((item) => false === session.chain.dispatchers.includes(item))
+          dispatchers = [ dispatcher ].flat(),
+          uniqueList  = dispatchers.filter(item => false === session.chain.dispatchers.includes(item))
 
         // insert the forward routed dispatcher(s) after the current dispatcher in the chain 
         // for the dispatcher chain iterator to dispatch it/them next

package/index.test.js

@@ -418,7 +418,7 @@ suite('@superhero/http-server', () =>
       {
         for(const algorithm in algorithms)
         {
-          test(algorithm, async (sub) =>
+          test(algorithm, async sub =>
           {
             fs.mkdirSync('test', { recursive: true })
             execSync(algorithms[algorithm], { stdio: ['ignore', 'ignore', 'pipe'] })
@@ -433,7 +433,7 @@ suite('@superhero/http-server', () =>
               { dispatch: (_, session) => session.view.body.dispatched = true })
 
             await assert.doesNotReject(server.bootstrap(
-              { server: { cert, key, minVersion: tlsVersion, maxVersion: tlsVersion }, 
+              { server: { cert, key, minVersion: tlsVersion, maxVersion: tlsVersion },
                 router:
                 { routes:
                   { 'test':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/http-server",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "description": "HTTP(S) server component supporting both HTTP 1.1 and HTTP 2.0",
   "keywords": [
     "http server",
@@ -27,16 +27,16 @@
     "test": "syntax-check; node --test --test-reporter=@superhero/audit/reporter --experimental-test-coverage"
   },
   "dependencies": {
-    "@superhero/router": "4.7.2",
-    "@superhero/deep": "4.7.2",
-    "@superhero/log": "4.7.2",
-    "@superhero/id-name-generator": "4.7.2"
+    "@superhero/router": "4.7.3",
+    "@superhero/deep": "4.7.3",
+    "@superhero/log": "4.7.3",
+    "@superhero/id-name-generator": "4.7.3"
   },
   "devDependencies": {
-    "@superhero/audit": "4.7.2",
+    "@superhero/audit": "4.7.3",
     "@superhero/syntax-check": "0.0.2",
-    "@superhero/locator": "4.7.2",
-    "@superhero/http-request": "4.7.2"
+    "@superhero/locator": "4.7.3",
+    "@superhero/http-request": "4.7.3"
   },
   "author": {
     "name": "Erik Landvall",

package/conditions/upstream/method.js

@@ -1,7 +0,0 @@
-export default
-{
-  isValid(request, session)
-  {
-    return [session.route['condition.method']].flat().includes(request.method)
-  }
-}