@canboat/canboatjs 1.27.1 → 1.28.0

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

@@ -299,11 +299,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 +317,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)
       }

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/package.json

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