Inlined JSON and XML parsers

badges · Sep 3, 2018 · a0de9f9 · a0de9f9
1 parent 45f9e8b
commit a0de9f9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 79 deletions.
diff --git a/lib/response-parsers.js b/lib/response-parsers.js
diff --git a/lib/response-parsers.spec.js b/lib/response-parsers.spec.js
diff --git a/services/base-json.js b/services/base-json.js
@@ -2,9 +2,9 @@
 
 // See available emoji at http://emoji.muan.co/
 const emojic = require('emojic')
-const { asJson } = require('../lib/response-parsers')
 const BaseService = require('./base')
 const trace = require('./trace')
+const { InvalidResponse } = require('./errors')
 
 class BaseJsonService extends BaseService {
   async _requestJson({ schema, url, options = {}, errorMessages = {} }) {
@@ -13,12 +13,20 @@ class BaseJsonService extends BaseService {
       ...{ headers: { Accept: 'application/json' } },
       ...options,
     }
-    const jsonData = await this._request({
+    const { buffer } = await this._request({
       url,
       options: mergedOptions,
       errorMessages,
     })
-    const json = await asJson(jsonData)
+    let json
+    try {
+      json = JSON.parse(buffer)
+    } catch (err) {
+      throw new InvalidResponse({
+        prettyMessage: 'unparseable json response',
+        underlyingError: err,
+      })
+    }
     logTrace(emojic.dart, 'Response JSON (before validation)', json, {
       deep: true,
     })

diff --git a/services/base-xml.js b/services/base-xml.js
@@ -2,9 +2,10 @@
 
 // See available emoji at http://emoji.muan.co/
 const emojic = require('emojic')
-const { asXml } = require('../lib/response-parsers')
+const fastXmlParser = require('fast-xml-parser')
 const BaseService = require('./base')
 const trace = require('./trace')
+const { InvalidResponse } = require('./errors')
 
 class BaseXmlService extends BaseService {
   async _requestXml({ schema, url, options = {}, errorMessages = {} }) {
@@ -13,12 +14,19 @@ class BaseXmlService extends BaseService {
       ...{ headers: { Accept: 'application/xml, text/xml' } },
       ...options,
     }
-    const xmlData = await this._request({
+    const { buffer } = await this._request({
       url,
       options: mergedOptions,
       errorMessages,
     })
-    const xml = await asXml(xmlData)
+    const validateResult = fastXmlParser.validate(buffer)
+    if (validateResult !== true) {
+      throw new InvalidResponse({
+        prettyMessage: 'unparseable xml response',
+        underlyingError: validateResult.err,
+      })
+    }
+    const xml = fastXmlParser.parse(buffer)
     logTrace(emojic.dart, 'Response XML (before validation)', xml, {
       deep: true,
     })