tom-microservice 3.3.7 → 3.4.0

package/bin/listen.js

@@ -2,20 +2,16 @@
 
 'use strict'
 
-const express = require('express')
+const { createServer } = require('http')
 
 const PORT =
   process.env.PORT || process.env.port || process.env.TOM_PORT || 3000
 
-const createServer = routes =>
-  express()
-    .use(routes)
-    .disable('x-powered-by')
-
 module.exports = async (tomConfig, { port = PORT } = {}) => {
   const routes = require('../src/routes')(tomConfig)
+  const server = createServer(routes)
 
-  createServer(routes).listen(port, () => {
+  server.listen(port, () => {
     console.log(
       require('./logo')({
         header: 'tom is running',

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.3.7",
+  "version": "3.4.0",
   "main": "src",
   "bin": {
     "tom": "bin/index.js"
@@ -46,14 +46,12 @@
     "cors": "~2.8.5",
     "country-vat": "~1.0.6",
     "emittery": "~0.13.1",
-    "express": "~4.18.2",
     "got": "~11.8.6",
     "helmet": "~6.0.0",
     "import-modules": "~2.1.0",
     "is-buffer": "~2.0.5",
     "is-european": "~1.0.4",
     "joycon": "~3.1.1",
-    "jsendp": "~2.1.0",
     "lodash": "~4.17.21",
     "mailgen": "~2.0.27",
     "map-values-deep": "~1.0.2",
@@ -68,6 +66,8 @@
     "pretty-ms": "~7.0.1",
     "req-country": "~1.2.6",
     "request-ip": "~3.3.0",
+    "router-http": "0.1.2",
+    "send-http": "~1.0.2",
     "stripe": "11",
     "time-span": "~4.0.0",
     "to-query": "~1.6.10",
@@ -113,6 +113,25 @@
     "bin",
     "src"
   ],
+  "scripts": {
+    "build": "gulp build && untracked > .nowignore",
+    "clean": "rm -rf node_modules",
+    "coverage": "c8 report --reporter=text-lcov | coveralls",
+    "dev": "svr src/router",
+    "dev:docs": "concurrently \"gulp\" \"npm run dev:docs:server\"",
+    "dev:docs:server": "browser-sync start --server --files \"index.html, README.md, static/**/*.(css|js)\"",
+    "lint": "standard-markdown README.md && standard",
+    "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
+    "prerelease": "npm run update:check",
+    "pretest": "npm run lint",
+    "release": "git-authors-cli && git add package.json && standard-version -a",
+    "release:github": "conventional-github-releaser -p angular",
+    "release:tags": "git push --follow-tags origin HEAD:master",
+    "start": "tom",
+    "test": "NODE_ENV=test c8 ava",
+    "update": "ncu -i",
+    "update:check": "ncu -- --error-level 2"
+  },
   "license": "MIT",
   "ava": {
     "files": [
@@ -144,24 +163,5 @@
     "env": [
       "mocha"
     ]
-  },
-  "scripts": {
-    "build": "gulp build && untracked > .nowignore",
-    "clean": "rm -rf node_modules",
-    "coverage": "c8 report --reporter=text-lcov | coveralls",
-    "dev": "svr src/router",
-    "dev:docs": "concurrently \"gulp\" \"npm run dev:docs:server\"",
-    "dev:docs:server": "browser-sync start --server --files \"index.html, README.md, static/**/*.(css|js)\"",
-    "lint": "standard-markdown README.md && standard",
-    "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
-    "prerelease": "npm run update:check",
-    "pretest": "npm run lint",
-    "release": "git-authors-cli && git add package.json && standard-version -a",
-    "release:github": "conventional-github-releaser -p angular",
-    "release:tags": "git push --follow-tags origin HEAD:master",
-    "start": "tom",
-    "test": "NODE_ENV=test c8 ava",
-    "update": "ncu -i",
-    "update:check": "ncu -- --error-level 2"
   }
-}
+}

package/src/interface/route.js

@@ -3,25 +3,27 @@
 const { isArray, pick } = require('lodash')
 const isBuffer = require('is-buffer')
 
-module.exports = ({ fn, tom }) => async (req, res) => {
-  let status
-  const payload = {}
+module.exports =
+  ({ fn, tom }) =>
+    async (req, res) => {
+      let status
+      const payload = {}
 
-  try {
-    const body = isBuffer(req.body) ? { body: req.body } : req.body
-    const props = pick(req, ['ipAddress', 'headers'])
+      try {
+        const body = isBuffer(req.body) ? { body: req.body } : req.body
+        const props = pick(req, ['ipAddress', 'headers'])
 
-    const opts = isArray(body)
-      ? { commands: body, ...props }
-      : { ...body, ...props }
+        const opts = isArray(body)
+          ? { commands: body, ...props }
+          : { ...body, ...props }
 
-    const res = await fn(opts)
-    payload.data = res
-    status = 200
-  } catch (err) {
-    payload.message = err.message || err
-    status = 400
-  }
+        const res = await fn(opts)
+        payload.data = res
+        status = 200
+      } catch (err) {
+        payload.message = err.message || err
+        status = 400
+      }
 
-  return res.status(status).send({ status, ...payload })
-}
+      return res.status(status).send({ status, ...payload })
+    }

package/src/routes.js

@@ -4,7 +4,29 @@ const { get, eq, forEach } = require('lodash')
 const bodyParser = require('body-parser')
 const requestIp = require('request-ip')
 const toQuery = require('to-query')()
-const express = require('express')
+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 withRoute = require('./interface/route')
 const createTom = require('.')
@@ -13,60 +35,63 @@ const { TOM_API_KEY, TOM_ALLOWED_ORIGIN, NODE_ENV } = process.env
 
 const isTest = NODE_ENV === 'test'
 
-const { Router } = express
-
 const jsonBodyParser = bodyParser.json()
 const urlEncodedBodyParser = bodyParser.urlencoded({ extended: true })
 const rawBodyParser = bodyParser.raw({ type: 'application/json' })
 const isWebhook = req => req.path.endsWith('webhook')
 
+const finalhandler = (error, req, res) => {
+  const hasError = error !== undefined
+  // if (hasError) console.error(error)
+  return hasError
+    ? send.error(res, 500, { message: error.mesage || 'Internal Server Error' })
+    : send.fail(res, 405, { message: 'HTTP Method Not Allowed' })
+}
+
 const createRouter = () => {
-  const router = Router()
-
-  router.use(require('helmet')())
-  router.use(require('jsendp')())
-  router.use(require('compression')())
-  router.use(
-    require('cors')({
-      methods: ['GET', 'OPTIONS', 'POST'],
-      origin: TOM_ALLOWED_ORIGIN
-        ? TOM_ALLOWED_ORIGIN.replace(/\s/g, '').split(',')
-        : '*',
-      allowedHeaders: [
-        'content-type',
-        'x-amz-date',
-        'authorization',
-        'x-api-key',
-        'x-amz-security-token',
-        'x-csrf-token'
-      ]
+  const router = Router(finalhandler)
+
+  router
+    .use(require('helmet')())
+    .use(require('compression')())
+    .use(
+      require('cors')({
+        methods: ['GET', 'OPTIONS', 'POST'],
+        origin: TOM_ALLOWED_ORIGIN
+          ? TOM_ALLOWED_ORIGIN.replace(/\s/g, '').split(',')
+          : '*',
+        allowedHeaders: [
+          'content-type',
+          'x-amz-date',
+          'authorization',
+          'x-api-key',
+          'x-amz-security-token',
+          'x-csrf-token'
+        ]
+      })
+    )
+    .use((req, res, next) =>
+      isWebhook(req) ? rawBodyParser(req, res, next) : next()
+    )
+    .use((req, res, next) =>
+      isWebhook(req) ? next() : urlEncodedBodyParser(req, res, next)
+    )
+    .use((req, res, next) =>
+      isWebhook(req) ? next() : jsonBodyParser(req, res, next)
+    )
+    .use((req, res, next) => {
+      req.query = toQuery(req.url)
+      req.ipAddress = requestIp.getClientIp(req)
+      next()
     })
-  )
-
-  router.use((req, res, next) =>
-    isWebhook(req) ? rawBodyParser(req, res, next) : next()
-  )
-
-  router.use((req, res, next) =>
-    isWebhook(req) ? next() : urlEncodedBodyParser(req, res, next)
-  )
-
-  router.use((req, res, next) =>
-    isWebhook(req) ? next() : jsonBodyParser(req, res, next)
-  )
-
-  router.use((req, res, next) => {
-    req.query = toQuery(req.url)
-    req.ipAddress = requestIp.getClientIp(req)
-    next()
-  })
 
   if (!isTest) router.use(require('morgan')('tiny'))
 
-  router.get('/', (req, res) => res.status(204).send())
-  router.get('/robots.txt', (req, res) => res.status(204).send())
-  router.get('/favicon.ico', (req, res) => res.status(204).send())
-  router.get('/ping', (req, res) => res.send('pong'))
+  router
+    .get('/', (req, res) => send(res, 204))
+    .get('/robots.txt', (req, res) => send(res, 204))
+    .get('/favicon.ico', (req, res) => send(res, 204))
+    .get('/ping', (req, res) => send(res, 200, 'pong'))
 
   if (TOM_API_KEY) {
     router.use((req, res, next) => {
@@ -74,8 +99,7 @@ const createRouter = () => {
       const apiKey = get(req, 'headers.x-api-key')
       return eq(apiKey, TOM_API_KEY)
         ? next()
-        : res.fail({
-          statusCode: 401,
+        : send.fail(res, 401, {
           message: 'Invalid API token in x-api-key header.'
         })
     })
@@ -100,12 +124,5 @@ module.exports = tomConfig => {
     })
   })
 
-  router.use((req, res) =>
-    res.fail({
-      statusCode: 405,
-      message: 'HTTP Method Not Allowed'
-    })
-  )
-
   return router
 }