Chore: Misc infrastructure updates (#104)

- Upgrade all prod + dev dependencies
- BREAKING: Update node engines
- Switch istanbul to nyc.
- Update to es-next code from at least auto-fixes.

Author: ryan-roemer

.eslintrc

@@ -1,3 +1,3 @@
 ---
 extends:
-  - "formidable/configurations/es5-node"
+  - "formidable/configurations/es6-node"

.gitignore

@@ -2,3 +2,4 @@
 npm-debug.log
 coverage
 .vscode
+.nyc_output

.nycrc

@@ -0,0 +1,12 @@
+{
+  "include": [
+    "*.js",
+    "bin/**/*.js",
+    "lib/**/*.js"
+  ],
+  "reporter": [
+    "lcov",
+    "text"
+  ],
+  "all": true
+}

.travis.yml

@@ -7,6 +7,7 @@ branches:
     - master
 
 node_js:
-  - "4"
-  - "6"
   - "8"
+  - "10"
+  - "12"
+  - "13"

bin/nodejs-dashboard.js

@@ -1,26 +1,27 @@
 #!/usr/bin/env node
+
 "use strict";
 
-var SocketIO = require("socket.io");
-var spawn = require("cross-spawn");
-var commander = require("commander");
-var path = require("path");
+const SocketIO = require("socket.io");
+const spawn = require("cross-spawn");
+const commander = require("commander");
+const path = require("path");
 
-var Dashboard = require("../lib/dashboard");
-var config = require("../lib/config");
-var appPkg = require(path.resolve("package.json"));
-var pkg = require("../package.json");
-var parseSettings = require("../lib/parse-settings");
+const Dashboard = require("../lib/dashboard");
+const config = require("../lib/config");
+const appPkg = require(path.resolve("package.json"));
+const pkg = require("../package.json");
+const parseSettings = require("../lib/parse-settings");
 
-var appName = appPkg.name || "node";
-var program = new commander.Command(pkg.name);
+const appName = appPkg.name || "node";
+const program = new commander.Command(pkg.name);
 
 // Mimic commander syntax errors (with offsets) for consistency
 /* eslint-disable no-console */
-var exitWithError = function () {
-  var args = Array.prototype.slice.call(arguments);
+const exitWithError = function () {
+  const args = Array.prototype.slice.call(arguments);
   console.error();
-  console.error.apply(console, [" "].concat(args));
+  console.error(...[" "].concat(args));
   console.error();
   process.exit(1); // eslint-disable-line no-process-exit
 };
@@ -44,8 +45,8 @@ program.option("-r, --refreshinterval [ms]",
 
 program.option("-s, --settings [settings]",
   "Overrides layout settings for given view types",
-  function (settings) {
-    var res = parseSettings(settings);
+  (settings) => {
+    const res = parseSettings(settings);
 
     if (res.error) {
       exitWithError(res.error);
@@ -65,51 +66,54 @@ if (!program.args.length) {
   return;
 }
 
-var command = program.args[0];
-var args = program.args.slice(1);
+const command = program.args[0];
+const args = program.args.slice(1);
 
-var port = program.port;
+const port = program.port;
 
 process.env[config.PORT_KEY] = port;
 process.env[config.REFRESH_INTERVAL_KEY] = program.refreshinterval;
 process.env[config.BLOCKED_THRESHOLD_KEY] = program.eventdelay;
 
 
-var child = spawn(command, args, {
+const child = spawn(command, args, {
   env: process.env,
   stdio: [null, null, null, null],
   detached: true
 });
 
 console.log("Waiting for client connection on %d...", port); //eslint-disable-line
 
-var server = new SocketIO(port);
+const server = new SocketIO(port);
 
-var dashboard = new Dashboard({
-  appName: appName,
-  program: program,
+const dashboard = new Dashboard({
+  appName,
+  program,
   layoutsFile: program.layouts,
   settings: program.settings
 });
 
-server.on("connection", function (socket) {
-  socket.on("metrics", function (data) {
-    dashboard.onEvent({ type: "metrics", data: JSON.parse(data) });
+server.on("connection", (socket) => {
+  socket.on("metrics", (data) => {
+    dashboard.onEvent({ type: "metrics",
+      data: JSON.parse(data) });
   });
 
-  socket.on("error", function (err) {
+  socket.on("error", (err) => {
     exitWithError("Received error from agent, exiting: ", err);
   });
 });
 
-child.stdout.on("data", function (data) {
-  dashboard.onEvent({ type: "stdout", data: data.toString("utf8") });
+child.stdout.on("data", (data) => {
+  dashboard.onEvent({ type: "stdout",
+    data: data.toString("utf8") });
 });
 
-child.stderr.on("data", function (data) {
-  dashboard.onEvent({ type: "stderr", data: data.toString("utf8") });
+child.stderr.on("data", (data) => {
+  dashboard.onEvent({ type: "stderr",
+    data: data.toString("utf8") });
 });
 
-process.on("exit", function () {
+process.on("exit", () => {
   process.kill(process.platform === "win32" ? child.pid : -child.pid);
 });

index.js

@@ -1,4 +1,5 @@
 "use strict";
-var dashboardAgent = require("./lib/dashboard-agent");
+
+const dashboardAgent = require("./lib/dashboard-agent");
 
 module.exports = dashboardAgent();

lib/config.js

@@ -1,17 +1,17 @@
 "use strict";
 
-var pkg = require("../package.json");
+const pkg = require("../package.json");
 // Env var names must comply with:
 // http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap08.html
 // See: https://github.com/FormidableLabs/nodejs-dashboard/issues/75
-var name = pkg.name.replace("-", "_");
+const name = pkg.name.replace("-", "_");
 
 module.exports = {
   PORT: 9838,
-  PORT_KEY: name + "_PORT",
+  PORT_KEY: `${name}_PORT`,
   REFRESH_INTERVAL: 1000,
-  REFRESH_INTERVAL_KEY: name + "_REFRESH_INTERVAL",
+  REFRESH_INTERVAL_KEY: `${name}_REFRESH_INTERVAL`,
   BLOCKED_THRESHOLD: 10,
-  BLOCKED_THRESHOLD_KEY: name + "_BLOCKED_THRESHOLD",
+  BLOCKED_THRESHOLD_KEY: `${name}_BLOCKED_THRESHOLD`,
   LAYOUTS: ""
 };

lib/constants.js

@@ -9,7 +9,7 @@
 // will be at 5s increments of time
 //
 // 300000 = 30s and the corresponding zoom will show 30s aggregates
-var AGGREGATE_TIME_LEVELS = [
+const AGGREGATE_TIME_LEVELS = [
   "1000",
   "5000",
   "10000",
@@ -23,11 +23,11 @@ var AGGREGATE_TIME_LEVELS = [
   "3600000"
 ];
 
-var MILLISECONDS_PER_SECOND = 1000;
+const MILLISECONDS_PER_SECOND = 1000;
 
 // this array object is used to reduce ms to its highest human-readable form
 // see lib/providers/metrics-provider.js::getTimeIndexLabel
-var TIME_SCALES = [
+const TIME_SCALES = [
   {
     units: "ms",
     divisor: 1
@@ -50,7 +50,7 @@ var TIME_SCALES = [
 ];
 
 module.exports = {
-  AGGREGATE_TIME_LEVELS: AGGREGATE_TIME_LEVELS,
-  MILLISECONDS_PER_SECOND: MILLISECONDS_PER_SECOND,
-  TIME_SCALES: TIME_SCALES
+  AGGREGATE_TIME_LEVELS,
+  MILLISECONDS_PER_SECOND,
+  TIME_SCALES
 };

lib/dashboard-agent.js

@@ -1,27 +1,26 @@
 "use strict";
 
-var SocketIO = require("socket.io-client");
-var blocked = require("blocked");
-var pusage = require("pidusage");
-var os = require("os");
-var _ = require("lodash");
-var config = require("./config");
-
-var dashboardAgent = function () {
-
-  var options = {
+const SocketIO = require("socket.io-client");
+const blocked = require("blocked");
+const pusage = require("pidusage");
+const os = require("os");
+const _ = require("lodash");
+const config = require("./config");
+
+const dashboardAgent = function () {
+  const options = {
     port: process.env[config.PORT_KEY],
     refreshInterval: process.env[config.REFRESH_INTERVAL_KEY],
     blockedThreshold: process.env[config.BLOCKED_THRESHOLD_KEY]
   };
 
   // check if the app was launched w/o the dashboard
   // if so, don't start any of the monitoring
-  var enabled = options.port && options.refreshInterval && options.blockedThreshold;
+  const enabled = options.port && options.refreshInterval && options.blockedThreshold;
 
-  var socket;
+  let socket;
 
-  var metrics = {
+  const metrics = {
     eventLoop: {
       delay: 0,
       high: 0
@@ -34,33 +33,30 @@ var dashboardAgent = function () {
     }
   };
 
-  var _delayed = function (delay) {
+  const _delayed = function (delay) {
     metrics.eventLoop.high = Math.max(metrics.eventLoop.high, delay);
     metrics.eventLoop.delay = delay;
   };
 
-  var _getStats = function (cb) {
+  const _getStats = function (cb) {
     _.merge(metrics.mem, process.memoryUsage());
 
-    pusage.stat(process.pid, function (err, stat) {
-
+    pusage(process.pid, (err, stat) => {
       if (err) {
         return cb(err);
       }
 
       metrics.cpu.utilization = stat.cpu;
       return cb(null, metrics);
     });
-
   };
 
-  var resetEventMetrics = function () {
+  const resetEventMetrics = function () {
     metrics.eventLoop.delay = 0;
   };
 
-  var _emitStats = function () {
-
-    _getStats(function (err, newMetrics) {
+  const _emitStats = function () {
+    _getStats((err, newMetrics) => {
       if (err) {
         console.error("Failed to load metrics: ", err); //eslint-disable-line
         if (socket && socket.connected) {
@@ -72,18 +68,17 @@ var dashboardAgent = function () {
 
       resetEventMetrics();
     });
-
   };
 
-  var startPump = function () {
+  const startPump = function () {
     if (enabled) {
-      socket = new SocketIO("http://localhost:" + options.port);
+      socket = new SocketIO(`http://localhost:${options.port}`);
       blocked(_delayed, { threshold: options.blockedThreshold });
       options.intervalId = setInterval(_emitStats, options.refreshInterval);
     }
   };
 
-  var destroy = function () {
+  const destroy = function () {
     if (socket) {
       socket.close();
       socket = null;
@@ -97,10 +92,10 @@ var dashboardAgent = function () {
   startPump();
 
   return {
-    _delayed: _delayed,
-    _getStats: _getStats,
-    _emitStats: _emitStats,
-    destroy: destroy
+    _delayed,
+    _getStats,
+    _emitStats,
+    destroy
   };
 };