@canboat/canboatjs 1.27.0 → 1.27.2

package/lib/serial.js

@@ -108,6 +108,10 @@ SerialStream.prototype.start = function () {
   this.isFile = false
   this.state = MSG_START
 
+  if ( typeof this.reconnectDelay === 'undefined' ) {
+    this.reconnectDelay = 1000
+  }
+
   if ( !this.options.fromFile ) {
     this.serial = new SerialPort(this.options.device, {
       baudRate: this.options.baudrate || 115200
@@ -122,7 +126,9 @@ SerialStream.prototype.start = function () {
         ? (msg) => {
           this.options.app.setProviderError(this.options.providerId, msg)
         }
-        : () => {}
+          : () => {}
+    this.setProviderStatus = setProviderStatus
+    
     var that = this
     
     this.serial.on('data', (data) => {
@@ -175,15 +181,18 @@ SerialStream.prototype.start = function () {
     this.serial.on('error', function (x) {
       setProviderError(x.message)
       console.log(x)
+      that.scheduleReconnect()
     })
     this.serial.on('close', () => {
       setProviderError('Closed, reconnecting...')
-      this.start.bind(this)
+      //this.start.bind(this)
+      that.scheduleReconnect()
     })
     this.serial.on(
       'open',
       function () {
         try {
+          this.reconnectDelay = 1000
           setProviderStatus(`Connected to ${that.options.device}`)
           var buf = composeMessage(NGT_MSG_SEND, Buffer.from(NGT_STARTUP_MSG), NGT_STARTUP_MSG.length)
           debugOut(buf)
@@ -211,6 +220,16 @@ SerialStream.prototype.start = function () {
   }
 }
 
+SerialStream.prototype.scheduleReconnect = function () {
+  this.reconnectDelay *= this.reconnectDelay < 60 * 1000 ? 1.5 : 1
+  const msg = `Not connected (retry delay ${(
+    this.reconnectDelay / 1000
+  ).toFixed(0)} s)`
+  debug(msg)
+  this.setProviderStatus(msg)
+  setTimeout(this.start.bind(this), this.reconnectDelay)
+}
+
 function readData(that, data) {
   for ( var i = 0; i < data.length; i++ ) {
     //console.log(data[i])

package/lib/stringMsg.js

@@ -59,7 +59,7 @@ exports.encodeActisense = ({
     byteString(data)
   ].join(','))
 
-exports.toActisenseSerialFormat = (pgn, data, dst=255, src=0) => exports.encodeActisense({
+exports.toActisenseSerialFormat = (pgn, data, dst=255, src=0, prio=2) => exports.encodeActisense({
   pgn, data, dst, src, prio
 })
 

package/lib/toPgn.js

@@ -154,7 +154,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
   }
 
   // console.log(`${field.Name}:${value}(${bitLength}-${field.Resolution})`)
-  if ( _.isUndefined(value) ) {
+  if ( _.isUndefined(value) || value === null) {
     if ( field.Type && fieldTypeWriters[field.Type] ) {
       fieldTypeWriters[field.Type](pgn_number, field, value, bs)
     } else if ( bitLength % 8  == 0 ) {
@@ -223,7 +223,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
         if (field.Signed) {
           bs.writeInt32(value)
         } else {
-          bs.writeUint32(value)
+          bs.writeUint32(value) 
         }
       } else if (bitLength === 48 || bitLength == 24) {
         var count = bitLength/8;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "1.27.0",
+  "version": "1.27.2",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {