@signalk/streams 2.1.0 → 2.2.1

package/mdns-ws.js

@@ -66,6 +66,7 @@ function MdnsWs(options) {
       autoConnect: false,
       deltaStreamBehaviour,
       rejectUnauthorized: !(options.selfsignedcert === true),
+      wsKeepaliveInterval: 10,
     })
     this.connect(this.signalkClient)
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "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/pigpio-seatalk.js

@@ -29,7 +29,11 @@ import pigpio, time, signal, sys
 if  sys.argv[1] == "undefined":
         gpio = 4					                            #Default GPIO4 if not set
 else:
-        gpio = int(filter(str.isdigit, sys.argv[1])) 	#Ggpio, info as "GPIOnn", from GUI setup. Sensing the seatalk1 (yellow wire)
+        #Ggpio, info as "GPIOnn", from GUI setup. Sensing the seatalk1 (yellow wire)
+        try:
+                gpio = int(filter(str.isdigit, sys.argv[1])) #python2
+        except:
+                gpio = int("".join(filter(str.isdigit, sys.argv[1]))) #python3
 
 if __name__ == "__main__":
         st1read =pigpio.pi()

package/simple.js

@@ -253,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/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) {