@canboat/canboatjs 1.26.2 → 1.27.0

package/lib/canbus.js

@@ -84,7 +84,7 @@ function CanbusStream (options) {
     options.app.on(options.outEvent || 'nmea2000out', (msg) => {
       that.sendPGN(msg)
     })
-    options.app.on('nmea2000JsonOut', (msg) => {
+    options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
       that.sendPGN(msg)
     })
   }

package/lib/candevice.js

@@ -88,7 +88,7 @@ class CanDevice extends EventEmitter {
     }
 
     if ( options.app ) {
-      options.app.on('N2KAnalyzerOut', this.n2kMessage.bind(this))
+      options.app.on(options.analyzerOutEvent || 'N2KAnalyzerOut', this.n2kMessage.bind(this))
     }
   }
 

package/lib/fromPgn.js

@@ -738,17 +738,21 @@ function readVariableLengthField(options, pgn, field, bs) {
    * length and thus that the field number is exactly one byte earlier.
    */
 
-  var refField = getField(pgn.fields.PGN, bs.view.buffer[bs.byteIndex-1]-1, pgn)
-
-  if ( refField ) {
-    var bits = (refField.BitLength + 7) & ~7; // Round # of bits in field refField up to complete bytes: 1->8, 7->8, 8->8 etc.
-    let res =  readField(options, false, pgn, refField, bs)
-
-    if ( bits > refField.BitLength ) {
-      bs.readBits(bits - refField.BitLength, false)
+  try {
+    var refField = getField(pgn.fields.PGN, bs.view.buffer[bs.byteIndex-1]-1, pgn)
+    
+    if ( refField ) {
+      var bits = (refField.BitLength + 7) & ~7; // Round # of bits in field refField up to complete bytes: 1->8, 7->8, 8->8 etc.
+      let res =  readField(options, false, pgn, refField, bs)
+      
+      if ( bits > refField.BitLength ) {
+        bs.readBits(bits - refField.BitLength, false)
+      }
+      
+      return res
     }
-
-    return res
+  } catch ( error ) {
+    debug(error)
   }
 }
 

package/lib/ikonvert.js

@@ -77,7 +77,7 @@ function iKonvertStream (options) {
         that.sendPGN(msg)
       }
     })
-    options.app.on('nmea2000JsonOut', (msg) => {
+    options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
       that.sendPGN(msg)
     })
 

package/lib/serial.js

@@ -163,7 +163,7 @@ SerialStream.prototype.start = function () {
         }
       })
       
-      this.options.app.on('nmea2000JsonOut', msg => {
+      this.options.app.on(this.options.jsonOutEvent || 'nmea2000JsonOut', msg => {
         if ( this.outAvailable ) {
           writeObject(msg)
         }

package/lib/venus.js

@@ -75,7 +75,7 @@ VenusStream.prototype._transform = function (pgn, encoding, done) {
   this.fromPgn.parseVenusMQTT(pgn, (error, pgn) => {
     if ( !error ) {
       this.push(pgn)
-      this.options.app.emit('N2KAnalyzerOut', pgn)
+      this.options.app.emit(this.options.analyzerOutEvent || 'N2KAnalyzerOut', pgn)
     }
 
     done()

package/lib/w2k01.js

@@ -51,7 +51,7 @@ function W2K01Stream (options, type, outEvent) {
         }
       })
       
-      options.app.on('nmea2000JsonOut', (msg) => {
+      options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
         this.sendPGN(msg)
       })
     }

package/lib/ydgw02.js

@@ -57,7 +57,7 @@ function Ydgw02Stream (options, type) {
       }
     })
 
-    options.app.on('nmea2000JsonOut', (msg) => {
+    options.app.on(options.jsonOutEvent || 'nmea2000JsonOut', (msg) => {
       this.sendPGN(msg)
     })
 
@@ -133,7 +133,7 @@ Ydgw02Stream.prototype._transform = function (chunk, encoding, done) {
   const pgn = this.fromPgn.parseYDGW02(line)
   if ( !_.isUndefined(pgn) ) {
     this.push(pgn)
-    this.options.app.emit('N2KAnalyzerOut', pgn)
+    this.options.app.emit(this.options.analyzerOutEvent || 'N2KAnalyzerOut', pgn)
   }
 
   done()

package/lib/ydvr.js

@@ -108,6 +108,10 @@ function YdvrStream() {
 
   this.parser = new FromPgn();
 
+  this.messageCount = 0;
+  this.errorCount = 0;
+  this.timerResetCount = 0;
+
   this.parser.on('error', (pgn, error) => {
     console.error(`Error parsing ${pgn.pgn} ${error}`);
     console.error(error.stack);
@@ -141,7 +145,8 @@ YdvrStream.prototype.parseNextRecord = function () {
   let timeAbsolute;
   if (this.lastTime != null && time < this.lastTime) {
     this.timeOffset = (this.timeOffset || 0) + 60000;
-    timeAbsolute = time + timeOffset;
+    timeAbsolute = time + this.timeOffset;
+    this.timerResetCount += 1;
   } else {
     timeAbsolute = time;
   }
@@ -150,6 +155,9 @@ YdvrStream.prototype.parseNextRecord = function () {
   var identifier = this.bs.readUint32();
   if (identifier === 0xffffffff) {
     // service record
+    if (this.bs.bitsLeft < 8 * 8) {
+      return false;
+    }
     var srData = this.bs.readArrayBuffer(8);
   } else {
     const pgn = parseCanId(identifier);
@@ -163,6 +171,9 @@ YdvrStream.prototype.parseNextRecord = function () {
     } else {
       bodyLen = 8;
     }
+    if (this.bs.bitsLeft < bodyLen * 8) {
+      return false;
+    }
     var body = this.bs.readArrayBuffer(bodyLen);
 
     const parsed = this.parser.parsePgnData(
@@ -177,6 +188,7 @@ YdvrStream.prototype.parseNextRecord = function () {
     }
   }
 
+  this.messageCount += 1;
   return true;
 }
 
@@ -192,7 +204,10 @@ YdvrStream.prototype._transform = function (chunk, encoding, done) {
     let parsed = false;
     try {
       parsed = this.parseNextRecord();
-    } catch (ex) { }
+    } catch (ex) {
+      console.error(ex);
+      this.errorCount += 1;
+    }
     if (!parsed) {
       this.bs.byteIndex = startIndex;
       break;

package/package.json

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