Merge pull request #573 from minrk/npm-bump

consolidated nodejs bump

Author: consideRatio

bin/configurable-http-proxy

@@ -7,12 +7,13 @@
 //
 "use strict";
 
-var fs = require("fs"),
+const fs = require("fs"),
   pkg = require("../package.json"),
-  cli = require("commander"),
+  { Command } = require("commander"),
   tls = require("tls"),
   winston = require("winston");
 
+const cli = new Command();
 cli
   .version(pkg.version)
   .option("--ip <ip-address>", "Public-facing IP of the proxy")

lib/log.js

@@ -1,6 +1,5 @@
 "use strict";
-var strftime = require("strftime"),
-  winston = require("winston");
+const winston = require("winston");
 
 const simpleFormat = winston.format.printf((info) => {
   // console.log(info);
@@ -13,9 +12,7 @@ function defaultLogger(options) {
     winston.format.colorize(),
     winston.format.label({ label: "ConfigProxy" }),
     winston.format.splat(),
-    winston.format.timestamp({
-      format: () => strftime("%H:%M:%S.%L", new Date()),
-    }),
+    winston.format.timestamp(),
     simpleFormat
   );
   options.transports = [new winston.transports.Console()];

lib/testutil.js

@@ -149,5 +149,8 @@ exports.teardownServers = function (callback) {
   };
   for (var i = servers.length - 1; i >= 0; i--) {
     servers[i].close(onclose);
+    // closeAllConnections is implied in close in node >=19
+    // but this avoids waits between all tests with node 18
+    servers[i].closeAllConnections();
   }
 };