@signalk/streams 4.0.0 → 4.1.0

package/autodetect.js

@@ -113,6 +113,9 @@ Splitter.prototype._transform = function (msg, encoding, _done) {
       default:
         try {
           const parsed = JSON.parse(msg.data)
+          const timestamp = new Date(Number(msg.timestamp))
+          parsed.updates &&
+            parsed.updates.forEach((update) => (update.timestamp = timestamp))
           this.push(parsed)
           this.demuxEmitData(parsed)
         } catch (e) {
@@ -137,10 +140,12 @@ function ToTimestamped(deMultiplexer, options) {
 }
 require('util').inherits(ToTimestamped, Transform)
 
+// runs only once, self-assigns the actual transform functions
+// on first call
 ToTimestamped.prototype._transform = function (msg, encoding, done) {
   const line = msg.toString()
   this.multiplexedFormat =
-    line.length > 16 && line.charAt(13) === ';' && line.charAt(15) === ';'
+    line.length > 16 && line.charAt(13) === ';' && line.split(';').length >= 3
   if (this.multiplexedFormat) {
     if (this.options.noThrottle) {
       this.deMultiplexer.toTimestamped.pipe(this.deMultiplexer.splitter)
@@ -176,7 +181,11 @@ ToTimestamped.prototype.handleMixed = function (msg, encoding, done) {
 ToTimestamped.prototype.handleMultiplexed = function (msg, encoding, done) {
   const line = msg.toString()
   const parts = line.split(';')
-  this.push({ timestamp: parts[0], discriminator: parts[1], data: parts[2] })
+  this.push({
+    timestamp: parts[0],
+    discriminator: parts[1],
+    data: parts.slice(2).join(';'),
+  })
   done()
 }
 

package/canboatjs.js

@@ -29,10 +29,12 @@ function CanboatJs(options) {
 
   this.fromPgn.on('warning', (pgn, warning) => {
     debug(`[warning] ${pgn.pgn} ${warning}`)
+    options.app.emit(`canboatjs:warning`, warning)
   })
 
   this.fromPgn.on('error', (pgn, err) => {
     console.error(pgn.input, err.message)
+    options.app.emit(`canboatjs:error`, err)
   })
 
   this.app = options.app
@@ -48,12 +50,16 @@ CanboatJs.prototype._transform = function (chunk, encoding, done) {
       pgnData.timestamp = new Date(Number(chunk.timestamp)).toISOString()
       this.push(pgnData)
       this.app.emit(this.analyzerOutEvent, pgnData)
+    } else {
+      this.app.emit('canboatjs:unparsed:object', chunk)
     }
   } else {
     const pgnData = this.fromPgn.parse(chunk)
     if (pgnData) {
       this.push(pgnData)
       this.app.emit(this.analyzerOutEvent, pgnData)
+    } else {
+      this.app.emit('canboatjs:unparsed:data', chunk)
     }
   }
   done()

package/package.json

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