@canboat/canboatjs 1.24.4 → 1.26.0

package/bin/candumpjs

@@ -57,14 +57,18 @@ parser.on('pgn', (pgn) => {
 
 const canDevice = argv['_'][0]
 
-this.channel = socketcan.createRawChannel(canDevice);
+const channel = socketcan.createRawChannel(canDevice);
 
-this.channel.addListener('onMessage', (msg) => {
+channel.addListener('onStopped', (msg) => {
+  console.error('socketcan stopped')
+})
+
+channel.addListener('onMessage', (msg) => {
   var pgn = parseCanId(msg.id)
   
   pgn.timestamp = new Date().toISOString()
-
+  
   parser.parse({ pgn, length: msg.data.length, data: msg.data })
 })
 
-this.channel.start()
+channel.start()

package/lib/canbus.js

@@ -55,25 +55,23 @@ function CanbusStream (options) {
   this.options = options
   this.start()
 
-  const setProviderStatus = options.app && options.app.setProviderStatus
-        ? (msg) => {
-          options.app.setProviderStatus(options.providerId, msg)
-        }
-        : () => {}
-  const setProviderError = options.app && options.app.setProviderError
-        ? (msg) => {
-          options.app.setProviderError(options.providerId, msg)
-        }
-        : () => {}
-
+  this.setProviderStatus = options.app && options.app.setProviderStatus
+    ? (msg) => {
+      options.app.setPluginStatus(options.providerId, msg)
+    }
+  : () => {}
+  this.setProviderError = options.app && options.app.setProviderError
+    ? (msg) => {
+      options.app.setPluginError(options.providerId, msg)
+    }
+  : () => {}
+  
   if ( options.fromStdIn ) {
     return
   }
 
-  var socketcan;
-
   try {
-    socketcan = require('socketcan')
+    this.socketcan = require('socketcan')
   } catch ( err ) {
     console.error(err)
     var msg = 'WARNING unable to load native socketcan interface'
@@ -92,7 +90,7 @@ function CanbusStream (options) {
   }
 
   var canDevice = options.canDevice || 'can0'
-  if ( !socketcan || this.options.useSocketCanWriter ) {
+  if ( !this.socketcan || this.options.useSocketCanWriter ) {
     this.socketCanWriter = null
     var hasWriter = spawn('sh', ['-c', 'which socketcan-writer'])
 
@@ -119,34 +117,73 @@ function CanbusStream (options) {
       }
     })
   } else {
-    try {
-      this.channel = socketcan.createRawChannelWithOptions(canDevice, { non_block_send: true} );
-      this.channel.addListener('onMessage', (msg) => {
-        var pgn = parseCanId(msg.id)
-
-        if ( that.candevice && that.candevice.cansend && pgn.src == that.candevice.address ) {
-          return
+    this.connect()
+
+    const noDataReceivedTimeout = typeof options.noDataReceivedTimeout !== 'undefined' ? options.noDataReceivedTimeout : -1
+    if ( noDataReceivedTimeout > 0 ) {
+      this.noDataInterval = setInterval(() => {
+        if ( this.channel && this.lastDataReceived && Date.now() - this.lastDataReceived > noDataReceivedTimeout * 1000 ) {
+          try {
+            this.channel.stop()
+          } catch ( error ) {
+          }
+          delete this.channel
+          this.setProviderError('No data received, retrying...')
+          if ( this.options.app ) {
+            console.error('No data received, retrying...')
+          }
+          this.connect()
         }
-
-        pgn.timestamp = new Date().toISOString()
-        if ( that.plainText ) {
-          this.push(binToActisense(pgn, msg.data, msg.data.length))
-        } else {
-          that.push({ pgn, length: msg.data.length, data: msg.data })
-        }
-      })
-      this.channel.start()
-      this.candevice = new CanDevice(this, options)
-      this.candevice.start()
-      setProviderStatus('Connected')
-    } catch (e) {
-      setProviderError(e.message)
-      console.error(`unable to open canbus ${canDevice}: ${e}`)
-      console.error(e.stack)
+      }, noDataReceivedTimeout * 1000)
     }
   }
 }
 
+CanbusStream.prototype.connect = function() {
+  try {
+    var that = this
+    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...')
+      }
+      setTimeout(() => {
+        this.setProviderError('Reconnecting...')
+        this.connect()
+      }, 2000)
+    })
+    this.channel.addListener('onMessage', (msg) => {
+      var pgn = parseCanId(msg.id)
+
+      if ( this.noDataInterval ) {
+        this.lastDataReceived = Date.now()
+      }
+
+      if ( that.candevice && that.candevice.cansend && pgn.src == that.candevice.address ) {
+        return
+      }
+
+      pgn.timestamp = new Date().toISOString()
+      if ( that.plainText ) {
+        this.push(binToActisense(pgn, msg.data, msg.data.length))
+      } else {
+        that.push({ pgn, length: msg.data.length, data: msg.data })
+      }
+    })
+    this.channel.start()
+    this.candevice = new CanDevice(this, this.options)
+    this.candevice.start()
+    this.setProviderStatus('Connected')
+  } catch (e) {
+    console.error(`unable to open canbus ${canDevice}: ${e}`)
+    console.error(e.stack)
+    this.setProviderError(e.message)
+  }
+}
+
 function binToActisense(pgn, data, length) {
   return (
     pgn.timestamp +
@@ -290,7 +327,13 @@ CanbusStream.prototype.end = function () {
   if ( this.socketCanWriter ) {
     debug('end, killing socketcan-writer process')
     this.socketCanWriter.kill()
-   }
+  }
+  if ( this.channel ) {
+    this.channel.stop()
+  }
+  if ( this.noDataInterval ) {
+    clearInterval(this.noDataInterval)
+  }
 }
 
 

package/package.json

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