rollbar 2.23.0 → 2.25.0

package/.github/pull_request_template.md

@@ -1,14 +1,23 @@
 ## Description of the change
 
-> Description here
+> Please include a summary of the change and which issues are fixed.
+> Please also include relevant motivation and context.
+
 ## Type of change
+
 - [ ] Bug fix (non-breaking change that fixes an issue)
 - [ ] New feature (non-breaking change that adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Maintenance
+- [ ] New release
 
 ## Related issues
 
-> Fix [#1]() 
+> Shortcut stories and GitHub issues (delete irrelevant)
+
+- Fix [SC-]
+- Fix #1
+
 ## Checklists
 
 ### Development
@@ -17,9 +26,9 @@
 - [ ] The code changed/added as part of this pull request has been covered with tests
 - [ ] All tests related to the changed code pass in development
 
-### Code review 
+### Code review
 
-- [ ]  This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
-- [ ] "Ready for review" label attached to the PR and reviewers mentioned in a comment
+- [ ] This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
+- [ ] "Ready for review" label attached to the PR and reviewers assigned
+- [ ] Issue from task tracker has a link to this pull request
 - [ ] Changes have been reviewed by at least one other engineer
-- [ ] Issue from task tracker has a link to this pull request 

package/.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         node-version: [8, 10, 12, 14, 16]

package/dist/rollbar.js

@@ -491,6 +491,37 @@ function wrapCallback(logger, f) {
   };
 }
 
+function nonCircularClone(obj) {
+  var seen = [obj];
+
+  function clone(obj, seen) {
+    var value, name, newSeen, result = {};
+
+    try {
+      for (name in obj) {
+        value = obj[name];
+
+        if (value && (isType(value, 'object') || isType(value, 'array'))) {
+          if (seen.includes(value)) {
+            result[name] = 'Removed circular reference: ' + typeName(value);
+          } else {
+            newSeen = seen.slice();
+            newSeen.push(value);
+            result[name] = clone(value, newSeen);
+          }
+          continue;
+        }
+
+        result[name] = value;
+      }
+    } catch (e) {
+      result = 'Failed cloning custom data: ' + e.message;
+    }
+    return result;
+  }
+  return clone(obj, seen);
+}
+
 function createItem(args, logger, notifier, requestKeys, lambdaContext) {
   var message, err, custom, callback, request;
   var arg;
@@ -548,10 +579,12 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
     }
   }
 
+  // if custom is an array this turns it into an object with integer keys
+  if (custom) custom = nonCircularClone(custom);
+
   if (extraArgs.length > 0) {
-    // if custom is an array this turns it into an object with integer keys
-    custom = merge(custom);
-    custom.extraArgs = extraArgs;
+    if (!custom) custom = nonCircularClone({});
+    custom.extraArgs = nonCircularClone(extraArgs);
   }
 
   var item = {
@@ -596,7 +629,7 @@ function addErrorContext(item, errors) {
   try {
     for (var i = 0; i < errors.length; ++i) {
       if (errors[i].hasOwnProperty('rollbarContext')) {
-        custom = merge(custom, errors[i].rollbarContext);
+        custom = merge(custom, nonCircularClone(errors[i].rollbarContext));
         contextAdded = true;
       }
     }
@@ -1051,11 +1084,11 @@ function Stack(exception, skip) {
 function parse(e, skip) {
   var err = e;
 
-  if (err.nested) {
+  if (err.nested || err.cause) {
     var traceChain = [];
     while (err) {
       traceChain.push(new Stack(err, skip));
-      err = err.nested;
+      err = err.nested || err.cause;
 
       skip = 0; // Only apply skip value to primary error
     }
@@ -3512,8 +3545,8 @@ function addErrorContext(item) {
 
   chain.push(err);
 
-  while (err.nested) {
-    err = err.nested;
+  while (err.nested || err.cause) {
+    err = err.nested || err.cause;
     chain.push(err);
   }
 
@@ -4546,7 +4579,7 @@ module.exports = {
 
 
 module.exports = {
-  version: '2.23.0',
+  version: '2.25.0',
   endpoint: 'api.rollbar.com/api/1/item/',
   logLevel: 'debug',
   reportLevel: 'debug',
@@ -5222,8 +5255,10 @@ Instrumenter.prototype.instrumentNetwork = function() {
               // Test to ensure body is a Promise, which it should always be.
               if (typeof body.then === 'function') {
                 body.then(function (text) {
-                  if (self.isJsonContentType(metadata.response_content_type)) {
+                  if (text && self.isJsonContentType(metadata.response_content_type)) {
                     metadata.response.body = self.scrubJson(text);
+                  } else {
+                    metadata.response.body = text;
                   }
                 });
               } else {
@@ -5548,16 +5583,16 @@ Instrumenter.prototype.handleCspError = function(message) {
 }
 
 Instrumenter.prototype.deinstrumentContentSecurityPolicy = function() {
-  if (!('addEventListener' in this._window)) { return; }
+  if (!('addEventListener' in this._document)) { return; }
 
   this.removeListeners('contentsecuritypolicy');
 };
 
 Instrumenter.prototype.instrumentContentSecurityPolicy = function() {
-  if (!('addEventListener' in this._window)) { return; }
+  if (!('addEventListener' in this._document)) { return; }
 
   var cspHandler = this.handleCspEvent.bind(this);
-  this.addListener('contentsecuritypolicy', this._window, 'securitypolicyviolation', null, cspHandler, false);
+  this.addListener('contentsecuritypolicy', this._document, 'securitypolicyviolation', null, cspHandler, false);
 };
 
 Instrumenter.prototype.addListener = function(section, obj, type, altType, handler, capture) {