fix: upgrade packages to the latest versions

Author: dsueltenfuss

examples/basic-client.js

@@ -1,6 +1,6 @@
-var netcat = require('../index')
-var NetcatClient = netcat.client
+const netcat = require('../index')
+const NetcatClient = netcat.client
 
-var nc = new NetcatClient()
+const nc = new NetcatClient()
 
 process.stdin.pipe(nc.addr('127.0.0.1').port(6666).connect().pipe(process.stdout).stream())

examples/basic-server.js

@@ -1,6 +1,6 @@
-var netcat = require('../index')
-var NetcatServer = netcat.server
+const netcat = require('../index')
+const NetcatServer = netcat.server
 
-var nc = new NetcatServer()
+const nc = new NetcatServer()
 
 nc.k().port(6666).addr('127.0.0.1').listen().exec('/bin/sh')

lib/Client.js

@@ -1,6 +1,6 @@
 'use strict'
 const log = require('debug')
-var debug = log('netcat:client')
+let debug = log('netcat:client')
 const Netcat = require('./Netcat')
 const portScan = require('./portScan')
 const tcpClient = require('./tcpClient')
@@ -13,10 +13,12 @@ class Client extends Netcat {
     opts = opts || {}
     super(opts)
 
-    debug = opts.verbose ? function () {
-      var args = Array.prototype.slice.call(arguments)
-      process.stderr.write(args.join(' ') + '\n')
-    } : debug
+    debug = opts.verbose
+      ? function () {
+          const args = Array.prototype.slice.call(arguments)
+          process.stderr.write(args.join(' ') + '\n')
+        }
+      : debug
     this.debug = debug
     this._verbose = opts.verbose || false
     this._address = opts.address || '127.0.0.1'
@@ -73,12 +75,12 @@ class Client extends Netcat {
   }
 
   send (data, cb) {
-    var cbOrHost = (this._protocol === 'tcp') ? (cb || noop) : (cb || null)
+    const cbOrHost = (this._protocol === 'tcp') ? (cb || noop) : (cb || null)
 
     if (data && !Buffer.isBuffer(data)) {
       data = Buffer.from(data)
     }
-    var self = this
+    const self = this
     if (!this.client) return this
     if (self._interval) { /* delay */
       setTimeout(function () {
@@ -92,7 +94,7 @@ class Client extends Netcat {
 
   end (d) {
     if (this._protocol === 'udp') throw Error('end() method is tcp only')
-    var self = this
+    const self = this
     if (this._interval) {
       setTimeout(function () { /* delay */
         if (self.client) self.client.end(d) /* send data + EOF */

lib/Netcat.js

@@ -1,5 +1,5 @@
 'use strict'
-var debug = require('debug')('netcat:netcat')
+const debug = require('debug')('netcat:netcat')
 const EventEmitter = require('events').EventEmitter
 const through2 = require('through2')
 

lib/Server.js

@@ -1,6 +1,6 @@
 'use strict'
 const log = require('debug')
-var debug = log('netcat:server')
+let debug = log('netcat:server')
 const fs = require('fs')
 const Netcat = require('./Netcat')
 const tcpServer = require('./tcpServer')
@@ -14,10 +14,12 @@ class Server extends Netcat {
     opts = opts || {}
     super(opts)
 
-    debug = opts.verbose ? function () {
-      var args = Array.prototype.slice.call(arguments)
-      process.stderr.write(args.join(' ') + '\n')
-    } : debug
+    debug = opts.verbose
+      ? function () {
+          const args = Array.prototype.slice.call(arguments)
+          process.stderr.write(args.join(' ') + '\n')
+        }
+      : debug
     this.debug = debug
     this._verbose = opts.verbose || false
     this._address = opts.address || '0.0.0.0'
@@ -38,7 +40,7 @@ class Server extends Netcat {
   close (cb) {
     debug('Server: closing sockets...')
     cb = cb || noop
-    for (var c in this._clients) {
+    for (const c in this._clients) {
       this._clients[c].destroy() // closing existing sockets
     }
     try {

lib/portScan.js

@@ -1,14 +1,14 @@
 const eachSeries = require('async-each-series')
 
 module.exports = function (client, portsInterval, cb) {
-  var ports = []
+  let ports = []
   /* get and validate ports range */
   if (Number.isInteger(portsInterval)) {
     ports.push(portsInterval) // single port
   } else if (typeof portsInterval === 'string') {
-    var i = portsInterval.split('-')
-    var lowEnd = +i[0]
-    var highEnd = +i[1]
+    const i = portsInterval.split('-')
+    let lowEnd = +i[0]
+    const highEnd = +i[1]
     if (isNaN(lowEnd) || isNaN(highEnd)) throw Error('Scan: invalid ports range')
     while (lowEnd <= highEnd) {
       ports.push(lowEnd++)
@@ -26,7 +26,7 @@ module.exports = function (client, portsInterval, cb) {
 }
 
 function startScan (client, ports, cb) {
-  var outcome = {}
+  const outcome = {}
 
   eachSeries(ports, function (port, done) {
     client.port(port).connect()

lib/tcpClient.js

@@ -6,12 +6,12 @@ const waitTimer = util.waitTimer
 const hex = require('hexer')
 
 const noop = function () {}
-var hexer = hex.Transform({ prefix: '> ' }) // outcoming
-var hexPipeStarted = false
+const hexer = hex.Transform({ prefix: '> ' }) // outcoming
+let hexPipeStarted = false
 
 module.exports = function (debug, cb) {
   debug('connect() called')
-  var self = this
+  const self = this
   cb = cb || noop
 
   function _send (data, cb) {

lib/tcpServer.js

@@ -5,14 +5,14 @@ const fs = require('fs')
 const net = require('net')
 const stream = require('stream')
 const through2 = require('through2')
-const generate = require('nanoid/generate')
+const nanoid = require('nanoid')
 const hex = require('hexer')
 
-var hexerIn = hex.Transform({ prefix: '< ' })
-var hexerOut = hex.Transform({ prefix: '> ' })
+const hexerIn = hex.Transform({ prefix: '< ' })
+const hexerOut = hex.Transform({ prefix: '> ' })
 
 module.exports = function (debug) {
-  var self = this
+  const self = this
   this.server = net.createServer()
 
   function listening () {
@@ -40,12 +40,12 @@ module.exports = function (debug) {
       hexerOut.pipe(self._output)
     }
 
-    socket.id = generate('1234567890abcdefghpsxz', 7)
+    socket.id = nanoid.customAlphabet('1234567890abcdefghpsxz', 7)
     socket.setKeepAlive(!!self._keepalive)
     if (self._encoding) socket.setEncoding(self._encoding)
     self.emit('connection', socket)
 
-    var IPandPort = socket.remoteAddress + ':' + socket.remotePort
+    const IPandPort = socket.remoteAddress + ':' + socket.remotePort
     debug('New connection', socket.id, IPandPort)
     self._clients[socket.id] = socket
 
@@ -59,7 +59,7 @@ module.exports = function (debug) {
     } else if (self._serveStream) {
       debug('Serving given stream to the client', socket.id)
       if (Buffer.isBuffer(self._serveStream)) {
-        var pt = new stream.PassThrough()
+        const pt = new stream.PassThrough()
         pt.end(self._serveStream)
         pt.pipe(socket)
       } else {
@@ -140,7 +140,7 @@ module.exports = function (debug) {
 }
 
 function streamDebug (debug, IPandPort) {
-  var self = this
+  const self = this
   return through2(function (chunk, enc, cb) {
     debug('Got data from', IPandPort, '->', chunk)
     if (self._output) hexerIn.write(chunk) // hex Dump

lib/udpClient.js

@@ -3,16 +3,16 @@ const dgram = require('dgram')
 const stream = require('stream')
 const through2 = require('through2')
 const waitTimer = require('./util').waitTimer
-var pipe = stream.prototype.pipe
+const pipe = stream.prototype.pipe
 
 const hex = require('hexer')
-var hexerIn = hex.Transform({ prefix: '< ' })
-var hexerOut = hex.Transform({ prefix: '> ' })
+const hexerIn = hex.Transform({ prefix: '< ' })
+const hexerOut = hex.Transform({ prefix: '> ' })
 
 /* Inspired by https://github.com/dominictarr/broadcast-stream for piping */
 
 module.exports = function (debug) {
-  var self = this
+  const self = this
 
   self.client = dgram.createSocket({ type: 'udp4', reuseAddr: true })
 
@@ -37,10 +37,10 @@ module.exports = function (debug) {
     waitTimer.call(self)
   }
 
-  var latest = null
+  let latest = null
 
   function message (msg, rinfo) {
-    var _msg = self._encoding ? msg.toString(self._encoding) : msg
+    const _msg = self._encoding ? msg.toString(self._encoding) : msg
     debug('Msg from %s:%d : %s', rinfo.address, rinfo.port, _msg)
     msg = { data: _msg, rinfo: rinfo }
     // if paused, remember the latest item.
@@ -79,7 +79,7 @@ module.exports = function (debug) {
   self.client.resume = function () {
     self.client.paused = false
     if (latest) {
-      var msg = latest
+      const msg = latest
       latest = null
       self.client.emit('data', msg)
       self.emit('data', msg)

lib/udpServer.js

@@ -7,12 +7,12 @@ const udp = require('datagram-stream')
 const waitTimer = require('./util').waitTimer
 
 const hex = require('hexer')
-var hexerIn = hex.Transform({ prefix: '< ' })
-var hexerOut = hex.Transform({ prefix: '> ' })
+const hexerIn = hex.Transform({ prefix: '< ' })
+const hexerOut = hex.Transform({ prefix: '> ' })
 
 module.exports = function (debug) {
-  var self = this
-  var addresses = {}
+  const self = this
+  const addresses = {}
 
   self.server = udp({
     address: self._address,
@@ -22,8 +22,8 @@ module.exports = function (debug) {
     unicast: self._destination
   }, function (err) {
     if (err) return self.emit('error', err)
-    var ifaces = os.networkInterfaces()
-    for (var k in ifaces) {
+    const ifaces = os.networkInterfaces()
+    for (const k in ifaces) {
       ifaces[k].forEach(function (address) {
         addresses[address.address] = true
       })
@@ -47,11 +47,11 @@ module.exports = function (debug) {
   }
 
   self.server.on('data', function (d) {
-    var msg = self._encoding ? d.toString(self._encoding) : d
-    var rinfo = d.rinfo
+    const msg = self._encoding ? d.toString(self._encoding) : d
+    const rinfo = d.rinfo
     delete msg.rinfo
 
-    var addr = self.server.address()
+    const addr = self.server.address()
     if (addresses[rinfo.address] && rinfo.port === addr.port) {
       if (self._loopback === false) return
       rinfo.loopback = true
@@ -85,7 +85,7 @@ module.exports = function (debug) {
     } else if (self._serveStream) {
       debug('Serving given stream over UDP to', self._destination)
       if (Buffer.isBuffer(self._serveStream)) {
-        var pt = new stream.PassThrough()
+        const pt = new stream.PassThrough()
         pt.end(self._serveStream)
         pt.pipe(self.server)
       } else {

lib/util.js

@@ -5,16 +5,16 @@ const spawn = require('child_process').spawn
 
 /* Used from both Server and Client */
 function spawnProcess (inStream, outStream) {
-  var self = this
-  var debug = self.debug
-  var debugExec = log('netcat:exec')
+  const self = this
+  const debug = self.debug
+  const debugExec = log('netcat:exec')
   /* spawn exec */
   if (self._exec) {
     debug('Spawning', self._exec)
-    var sh = null
+    let sh = null
     if (self._exec.indexOf('|') !== -1) {
-      var cmd = (os.platform() === 'win32') ? 'cmd.exe' : 'sh'
-      var cmdO = (os.platform() === 'win32') ? '/C' : '-c'
+      const cmd = (os.platform() === 'win32') ? 'cmd.exe' : 'sh'
+      const cmdO = (os.platform() === 'win32') ? '/C' : '-c'
       debug('multiple commands detected, executing under shell:', cmd, cmdO)
       sh = spawn(cmd, [cmdO, self._exec], self._execOptions)
     } else {