@canboat/canboatjs 1.26.0 → 1.26.2

package/lib/canbus.js

@@ -123,11 +123,12 @@ function CanbusStream (options) {
     if ( noDataReceivedTimeout > 0 ) {
       this.noDataInterval = setInterval(() => {
         if ( this.channel && this.lastDataReceived && Date.now() - this.lastDataReceived > noDataReceivedTimeout * 1000 ) {
+          let channel = this.channel
+          delete this.channel
           try {
-            this.channel.stop()
+            channel.stop()
           } catch ( error ) {
           }
-          delete this.channel
           this.setProviderError('No data received, retrying...')
           if ( this.options.app ) {
             console.error('No data received, retrying...')
@@ -145,15 +146,17 @@ CanbusStream.prototype.connect = function() {
     var canDevice = this.options.canDevice || 'can0'
     this.channel = this.socketcan.createRawChannelWithOptions(canDevice, { non_block_send: true} );
     this.channel.addListener('onStopped', (msg) => {
-      delete this.channel 
-      this.setProviderError('Stopped, Retrying...')
-      if ( this.options.app ) {
-        console.error('socketcan stopped, retrying...')
+      if ( this.channel ) { // stoped by us?
+        delete this.channel 
+        this.setProviderError('Stopped, Retrying...')
+        if ( this.options.app ) {
+          console.error('socketcan stopped, retrying...')
+        }
+        setTimeout(() => {
+          this.setProviderError('Reconnecting...')
+          this.connect()
+        }, 2000)
       }
-      setTimeout(() => {
-        this.setProviderError('Reconnecting...')
-        this.connect()
-      }, 2000)
     })
     this.channel.addListener('onMessage', (msg) => {
       var pgn = parseCanId(msg.id)
@@ -329,7 +332,9 @@ CanbusStream.prototype.end = function () {
     this.socketCanWriter.kill()
   }
   if ( this.channel ) {
-    this.channel.stop()
+    let channel = this.channel
+    delete this.channel
+    channel.stop()
   }
   if ( this.noDataInterval ) {
     clearInterval(this.noDataInterval)

package/lib/fromPgn.js

@@ -488,11 +488,30 @@ class Parser extends EventEmitter {
 
 }
 
-function getField(pgn, index) {
+function getField(pgn, index, data) {
   var pgnList = pgns[pgn]
   if ( pgnList ) {
     var pgn = pgnList[0]
 
+    if ( pgnList.length > 1 ) {
+      pgn.Fields.forEach((field, idx) => {
+        var hasMatch = !_.isUndefined(field.Match)
+        if ( hasMatch && data.fields.list.length > 0 ) {
+          let param = data.fields.list.find(f => f.Parameter === idx+1)
+          
+          if ( param ) {
+            pgnList = pgnList.filter(f => f.Fields[idx].Match == param.Value)
+            if ( pgnList.length == 0 ) {
+              throw new Error('unable to read: ' + JSON.stringify(data))
+              return
+            } else {
+              pgn = pgnList[0]
+            }
+          }
+        }
+      })
+    }
+    
     if ( index >= 0 && index < pgn.Fields.length ) {
       return pgn.Fields[index]
     }
@@ -719,13 +738,13 @@ 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)
+  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 > field.BitLength ) {
+    if ( bits > refField.BitLength ) {
       bs.readBits(bits - refField.BitLength, false)
     }
 

package/lib/stringMsg.js

@@ -60,7 +60,7 @@ exports.encodeActisense = ({
   ].join(','))
 
 exports.toActisenseSerialFormat = (pgn, data, dst=255, src=0) => exports.encodeActisense({
-  pgn, data, dst, src,
+  pgn, data, dst, src, prio
 })
 
 // A764027.880 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F

package/lib/toPgn.js

@@ -259,7 +259,7 @@ function writeField(bs, pgn_number, field, data, value, bitLength) {
 }
 
 function writeVariableLengthField(bs, pgn_number, pgn, field, value) {
-  var refField = getField(pgn.PGN, bs.view.buffer[bs.byteIndex-1]-1)
+  var refField = getField(pgn.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.
@@ -292,15 +292,15 @@ function canboat2Buffer(canboatData) {
 }
 
 function pgnToActisenseSerialFormat(pgn) {
-  return encodeActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst})
+  return encodeActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst, src: pgn.src, prio: pgn.prio})
 }
 
 function pgnToActisenseN2KAsciiFormat(pgn) {
-  return encodeActisenseN2KACSII({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst})
+  return encodeActisenseN2KACSII({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst, src: pgn.src, prio: pgn.prio})
 }
 
 function pgnToN2KActisenseFormat(pgn) {
-  return encodeN2KActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst})
+  return encodeN2KActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst, src: pgn.src, prio: pgn.prio})
 }
 
 function toiKonvertSerialFormat(pgn, data, dst=255) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "1.26.0",
+  "version": "1.26.2",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -80,7 +80,7 @@
   },
   "optionalDependencies": {
     "serialport": "^9.0.7",
-    "socketcan": "^2.2.2"
+    "socketcan": "^4.0.3"
   },
   "repository": {
     "type": "git",