@signalk/streams 3.0.0 → 3.2.0

package/gpsd.js

@@ -31,7 +31,7 @@
  */
 
 const Transform = require('stream').Transform
-const gpsd = require('node-gpsd')
+const GpsdClient = require('node-gpsd-client')
 
 function Gpsd(options) {
   Transform.call(this, {
@@ -40,6 +40,7 @@ function Gpsd(options) {
 
   const port = options.port || 2947
   const hostname = options.hostname || options.host || 'localhost'
+  const noDataReceivedTimeout = options.noDataReceivedTimeout || 0
 
   function setProviderStatus(msg) {
     options.app.setProviderStatus(options.providerId, msg)
@@ -47,9 +48,9 @@ function Gpsd(options) {
 
   const createDebug = options.createDebug || require('debug')
 
-  this.listener = new gpsd.Listener({
-    port,
-    hostname,
+  this.listener = new GpsdClient({
+    port: port,
+    hostname: hostname,
     logger: {
       info: createDebug('signalk:streams:gpsd'),
       warn: console.warn,
@@ -61,12 +62,19 @@ function Gpsd(options) {
       },
     },
     parse: false,
+    reconnectThreshold: noDataReceivedTimeout,
+    reconnectInterval: noDataReceivedTimeout / 2,
   })
 
   setProviderStatus(`Connecting to ${hostname}:${port}`)
 
-  this.listener.connect(function () {
+  this.listener.on('connected', () => {
     setProviderStatus(`Connected to ${hostname}:${port}`)
+    this.listener.watch({
+      class: 'WATCH',
+      nmea: true,
+      json: false,
+    })
   })
 
   const self = this
@@ -74,10 +82,7 @@ function Gpsd(options) {
     self.push(data)
   })
 
-  this.listener.watch({
-    class: 'WATCH',
-    nmea: true,
-  })
+  this.listener.connect()
 }
 
 require('util').inherits(Gpsd, Transform)

package/logging.js

@@ -18,6 +18,7 @@ const { FileTimestampStream } = require('file-timestamp-stream')
 const path = require('path')
 let debug = require('debug')('signalk:streams:logging')
 const fs = require('fs')
+const { isUndefined } = require('lodash')
 
 const filenamePattern = /skserver\-raw\_\d\d\d\d\-\d\d\-\d\dT\d\d\.log/
 const loggers = {}
@@ -85,7 +86,10 @@ function getLogger(app, discriminator = '', logdir) {
     debug(`logging to ${fileName}`)
 
     let fileTimestampStream
-    if (app.config.settings.keepMostRecentLogsOnly) {
+    if (
+      isUndefined(app.config.settings.keepMostRecentLogsOnly) ||
+      app.config.settings.keepMostRecentLogsOnly
+    ) {
       // Delete old logs
       fileTimestampStream = new FileTimestampStreamWithDelete(
         app,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "Utilities for handling streams of Signal K data",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "file-timestamp-stream": "^2.1.2",
     "lodash": "^4.17.4",
     "moment": "^2.24.0",
-    "node-gpsd": "^0.3.0",
+    "node-gpsd-client": "^1.4.1",
     "reconnect-core": "^1.3.0",
     "stream-throttle": "^0.1.3"
   },

package/serialport.js

@@ -166,6 +166,11 @@ SerialStream.prototype.start = function () {
         } else {
           that.serial.write(d + '\r\n')
         }
+        setImmediate(() => {
+          that.options.app.emit('connectionwrite', {
+            providerId: that.options.providerId,
+          })
+        })
         pendingWrites++
         that.serial.drain(onDrain)
       })

package/simple.js

@@ -76,6 +76,16 @@ function Simple(options) {
     ) {
       mappingType = 'NMEA2000YD'
     }
+    options.app.on('nmea2000out', () => {
+      setImmediate(() =>
+        options.app.emit('connectionwrite', { providerId: options.providerId })
+      )
+    })
+    options.app.on('nmea2000JsonOut', () => {
+      setImmediate(() =>
+        options.app.emit('connectionwrite', { providerId: options.providerId })
+      )
+    })
   }
 
   const pipeline = [].concat(

package/tcp.js

@@ -53,6 +53,11 @@ TcpStream.prototype.pipe = function (pipeTo) {
       if (that.tcpStream) {
         that.debug('sending %s', d)
         that.tcpStream.write(d)
+        setImmediate(() => {
+          that.options.app.emit('connectionwrite', {
+            providerId: that.options.providerId,
+          })
+        })
       }
     })
   }