tom-microservice 3.4.4 → 3.4.6

package/package.json

@@ -2,7 +2,7 @@
   "name": "tom-microservice",
   "description": "Tom creates customers, subscriptions plans & send notifications.",
   "homepage": "https://tom.js.org",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "main": "src",
   "bin": {
     "tom": "bin/index.js"

package/src/interface/route.js

@@ -3,10 +3,12 @@
 const { isArray, pick } = require('lodash')
 const isBuffer = require('is-buffer')
 
+const send = require('../send')
+
 module.exports =
-  ({ fn, tom }) =>
+  ({ fn }) =>
     async (req, res) => {
-      let status
+      let status = 'success'
       const payload = {}
 
       try {
@@ -19,11 +21,10 @@ module.exports =
 
         const res = await fn(opts)
         payload.data = res
-        status = 200
-      } catch (err) {
-        payload.message = err.message || err
-        status = 400
+      } catch (error) {
+        payload.message = error.message || error
+        status = 'fail'
       }
 
-      return res.status(status).send({ status, ...payload })
+      return send[status](res, payload)
     }

package/src/routes.js

@@ -5,28 +5,7 @@ const bodyParser = require('body-parser')
 const requestIp = require('request-ip')
 const toQuery = require('to-query')()
 const Router = require('router-http')
-const send = require('send-http')
-
-send.fail = (res, code = 400, data) => {
-  send(res, code, {
-    status: 'fail',
-    ...data
-  })
-}
-
-send.error = (res, code = 500, data) => {
-  send(res, code, {
-    status: 'error',
-    ...data
-  })
-}
-
-send.success = (res, code = 200, data) => {
-  send(res, code, {
-    status: 'success',
-    ...data
-  })
-}
+const send = require('./send')
 
 const withRoute = require('./interface/route')
 const createTom = require('.')
@@ -43,8 +22,12 @@ const isWebhook = req => req.path.endsWith('webhook')
 const finalhandler = (error, req, res) => {
   const hasError = error !== undefined
   return hasError
-    ? send.error(res, 500, { message: error.mesage || 'Internal Server Error' })
-    : send.fail(res, 405, { message: 'HTTP Method Not Allowed' })
+    ? send.error(
+      res,
+      { message: error.mesage || 'Internal Server Error' },
+      error.statusCode
+    )
+    : send.fail(res, { message: 'HTTP Method Not Allowed' }, 405)
 }
 
 const createRouter = () => {
@@ -98,9 +81,13 @@ const createRouter = () => {
       const apiKey = get(req, 'headers.x-api-key')
       return eq(apiKey, TOM_API_KEY)
         ? next()
-        : send.fail(res, 401, {
-          message: 'Invalid API token in x-api-key header.'
-        })
+        : send.fail(
+          res,
+          {
+            message: 'Invalid API token in x-api-key header.'
+          },
+          401
+        )
     })
   }
 

package/src/send.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const send = require('send-http')
+
+send.fail = (res, data, statusCode = 400) => {
+  send(res, statusCode, {
+    status: 'fail',
+    ...data
+  })
+}
+
+send.error = (res, data, statusCode = 500) => {
+  send(res, statusCode, {
+    status: 'error',
+    ...data
+  })
+}
+
+send.success = (res, data, statusCode = 200) => {
+  send(res, statusCode, {
+    status: 'success',
+    ...data
+  })
+}
+
+module.exports = send