rollbar 2.26.3 → 3.0.0-alpha.1

package/src/server/rollbar.js

@@ -39,9 +39,14 @@ function Rollbar(options, client) {
   this.lambdaTimeoutHandle = null;
   var transport = new Transport();
   var api = new API(this.options, transport, urllib, truncation, jsonBackup);
-  var telemeter = new Telemeter(this.options)
-  this.client = client || new Client(this.options, api, logger, telemeter, 'server');
-  this.instrumenter = new Instrumenter(this.options, this.client.telemeter, this);
+  var telemeter = new Telemeter(this.options);
+  this.client =
+    client || new Client(this.options, api, logger, telemeter, null, null, 'server');
+  this.instrumenter = new Instrumenter(
+    this.options,
+    this.client.telemeter,
+    this,
+  );
   this.instrumenter.instrument();
   if (this.options.locals) {
     this.locals = initLocals(this.options.locals, logger);
@@ -55,7 +60,9 @@ function Rollbar(options, client) {
 function initLocals(localsOptions, logger) {
   // Capturing stack local variables is only supported in Node 10 and higher.
   var nodeMajorVersion = process.versions.node.split('.')[0];
-  if (nodeMajorVersion < 10) { return null; }
+  if (nodeMajorVersion < 10) {
+    return null;
+  }
 
   var Locals;
   if (typeof localsOptions === 'function') {
@@ -65,7 +72,9 @@ function initLocals(localsOptions, logger) {
     Locals = localsOptions.module;
     delete localsOptions.module;
   } else {
-    logger.error('options.locals or options.locals.module must be a Locals module');
+    logger.error(
+      'options.locals or options.locals.module must be a Locals module',
+    );
     return null;
   }
   return new Locals(localsOptions, logger);
@@ -110,7 +119,11 @@ Rollbar.prototype.configure = function (options, payloadData) {
     payload = { payload: payloadData };
   }
   this.options = _.handleOptions(oldOptions, options, payload, logger);
-  this.options._configuredOptions = _.handleOptions(oldOptions._configuredOptions, options, payload);
+  this.options._configuredOptions = _.handleOptions(
+    oldOptions._configuredOptions,
+    options,
+    payload,
+  );
   // On the server we want to ignore any maxItems setting
   delete this.options.maxItems;
   logger.setVerbose(this.options.verbose);
@@ -121,7 +134,7 @@ Rollbar.prototype.configure = function (options, payloadData) {
     if (this.locals) {
       this.locals.updateOptions(this.options.locals);
     } else {
-      this.locals = initLocals(this.options.locals, logger)
+      this.locals = initLocals(this.options.locals, logger);
     }
   }
   return this;
@@ -205,7 +218,6 @@ Rollbar.warn = function () {
   }
 };
 
-
 Rollbar.prototype.warning = function () {
   var item = this._createItem(arguments);
   var uuid = item.uuid;
@@ -221,7 +233,6 @@ Rollbar.warning = function () {
   }
 };
 
-
 Rollbar.prototype.error = function () {
   var item = this._createItem(arguments);
   var uuid = item.uuid;
@@ -239,8 +250,9 @@ Rollbar.error = function () {
 Rollbar.prototype._uncaughtError = function () {
   var item = this._createItem(arguments);
   item._isUncaught = true;
+  item.level = this.options.uncaughtErrorLevel;
   var uuid = item.uuid;
-  this.client.error(item);
+  this.client.log(item);
   return { uuid: uuid };
 };
 
@@ -286,7 +298,7 @@ Rollbar.prototype.wait = function (callback) {
 };
 Rollbar.wait = function (callback) {
   if (_instance) {
-    return _instance.wait(callback)
+    return _instance.wait(callback);
   } else {
     var maybeCallback = _getFirstFunction(arguments);
     handleUninitialized(maybeCallback);
@@ -313,7 +325,7 @@ Rollbar.prototype.errorHandler = function () {
 };
 Rollbar.errorHandler = function () {
   if (_instance) {
-    return _instance.errorHandler()
+    return _instance.errorHandler();
   } else {
     handleUninitialized();
   }
@@ -341,8 +353,15 @@ Rollbar.prototype.asyncLambdaHandler = function (handler, timeoutHandler) {
     return new Promise(function (resolve, reject) {
       self.lambdaContext = context;
       if (shouldReportTimeouts) {
-        var timeoutCb = (timeoutHandler || _timeoutHandler).bind(null, event, context);
-        self.lambdaTimeoutHandle = setTimeout(timeoutCb, context.getRemainingTimeInMillis() - 1000);
+        var timeoutCb = (timeoutHandler || _timeoutHandler).bind(
+          null,
+          event,
+          context,
+        );
+        self.lambdaTimeoutHandle = setTimeout(
+          timeoutCb,
+          context.getRemainingTimeInMillis() - 1000,
+        );
       }
       handler(event, context)
         .then(function (resp) {
@@ -375,8 +394,16 @@ Rollbar.prototype.syncLambdaHandler = function (handler, timeoutHandler) {
   return function (event, context, callback) {
     self.lambdaContext = context;
     if (shouldReportTimeouts) {
-      var timeoutCb = (timeoutHandler || _timeoutHandler).bind(null, event, context, callback);
-      self.lambdaTimeoutHandle = setTimeout(timeoutCb, context.getRemainingTimeInMillis() - 1000);
+      var timeoutCb = (timeoutHandler || _timeoutHandler).bind(
+        null,
+        event,
+        context,
+        callback,
+      );
+      self.lambdaTimeoutHandle = setTimeout(
+        timeoutCb,
+        context.getRemainingTimeInMillis() - 1000,
+      );
     }
     try {
       handler(event, context, function (err, resp) {
@@ -456,19 +483,33 @@ Rollbar.reportMessage = function (message, level, request, callback) {
   }
 };
 
-Rollbar.prototype.reportMessageWithPayloadData = function (message, payloadData, request, callback) {
+Rollbar.prototype.reportMessageWithPayloadData = function (
+  message,
+  payloadData,
+  request,
+  callback,
+) {
   logger.log('reportMessageWithPayloadData is deprecated');
   return this.error(message, request, payloadData, callback);
 };
-Rollbar.reportMessageWithPayloadData = function (message, payloadData, request, callback) {
+Rollbar.reportMessageWithPayloadData = function (
+  message,
+  payloadData,
+  request,
+  callback,
+) {
   if (_instance) {
-    return _instance.reportMessageWithPayloadData(message, payloadData, request, callback);
+    return _instance.reportMessageWithPayloadData(
+      message,
+      payloadData,
+      request,
+      callback,
+    );
   } else {
     handleUninitialized(callback);
   }
 };
 
-
 Rollbar.prototype.handleError = function (err, request, callback) {
   logger.log('handleError is deprecated');
   return this.error(err, request, callback);
@@ -481,14 +522,28 @@ Rollbar.handleError = function (err, request, callback) {
   }
 };
 
-
-Rollbar.prototype.handleErrorWithPayloadData = function (err, payloadData, request, callback) {
+Rollbar.prototype.handleErrorWithPayloadData = function (
+  err,
+  payloadData,
+  request,
+  callback,
+) {
   logger.log('handleErrorWithPayloadData is deprecated');
   return this.error(err, request, payloadData, callback);
 };
-Rollbar.handleErrorWithPayloadData = function (err, payloadData, request, callback) {
+Rollbar.handleErrorWithPayloadData = function (
+  err,
+  payloadData,
+  request,
+  callback,
+) {
   if (_instance) {
-    return _instance.handleErrorWithPayloadData(err, payloadData, request, callback);
+    return _instance.handleErrorWithPayloadData(
+      err,
+      payloadData,
+      request,
+      callback,
+    );
   } else {
     handleUninitialized(callback);
   }
@@ -514,7 +569,10 @@ Rollbar.handleUnhandledRejections = function (accessToken, options) {
   }
 };
 
-Rollbar.handleUncaughtExceptionsAndRejections = function (accessToken, options) {
+Rollbar.handleUncaughtExceptionsAndRejections = function (
+  accessToken,
+  options,
+) {
   if (_instance) {
     options = options || {};
     options.accessToken = accessToken;
@@ -577,7 +635,10 @@ Rollbar.prototype.setupUnhandledCapture = function () {
   if (this.options.captureUncaught || this.options.handleUncaughtExceptions) {
     this.handleUncaughtExceptions();
   }
-  if (this.options.captureUnhandledRejections || this.options.handleUnhandledRejections) {
+  if (
+    this.options.captureUnhandledRejections ||
+    this.options.handleUnhandledRejections
+  ) {
     this.handleUnhandledRejections();
   }
 };
@@ -586,40 +647,58 @@ Rollbar.prototype.handleUncaughtExceptions = function () {
   var exitOnUncaught = !!this.options.exitOnUncaughtException;
   delete this.options.exitOnUncaughtException;
 
-  addOrReplaceRollbarHandler('uncaughtException', function (err) {
-    if (!this.options.captureUncaught && !this.options.handleUncaughtExceptions) {
-      return;
-    }
+  addOrReplaceRollbarHandler(
+    'uncaughtException',
+    function (err) {
+      if (
+        !this.options.captureUncaught &&
+        !this.options.handleUncaughtExceptions
+      ) {
+        return;
+      }
 
-    this._uncaughtError(err, function (err) {
-      if (err) {
-        logger.error('Encountered error while handling an uncaught exception.');
-        logger.error(err);
+      this._uncaughtError(err, function (err) {
+        if (err) {
+          logger.error(
+            'Encountered error while handling an uncaught exception.',
+          );
+          logger.error(err);
+        }
+      });
+      if (exitOnUncaught) {
+        setImmediate(
+          function () {
+            this.wait(function () {
+              process.exit(1);
+            });
+          }.bind(this),
+        );
       }
-    });
-    if (exitOnUncaught) {
-      setImmediate(function () {
-        this.wait(function () {
-          process.exit(1);
-        });
-      }.bind(this));
-    }
-  }.bind(this));
+    }.bind(this),
+  );
 };
 
 Rollbar.prototype.handleUnhandledRejections = function () {
-  addOrReplaceRollbarHandler('unhandledRejection', function (reason) {
-    if (!this.options.captureUnhandledRejections && !this.options.handleUnhandledRejections) {
-      return;
-    }
-
-    this._uncaughtError(reason, function (err) {
-      if (err) {
-        logger.error('Encountered error while handling an uncaught exception.');
-        logger.error(err);
+  addOrReplaceRollbarHandler(
+    'unhandledRejection',
+    function (reason) {
+      if (
+        !this.options.captureUnhandledRejections &&
+        !this.options.handleUnhandledRejections
+      ) {
+        return;
       }
-    });
-  }.bind(this));
+
+      this._uncaughtError(reason, function (err) {
+        if (err) {
+          logger.error(
+            'Encountered error while handling an uncaught exception.',
+          );
+          logger.error(err);
+        }
+      });
+    }.bind(this),
+  );
 };
 
 function addOrReplaceRollbarHandler(event, action) {
@@ -658,7 +737,7 @@ Rollbar.defaultOptions = {
   showReportedMessageTraces: false,
   notifier: {
     name: 'node_rollbar',
-    version: packageJson.version
+    version: packageJson.version,
   },
   scrubHeaders: packageJson.defaults.server.scrubHeaders,
   scrubFields: packageJson.defaults.server.scrubFields,
@@ -675,7 +754,7 @@ Rollbar.defaultOptions = {
   captureLambdaTimeouts: true,
   ignoreDuplicateErrors: true,
   scrubRequestBody: true,
-  autoInstrument: false
+  autoInstrument: false,
 };
 
 module.exports = Rollbar;

package/src/server/sourceMap/stackTrace.js

@@ -31,10 +31,10 @@ function retrieveFile(path) {
   path = path.trim();
   if (/^file:/.test(path)) {
     // existsSync/readFileSync can't handle file protocol, but once stripped, it works
-    path = path.replace(/file:\/\/\/(\w:)?/, function(_protocol, drive) {
-      return drive ?
-        '' : // file:///C:/dir/file -> C:/dir/file
-        '/'; // file:///root-dir/file -> /root-dir/file
+    path = path.replace(/file:\/\/\/(\w:)?/, function (_protocol, drive) {
+      return drive
+        ? '' // file:///C:/dir/file -> C:/dir/file
+        : '/'; // file:///root-dir/file -> /root-dir/file
     });
   }
   if (path in fileContentsCache) {
@@ -50,7 +50,7 @@ function retrieveFile(path) {
     /* ignore any errors */
   }
 
-  return fileContentsCache[path] = contents;
+  return (fileContentsCache[path] = contents);
 }
 
 // Support URLs relative to a directory, but be careful about a protocol prefix
@@ -64,7 +64,10 @@ function supportRelativeURL(file, url) {
   if (protocol && /^\/\w\:/.test(startPath)) {
     // handle file:///C:/ paths
     protocol += '/';
-    return protocol + path.resolve(dir.slice(protocol.length), url).replace(/\\/g, '/');
+    return (
+      protocol +
+      path.resolve(dir.slice(protocol.length), url).replace(/\\/g, '/')
+    );
   }
   return protocol + path.resolve(dir.slice(protocol.length), url);
 }
@@ -74,7 +77,8 @@ function retrieveSourceMapURL(source) {
 
   // Get the URL of the source map
   fileData = retrieveFile(source);
-  var re = /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/)[ \t]*$)/mg;
+  var re =
+    /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/)[ \t]*$)/gm;
   // Keep executing the search to find the *last* sourceMappingURL to avoid
   // picking up sourceMappingURLs from comments, strings, etc.
   var lastMatch, match;
@@ -110,7 +114,7 @@ function retrieveSourceMap(source) {
 
   return {
     url: sourceMappingURL,
-    map: sourceMapData
+    map: sourceMapData,
   };
 }
 
@@ -122,7 +126,10 @@ function cacheSourceContent(sourceMap, originalSource, newSource) {
   // The sourceContentFor lookup needs the original source url as found in the
   // map file. However the client lookup in sourcesContentCache will use
   // a rewritten form of the url, hence originalSource and newSource.
-  sourcesContentCache[newSource] = sourceMap.map.sourceContentFor(originalSource, true);
+  sourcesContentCache[newSource] = sourceMap.map.sourceContentFor(
+    originalSource,
+    true,
+  );
 }
 
 exports.mapSourcePosition = function mapSourcePosition(position, diagnostic) {
@@ -133,14 +140,15 @@ exports.mapSourcePosition = function mapSourcePosition(position, diagnostic) {
     if (urlAndMap) {
       sourceMap = sourceMapCache[position.source] = {
         url: urlAndMap.url,
-        map: new SourceMapConsumer(urlAndMap.map)
+        map: new SourceMapConsumer(urlAndMap.map),
       };
-      diagnostic.node_source_maps.source_mapping_urls[position.source] = urlAndMap.url;
+      diagnostic.node_source_maps.source_mapping_urls[position.source] =
+        urlAndMap.url;
 
       // Load all sources stored inline with the source map into the file cache
       // to pretend like they are already loaded. They may not exist on disk.
       if (sourceMap.map.sourcesContent) {
-        sourceMap.map.sources.forEach(function(source, i) {
+        sourceMap.map.sources.forEach(function (source, i) {
           var contents = sourceMap.map.sourcesContent[i];
           if (contents) {
             var url = supportRelativeURL(sourceMap.url, source);
@@ -151,14 +159,19 @@ exports.mapSourcePosition = function mapSourcePosition(position, diagnostic) {
     } else {
       sourceMap = sourceMapCache[position.source] = {
         url: null,
-        map: null
+        map: null,
       };
-      diagnostic.node_source_maps.source_mapping_urls[position.source] = 'not found';
+      diagnostic.node_source_maps.source_mapping_urls[position.source] =
+        'not found';
     }
   }
 
   // Resolve the source URL relative to the URL of the source map
-  if (sourceMap && sourceMap.map && typeof sourceMap.map.originalPositionFor === 'function') {
+  if (
+    sourceMap &&
+    sourceMap.map &&
+    typeof sourceMap.map.originalPositionFor === 'function'
+  ) {
     var originalPosition = sourceMap.map.originalPositionFor(position);
 
     // Only return the original position if a matching line was found. If no
@@ -169,15 +182,17 @@ exports.mapSourcePosition = function mapSourcePosition(position, diagnostic) {
     if (originalPosition.source !== null) {
       var originalSource = originalPosition.source;
       originalPosition.source = supportRelativeURL(
-        sourceMap.url, originalPosition.source);
+        sourceMap.url,
+        originalPosition.source,
+      );
       cacheSourceContent(sourceMap, originalSource, originalPosition.source);
       return originalPosition;
     }
   }
 
   return position;
-}
+};
 
 exports.sourceContent = function sourceContent(source) {
   return sourcesContentCache[source];
-}
+};

package/src/server/telemetry/urlHelpers.js

@@ -1,4 +1,3 @@
-var url = require('url');
 var { URL } = require('url');
 var merge = require('../../merge');
 
@@ -12,8 +11,7 @@ function mergeOptions(input, options, cb) {
   if (typeof input === 'string') {
     const urlStr = input;
     input = urlToHttpOptions(new URL(urlStr));
-  } else if (input && input[url.searchParamsSymbol] &&
-             input[url.searchParamsSymbol][url.searchParamsSymbol]) {
+  } else if (input && input instanceof URL) {
     // url.URL instance
     input = urlToHttpOptions(input);
   } else {
@@ -28,7 +26,7 @@ function mergeOptions(input, options, cb) {
   } else {
     options = merge(input || {}, options);
   }
-  return {options: options, cb: cb};
+  return { options: options, cb: cb };
 }
 
 // This function replicates the relevant logic in node/lib/url.js as closely
@@ -40,15 +38,15 @@ function mergeOptions(input, options, cb) {
 function urlToHttpOptions(url) {
   const options = {
     protocol: url.protocol,
-    hostname: typeof url.hostname === 'string' &&
-              url.hostname.startsWith('[') ?
-      url.hostname.slice(1, -1) :
-      url.hostname,
+    hostname:
+      typeof url.hostname === 'string' && url.hostname.startsWith('[')
+        ? url.hostname.slice(1, -1)
+        : url.hostname,
     hash: url.hash,
     search: url.search,
     pathname: url.pathname,
     path: `${url.pathname || ''}${url.search || ''}`,
-    href: url.href
+    href: url.href,
   };
   if (url.port !== '') {
     options.port = Number(url.port);
@@ -67,7 +65,7 @@ function constructUrl(options) {
   }
   url += options.hostname || options.host || 'localhost';
   if (options.port) {
-    url += `:${options.port}`
+    url += `:${options.port}`;
   }
   url += options.path || '/';
 
@@ -76,5 +74,5 @@ function constructUrl(options) {
 
 module.exports = {
   mergeOptions,
-  constructUrl
+  constructUrl,
 };