Safe parse Circular JSON

Author: vedharish

lib/_patch/browserstack.js

@@ -9,7 +9,7 @@
   }
 
   // Tiny Ajax Post
-  var post = function (url, json, cb){
+  var post = function (url, json, cb) {
     var req;
 
     if (window.ActiveXObject)
@@ -20,10 +20,15 @@
       throw "Strider: No ajax"
 
     req.onreadystatechange = function () {
-        if (req.readyState==4)
-          cb(req.responseText);
-      };
-    var data = JSON.stringify(json);
+      if (req.readyState==4)
+        cb(req.responseText);
+    };
+    var data;
+    if(window.CircularJSON) {
+      data = window.CircularJSON.stringify(json);
+    } else {
+      data = JSON.stringify(json);
+    }
     req.open("POST", url, true);
     req.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     req.setRequestHeader('X-Browser-String', BrowserStack.browser_string);

lib/server.js

@@ -11,7 +11,8 @@ var Log = require('./logger'),
   chalk = require('chalk'),
   mime = require('mime'),
   send = require('send'),
-  vm = require('vm');
+  vm = require('vm'),
+  CircularJSON = require('circular-json');
 
 exports.Server = function Server(bsClient, workers, config, callback) {
   var testFilePaths = (Array.isArray(config.test_path) ? config.test_path : [ config.test_path ])
@@ -64,6 +65,10 @@ exports.Server = function Server(bsClient, workers, config, callback) {
       var jsReportersScript = fs.readFileSync(jsReportersPath, {
         encoding: 'utf8'
       });
+      var circularJSONPath = path.join(__dirname, '../node_modules/circular-json/build/circular-json.js');
+      var circularJSONScript = fs.readFileSync(circularJSONPath, {
+        encoding: 'utf8'
+      });
 
       if (pathMatches) {
         var framework = config['test_framework'];
@@ -75,6 +80,7 @@ exports.Server = function Server(bsClient, workers, config, callback) {
         });
 
         patch += '<script type="text/javascript">' + jsReportersScript + '</script>';
+        patch += '<script type="text/javascript">' + circularJSONScript + '</script>';
 
         // adding framework scripts
         if (framework === 'jasmine') {
@@ -238,13 +244,13 @@ exports.Server = function Server(bsClient, workers, config, callback) {
       var query = null;
 
       try {
-        query = JSON.parse(body);
+        query = CircularJSON.parse(body);
       } catch(e) {
         logger.info('[%s] Exception in parsing log', worker.string);
         logger.info('[%s] Log: ' + qs.parse(body).data, worker.string);
       }
 
-      logger.trace('[%s] _progress', worker.id, JSON.stringify(query));
+      logger.trace('[%s] _progress', worker.id, CircularJSON.stringify(query));
 
       if (query && query.test && query.test.errors) {
         var browserReport = getBrowserReport(browserInfo);
@@ -275,10 +281,10 @@ exports.Server = function Server(bsClient, workers, config, callback) {
 
       var query = null;
       try {
-        query = JSON.parse(body);
+        query = CircularJSON.parse(body);
       } catch (e) {}
 
-      logger.trace('[%s] _report', worker.id, JSON.stringify(query));
+      logger.trace('[%s] _report', worker.id, CircularJSON.stringify(query));
 
       if (query === null) {
         logger.info('[%s] Null response from remote Browser', request.headers['x-browser-string']);

package.json

@@ -10,15 +10,16 @@
   "dependencies": {
     "browserstack": "1.3.0",
     "chalk": "0.4.0",
-    "js-reporters": "^1.1.0",
+    "circular-json": "0.3.1",
+    "js-reporters": "1.1.0",
     "mime": "1.3.4",
     "send": "0.13.0",
     "tunnel": "0.0.3"
   },
   "devDependencies": {
     "jshint": "2.5.6",
     "mocha": "1.15.1",
-    "sinon": "^1.17.5"
+    "sinon": "1.17.5"
   },
   "licenses": [
     {