@signalk/streams 5.1.1 → 5.1.4

package/autodetect.js

@@ -114,8 +114,11 @@ Splitter.prototype._transform = function (msg, encoding, _done) {
         try {
           const parsed = JSON.parse(msg.data)
           const timestamp = new Date(Number(msg.timestamp))
-          parsed.updates &&
-            parsed.updates.forEach((update) => (update.timestamp = timestamp))
+          if (parsed.updates) {
+            parsed.updates.forEach((update) => {
+              update.timestamp = timestamp
+            })
+          }
           this.push(parsed)
           this.demuxEmitData(parsed)
         } catch (e) {

package/n2k-signalk.js

@@ -71,7 +71,7 @@ function ToSignalK(options) {
   })
 
   this.n2kMapper.on('n2kSourceMetadataTimeout', (pgn, src) => {
-    if (pgn == 60928) {
+    if (Number(pgn) === 60928) {
       console.warn(`n2k-signalk: unable to detect can name for src ${src}`)
       this.sourceMeta[src].unknowCanName = true
     }
@@ -101,8 +101,10 @@ ToSignalK.prototype.isFiltered = function (source) {
       return (
         (!filter.source ||
           filter.source.length === 0 ||
-          filter.source == sFilter) &&
-        (!filter.pgn || filter.pgn.length === 0 || filter.pgn == source.pgn)
+          filter.source === sFilter) &&
+        (!filter.pgn ||
+          filter.pgn.length === 0 ||
+          String(filter.pgn) === String(source.pgn))
       )
     })
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "5.1.1",
+  "version": "5.1.4",
   "description": "Utilities for handling streams of Signal K data",
   "main": "index.js",
   "scripts": {

package/serialport.js

@@ -82,13 +82,52 @@ function SerialStream(options) {
 
   const createDebug = options.createDebug || require('debug')
   this.debug = createDebug('signalk:streams:serialport')
+
+  let pendingWrites = 0
+  const stdOutEvents = isArray(this.options.toStdout)
+    ? this.options.toStdout
+    : [this.options.toStdout]
+  const standardOutEventName = `serial-${this.options.providerId}-toStdout`
+  stdOutEvents.push(standardOutEventName)
+
+  const that = this
+  stdOutEvents.forEach((event) => {
+    const onDrain = () => {
+      pendingWrites--
+    }
+
+    that.options.app.on(event, (d) => {
+      if (pendingWrites > that.maxPendingWrites) {
+        that.debug('Buffer overflow, not writing:' + d)
+        return
+      }
+      that.debug('Writing:' + d)
+      if (isBuffer(d)) {
+        that.serial.write(d)
+      } else {
+        that.serial.write(d + '\r\n')
+      }
+      setImmediate(() => {
+        that.options.app.emit('connectionwrite', {
+          providerId: that.options.providerId
+        })
+      })
+      pendingWrites++
+      that.serial.drain(onDrain)
+    })
+  })
+
+  this.options.app.emitPropertyValue('serialport', {
+    id: this.options.providerId,
+    eventNames: {
+      toStdout: standardOutEventName
+    }
+  })
 }
 
 require('util').inherits(SerialStream, Transform)
 
 SerialStream.prototype.start = function () {
-  const that = this
-
   if (this.serial !== null) {
     this.serial.unpipe(this)
     this.serial.removeAllListeners()
@@ -146,36 +185,6 @@ SerialStream.prototype.start = function () {
       this.scheduleReconnect()
     }.bind(this)
   )
-
-  let pendingWrites = 0
-  const stdOutEvent = this.options.toStdout
-  if (stdOutEvent) {
-    ;(isArray(stdOutEvent) ? stdOutEvent : [stdOutEvent]).forEach((event) => {
-      const onDrain = () => {
-        pendingWrites--
-      }
-
-      that.options.app.on(event, (d) => {
-        if (pendingWrites > that.maxPendingWrites) {
-          that.debug('Buffer overflow, not writing:' + d)
-          return
-        }
-        that.debug('Writing:' + d)
-        if (isBuffer(d)) {
-          that.serial.write(d)
-        } else {
-          that.serial.write(d + '\r\n')
-        }
-        setImmediate(() => {
-          that.options.app.emit('connectionwrite', {
-            providerId: that.options.providerId
-          })
-        })
-        pendingWrites++
-        that.serial.drain(onDrain)
-      })
-    })
-  }
 }
 
 SerialStream.prototype.end = function () {

package/simple.js

@@ -97,6 +97,7 @@ function Simple(options) {
   const dataReceivedEventName = `${options.subOptions.providerId}-received`
 
   const spy = new Transform({
+    objectMode: true,
     transform(chunk, encoding, callback) {
       options.app.emit(dataReceivedEventName, chunk)
       callback(null, chunk)
@@ -119,7 +120,9 @@ function Simple(options) {
         transform(delta, encoding, callback) {
           if (delta.updates) {
             const now = new Date().toISOString()
-            delta.updates.forEach((update) => (update.timestamp = now))
+            delta.updates.forEach((update) => {
+              update.timestamp = now
+            })
           }
           callback(null, delta)
         }