rollbar 3.0.0-beta.5 → 3.0.0

package/src/rateLimiter.js

@@ -1,108 +1,114 @@
-import * as _ from './utility.js';
-
 /*
- * RateLimiter - an object that encapsulates the logic for counting items sent to Rollbar
+ * RateLimiter - encapsulates the logic for counting items sent to Rollbar.
  *
  * @param options - the same options that are accepted by configureGlobal offered as a convenience
  */
-function RateLimiter(options) {
-  this.startTime = _.now();
-  this.counter = 0;
-  this.perMinCounter = 0;
-  this.platform = null;
-  this.platformOptions = {};
-  this.configureGlobal(options);
-}
-
-RateLimiter.globalSettings = {
-  startTime: _.now(),
-  maxItems: undefined,
-  itemsPerMinute: undefined,
-};
+class RateLimiter {
+  static globalSettings = {
+    startTime: Date.now(),
+    maxItems: undefined,
+    itemsPerMinute: undefined,
+  };
 
-/*
- * configureGlobal - set the global rate limiter options
- *
- * @param options - Only the following values are recognized:
- *    startTime: a timestamp of the form returned by (new Date()).getTime()
- *    maxItems: the maximum items
- *    itemsPerMinute: the max number of items to send in a given minute
- */
-RateLimiter.prototype.configureGlobal = function (options) {
-  if (options.startTime !== undefined) {
-    RateLimiter.globalSettings.startTime = options.startTime;
-  }
-  if (options.maxItems !== undefined) {
-    RateLimiter.globalSettings.maxItems = options.maxItems;
-  }
-  if (options.itemsPerMinute !== undefined) {
-    RateLimiter.globalSettings.itemsPerMinute = options.itemsPerMinute;
+  constructor(options = {}) {
+    this.startTime = Date.now();
+    this.counter = 0;
+    this.perMinCounter = 0;
+    this.platform = null;
+    this.platformOptions = {};
+    this.configureGlobal(options);
   }
-};
 
-/*
- * shouldSend - determine if we should send a given item based on rate limit settings
- *
- * @param item - the item we are about to send
- * @returns An object with the following structure:
- *  error: (Error|null)
- *  shouldSend: bool
- *  payload: (Object|null)
- *  If shouldSend is false, the item passed as a parameter should not be sent to Rollbar, and
- *  exactly one of error or payload will be non-null. If error is non-null, the returned Error will
- *  describe the situation, but it means that we were already over a rate limit (either globally or
- *  per minute) when this item was checked. If error is null, and therefore payload is non-null, it
- *  means this item put us over the global rate limit and the payload should be sent to Rollbar in
- *  place of the passed in item.
- */
-RateLimiter.prototype.shouldSend = function (item, now) {
-  now = now || _.now();
-  var elapsedTime = now - this.startTime;
-  if (elapsedTime < 0 || elapsedTime >= 60000) {
-    this.startTime = now;
-    this.perMinCounter = 0;
+  /*
+   * configureGlobal - set the global rate limiter options
+   *
+   * @param options - Only the following values are recognized:
+   *    startTime: a timestamp of the form returned by (new Date()).getTime()
+   *    maxItems: the maximum items
+   *    itemsPerMinute: the max number of items to send in a given minute
+   */
+  configureGlobal(options = {}) {
+    const { startTime, maxItems, itemsPerMinute } = options;
+
+    if (startTime !== undefined) {
+      RateLimiter.globalSettings.startTime = startTime;
+    }
+    if (maxItems !== undefined) {
+      RateLimiter.globalSettings.maxItems = maxItems;
+    }
+    if (itemsPerMinute !== undefined) {
+      RateLimiter.globalSettings.itemsPerMinute = itemsPerMinute;
+    }
   }
 
-  var globalRateLimit = RateLimiter.globalSettings.maxItems;
-  var globalRateLimitPerMin = RateLimiter.globalSettings.itemsPerMinute;
+  /*
+   * shouldSend - determine if we should send a given item based on rate limit settings
+   *
+   * @param item - the item we are about to send
+   * @returns An object with the following structure:
+   *  error: (Error|null)
+   *  shouldSend: bool
+   *  payload: (Object|null)
+   *  If shouldSend is false, the item passed as a parameter should not be sent to Rollbar, and
+   *  exactly one of error or payload will be non-null. If error is non-null, the returned Error will
+   *  describe the situation, but it means that we were already over a rate limit (either globally or
+   *  per minute) when this item was checked. If error is null, and therefore payload is non-null, it
+   *  means this item put us over the global rate limit and the payload should be sent to Rollbar in
+   *  place of the passed in item.
+   */
+  shouldSend(item, now = Date.now()) {
+    const elapsedTime = now - this.startTime;
+    if (elapsedTime < 0 || elapsedTime >= 60000) {
+      this.startTime = now;
+      this.perMinCounter = 0;
+    }
+
+    const globalRateLimit = RateLimiter.globalSettings.maxItems;
+    const globalRateLimitPerMin = RateLimiter.globalSettings.itemsPerMinute;
+
+    if (checkRate(item, globalRateLimit, this.counter)) {
+      return shouldSendValue(
+        this.platform,
+        this.platformOptions,
+        `${globalRateLimit} max items reached`,
+        false,
+      );
+    }
+
+    if (checkRate(item, globalRateLimitPerMin, this.perMinCounter)) {
+      return shouldSendValue(
+        this.platform,
+        this.platformOptions,
+        `${globalRateLimitPerMin} items per minute reached`,
+        false,
+      );
+    }
+
+    this.counter += 1;
+    this.perMinCounter += 1;
+
+    const underGlobalLimit = !checkRate(item, globalRateLimit, this.counter);
+    const perMinute = underGlobalLimit;
+    const shouldSend =
+      underGlobalLimit &&
+      !checkRate(item, globalRateLimitPerMin, this.perMinCounter);
 
-  if (checkRate(item, globalRateLimit, this.counter)) {
-    return shouldSendValue(
-      this.platform,
-      this.platformOptions,
-      globalRateLimit + ' max items reached',
-      false,
-    );
-  } else if (checkRate(item, globalRateLimitPerMin, this.perMinCounter)) {
     return shouldSendValue(
       this.platform,
       this.platformOptions,
-      globalRateLimitPerMin + ' items per minute reached',
-      false,
+      null,
+      shouldSend,
+      globalRateLimit,
+      globalRateLimitPerMin,
+      perMinute,
     );
   }
-  this.counter++;
-  this.perMinCounter++;
-
-  var shouldSend = !checkRate(item, globalRateLimit, this.counter);
-  var perMinute = shouldSend;
-  shouldSend =
-    shouldSend && !checkRate(item, globalRateLimitPerMin, this.perMinCounter);
-  return shouldSendValue(
-    this.platform,
-    this.platformOptions,
-    null,
-    shouldSend,
-    globalRateLimit,
-    globalRateLimitPerMin,
-    perMinute,
-  );
-};
-
-RateLimiter.prototype.setPlatformOptions = function (platform, options) {
-  this.platform = platform;
-  this.platformOptions = options;
-};
+
+  setPlatformOptions(platform, options) {
+    this.platform = platform;
+    this.platformOptions = options;
+  }
+}
 
 /* Helpers */
 
@@ -119,11 +125,10 @@ function shouldSendValue(
   limitPerMin,
   perMinute,
 ) {
-  var payload = null;
-  if (error) {
-    error = new Error(error);
-  }
-  if (!error && !shouldSend) {
+  let payload = null;
+  const errorResult = error ? new Error(error) : null;
+
+  if (!errorResult && !shouldSend) {
     payload = rateLimitPayload(
       platform,
       options,
@@ -132,7 +137,8 @@ function shouldSendValue(
       perMinute,
     );
   }
-  return { error: error, shouldSend: shouldSend, payload: payload };
+
+  return { error: errorResult, shouldSend, payload };
 }
 
 function rateLimitPayload(
@@ -142,15 +148,12 @@ function rateLimitPayload(
   limitPerMin,
   perMinute,
 ) {
-  var environment =
+  const environment =
     options.environment || (options.payload && options.payload.environment);
-  var msg;
-  if (perMinute) {
-    msg = 'item per minute limit reached, ignoring errors until timeout';
-  } else {
-    msg = 'maxItems has been hit, ignoring errors until reset.';
-  }
-  var item = {
+  const msg = perMinute
+    ? 'item per minute limit reached, ignoring errors until timeout'
+    : 'maxItems has been hit, ignoring errors until reset.';
+  const item = {
     body: {
       message: {
         body: msg,

package/src/react-native/rollbar.js

@@ -1,18 +1,17 @@
-import Client from '../rollbar.js';
-import * as _ from '../utility.js';
 import API from '../api.js';
-import logger from '../logger.js';
-import * as rnDefaults from './defaults.js';
-import { version, reportLevel } from '../defaults.js';
-
-import Transport from './transport.js';
 import * as urllib from '../browser/url.js';
-
+import { version, reportLevel } from '../defaults.js';
+import logger from '../logger.js';
+import * as sharedPredicates from '../predicates.js';
+import Client from '../rollbar.js';
 import Telemeter from '../telemetry.js';
-import * as transforms from './transforms.js';
 import * as sharedTransforms from '../transforms.js';
-import * as sharedPredicates from '../predicates.js';
 import truncation from '../truncation.js';
+import * as _ from '../utility.js';
+
+import * as rnDefaults from './defaults.js';
+import * as transforms from './transforms.js';
+import Transport from './transport.js';
 
 function Rollbar(options, client) {
   if (_.isType(options, 'string')) {

package/src/react-native/transforms.js

@@ -1,6 +1,6 @@
-import * as _ from '../utility.js';
-import scrub from '../scrub.js';
 import errorParser from '../errorParser.js';
+import scrub from '../scrub.js';
+import * as _ from '../utility.js';
 
 function baseData(item, options, callback) {
   var environment =
@@ -25,7 +25,7 @@ function baseData(item, options, callback) {
 
   var props = Object.getOwnPropertyNames(item.custom || {});
   props.forEach(function (name) {
-    if (!data.hasOwnProperty(name)) {
+    if (!_.hasOwn(data, name)) {
       data[name] = item.custom[name];
     }
   });
@@ -115,8 +115,7 @@ function _buildFrames(stack, options) {
   }
 
   var frames = [];
-  for (var i = 0; i < stack.length; ++i) {
-    var stackFrame = stack[i];
+  for (const stackFrame of stack) {
     var filename = stackFrame.url ? _.sanitizeUrl(stackFrame.url) : '<unknown>';
     var frame = {
       filename: _rewriteFilename(filename, options),

package/src/react-native/transport.js

@@ -1,8 +1,8 @@
-import * as _ from '../utility.js';
-import logger from '../logger.js';
-
 import { Buffer } from 'buffer/';
 
+import logger from '../logger.js';
+import * as _ from '../utility.js';
+
 function Transport(truncation) {
   this.rateLimitExpires = 0;
   this.truncation = truncation;
@@ -10,7 +10,7 @@ function Transport(truncation) {
 
 Transport.prototype.get = function (accessToken, options, params, callback) {
   if (!callback || !_.isFunction(callback)) {
-    callback = function () {};
+    callback = () => {};
   }
   options = options || {};
   _.addParamsAndAccessTokenToPath(accessToken, options, params);
@@ -29,7 +29,7 @@ Transport.prototype.get = function (accessToken, options, params, callback) {
 
 Transport.prototype.post = function (accessToken, options, payload, callback) {
   if (!callback || !_.isFunction(callback)) {
-    callback = function () {};
+    callback = () => {};
   }
   options = options || {};
   if (!payload) {
@@ -59,7 +59,7 @@ Transport.prototype.postJsonPayload = function (
   callback,
 ) {
   if (!callback || !_.isFunction(callback)) {
-    callback = function () {};
+    callback = () => {};
   }
   options = options || {};
   if (!jsonPayload) {
@@ -95,7 +95,7 @@ function _headers(accessToken, options, data) {
   if (data) {
     try {
       headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
-    } catch (e) {
+    } catch (_e) {
       logger.error('Could not get the content length of the data');
     }
   }

package/src/rollbar.js

@@ -1,6 +1,6 @@
-import RateLimiter from './rateLimiter.js';
-import Queue from './queue.js';
 import Notifier from './notifier.js';
+import Queue from './queue.js';
+import RateLimiter from './rateLimiter.js';
 import * as _ from './utility.js';
 
 /*
@@ -162,7 +162,7 @@ Rollbar.prototype._log = function (defaultLevel, item) {
   try {
     item.level = item.level || defaultLevel;
 
-    this._addTracingAttributes(item);
+    this._addItemAttributes(item);
 
     // Legacy OpenTracing support
     this._addTracingInfo(item);
@@ -182,7 +182,7 @@ Rollbar.prototype._log = function (defaultLevel, item) {
   }
 };
 
-Rollbar.prototype._addTracingAttributes = function (item) {
+Rollbar.prototype._addItemAttributes = function (item) {
   const span = this.tracing?.getSpan();
 
   const attributes = [
@@ -190,6 +190,9 @@ Rollbar.prototype._addTracingAttributes = function (item) {
     { key: 'span_id', value: span?.spanId },
     { key: 'trace_id', value: span?.traceId },
   ];
+  if (item._isUncaught) {
+    attributes.push({ key: 'is_uncaught', value: 'true' });
+  }
   _.addItemAttributes(item.data, attributes);
 
   span?.addEvent('rollbar.occurrence', [

package/src/scrub.js

@@ -1,12 +1,12 @@
-import * as _ from './utility.js';
 import traverse from './utility/traverse.js';
+import * as _ from './utility.js';
 
 function scrub(data, scrubFields, scrubPaths) {
   scrubFields = scrubFields || [];
 
   if (scrubPaths) {
-    for (var i = 0; i < scrubPaths.length; ++i) {
-      scrubPath(data, scrubPaths[i]);
+    for (const path of scrubPaths) {
+      scrubPath(data, path);
     }
   }
 
@@ -18,19 +18,17 @@ function scrub(data, scrubFields, scrubPaths) {
   }
 
   function paramScrubber(v) {
-    var i;
     if (_.isType(v, 'string')) {
-      for (i = 0; i < queryRes.length; ++i) {
-        v = v.replace(queryRes[i], redactQueryParam);
+      for (const regex of queryRes) {
+        v = v.replace(regex, redactQueryParam);
       }
     }
     return v;
   }
 
   function valScrubber(k, v) {
-    var i;
-    for (i = 0; i < paramRes.length; ++i) {
-      if (paramRes[i].test(k)) {
+    for (const regex of paramRes) {
+      if (regex.test(k)) {
         v = _.redact();
         break;
       }
@@ -57,23 +55,22 @@ function scrubPath(obj, path) {
   var keys = path.split('.');
   var last = keys.length - 1;
   try {
-    for (var i = 0; i <= last; ++i) {
-      if (i < last) {
-        obj = obj[keys[i]];
+    for (const [index, key] of keys.entries()) {
+      if (index < last) {
+        obj = obj[key];
       } else {
-        obj[keys[i]] = _.redact();
+        obj[key] = _.redact();
       }
     }
-  } catch (e) {
+  } catch (_e) {
     // Missing key is OK;
   }
 }
 
 function _getScrubFieldRegexs(scrubFields) {
   var ret = [];
-  var pat;
-  for (var i = 0; i < scrubFields.length; ++i) {
-    pat = '^\\[?(%5[bB])?' + scrubFields[i] + '\\[?(%5[bB])?\\]?(%5[dD])?$';
+  for (const field of scrubFields) {
+    var pat = '^\\[?(%5[bB])?' + field + '\\[?(%5[bB])?\\]?(%5[dD])?$';
     ret.push(new RegExp(pat, 'i'));
   }
   return ret;
@@ -81,9 +78,8 @@ function _getScrubFieldRegexs(scrubFields) {
 
 function _getScrubQueryParamRegexs(scrubFields) {
   var ret = [];
-  var pat;
-  for (var i = 0; i < scrubFields.length; ++i) {
-    pat = '\\[?(%5[bB])?' + scrubFields[i] + '\\[?(%5[bB])?\\]?(%5[dD])?';
+  for (const field of scrubFields) {
+    var pat = '\\[?(%5[bB])?' + field + '\\[?(%5[bB])?\\]?(%5[dD])?';
     ret.push(new RegExp('(' + pat + '=)([^&\\n]+)', 'igm'));
   }
   return ret;

package/src/server/locals.js

@@ -1,6 +1,7 @@
-/* globals Map */
 import inspector from 'inspector';
+
 import async from 'async';
+
 import * as _ from '../utility.js';
 
 // It's helpful to have default limits, as the data expands quickly in real environments.
@@ -41,7 +42,7 @@ Locals.prototype.initSession = function () {
   Locals.currentErrors = new Map();
 
   Locals.session.on('Debugger.paused', ({ params }) => {
-    if (params.reason == 'promiseRejection' || params.reason == 'exception') {
+    if (params.reason === 'promiseRejection' || params.reason === 'exception') {
       var key = params.data.description;
       Locals.currentErrors.set(key, params);
 
@@ -57,10 +58,9 @@ Locals.prototype.initSession = function () {
     }
   });
 
-  var self = this;
   Locals.session.post('Debugger.enable', (_err, _result) => {
-    self.initialized = true;
-    updatePauseState(self.options, self.logger);
+    this.initialized = true;
+    updatePauseState(this.options, this.logger);
   });
 };
 
@@ -74,8 +74,8 @@ Locals.prototype.disconnectSession = function () {
 
 Locals.prototype.updateOptions = function (options) {
   var pauseStateChanged =
-    this.options.enabled != options.enabled ||
-    this.options.uncaughtOnly != options.uncaughtOnly;
+    this.options.enabled !== options.enabled ||
+    this.options.uncaughtOnly !== options.uncaughtOnly;
 
   this.options = _.merge(this.options, options);
 

package/src/server/parser.js

@@ -1,8 +1,11 @@
-import logger from '../logger.js';
-import async from 'async';
 import fs from 'fs';
-import lru from 'lru-cache';
 import util from 'util';
+
+import async from 'async';
+import lru from 'lru-cache';
+
+import logger from '../logger.js';
+
 import * as stackTrace from './sourceMap/stackTrace.js';
 
 var linesOfContext = 3;
@@ -186,8 +189,8 @@ function shouldReadFrameFile(frameFilename, callback) {
   var isValidFilename, isCached, isPending;
 
   isValidFilename = frameFilename[0] === '/' || frameFilename[0] === '.';
-  isCached = !!cache.get(frameFilename);
-  isPending = !!pendingReads[frameFilename];
+  isCached = Boolean(cache.get(frameFilename));
+  isPending = Boolean(pendingReads[frameFilename]);
 
   callback(null, isValidFilename && !isCached && !isPending);
 }
@@ -382,7 +385,7 @@ export function parseStack(stack, options, item, callback) {
       async.filter(
         frames,
         function (frame, callback) {
-          callback(null, !!frame);
+          callback(null, Boolean(frame));
         },
         function (err, results) {
           if (err) return callback(err);