v2.0.0 (#22)

* v2.0.0

* supporting restana 4.x

Author: jkyberneees

index.js

@@ -5,7 +5,7 @@ const restana = require('restana')
 const pump = require('pump')
 const toArray = require('stream-to-array')
 const defaultProxyHandler = (req, res, url, proxy, proxyOpts) => proxy(req, res, url, proxyOpts)
-const DEFAULT_METHODS = require('restana/libs/methods')
+const DEFAULT_METHODS = require('restana/libs/methods').filter(method => method !== 'all')
 const send = require('@polka/send-type')
 
 const gateway = (opts) => {
@@ -14,9 +14,7 @@ const gateway = (opts) => {
     pathRegex: '/*'
   }, opts)
 
-  const server = opts.server || ((opts.restana instanceof Function) ? opts.restana() : restana(opts.restana || {
-    disableResponseEvent: true
-  }))
+  const server = opts.server || restana(opts.restana)
 
   // registering global middlewares
   opts.middlewares.forEach(middleware => {
@@ -64,36 +62,42 @@ const gateway = (opts) => {
 
     // registering route handlers
     const methods = route.methods || DEFAULT_METHODS
+
+    const args = [
+      // path
+      route.prefix + route.pathRegex,
+      // route middlewares
+      ...route.middlewares,
+      // route handler
+      handler(route, proxy, proxyHandler)
+    ]
+
     methods.forEach(method => {
       method = method.toLowerCase()
-
       if (server[method]) {
-        server[method].apply(server, [
-          // path
-          route.prefix + route.pathRegex,
-          // route middlewares
-          ...route.middlewares,
-          // route handler
-          handler(route, proxy, proxyHandler)
-        ])
+        server[method].apply(server, args)
       }
     })
   })
 
   return server
 }
 
-const handler = (route, proxy, proxyHandler) => async (req, res) => {
-  req.url = req.url.replace(route.prefix, route.prefixRewrite)
-  const shouldAbortProxy = await route.hooks.onRequest(req, res)
-  if (!shouldAbortProxy) {
-    const proxyOpts = Object.assign({
-      request: {
-        timeout: req.timeout || route.timeout
-      }
-    }, route.hooks)
-
-    proxyHandler(req, res, req.url, proxy, proxyOpts)
+const handler = (route, proxy, proxyHandler) => async (req, res, next) => {
+  try {
+    req.url = req.url.replace(route.prefix, route.prefixRewrite)
+    const shouldAbortProxy = await route.hooks.onRequest(req, res)
+    if (!shouldAbortProxy) {
+      const proxyOpts = Object.assign({
+        request: {
+          timeout: req.timeout || route.timeout
+        }
+      }, route.hooks)
+
+      proxyHandler(req, res, req.url, proxy, proxyOpts)
+    }
+  } catch (err) {
+    return next(err)
   }
 }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-gateway",
-  "version": "1.5.2",
+  "version": "2.0.0",
   "description": "A Node.js API Gateway for the masses!",
   "main": "index.js",
   "scripts": {
@@ -29,19 +29,19 @@
     "@polka/send-type": "^0.5.2",
     "fast-proxy": "^1.3.0",
     "http-cache-middleware": "^1.2.3",
-    "restana": "^3.4.1",
+    "restana": "^4.0.3",
     "stream-to-array": "^2.3.0"
   },
   "devDependencies": {
-    "express": "^4.17.1",
     "chai": "^4.2.0",
     "cors": "^2.8.5",
+    "express": "^4.17.1",
     "express-jwt": "^5.3.1",
     "express-rate-limit": "^5.0.0",
     "helmet": "^3.21.2",
     "mocha": "^6.2.2",
     "nyc": "^14.1.1",
-    "opossum": "^4.2.1",
+    "opossum": "^4.2.2",
     "request-ip": "^2.1.3",
     "response-time": "^2.3.2",
     "standard": "^14.3.1",

package.json

@@ -24,12 +24,16 @@ module.exports = async () => {
         onResponse (req, res, stream) { pump(stream, res) }
       }
     }, {
-      prefix: '/users',
+      prefix: '/users/response-time',
+      prefixRewrite: '',
       target: 'http://localhost:3000',
-      docs: {
-        name: 'Users Service',
-        endpoint: 'swagger.json',
-        type: 'swagger'
+      middlewares: [require('response-time')()],
+      hooks: {
+        rewriteHeaders (headers) {
+          headers['post-processed'] = true
+
+          return headers
+        }
       }
     }, {
       prefix: '/users/proxy-aborted',
@@ -43,18 +47,6 @@ module.exports = async () => {
           return true
         }
       }
-    }, {
-      prefix: '/users/response-time',
-      prefixRewrite: '',
-      target: 'http://localhost:3000',
-      middlewares: [require('response-time')()],
-      hooks: {
-        rewriteHeaders (headers) {
-          headers['post-processed'] = true
-
-          return headers
-        }
-      }
     }, {
       prefix: '/users/on-request-error',
       target: 'http://localhost:3000',
@@ -63,6 +55,14 @@ module.exports = async () => {
           throw new Error('ups, pre-processing error...')
         }
       }
+    }, {
+      prefix: '/users',
+      target: 'http://localhost:3000',
+      docs: {
+        name: 'Users Service',
+        endpoint: 'swagger.json',
+        type: 'swagger'
+      }
     },
     {
       pathRegex: '',