Merge pull request #85 from knight42/parse-cause

The `cause` could be a JSON string

Author: apocas

lib/modem.js

@@ -1,3 +1,11 @@
+function parseJSON(s) {
+  try {
+    return JSON.parse(s);
+  } catch (e) {
+    return null;
+  }
+}
+
 var querystring = require('querystring'),
   http = require('./http'),
   fs = require('fs'),
@@ -217,12 +225,7 @@ Modem.prototype.buildRequest = function(options, context, data, callback) {
       res.on('end', function() {
         debug('Received: %s', chunks);
 
-        var json;
-        try {
-          json = JSON.parse(chunks);
-        } catch (e) {
-          json = chunks;
-        }
+        var json = parseJSON(chunks) || chunks;
         self.buildPayload(null, context.isStream, context.statusCodes, false, req, res, json, callback);
       });
     }
@@ -275,7 +278,7 @@ Modem.prototype.buildPayload = function(err, isStream, statusCodes, openStdin, r
         chunks += chunk;
       });
       res.on('end', function() {
-        callback(null, chunks);
+        callback(null, parseJSON(chunks) || chunks);
       });
     } else {
       callback(null, json);