@signalk/streams 2.0.3 → 2.2.0

package/mdns-ws.js

@@ -34,12 +34,12 @@ function MdnsWs(options) {
   const createDebug = options.createDebug || require('debug')
   this.debug = createDebug('signalk:streams:mdns-ws')
   this.dataDebug = createDebug('signalk:streams:mdns-ws-data')
-  debug(`deltaStreamBehaviour:${deltaStreamBehaviour}`)
+  this.debug(`deltaStreamBehaviour:${deltaStreamBehaviour}`)
 
   this.handleContext = () => {}
   if (options.selfHandling === 'manualSelf') {
     if (options.remoteSelf) {
-      debug(`Using manual remote self ${options.remoteSelf}`)
+      this.debug(`Using manual remote self ${options.remoteSelf}`)
       this.handleContext = (delta) => {
         if (delta.context === options.remoteSelf) {
           delete delta.context
@@ -66,6 +66,7 @@ function MdnsWs(options) {
       autoConnect: false,
       deltaStreamBehaviour,
       rejectUnauthorized: !(options.selfsignedcert === true),
+      wsKeepaliveInterval: 10
     })
     this.connect(this.signalkClient)
   } else {

package/nmea0183-signalk.js

@@ -39,8 +39,9 @@ function Nmea0183ToSignalK(options) {
   Transform.call(this, {
     objectMode: true,
   })
-  this.debug = (options.createDebug || require('debug'))('signalk:streams:nmea0183-signalk')
-  
+  this.debug = (options.createDebug || require('debug'))(
+    'signalk:streams:nmea0183-signalk'
+  )
 
   this.parser = new Parser(options)
   this.n2kParser = new FromPgn(options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "2.0.3",
+  "version": "2.2.0",
   "description": "Utilities for handling streams of Signal K data",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/SignalK/signalk-server-node#readme",
   "dependencies": {
     "@canboat/canboatjs": "^1.4.0",
-    "@signalk/client": "^2.1.0",
+    "@signalk/client": "^2.3.0",
     "@signalk/n2k-signalk": "^2.0.0",
     "@signalk/nmea0183-signalk": "^3.0.0",
     "@signalk/nmea0183-utilities": "^0.8.0",

package/simple.js

@@ -80,6 +80,20 @@ function Simple(options) {
     getLogger(options.app, options.logging, discriminatorByDataType[dataType]),
     dataTypeMapping[mappingType](options)
   )
+  if (options.subOptions.overrideTimestamp) {
+    pipeline.push(
+      new Transform({
+        objectMode: true,
+        transform(delta, encoding, callback) {
+          if (delta.updates) {
+            const now = new Date().toISOString()
+            delta.updates.forEach((update) => (update.timestamp = now))
+          }
+          callback(null, delta)
+        },
+      })
+    )
+  }
 
   for (let i = pipeline.length - 2; i >= 0; i--) {
     pipeline[i].pipe(pipeline[i + 1])
@@ -239,7 +253,13 @@ function nmea2000input(subOptions, logging) {
       new Liner(subOptions),
     ]
   } else if (subOptions.type === 'ydwg02-udp-canboatjs') {
-    return [new Udp(subOptions), new Liner(subOptions)]
+    return [
+      new Udp({
+        ...subOptions,
+        outEvent: 'ydwg02-out',
+      }),
+      new Liner(subOptions),
+    ]
   } else if (subOptions.type === 'navlink2-tcp-canboatjs') {
     return [
       new Tcp({

package/tcp.js

@@ -38,6 +38,7 @@ function TcpStream(options) {
   this.noDataReceivedTimeout =
     Number.parseInt((this.options.noDataReceivedTimeout + '').trim()) * 1000
   this.debug = (options.createDebug || require('debug'))('signalk:streams:tcp')
+  this.debug(`noDataReceivedTimeout:${this.noDataReceivedTimeout}`)
   this.debugData = (options.createDebug || require('debug'))(
     'signalk:streams:tcp-data'
   )

package/udp.js

@@ -41,6 +41,9 @@ function Udp(options) {
   })
   this.options = options
   this.debug = (options.createDebug || require('debug'))('signalk:streams:udp')
+  this.debugData = (options.createDebug || require('debug'))(
+    'signalk:streams:udp-data'
+  )
 }
 
 require('util').inherits(Udp, Transform)
@@ -51,11 +54,21 @@ Udp.prototype.pipe = function (pipeTo) {
 
   const socket = require('dgram').createSocket('udp4')
   const self = this
+
+  if (this.options.outEvent && this.options.port !== undefined) {
+    this.options.app.on(this.options.outEvent, function (d) {
+      self.debug('sending over udp: %s', d)
+      socket.send(d, 0, d.length, self.options.port, '255.255.255.255')
+    })
+  }
+
   socket.on('message', function (message, remote) {
     self.debug(message.toString())
     self.push(message)
   })
-  socket.bind(this.options.port)
+  socket.bind(this.options.port, function () {
+    socket.setBroadcast(true)
+  })
 }
 
 Udp.prototype._transform = function (chunk, encoding, done) {