tom-microservice 3.5.2 → 3.5.4

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.5.2",
+  "version": "3.5.4",
   "main": "src",
   "bin": {
     "tom": "bin/index.js"
@@ -43,7 +43,6 @@
     "beauty-error": "~1.2.15",
     "cors": "~2.8.5",
     "country-vat": "~1.0.8",
-    "emittery": "~0.13.1",
     "got": "~11.8.6",
     "helmet": "~6.1.2",
     "http-body": "~1.0.4",
@@ -56,6 +55,7 @@
     "mailgen": "~2.0.27",
     "map-values-deep": "~1.0.2",
     "meow": "~9.0.0",
+    "mitt": "~3.0.0",
     "morgan": "~1.10.0",
     "nodemailer": "~6.9.1",
     "ow": "~0.28.2",

package/src/config/create.js

@@ -1,7 +1,20 @@
 'use strict'
 
 const { isFunction, get, set } = require('lodash')
-const Emittery = require('emittery')
+const mitt = require('mitt')
+
+const createEmitter = () => {
+  const emitter = mitt()
+  emitter.emitAsync = (type, data) =>
+    Promise.all(
+      []
+        .concat(emitter.all.get('*'))
+        .concat(emitter.all.get(type))
+        .filter(Boolean)
+        .map(fn => fn(data))
+    )
+  return emitter
+}
 
 const setEnv = (config, configKey, globalEnvKey) => {
   const globalEnvValue = get(process.env, globalEnvKey)
@@ -11,9 +24,9 @@ const setEnv = (config, configKey, globalEnvKey) => {
 
 module.exports = fn => {
   let config
-  const emitter = new Emittery()
+  const emitter = createEmitter()
   const on = (eventName, listener) => emitter.on(eventName, listener)
-  const emit = (eventName, data) => emitter.emit(eventName, data)
+  const emit = (eventName, data) => emitter.emitAsync(eventName, data)
   const setConfig = obj => (config = obj)
 
   if (isFunction(fn)) fn({ setConfig, on })

package/src/routes.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const { get, eq, forEach } = require('lodash')
+const { buffer, text } = require('http-body')
 const requestIp = require('request-ip')
-const { text } = require('http-body')
 const toQuery = require('to-query')()
 const Router = require('router-http')
 const send = require('./send')
@@ -21,11 +21,13 @@ const UNAUTHENTICATED_PATHS = [
 ]
 
 const getBody = async req => {
-  const string = await text(req)
+  if (req.path === '/payment/webhook') return buffer(req)
+  const body = await text(req)
+  if (body === '') return body
   try {
-    return JSON.parse(string)
+    return JSON.parse(body)
   } catch (_) {
-    return string
+    return body
   }
 }