Merge pull request #37 from uniquelyparticular/fix/emptyResponse

release: tokenization>utils, +safeParse, fix _toJSON

Author: agrohs

now.json

@@ -12,7 +12,7 @@
   "routes": [{ "src": "/(.*)", "dest": "/src" }],
   "builds": [
     {
-      "src": "src/*.js",
+      "src": "src/index.js",
       "use": "@now/node"
     }
   ]

src/index.js

@@ -5,14 +5,16 @@ const { URL } = require('whatwg-url')
 const UrlPattern = require('url-pattern')
 const cors = require('micro-cors')()
 const fetch = require('node-fetch')
-const { filterByPrefix, mustachReplace } = require('./utils/tokenization')
+const { filterByPrefix, mustachReplace, safeParse } = require('./utils')
 
-const _toJSON = error => {
-  return !error
-    ? ''
-    : Object.getOwnPropertyNames(error).reduce(
+const _toJSON = errorObj => {
+  return !errorObj
+    ? {}
+    : typeof errorObj === 'string'
+    ? errorObj
+    : Object.getOwnPropertyNames(errorObj).reduce(
         (jsonError, key) => {
-          return { ...jsonError, [key]: error[key] }
+          return { ...jsonError, [key]: errorObj[key] }
         },
         { type: 'error' }
       )
@@ -157,15 +159,15 @@ const handleResponse = response => {
       return text
     })
     .then((response = {}) => {
-      const jsonResponse = JSON.parse(response)
+      const jsonResponse = safeParse(response)
       // console.log('processRequest, jsonResponse', jsonResponse)
       return jsonResponse
     })
 }
 
 const processRequest = (res, origin, url, options) => {
-  // console.log('url', url)
-  // console.log('options', options)
+  // console.log('processRequest, url', url)
+  // console.log('processRequest, options', options)
   return fetch(url, options)
     .then(response => {
       // console.log('processRequest, response', response)
@@ -192,14 +194,14 @@ const processRequest = (res, origin, url, options) => {
             return send(res, 200, data)
           })
           .catch(error => {
-            const jsonError = _toJSON(error)
-            return send(res, error.statusCode || 500, jsonError)
+            console.error('processRequest, handleResponse, error', error)
+            return send(res, error.statusCode || 500, _toJSON(error))
           })
       }
     })
     .catch(error => {
-      const jsonError = _toJSON(error)
-      return send(res, error.statusCode || 500, jsonError)
+      console.error('processRequest, error', error)
+      return send(res, error.statusCode || 500, _toJSON(error))
     })
 }
 
@@ -211,19 +213,18 @@ const handleOptions = async (req, res) => {
 }
 
 const handleProxy = async (req, res) => {
-  // console.log('called proxy')
-  // console.log('req.method', req.method)
+  // console.log('handleProxy, req.method', req.method)
   if (req.method === 'OPTIONS') {
     return handleOptions(req, res)
   }
 
   try {
     const path = req.url
-    // console.log('path', path)
-    // console.log('req.rawHeaders',req.rawHeaders)
-    // console.log('req.headers.referer', req.headers.referer)
-    // console.log('req.headers.origin', req.headers.origin)
-    // console.log('req.headers',req.headers)
+    // console.log('handleProxy,path', path)
+    // console.log('handleProxy,req.rawHeaders',req.rawHeaders)
+    // console.log('handleProxy,req.headers.referer', req.headers.referer)
+    // console.log('handleProxy,req.headers.origin', req.headers.origin)
+    // console.log('handleProxy,req.headers',req.headers)
     if (!req.headers.referer) {
       return noReferer(req, res)
     }
@@ -237,7 +238,7 @@ const handleProxy = async (req, res) => {
       return notAuthorized(req, res)
     }
 
-    // console.log('proxyPrefix', proxyPrefix)
+    // console.log('handleProxy,proxyPrefix', proxyPrefix)
     const destinationURL = decodeURIComponent(
       decodeURIComponent(path.replace(`/${proxyPrefix}/`, ''))
     )
@@ -256,18 +257,18 @@ const handleProxy = async (req, res) => {
         req.headers['content-type'] === 'application/json'
           ? JSON.stringify((await json(req)) || {})
           : await text(req)
-      // console.log('txt', txt)
+      // console.log('handleProxy,txt', txt)
 
       if (body) {
         fetchOptions.body = body
       }
-      // console.log('fetchOptions.body', fetchOptions.body)
+      // console.log('handleProxy,fetchOptions.body', fetchOptions.body)
     }
-    // console.log('fetchOptions', fetchOptions)
+    // console.log('handleProxy,fetchOptions', fetchOptions)
     return processRequest(res, req.headers.origin, destinationURL, fetchOptions)
   } catch (error) {
-    const jsonError = _toJSON(error)
-    return send(res, error.statusCode || 500, jsonError)
+    console.error('handleProxy, error', error)
+    return send(res, error.statusCode || 500, _toJSON(error))
   }
 }
 

src/utils.js

@@ -0,0 +1,50 @@
+const safeParse = object => {
+  if (
+    object &&
+    typeof object === 'string' &&
+    (object.startsWith('{') || object.startsWith('['))
+  ) {
+    object = JSON.parse(object)
+  }
+  return object
+}
+
+const filterByPrefix = (input, ...matchPrefixes) => {
+  return Object.keys(input)
+    .filter(key => {
+      // return only objects within input who's keys start with any envPrefix
+      let matched = false
+      matchPrefixes.forEach(prefix => {
+        matched = matched || key.startsWith(prefix)
+      })
+      return matched
+    })
+    .reduce((obj, rawKey) => {
+      // remove any envPrefix that object startswith
+      let key = rawKey
+      matchPrefixes.forEach(prefix => {
+        key = key.startsWith(prefix) ? key.replace(prefix, '') : key
+      })
+      obj[key] = input[rawKey]
+      return obj
+    }, {})
+}
+
+const mustachReplace = (input, replacements, ...mustachPrefixes) => {
+  // will search for input containing {{mustachePrefix.XYZ}}
+  return input.replace(/{{((.*?)\.(.*?))}}/g, (match, ...groups) => {
+    if (mustachPrefixes.includes(groups[1])) {
+      return groups[2] !== 'undefined'
+        ? replacements[groups[2].toUpperCase()] || match
+        : match
+    } else {
+      return match
+    }
+  })
+}
+
+module.exports = {
+  safeParse,
+  filterByPrefix,
+  mustachReplace
+}