@canboat/canboatjs 1.27.2 → 1.28.1

package/bin/candumpjs

@@ -67,8 +67,25 @@ channel.addListener('onMessage', (msg) => {
   var pgn = parseCanId(msg.id)
   
   pgn.timestamp = new Date().toISOString()
+
+  let sourceString = binToActisense(pgn, msg.data, msg.data.length)
   
-  parser.parse({ pgn, length: msg.data.length, data: msg.data })
+  parser.parse({ pgn, length: msg.data.length, data: msg.data, sourceString })
 })
 
 channel.start()
+
+
+function binToActisense(pgn, data, length) {
+  return (
+    pgn.timestamp +
+      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
+      new Uint32Array(data)
+      .reduce(function(acc, i) {
+        acc.push(i.toString(16));
+        return acc;
+      }, [])
+      .map(x => (x.length === 1 ? "0" + x : x))
+      .join(",")
+  );
+}

package/lib/canbus.js

@@ -318,7 +318,7 @@ function readLine(that, line) {
 
   pgn.timestamp = new Date().toISOString()
 
-  that.push({ pgn: pgn, length: len, data })
+  that.push({ pgn: pgn, length: len, data, sourceString: line })
 }
 
 CanbusStream.prototype._transform = function (chunk, encoding, done) {

package/lib/fromPgn.js

@@ -40,6 +40,7 @@ const maxInt64 = new Int64LE(0x7fffffff, 0xffffffff)
 
 const FORMAT_PLAIN = 0
 const FORMAT_COALESCED  = 1
+const RES_BINARY = 'Binary data'
 
 const FASTPACKET_INDEX = 0
 const FASTPACKET_SIZE = 1
@@ -299,11 +300,11 @@ class Parser extends EventEmitter {
     } else if ( _.isBuffer(data) ) {
       return this.parseBuffer(data, cb)
     } else {
-      return this.parsePgnData(data.pgn, data.length, data.data, data.coalesced === true)
+      return this.parsePgnData(data.pgn, data.length, data.data, data.coalesced === true, cb, data.sourceString)
     }
   }
 
-  parsePgnData(pgn, length, data, coalesced, cb) {
+  parsePgnData(pgn, length, data, coalesced, cb, sourceString) {
     try
     {
       var buffer = data
@@ -317,7 +318,7 @@ class Parser extends EventEmitter {
 
       var bv = new BitView(buffer);
       var bs = new BitStream(bv)
-      const res = this._parse(pgn, bs, length, coalesced, cb);
+      const res = this._parse(pgn, bs, length, coalesced, cb, sourceString);
       if ( res ) {
         debug('parsed pgn %j', pgn)
       }
@@ -568,7 +569,7 @@ function readField(options, runPostProcessor, pgn, field, bs) {
   if ( reader ) {
     value = reader(pgn, field, bs)
   } else {
-    if ( bs.bitsLeft < field.BitLength ) {
+    if ( field.Type !== RES_BINARY  && bs.bitsLeft < field.BitLength ) {
       //no more data
       bs.readBits(bs.bitsLeft, false)
       return
@@ -697,12 +698,25 @@ function readValue(options, pgn, field, bs, bitLength) {
     } else {
       value = x === 0xffffffff && y == 0xffffffff ? null : new Uint64LE(y,x)
     }
-  } else {
+  } else if ( bitLength <= 64 ) {
     value = bs.readBits(bitLength, field.Signed)
     if ( bitLength > 1 && isMax(bitLength, value, field.Signed) ) {
       value = null
     }
-    //console.log(`${field.Name} ${bitLength} ${value} ${bs.view.buffer[bs.byteIndex]} ${bs.index}`)
+  } else {
+    if ( bs.bitsLeft < field.BitLength ) {
+      bitLength = bs.bitsLeft
+    }
+    
+    value = bs.readArrayBuffer(bitLength/8, field.Signed)
+    value = new Uint32Array(value)
+      .reduce(function(acc, i) {
+        acc.push(i.toString(16));
+        return acc;
+      }, [])
+      .map(x => (x.length === 1 ? "0" + x : x))
+      .join(" ")
+    return value
   }
   
   if ( value != null && typeof value !== 'undefined' && typeof value !== 'number' ) {
@@ -911,7 +925,7 @@ fieldTypePostProcessors['Pressure'] = (field, value) => {
   return value
 }
 
-fieldTypePostProcessors['Binary data'] = (field, value) => {
+fieldTypePostProcessors[RES_BINARY] = (field, value) => {
   return value.toString()
 }
 

package/package.json

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