@canboat/canboatjs 3.0.0-beta.5 → 3.0.0-beta.6

package/lib/canbus.js

@@ -73,7 +73,7 @@ function CanbusStream (options) {
     this.socketcan = require('socketcan')
   } catch ( err ) {
     console.error(err)
-    var msg = 'WARNING unable to load native socketcan interface'
+    var msg = 'unable to load native socketcan interface'
     console.error(msg)
   }
 
@@ -90,7 +90,9 @@ function CanbusStream (options) {
 
   var canDevice = options.canDevice || 'can0'
   
-  this.connect()
+  if ( this.connect() == false ) {
+    return
+  }
 
   const noDataReceivedTimeout = typeof options.noDataReceivedTimeout !== 'undefined' ? options.noDataReceivedTimeout : -1
   if ( noDataReceivedTimeout > 0 ) {
@@ -114,6 +116,11 @@ function CanbusStream (options) {
 
 CanbusStream.prototype.connect = function() {
   try {
+    if ( this.socketcan === undefined ) {
+      this.setProviderError('unable to load native socketcan interface')
+      return false
+    }
+    
     var that = this
     var canDevice = this.options.canDevice || 'can0'
     this.channel = this.socketcan.createRawChannelWithOptions(canDevice, { non_block_send: true} );
@@ -153,10 +160,12 @@ CanbusStream.prototype.connect = function() {
     this.setProviderStatus('Connected to socketcan')
     this.candevice = new CanDevice(this, this.options)
     this.candevice.start()
+    return true
   } catch (e) {
     console.error(`unable to open canbus ${canDevice}: ${e}`)
     console.error(e.stack)
     this.setProviderError(e.message)
+    return false
   }
 }
 

package/lib/n2kDevice.js

@@ -358,7 +358,7 @@ function sendNAKAcknowledgement(device, src, requestedPGN) {
     "Group Function": 255,
     PGN: requestedPGN
   }
-  device.sendPGN(device, acknowledgement)
+  device.sendPGN(acknowledgement)
 }
 
 function sendPGNList(device, src) {

package/lib/ydgw02.js

@@ -131,7 +131,7 @@ Ydgw02Stream.prototype.sendYdgwPGN = function (msg) {
     msgs = actisenseToYdgwRawFormat(msg)
   }
 
-  msg.forEach(raw => {
+  msgs.forEach(raw => {
     this.sendString(raw + '\r\n')
   })
 

package/package.json

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