Modernize code and drop old Node versions (#281)

* Modernize code and drop old Node versions

* update scripts and deps

* update ci

Author: jsumners

.eslintignore

@@ -38,7 +38,7 @@ jobs:
       contents: read
     strategy:
       matrix:
-        node-version: [14, 16, 18, 20, 22]
+        node-version: [20, 22, 24]
         os: [macos-latest, ubuntu-latest]
         exclude:
           - os: macos-latest

.eslintrc.yml

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('neostandard')({})

.github/workflows/ci.yml

@@ -1,13 +1,13 @@
 #! /usr/bin/env node
 
-'use strict';
+'use strict'
 
-const program = require('commander');
-const version = require('./package.json').version;
-const pinoGelf = require('./lib/pino-gelf');
+const program = require('commander')
+const version = require('./package.json').version
+const pinoGelf = require('./lib/pino-gelf')
 
 program
-  .version(version);
+  .version(version)
 
 program
   .command('log')
@@ -22,7 +22,7 @@ program
   .addOption(new program.Option('-v, --verbose', 'Output GELF to console'))
   .addOption(new program.Option('-t, --passthrough', 'Output original input to stdout to allow command chaining'))
   .action(function () {
-    const options = this.opts();
+    const options = this.opts()
 
     const opts = {
       customKeys: options.specifyCustomFields || [],
@@ -35,21 +35,21 @@ program
       port: options.port || 12201,
       verbose: (options.verbose && !options.passthrough) || false,
       passthrough: options.passthrough || false
-    };
-
-    switch(opts.protocol) {
-    case 'udp':
-    case 'http':
-    case 'https':
-    case 'tcp':
-    case 'tls':
-      break;
-    default:
-      throw new Error('Unsupported protocol ' + opts.protocol);
-    } 
-
-    pinoGelf(opts);
-  });
+    }
+
+    switch (opts.protocol) {
+      case 'udp':
+      case 'http':
+      case 'https':
+      case 'tcp':
+      case 'tls':
+        break
+      default:
+        throw new Error('Unsupported protocol ' + opts.protocol)
+    }
+
+    pinoGelf(opts)
+  })
 
 program
-  .parse(process.argv);
+  .parse(process.argv)

eslint.config.js

@@ -1,12 +1,12 @@
-'use strict';
+'use strict'
 
-const fastJsonParse = require('fast-json-parse');
-const pipeline = require('./pipeline');
-const pump = require('pump');
-const split = require('split2');
+const fastJsonParse = require('fast-json-parse')
+const pipeline = require('./pipeline')
+const pump = require('pump')
+const split = require('split2')
 
 module.exports = function (opts) {
-  const pipe = pipeline(opts);
-  pump(process.stdin, split(fastJsonParse), pipe);
-  process.on('SIGINT', function () { process.exit(0); });
-};
+  const pipe = pipeline(opts)
+  pump(process.stdin, split(fastJsonParse), pipe)
+  process.on('SIGINT', function () { process.exit(0) })
+}

index.js

@@ -1,45 +1,45 @@
-'use strict';
+'use strict'
 
-const through2 = require('through2');
-const transformer = require('./transformer');
-const utils = require('./utils');
-const Udp = require('./transports/udp');
-const Http = require('./transports/http');
-const Tcp = require('./transports/tcp');
+const through2 = require('through2')
+const transformer = require('./transformer')
+const utils = require('./utils')
+const Udp = require('./transports/udp')
+const Http = require('./transports/http')
+const Tcp = require('./transports/tcp')
 
 module.exports = function (opts) {
-  let transport;
-  switch(opts.protocol) {
-  case 'udp':
-    transport = new Udp(opts);
-    break;
-  case 'http':
-  case 'https':
-    transport = new Http(opts);
-    break;
-  case 'tcp':
-  case 'tls':
-    transport = new Tcp(opts);
-    break;
+  let transport
+  switch (opts.protocol) {
+    case 'udp':
+      transport = new Udp(opts)
+      break
+    case 'http':
+    case 'https':
+      transport = new Http(opts)
+      break
+    case 'tcp':
+    case 'tls':
+      transport = new Tcp(opts)
+      break
   }
 
   return through2.obj(function (data, enc, cb) {
     if (data.value) {
-      const transform = transformer(opts);
-      const message = transform(data.value);
+      const transform = transformer(opts)
+      const message = transform(data.value)
 
       if (opts.passthrough) {
         // Pass original input back to stdout to allow chaining of multiple commands
-        setImmediate(function () { process.stdout.write(`${JSON.stringify(data.value)}\n`); });
+        setImmediate(function () { process.stdout.write(`${JSON.stringify(data.value)}\n`) })
       } else if (opts.verbose) {
-        const stringify = utils.stringify(opts);
-        const messageString = stringify(message);
-        setImmediate(function () { process.stdout.write(`${messageString}\n`); });
+        const stringify = utils.stringify(opts)
+        const messageString = stringify(message)
+        setImmediate(function () { process.stdout.write(`${messageString}\n`) })
       }
 
-      transport.emit('log', message);
+      transport.emit('log', message)
     }
 
-    cb();
-  });
-};
+    cb()
+  })
+}

lib/pino-gelf.js

@@ -1,26 +1,26 @@
-'use strict';
+'use strict'
 
-const _ = require('lodash');
+const _ = require('lodash')
 
-const standardKeys = ['pid', 'hostname', 'name', 'level', 'time', 'msg', 'v'];
+const standardKeys = ['pid', 'hostname', 'name', 'level', 'time', 'msg', 'v']
 
 function filterStandardKeys (data) {
   return Object
     .keys(data)
-    .filter(function (key) { return !standardKeys.includes(key); });
+    .filter(function (key) { return !standardKeys.includes(key) })
 }
 
 module.exports = function (data) {
-  const expressKeys = filterStandardKeys(data);
-  const expressGelf = _.pick(data, expressKeys);
+  const expressKeys = filterStandardKeys(data)
+  const expressGelf = _.pick(data, expressKeys)
 
-  if(_.has(expressGelf, 'req') && _.has(expressGelf.req, 'headers')) {
-    expressGelf.req.headers = JSON.stringify(expressGelf.req.headers);
+  if (_.has(expressGelf, 'req') && _.has(expressGelf.req, 'headers')) {
+    expressGelf.req.headers = JSON.stringify(expressGelf.req.headers)
   }
 
-  if(_.has(expressGelf, 'res') && _.has(expressGelf.res, 'header')) {
-    expressGelf.res.header = JSON.stringify(expressGelf.res.header);
+  if (_.has(expressGelf, 'res') && _.has(expressGelf.res, 'header')) {
+    expressGelf.res.header = JSON.stringify(expressGelf.res.header)
   }
 
-  return expressGelf;
-};
+  return expressGelf
+}

lib/pipeline.js

@@ -1,11 +1,11 @@
-'use strict';
+'use strict'
 
-const buildStandardGelf = require('./standard-gelf');
+const buildStandardGelf = require('./standard-gelf')
 
 module.exports = function (/* opts */) {
   return function (data) {
-    const standardGelf = buildStandardGelf(data);
+    const standardGelf = buildStandardGelf(data)
 
-    return Object.assign({}, standardGelf /*, expressGelf */);
-  };
-};
+    return Object.assign({}, standardGelf /*, expressGelf */)
+  }
+}

lib/transformer/express-gelf.js

@@ -1,46 +1,45 @@
-const utils = require('./../utils');
+const utils = require('./../utils')
 
 module.exports = function (data) {
-
-  let mandatoryPayload = {
+  const mandatoryPayload = {
     version: '1.1',
     host: '0.0.0.0',
     short_message: '[empty message]',
-  };
+  }
 
-  let payload = {};
+  const payload = {}
 
   if (typeof data.hostname === 'string') {
-    payload.host = data.hostname;
+    payload.host = data.hostname
   }
 
   if (typeof data.msg === 'string') {
     // msg is a string
-    payload.short_message = data.msg.substring(0, 65);
+    payload.short_message = data.msg.substring(0, 65)
 
     // if (payload.short_message !== data.msg) {
-    payload.full_message = data.msg;
+    payload.full_message = data.msg
     // }
   } else if (typeof data.msg !== 'undefined') {
     // msg is something else
-    payload.full_message = JSON.stringify(data.msg);
+    payload.full_message = JSON.stringify(data.msg)
   }
 
   if (typeof data.time === 'number') {
-    payload.timestamp = data.time / 1000;
+    payload.timestamp = data.time / 1000
   }
 
   if (typeof data.level === 'number') {
-    payload.level = utils.pinoLevelToSyslogLevel(data.level);
+    payload.level = utils.pinoLevelToSyslogLevel(data.level)
   }
 
   // Add all additional fields as underscore prefixed string values
-  for (let [key, value] of Object.entries(data)) {
+  for (const [key, value] of Object.entries(data)) {
     // console.log(key, value)
     if (!['hostname', 'msg', 'time', 'level', 'pid', 'v'].includes(key)) {
-      payload[`_${key}`] = typeof value === 'string' ? value : JSON.stringify(value);
+      payload[`_${key}`] = typeof value === 'string' ? value : JSON.stringify(value)
     }
   }
 
-  return Object.assign({}, mandatoryPayload, payload);
-};
+  return Object.assign({}, mandatoryPayload, payload)
+}