@signalk/streams 4.4.1 → 4.5.0

package/autodetect.js

@@ -50,7 +50,7 @@ function DeMultiplexer(options) {
 
   this.toTimestamped = new ToTimestamped(this, options)
   this.timestampThrottle = new TimestampThrottle({
-    getMilliseconds: (msg) => msg.timestamp,
+    getMilliseconds: (msg) => msg.timestamp
   })
   this.splitter = new Splitter(this, options)
   this.options = options
@@ -190,7 +190,7 @@ ToTimestamped.prototype.handleMultiplexed = function (msg, encoding, done) {
   this.push({
     timestamp: parts[0],
     discriminator: parts[1],
-    data: parts.slice(2).join(';'),
+    data: parts.slice(2).join(';')
   })
   done()
 }

package/canboatjs.js

@@ -20,7 +20,7 @@ const _ = require('lodash')
 
 function CanboatJs(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 
   this.fromPgn = new FromPgn(options)

package/execute.js

@@ -49,7 +49,6 @@ function Execute(options) {
 require('util').inherits(Execute, Transform)
 
 Execute.prototype._transform = function (chunk, encoding, done) {
-  const data = chunk.toString()
   this.analyzerProcess.stdin.write(chunk.toString())
   done()
 }

package/folderstream.js

@@ -3,7 +3,7 @@ const fs = require('fs')
 
 function FolderStreamProvider(folder) {
   Transform.call(this, {
-    objectMode: false,
+    objectMode: false
   })
   this.folder = folder
   this.fileIndex = 0

package/from_json.js

@@ -29,7 +29,7 @@ const Transform = require('stream').Transform
 
 function FromJson() {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 }
 
@@ -39,7 +39,7 @@ FromJson.prototype._transform = function (chunk, encoding, done) {
   let parsed = null
   try {
     parsed = JSON.parse(chunk.toString())
-  } catch (ex) {
+  } catch (_) {
     console.error('Could not parse JSON:' + chunk.toString())
   }
   if (parsed) {

package/gpsd.js

@@ -35,7 +35,7 @@ const GpsdClient = require('node-gpsd-client')
 
 function Gpsd(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 
   const port = options.port || 2947
@@ -59,11 +59,11 @@ function Gpsd(options) {
           options.providerId,
           `${hostname}:${port}: ` + msg
         )
-      },
+      }
     },
     parse: false,
     reconnectThreshold: noDataReceivedTimeout,
-    reconnectInterval: noDataReceivedTimeout / 2,
+    reconnectInterval: noDataReceivedTimeout / 2
   })
 
   setProviderStatus(`Connecting to ${hostname}:${port}`)
@@ -73,7 +73,7 @@ function Gpsd(options) {
     this.listener.watch({
       class: 'WATCH',
       nmea: true,
-      json: false,
+      json: false
     })
   })
 

package/keys-filter.js

@@ -4,7 +4,7 @@ const Transform = require('stream').Transform
 
 function ToSignalK(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 
   const createDebug = options.createDebug || require('debug')
@@ -44,18 +44,18 @@ ToSignalK.prototype._transform = function (chunk, encoding, done) {
 
         if (values.length > 0) {
           const upd = {
-            values,
+            values
           }
 
-          if (update.hasOwnProperty('$source')) {
+          if (update.$source) {
             upd.$source = update.$source
           }
 
-          if (update.hasOwnProperty('source')) {
+          if (update.source) {
             upd.source = update.source
           }
 
-          if (update.hasOwnProperty('timestamp')) {
+          if (update.timestamp) {
             upd.timestamp = update.timestamp
           }
 

package/liner.js

@@ -30,7 +30,7 @@ require('util').inherits(Liner, Transform)
 
 function Liner(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   this.doPush = this.push.bind(this)
   this.lineSeparator = options.lineSeparator || '\n'

package/log.js

@@ -34,7 +34,7 @@ const getLogger = require('./logging').getLogger
 
 function Log(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 
   this.logger = getLogger(options.app, options.discriminator, options.logdir)
@@ -48,8 +48,4 @@ Log.prototype._transform = function (msg, encoding, done) {
   done()
 }
 
-function pad(num) {
-  return (num > 9 ? '' : '0') + num
-}
-
 module.exports = Log

package/logging.js

@@ -20,13 +20,13 @@ let debug = require('debug')('signalk:streams:logging')
 const fs = require('fs')
 const { isUndefined } = require('lodash')
 
-const filenamePattern = /skserver\-raw\_\d\d\d\d\-\d\d\-\d\dT\d\d\.log/
+const filenamePattern = /skserver-raw_\d\d\d\d-\d\d-\d\dT\d\d\.log/
 const loggers = {}
 
 module.exports = {
   getLogger,
   getFullLogDir,
-  listLogFiles,
+  listLogFiles
 }
 
 class FileTimestampStreamWithDelete extends FileTimestampStream {

package/mdns-ws.js

@@ -18,11 +18,9 @@ const Transform = require('stream').Transform
 
 const SignalK = require('@signalk/client')
 
-const WebSocket = require('ws')
-
 function MdnsWs(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   this.options = options
   this.selfHost = options.app.config.getExternalHostname() + '.'
@@ -67,7 +65,7 @@ function MdnsWs(options) {
       autoConnect: false,
       deltaStreamBehaviour,
       rejectUnauthorized: !(options.selfsignedcert === true),
-      wsKeepaliveInterval: 10,
+      wsKeepaliveInterval: 10
     })
     this.connect(this.signalkClient)
   } else {
@@ -155,9 +153,8 @@ MdnsWs.prototype.connect = function (client) {
         that.dataDebug(JSON.stringify(data))
       }
       data.updates.forEach(function (update) {
-        update[
-          '$source'
-        ] = `${that.options.providerId}.${client.options.hostname}:${client.options.port}`
+        update['$source'] =
+          `${that.options.providerId}.${client.options.hostname}:${client.options.port}`
       })
     }
 
@@ -165,6 +162,6 @@ MdnsWs.prototype.connect = function (client) {
   })
 }
 
-MdnsWs.prototype._transform = function (chunk, encoding, done) {}
+MdnsWs.prototype._transform = function () {}
 
 module.exports = MdnsWs

package/n2k-signalk.js

@@ -22,7 +22,7 @@ require('util').inherits(ToSignalK, Transform)
 
 function ToSignalK(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   const n2kOutEvent = 'nmea2000JsonOut'
   this.sourceMeta = {}
@@ -43,7 +43,7 @@ function ToSignalK(options) {
     const existing = this.sourceMeta[n2k.src] || {}
     this.sourceMeta[n2k.src] = {
       ...existing,
-      ...meta,
+      ...meta
     }
     const delta = {
       context: this.app.selfContext,
@@ -54,15 +54,15 @@ function ToSignalK(options) {
             label: this.options.providerId,
             type: 'NMEA2000',
             pgn: Number(n2k.pgn),
-            src: n2k.src.toString(),
+            src: n2k.src.toString()
           },
           timestamp:
             n2k.timestamp.substring(0, 10) +
             'T' +
             n2k.timestamp.substring(11, n2k.timestamp.length),
-          values: [],
-        },
-      ],
+          values: []
+        }
+      ]
     }
     this.app.deltaCache.setSourceDelta(
       `${this.options.providerId}.${n2k.src}`,
@@ -164,9 +164,9 @@ ToSignalK.prototype._transform = function (chunk, encoding, done) {
                       updates: [
                         {
                           source: update.source,
-                          values: [copy],
-                        },
-                      ],
+                          values: [copy]
+                        }
+                      ]
                     }
                     delete this.notifications[kv.path][src]
                     clearInterval(interval)
@@ -175,7 +175,7 @@ ToSignalK.prototype._transform = function (chunk, encoding, done) {
                 }, 5000)
                 this.notifications[kv.path][src] = {
                   lastTime: Date.now(),
-                  interval: interval,
+                  interval: interval
                 }
               } else {
                 this.notifications[kv.path][src].lastTime = Date.now()

package/n2kAnalyzer.js

@@ -18,7 +18,7 @@ const Transform = require('stream').Transform
 
 function N2KAnalyzer(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 
   this.analyzerOutEvent = options.analyzerOutEvent || 'N2KAnalyzerOut'
@@ -26,12 +26,12 @@ function N2KAnalyzer(options) {
   if (process.platform === 'win32') {
     this.analyzerProcess = require('child_process').spawn('cmd', [
       '/c',
-      'analyzer -json -si',
+      'analyzer -json -si'
     ])
   } else {
     this.analyzerProcess = require('child_process').spawn('sh', [
       '-c',
-      'analyzer -json -si',
+      'analyzer -json -si'
     ])
   }
   this.analyzerProcess.stderr.on('data', function (data) {

package/nmea0183-signalk.js

@@ -37,7 +37,7 @@ const FromPgn = require('@canboat/canboatjs').FromPgn
 
 function Nmea0183ToSignalK(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   this.debug = (options.createDebug || require('debug'))(
     'signalk:streams:nmea0183-signalk'

package/nullprovider.js

@@ -20,9 +20,9 @@
 
 const Transform = require('stream').Transform
 
-function NullProvider(options) {
+function NullProvider() {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "description": "Utilities for handling streams of Signal K data",
   "main": "index.js",
   "scripts": {
@@ -38,8 +38,5 @@
   },
   "optionalDependencies": {
     "serialport": "^11.0.0"
-  },
-  "devDependencies": {
-    "prettier": "2.5.1"
   }
 }

package/replacer.js

@@ -20,7 +20,7 @@ require('util').inherits(Replacer, Transform)
 
 function Replacer(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   this.doPush = this.push.bind(this)
   this.regexp = new RegExp(options.regexp, 'gu')

package/s3.js

@@ -27,7 +27,7 @@ const AWS = require('aws-sdk')
 
 function S3Provider({ bucket, prefix }) {
   Transform.call(this, {
-    objectMode: false,
+    objectMode: false
   })
   this.Bucket = bucket
   this.Prefix = prefix
@@ -41,7 +41,7 @@ S3Provider.prototype.pipe = function (pipeTo) {
   const s3 = new AWS.S3()
   const params = {
     Bucket: this.Bucket,
-    Prefix: this.Prefix,
+    Prefix: this.Prefix
   }
   console.log('listobjects')
   s3.listObjects(params)
@@ -51,11 +51,11 @@ S3Provider.prototype.pipe = function (pipeTo) {
       const jobs = data.Contents.map(
         (item, i) =>
           function () {
-            return new Promise((resolve, reject) => {
+            return new Promise((resolve) => {
               console.log('Starting key ' + item.Key)
               const objectParams = {
                 Bucket: params.Bucket,
-                Key: item.Key,
+                Key: item.Key
               }
               const request = s3.getObject(objectParams)
               request.on('error', (err) => {

package/serialport.js

@@ -107,7 +107,7 @@ SerialStream.prototype.start = function () {
 
   this.serial = new SerialPort({
     path: this.options.device,
-    baudRate: this.options.baudrate,
+    baudRate: this.options.baudrate
   })
 
   this.serial.on(
@@ -168,7 +168,7 @@ SerialStream.prototype.start = function () {
         }
         setImmediate(() => {
           that.options.app.emit('connectionwrite', {
-            providerId: that.options.providerId,
+            providerId: that.options.providerId
           })
         })
         pendingWrites++

package/simple.js

@@ -1,5 +1,4 @@
 const Transform = require('stream').Transform
-const Writable = require('stream').Writable
 const _ = require('lodash')
 const N2kAnalyzer = require('./n2kAnalyzer')
 const FromJson = require('./from_json')
@@ -34,7 +33,7 @@ function Simple(options) {
     ...options.subOptions,
     emitPropertyValue,
     onPropertyValues,
-    createDebug,
+    createDebug
   }
 
   options.subOptions.providerId = options.providerId
@@ -104,7 +103,7 @@ function Simple(options) {
             delta.updates.forEach((update) => (update.timestamp = now))
           }
           callback(null, delta)
-        },
+        }
       })
     )
   }
@@ -135,8 +134,8 @@ const getLogger = (app, logging, discriminator) =>
     ? [
         new Log({
           app: app,
-          discriminator,
-        }),
+          discriminator
+        })
       ]
     : []
 
@@ -147,7 +146,7 @@ const discriminatorByDataType = {
   NMEA2000: 'A',
   NMEA0183: 'N',
   SignalK: 'I',
-  Seatalk: 'N',
+  Seatalk: 'N'
 }
 
 const dataTypeMapping = {
@@ -156,14 +155,14 @@ const dataTypeMapping = {
       ? [new FromJson(options.subOptions)]
       : [],
   Seatalk: (options) => [
-    new nmea0183_signalk({ ...options.subOptions, validateChecksum: false }),
+    new nmea0183_signalk({ ...options.subOptions, validateChecksum: false })
   ],
   NMEA0183: (options) => {
     const result = [new nmea0183_signalk(options.subOptions)]
     if (options.type === 'FileStream') {
       result.unshift(
         new Throttle({
-          rate: options.subOptions.throttleRate || 1000,
+          rate: options.subOptions.throttleRate || 1000
         })
       )
     }
@@ -190,7 +189,7 @@ const dataTypeMapping = {
         new TimestampThrottle({
           getMilliseconds: (msg) => {
             return msg.timer * 1000
-          },
+          }
         })
       )
     } // else
@@ -210,7 +209,7 @@ const dataTypeMapping = {
       new Ydwg02(
         options.subOptions,
         options.subOptions.type === 'ydwg02-usb-canboatjs' ? 'usb' : 'network'
-      ),
+      )
     ]
     if (options.type === 'FileStream') {
       result.push(new TimestampThrottle())
@@ -231,7 +230,7 @@ const dataTypeMapping = {
     }
     return result.concat([new N2kToSignalK(options.subOptions)])
   },
-  Multiplexed: (options) => [new MultiplexedLog(options.subOptions)],
+  Multiplexed: (options) => [new MultiplexedLog(options.subOptions)]
 }
 
 const pipeStartByType = {
@@ -240,7 +239,7 @@ const pipeStartByType = {
   Execute: executeInput,
   FileStream: fileInput,
   SignalK: signalKInput,
-  Seatalk: seatalkInput,
+  Seatalk: seatalkInput
 }
 
 function nmea2000input(subOptions, logging) {
@@ -252,15 +251,15 @@ function nmea2000input(subOptions, logging) {
     return [
       new actisenseSerial({
         ...subOptions,
-        plainText: logging,
-      }),
+        plainText: logging
+      })
     ]
   } else if (subOptions.type === 'canbus-canboatjs') {
     return [
       new require('./canbus')({
         ...subOptions,
-        canDevice: subOptions.interface,
-      }),
+        canDevice: subOptions.interface
+      })
     ]
   } else if (subOptions.type === 'ikonvert-canboatjs') {
     const serialport = require('./serialport')
@@ -268,49 +267,49 @@ function nmea2000input(subOptions, logging) {
       new serialport({
         ...subOptions,
         baudrate: 230400,
-        toStdout: 'ikonvertOut',
-      }),
+        toStdout: 'ikonvertOut'
+      })
     ]
   } else if (subOptions.type === 'ydwg02-canboatjs') {
     return [
       new Tcp({
         ...subOptions,
-        outEvent: 'ydwg02-out',
+        outEvent: 'ydwg02-out'
       }),
-      new Liner(subOptions),
+      new Liner(subOptions)
     ]
   } else if (subOptions.type === 'ydwg02-udp-canboatjs') {
     return [
       new Udp({
         ...subOptions,
-        outEvent: 'ydwg02-out',
+        outEvent: 'ydwg02-out'
       }),
-      new Liner(subOptions),
+      new Liner(subOptions)
     ]
   } else if (subOptions.type === 'navlink2-tcp-canboatjs') {
     return [
       new Tcp({
         ...subOptions,
-        outEvent: 'navlink2-out',
+        outEvent: 'navlink2-out'
       }),
-      new Liner(subOptions),
+      new Liner(subOptions)
     ]
   } else if (subOptions.type === 'w2k-1-n2k-ascii-canboatjs') {
     return [
       new Tcp({
         ...subOptions,
-        outEvent: 'w2k-1-out',
+        outEvent: 'w2k-1-out'
       }),
       new Liner(subOptions),
-      new W2k01(subOptions, 'ascii', 'w2k-1-out'),
+      new W2k01(subOptions, 'ascii', 'w2k-1-out')
     ]
   } else if (subOptions.type === 'w2k-1-n2k-actisense-canboatjs') {
     return [
       new Tcp({
         ...subOptions,
-        outEvent: 'w2k-1-out',
+        outEvent: 'w2k-1-out'
       }),
-      new W2k01(subOptions, 'actisense', 'w2k-1-out'),
+      new W2k01(subOptions, 'actisense', 'w2k-1-out')
     ]
   } else if (subOptions.type === 'navlink2-udp-canboatjs') {
     return [new Udp(subOptions), new Liner(subOptions)]
@@ -320,8 +319,8 @@ function nmea2000input(subOptions, logging) {
       new serialport({
         ...subOptions,
         baudrate: 38400,
-        toStdout: 'ydwg02-out',
-      }),
+        toStdout: 'ydwg02-out'
+      })
     ]
   } else {
     let command
@@ -342,9 +341,9 @@ function nmea2000input(subOptions, logging) {
         command: command,
         toChildProcess: toChildProcess,
         app: subOptions.app,
-        providerId: subOptions.providerId,
+        providerId: subOptions.providerId
       }),
-      new Liner(subOptions),
+      new Liner(subOptions)
     ]
   }
 }
@@ -369,7 +368,7 @@ function nmea0183input(subOptions) {
       pipePart.push(
         new Replacer({
           regexp: '\u0000',
-          template: '',
+          template: ''
         })
       )
     }
@@ -380,7 +379,7 @@ function nmea0183input(subOptions) {
           pipePart.push(
             new Replacer({
               regexp: `^...${sentence}.*`,
-              template: '',
+              template: ''
             })
           )
         }
@@ -388,7 +387,7 @@ function nmea0183input(subOptions) {
     }
     return pipePart
   } else {
-    throw new Error(`Unknown networking tyoe: ${options.networking}`)
+    throw new Error(`Unknown networking tyoe: ${subOptions.networking}`)
   }
 }
 

package/splitting-liner.js

@@ -30,7 +30,7 @@ require('util').inherits(SplittingLiner, Transform)
 
 function SplittingLiner(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   this.doPush = this.push.bind(this)
   this.lineSeparator = options.lineSeparator || '\n'

package/tcp.js

@@ -55,7 +55,7 @@ TcpStream.prototype.pipe = function (pipeTo) {
         that.tcpStream.write(d)
         setImmediate(() => {
           that.options.app.emit('connectionwrite', {
-            providerId: that.options.providerId,
+            providerId: that.options.providerId
           })
         })
       }
@@ -77,7 +77,7 @@ TcpStream.prototype.pipe = function (pipeTo) {
     )
   }
 
-  const re = require('reconnect-core')(function () {
+  require('reconnect-core')(function () {
     return net.connect.apply(null, arguments)
   })({ maxDelay: 5 * 1000 }, (tcpStream) => {
     if (!isNaN(this.noDataReceivedTimeout)) {
@@ -110,7 +110,7 @@ TcpStream.prototype.pipe = function (pipeTo) {
       this.options.app.setProviderError(this.options.providerId, msg)
       that.debug(msg)
     })
-    .on('disconnect', (err) => {
+    .on('disconnect', () => {
       delete this.tcpStream
       that.debug(`Disconnected ${this.options.host} ${this.options.port}`)
     })

package/timestamp-throttle.js

@@ -25,7 +25,7 @@ rate control
 
 function TimestampThrottle(options) {
   Transform.call(this, {
-    objectMode: true,
+    objectMode: true
   })
   this.lastMsgMillis = new Date().getTime()
   this.getMilliseconds =

package/udp.js

@@ -37,7 +37,7 @@ const Transform = require('stream').Transform
 
 function Udp(options) {
   Transform.call(this, {
-    objectMode: false,
+    objectMode: false
   })
   this.options = options
   this.debug = (options.createDebug || require('debug'))('signalk:streams:udp')
@@ -62,7 +62,7 @@ Udp.prototype.pipe = function (pipeTo) {
     })
   }
 
-  socket.on('message', function (message, remote) {
+  socket.on('message', function (message) {
     self.debug(message.toString())
     self.push(message)
   })

package/.prettierrc.json

@@ -1,4 +0,0 @@
-{
-  "semi": false,
-  "singleQuote": true
-}