rollbar 2.17.0 → 2.19.2

package/src/truncation.js

@@ -1,4 +1,5 @@
 var _ = require('./utility');
+var traverse = require('./utility/traverse');
 
 function raw(payload, jsonBackup) {
   return [payload, _.stringify(payload, jsonBackup)];
@@ -48,12 +49,12 @@ function truncateStrings(len, payload, jsonBackup) {
         return maybeTruncateValue(len, v);
       case 'object':
       case 'array':
-        return _.traverse(v, truncator, seen);
+        return traverse(v, truncator, seen);
       default:
         return v;
     }
   }
-  payload = _.traverse(payload, truncator, []);
+  payload = traverse(payload, truncator, []);
   return [payload, _.stringify(payload, jsonBackup)];
 }
 

package/src/utility/traverse.js

@@ -0,0 +1,38 @@
+var _ = require('../utility');
+
+function traverse(obj, func, seen) {
+  var k, v, i;
+  var isObj = _.isType(obj, 'object');
+  var isArray = _.isType(obj, 'array');
+  var keys = [];
+
+  if (isObj && seen.indexOf(obj) !== -1) {
+    return obj;
+  }
+  seen.push(obj);
+
+  if (isObj) {
+    for (k in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, k)) {
+        keys.push(k);
+      }
+    }
+  } else if (isArray) {
+    for (i = 0; i < obj.length; ++i) {
+      keys.push(i);
+    }
+  }
+
+  var result = isObj ? {} : [];
+  var same = true;
+  for (i = 0; i < keys.length; ++i) {
+    k = keys[i];
+    v = obj[k];
+    result[k] = func(k, v, seen);
+    same = same && result[k] === obj[k];
+  }
+
+  return (keys.length != 0 && !same) ? result : obj;
+}
+
+module.exports = traverse;

package/src/utility.js

@@ -2,7 +2,7 @@ var merge = require('./merge');
 
 var RollbarJSON = {};
 var __initRollbarJSON = false;
-function setupJSON() {
+function setupJSON(polyfillJSON) {
   if (__initRollbarJSON) {
     return;
   }
@@ -17,11 +17,9 @@ function setupJSON() {
     }
   }
   if (!isFunction(RollbarJSON.stringify) || !isFunction(RollbarJSON.parse)) {
-    var setupCustomJSON = require('../vendor/JSON-js/json3.js');
-    setupCustomJSON(RollbarJSON);
+    polyfillJSON(RollbarJSON);
   }
 }
-setupJSON();
 
 /*
  * isType - Given a Javascript value and a string, returns true if the type of the value matches the
@@ -137,41 +135,6 @@ function isError(e) {
   return isType(e, 'error') || isType(e, 'exception');
 }
 
-function traverse(obj, func, seen) {
-  var k, v, i;
-  var isObj = isType(obj, 'object');
-  var isArray = isType(obj, 'array');
-  var keys = [];
-
-  if (isObj && seen.indexOf(obj) !== -1) {
-    return obj;
-  }
-  seen.push(obj);
-
-  if (isObj) {
-    for (k in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, k)) {
-        keys.push(k);
-      }
-    }
-  } else if (isArray) {
-    for (i = 0; i < obj.length; ++i) {
-      keys.push(i);
-    }
-  }
-
-  var result = isObj ? {} : [];
-  var same = true;
-  for (i = 0; i < keys.length; ++i) {
-    k = keys[i];
-    v = obj[k];
-    result[k] = func(k, v, seen);
-    same = same && result[k] === obj[k];
-  }
-
-  return (keys.length != 0 && !same) ? result : obj;
-}
-
 function redact() {
   return '********';
 }
@@ -506,6 +469,27 @@ function setCustomItemKeys(item, custom) {
   }
 }
 
+function addErrorContext(item, errors) {
+  var custom = item.data.custom || {};
+  var contextAdded = false;
+
+  try {
+    for (var i = 0; i < errors.length; ++i) {
+      if (errors[i].hasOwnProperty('rollbarContext')) {
+        custom = merge(custom, errors[i].rollbarContext);
+        contextAdded = true;
+      }
+    }
+
+    // Avoid adding an empty object to the data.
+    if (contextAdded) {
+      item.data.custom = custom;
+    }
+  } catch (e) {
+    item.diagnostic.error_context = 'Failed: ' + e.message;
+  }
+}
+
 var TELEMETRY_TYPES = ['log', 'network', 'dom', 'navigation', 'error', 'manual'];
 var TELEMETRY_LEVELS = ['critical', 'error', 'warning', 'info', 'debug'];
 
@@ -602,72 +586,6 @@ function set(obj, path, value) {
   }
 }
 
-function scrub(data, scrubFields) {
-  scrubFields = scrubFields || [];
-  var paramRes = _getScrubFieldRegexs(scrubFields);
-  var queryRes = _getScrubQueryParamRegexs(scrubFields);
-
-  function redactQueryParam(dummy0, paramPart) {
-    return paramPart + redact();
-  }
-
-  function paramScrubber(v) {
-    var i;
-    if (isType(v, 'string')) {
-      for (i = 0; i < queryRes.length; ++i) {
-        v = v.replace(queryRes[i], redactQueryParam);
-      }
-    }
-    return v;
-  }
-
-  function valScrubber(k, v) {
-    var i;
-    for (i = 0; i < paramRes.length; ++i) {
-      if (paramRes[i].test(k)) {
-        v = redact();
-        break;
-      }
-    }
-    return v;
-  }
-
-  function scrubber(k, v, seen) {
-    var tmpV = valScrubber(k, v);
-    if (tmpV === v) {
-      if (isType(v, 'object') || isType(v, 'array')) {
-        return traverse(v, scrubber, seen);
-      }
-      return paramScrubber(tmpV);
-    } else {
-      return tmpV;
-    }
-  }
-
-  return traverse(data, scrubber, []);
-}
-
-function _getScrubFieldRegexs(scrubFields) {
-  var ret = [];
-  var pat;
-  for (var i = 0; i < scrubFields.length; ++i) {
-    pat = '^\\[?(%5[bB])?' + scrubFields[i] + '\\[?(%5[bB])?\\]?(%5[dD])?$';
-    ret.push(new RegExp(pat, 'i'));
-  }
-  return ret;
-}
-
-
-function _getScrubQueryParamRegexs(scrubFields) {
-  var ret = [];
-  var pat;
-  for (var i = 0; i < scrubFields.length; ++i) {
-    pat = '\\[?(%5[bB])?' + scrubFields[i] + '\\[?(%5[bB])?\\]?(%5[dD])?';
-    ret.push(new RegExp('(' + pat + '=)([^&\\n]+)', 'igm'));
-  }
-  return ret;
-}
-
 function formatArgsAsString(args) {
   var i, len, arg;
   var result = [];
@@ -753,6 +671,7 @@ function handleOptions(current, input, payload) {
 module.exports = {
   addParamsAndAccessTokenToPath: addParamsAndAccessTokenToPath,
   createItem: createItem,
+  addErrorContext: addErrorContext,
   createTelemetryEvent: createTelemetryEvent,
   filterIp: filterIp,
   formatArgsAsString: formatArgsAsString,
@@ -773,11 +692,10 @@ module.exports = {
   now: now,
   redact: redact,
   sanitizeUrl: sanitizeUrl,
-  scrub: scrub,
   set: set,
+  setupJSON: setupJSON,
   stringify: stringify,
   maxByteSize: maxByteSize,
-  traverse: traverse,
   typeName: typeName,
   uuid4: uuid4
 };

package/test/api.test.js

@@ -4,6 +4,8 @@
 /* globals sinon */
 
 var API = require('../src/api');
+var utility = require('../src/utility');
+utility.setupJSON();
 
 function TestTransportGenerator() {
   var TestTransport = function(callbackError, callbackResponse) {

package/test/apiUtility.test.js

@@ -4,6 +4,8 @@
 /* globals sinon */
 
 var u = require('../src/apiUtility');
+var utility = require('../src/utility');
+utility.setupJSON();
 
 describe('buildPayload', function() {
   it('should package up the input into a payload', function() {
@@ -157,4 +159,3 @@ describe('appendPathToPath', function() {
     expect(u.appendPathToPath(base, 'item')).to.eql(expNoSlash);
   });
 });
-