@canboat/canboatjs 1.26.0 → 1.26.1

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

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