@canboat/canboatjs 1.25.0 → 1.26.1

package/lib/canbus.js

@@ -118,6 +118,25 @@ function CanbusStream (options) {
     })
   } else {
     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 ) {
+          let channel = this.channel
+          delete this.channel
+          try {
+            channel.stop()
+          } catch ( error ) {
+          }
+          this.setProviderError('No data received, retrying...')
+          if ( this.options.app ) {
+            console.error('No data received, retrying...')
+          }
+          this.connect()
+        }
+      }, noDataReceivedTimeout * 1000)
+    }
   }
 }
 
@@ -127,18 +146,25 @@ 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) => {
-      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)
 
+      if ( this.noDataInterval ) {
+        this.lastDataReceived = Date.now()
+      }
+
       if ( that.candevice && that.candevice.cansend && pgn.src == that.candevice.address ) {
         return
       }
@@ -304,7 +330,15 @@ CanbusStream.prototype.end = function () {
   if ( this.socketCanWriter ) {
     debug('end, killing socketcan-writer process')
     this.socketCanWriter.kill()
-   }
+  }
+  if ( this.channel ) {
+    let channel = this.channel
+    delete this.channel
+    channel.stop()
+  }
+  if ( this.noDataInterval ) {
+    clearInterval(this.noDataInterval)
+  }
 }
 
 

package/package.json

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