rollbar 2.22.0 → 2.24.1

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

@@ -246,6 +246,15 @@ function isError(e) {
   return isType(e, 'error') || isType(e, 'exception');
 }
 
+/* isPromise - a convenience function for checking if a value is a promise
+ *
+ * @param p - any value
+ * @returns true if f is a function, otherwise false
+ */
+function isPromise(p) {
+  return isObject(p) && isType(p.then, 'function');
+}
+
 function redact() {
   return '********';
 }
@@ -482,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;
@@ -539,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 = {
@@ -587,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;
       }
     }
@@ -812,6 +854,7 @@ module.exports = {
   isObject: isObject,
   isString: isString,
   isType: isType,
+  isPromise: isPromise,
   jsonParse: jsonParse,
   LEVELS: LEVELS,
   makeUnhandledStackInfo: makeUnhandledStackInfo,
@@ -4035,8 +4078,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
     var numericProps = ['columnNumber', 'lineNumber'];
     var stringProps = ['fileName', 'functionName', 'source'];
     var arrayProps = ['args'];
+    var objectProps = ['evalOrigin'];
 
-    var props = booleanProps.concat(numericProps, stringProps, arrayProps);
+    var props = booleanProps.concat(numericProps, stringProps, arrayProps, objectProps);
 
     function StackFrame(obj) {
         if (!obj) return;
@@ -4206,9 +4250,10 @@ function addMessageWithError(item, options, callback) {
 function userTransform(logger) {
   return function(item, options, callback) {
     var newItem = _.merge(item);
+    var response = null;
     try {
       if (_.isFunction(options.transform)) {
-        options.transform(newItem.data, item);
+        response = options.transform(newItem.data, item);
       }
     } catch (e) {
       options.transform = null;
@@ -4216,7 +4261,18 @@ function userTransform(logger) {
       callback(null, item);
       return;
     }
-    callback(null, newItem);
+    if(_.isPromise(response)) {
+      response.then(function (promisedItem) {
+        if(promisedItem) {
+          newItem.data = promisedItem;
+        }
+        callback(null, newItem);
+      }, function (error) {
+        callback(error, item);
+      });
+    } else {
+      callback(null, newItem);
+    }
   }
 }
 
@@ -4523,7 +4579,7 @@ module.exports = {
 
 
 module.exports = {
-  version: '2.22.0',
+  version: '2.24.1',
   endpoint: 'api.rollbar.com/api/1/item/',
   logLevel: 'debug',
   reportLevel: 'debug',