- Update eslint and related devDependencies to latest version

- Tests no longer run tap from the command line
- Cluster test should no longer intermittenly hang
- Reduce the opportunities for test.end to be called multiple times
- Split tests into multiple files
- Add a noColor option to ensure consistent behavior
- Move minimum node version from 8 to 10
- Update tap to latest version
- Drop node 8 from travis and add node 14

Author: bjornstar

.eslintrc

@@ -14,6 +14,7 @@
     "vars-on-top": 0,
     "no-console": 0,
     "no-param-reassign": 0,
-    "no-use-before-define": 0
+    "no-use-before-define": 0,
+    "strict": 0
   }
 }

.travis.yml

@@ -4,7 +4,7 @@ jobs:
       script: npm run lint
 language: node_js
 node_js:
+  - 14
   - 12
   - 10
-  - 8
 sudo: false

lib/log.js

@@ -7,22 +7,26 @@ var colors = {
   warn: '33'
 };
 
+function noop(s) { return s; }
+
+function colorFactory(enableColor) {
+  return enableColor ? function (s, c) {
+    return '\x1B[' + c + 'm' + s + '\x1B[0m';
+  } : noop;
+}
+
 /**
  * Logs a message to the console. The level is displayed in ANSI colors,
  * either bright red in case of an error or green otherwise.
  */
 module.exports = function (cfg) {
-  function color(s, c) {
-    if (process.stdout.isTTY) {
-      return '\x1B[' + c + 'm' + s + '\x1B[0m';
-    }
-    return s;
-  }
+  var enableColor = !(cfg.noColor || !process.stdout.isTTY);
+  var color = colorFactory(enableColor);
 
   function log(msg, level) {
-    if (cfg.timestamp) msg = color(fmt(new Date(), cfg.timestamp), '39') + ' ' + msg;
+    var timestamp = cfg.timestamp ? color(fmt(new Date(), cfg.timestamp), '39') + ' ' : '';
     var c = colors[level.toLowerCase()] || '32';
-    var output = '[' + color(level.toUpperCase(), c) + '] ' + msg;
+    var output = '[' + color(level.toUpperCase(), c) + '] ' + timestamp + msg;
     console.log(output);
     return output;
   }

package.json

@@ -24,11 +24,11 @@
   "main": "./lib",
   "preferGlobal": true,
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "scripts": {
     "lint": "eslint lib test",
-    "test": "tap test/*.js"
+    "test": "node test"
   },
   "dependencies": {
     "dateformat": "^3.0.3",
@@ -40,10 +40,11 @@
   },
   "devDependencies": {
     "coffeescript": "^2.4.1",
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.2",
-    "tap": "^13.1.2",
+    "eslint": "^7.3.1",
+    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint-plugin-import": "^2.22.0",
+    "nyc": "^15.1.0",
+    "tap": "^14.10.7",
     "touch": "^3.1.0"
   }
 }

test/fixture/catchNoSuchModule.js

@@ -1,5 +1,4 @@
 try {
-  /* eslint-disable import/no-unresolved */
   require('some_module_that_does_not_exist');
 } catch (err) {
   console.log('Caught', err);

test/fixture/cluster.js

@@ -1,30 +1,34 @@
 var cluster = require('cluster');
 
-function createWorker(i) {
-  var worker = cluster.fork();
-  worker.on('message', function (msg) {
-    console.log('Message from worker', i, ':', msg);
-  });
-  worker.on('disconnect', function () {
-    console.log('Worker disconnected', i);
-  });
-  return worker;
-}
-
-var workers = [];
-
 if (cluster.isMaster) {
+  function createWorker(i) {
+    var worker = cluster.fork();
+    worker.on('message', function (msg) {
+      console.log('Message from worker' + i + ':', msg);
+    });
+    worker.on('exit', function (code) {
+      console.log(`Worker #${i} exited with code: ${code}`);
+    });
+    return worker;
+  }
+
   for (var i = 0; i < 2; i += 1) {
     console.log('Forking worker', i);
-    workers.push(createWorker(i));
+    createWorker(i);
   }
-  process.on('SIGTERM', function () {
+  process.once('SIGTERM', function () {
     console.log('Master received SIGTERM');
-    workers.forEach(function (worker) {
-      worker.disconnect();
+    cluster.disconnect(function () {
+      console.log('All workers disconnected.');
     });
   });
 } else {
+  var server = require('./server');
+  process.on('disconnect', function () {
+    console.log(process.pid, 'disconnect received, shutting down');
+    if (server.lisening) {
+      server.close();
+    }
+  });
   process.send('Hello');
-  require('./server');
 }

test/fixture/ipc-server.js

@@ -1,4 +1,3 @@
-
 var http = require('http');
 var message = require('./message');
 

test/fixture/noSuchModule.js

@@ -1,2 +1 @@
-/* eslint-disable import/no-unresolved */
 require('some_module_that_does_not_exist');

test/fixture/server.coffee

@@ -8,9 +8,11 @@ server = http.createServer (req, res) ->
     res.write message
     res.end '\n'
 
-server.listen 8080
+server.once 'listening', ->
+  addr = this.address()
+  console.log 'Server listening on %s:%s', addr.address, addr.port
+  console.log message
+.listen 0
 
-console.log 'Server running at http://localhost:8080/'
-console.log message
-
-process.on 'SIGTERM', -> server.close()
+process.once 'SIGTERM', -> server.close()
+process.once 'exit', -> console.log 'exit'

test/fixture/server.js

@@ -1,4 +1,3 @@
-
 var http = require('http');
 var message = require('./message');
 
@@ -11,19 +10,20 @@ var server = http.createServer(function (req, res) {
   res.end('\n');
 });
 
-server.on('listening', function () {
+server.once('listening', function () {
   var addr = this.address();
   console.log('Server listening on %s:%s', addr.address, addr.port);
   console.log(message);
 }).listen(0);
 
-process.on('SIGTERM', function () {
-  server.close();
-  setTimeout(function () { console.log('3'); }, 200);
-  setTimeout(function () { console.log('2'); }, 400);
-  setTimeout(function () { console.log('1'); }, 600);
+process.once('SIGTERM', function () {
+  if (server.listening) {
+    server.close();
+  }
 });
 
-process.on('exit', function () {
+process.once('exit', function() {
   console.log('exit');
 });
+
+module.exports = server;