@signalk/streams 2.2.1 → 2.3.0

package/canboatjs.js

@@ -25,7 +25,7 @@ function CanboatJs(options) {
 
   this.fromPgn = new FromPgn(options)
   const createDebug = options.createDebug || require('debug')
-  const debug = createDebug('signalk:streams:nmea0183-signalk')
+  const debug = createDebug('signalk:streams:canboatjs')
 
   this.fromPgn.on('warning', (pgn, warning) => {
     debug(`[warning] ${pgn.pgn} ${warning}`)
@@ -36,6 +36,7 @@ function CanboatJs(options) {
   })
 
   this.app = options.app
+  this.analyzerOutEvent = options.analyzerOutEvent || 'N2KAnalyzerOut'
 }
 
 require('util').inherits(CanboatJs, Transform)
@@ -46,13 +47,13 @@ CanboatJs.prototype._transform = function (chunk, encoding, done) {
     if (pgnData) {
       pgnData.timestamp = new Date(Number(chunk.timestamp)).toISOString()
       this.push(pgnData)
-      this.app.emit('N2KAnalyzerOut', pgnData)
+      this.app.emit(this.analyzerOutEvent, pgnData)
     }
   } else {
     const pgnData = this.fromPgn.parse(chunk)
     if (pgnData) {
       this.push(pgnData)
-      this.app.emit('N2KAnalyzerOut', pgnData)
+      this.app.emit(this.analyzerOutEvent, pgnData)
     }
   }
   done()

package/n2kAnalyzer.js

@@ -20,6 +20,9 @@ function N2KAnalyzer(options) {
   Transform.call(this, {
     objectMode: true,
   })
+
+  this.analyzerOutEvent = options.analyzerOutEvent || 'N2KAnalyzerOut'
+
   if (process.platform === 'win32') {
     this.analyzerProcess = require('child_process').spawn('cmd', [
       '/c',
@@ -47,7 +50,7 @@ function N2KAnalyzer(options) {
     try {
       parsed = JSON.parse(data)
       that.push(parsed)
-      options.app.emit('N2KAnalyzerOut', parsed)
+      options.app.emit(this.analyzerOutEvent, parsed)
     } catch (ex) {
       console.error(data)
       console.error(ex.stack)

package/package.json

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

package/simple.js

@@ -20,6 +20,7 @@ const TimestampThrottle = require('./timestamp-throttle')
 const CanboatJs = require('./canboatjs')
 const iKonvert = require('@canboat/canboatjs').iKonvert
 const Ydwg02 = require('@canboat/canboatjs').Ydwg02
+const W2k01 = require('@canboat/canboatjs').W2k01
 const gpsd = require('./gpsd')
 const pigpioSeatalk = require('./pigpio-seatalk')
 
@@ -58,7 +59,9 @@ function Simple(options) {
   if (options.type === 'NMEA2000' && options.subOptions) {
     if (
       options.subOptions.type === 'ngt-1-canboatjs' ||
-      options.subOptions.type === 'canbus-canboatjs'
+      options.subOptions.type === 'canbus-canboatjs' ||
+      options.subOptions.type === 'w2k-1-n2k-actisense-canboatjs' ||
+      options.subOptions.type === 'w2k-1-n2k-ascii-canboatjs'
     ) {
       mappingType = 'NMEA2000JS'
     } else if (
@@ -203,6 +206,20 @@ const dataTypeMapping = {
     }
     return result.concat([new N2kToSignalK(options.subOptions)])
   },
+  NMEA2000W2K_ASCII: (options) => {
+    const result = [new W2k01({ format: 'ascii', ...options.subOptions })]
+    if (options.type === 'FileStream') {
+      result.push(new TimestampThrottle())
+    }
+    return result.concat([new N2kToSignalK(options.subOptions)])
+  },
+  NMEA2000W2K_ACTISENSE: (options) => {
+    const result = [new W2k01({ format: 'actisense', ...options.subOptions })]
+    if (options.type === 'FileStream') {
+      result.push(new TimestampThrottle())
+    }
+    return result.concat([new N2kToSignalK(options.subOptions)])
+  },
   Multiplexed: (options) => [new MultiplexedLog(options.subOptions)],
 }
 
@@ -224,7 +241,6 @@ function nmea2000input(subOptions, logging) {
     return [
       new actisenseSerial({
         ...subOptions,
-        outEvent: 'nmea2000out',
         plainText: logging,
       }),
     ]
@@ -268,6 +284,23 @@ function nmea2000input(subOptions, logging) {
       }),
       new Liner(subOptions),
     ]
+  } else if (subOptions.type === 'w2k-1-n2k-ascii-canboatjs') {
+    return [
+      new Tcp({
+        ...subOptions,
+        outEvent: 'w2k-1-out',
+      }),
+      new Liner(subOptions),
+      new W2k01(subOptions, 'ascii', 'w2k-1-out'),
+    ]
+  } else if (subOptions.type === 'w2k-1-n2k-actisense-canboatjs') {
+    return [
+      new Tcp({
+        ...subOptions,
+        outEvent: 'w2k-1-out',
+      }),
+      new W2k01(subOptions, 'actisense', 'w2k-1-out'),
+    ]
   } else if (subOptions.type === 'navlink2-udp-canboatjs') {
     return [new Udp(subOptions), new Liner(subOptions)]
   } else if (subOptions.type === 'ydwg02-usb-canboatjs') {