properly handle .toJSON in output

Author: keithwhor

lib/gateway.js

@@ -1962,21 +1962,36 @@ class Gateway extends EventEmitter {
     }
   }
 
+  jsonify (obj) {
+    if (
+      obj !== null &&
+      typeof obj === 'object' &&
+      !Buffer.isBuffer(obj)
+    ) {
+      if (typeof obj.toJSON === 'function') {
+        obj = obj.toJSON();
+      }
+      if (Array.isArray(obj)) {
+        obj = obj.map(item => this.jsonify(item));
+      } else if (
+        obj !== null &&
+        typeof obj === 'object' &&
+        !Buffer.isBuffer(obj)
+      ) {
+        Object.keys(obj).forEach(key => obj[key] = this.jsonify(obj[key]));
+      }
+    }
+    return obj;
+  }
+
   execute (definition, functionArgs, data, headers, callback) {
     headers = headers || {};
     let fn;
     let complete = false;
     let callbackWrapper = (err, result, headers, executionUuid) => {
       if (!complete) {
         complete = true;
-        if (
-          result !== null &&
-          typeof result === 'object' &&
-          !Buffer.isBuffer(result) &&
-          typeof result.toJSON === 'function'
-        ) {
-          result = JSON.parse(JSON.stringify(result.toJSON()));
-        }
+        result = this.jsonify(result);
         callback(err, result, headers, executionUuid);
       }
     };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionscript",
-  "version": "2.10.5",
+  "version": "2.10.6",
   "description": "An API gateway and framework for turning functions into web services",
   "author": "Keith Horwood <keithwhor@gmail.com>",
   "main": "index.js",