@canboat/canboatjs 3.0.0-beta.7 → 3.0.0-beta.9

package/bin/analyzerjs

@@ -2,10 +2,7 @@
 
 const argv = require('minimist')(process.argv.slice(2), {
   alias: { h: 'help' },
-  boolean: ['n'],
-  boolean: ['r'],
-  boolean: ['camel'],
-  boolean: ['camel-compat']
+  boolean: ['n', 'r', 'camel', 'camel-compat']
 })
 
 if ( argv['help'] ) {

package/bin/cansend

@@ -4,25 +4,25 @@ const canboatjs = require('../index')
 const Parser = require('../index').FromPgn
 const { parseCanId } = require('../lib/canId')
 const { parseActisense } = require('../lib/stringMsg')
-const socketcan = require('socketcan')
 
 const { toPgn } = require('../lib/toPgn')
 const { getPlainPGNs, binToActisense } = require('../lib/utilities')
 const { encodeCanId } = require('../lib/canId')
 
 const argv = require('minimist')(process.argv.slice(2), {
-  alias: { h: 'help' },
-  boolean: ['log-output'],
+  boolean: ['test', 'log-output'],
   string: ['src'],
+  alias: { h: 'help' }
 })
 
 if ( argv['help'] ) {
   console.error(`Usage: ${process.argv[0]} [options] candevice
 
 Options:
-  --src <src>  use src for all messages
-  --log-output log messages sent
-  -h, --help   output usage information`)
+  --src <src>    use src for all messages
+  --log-output   log messages sent
+  --test         don't connect or send any data
+  -h, --help     output usage information`)
   process.exit(1)
 }
 
@@ -34,14 +34,18 @@ if ( argv['_'].length === 0 ) {
 const canDevice = argv['_'][0]
 const srcArg = argv.src
 const logOut = argv['log-output']
+const test = argv.test
 
-const channel = socketcan.createRawChannel(canDevice);
-
-channel.addListener('onStopped', (msg) => {
-  console.error('socketcan stopped')
-})
-
-channel.start()
+if ( !test ) {
+  const socketcan = require('socketcan')
+  const channel = socketcan.createRawChannel(canDevice);
+  
+  channel.addListener('onStopped', (msg) => {
+    console.error('socketcan stopped')
+  })
+  
+  channel.start()
+}
 
 var readline = require('readline')
 var rl = readline.createInterface({
@@ -53,6 +57,10 @@ var rl = readline.createInterface({
 var input = []
 
 rl.on('line', function (line) {
+  if ( line.length === 0 ) {
+    return
+  }
+  
   let msg =  line[0] === '{'  ? JSON.parse(line) : line
 
   if ( typeof msg === 'string' ) {
@@ -80,9 +88,19 @@ rl.on('line', function (line) {
   if ( typeof msg === 'object' ) {
     canid = encodeCanId(msg)
     buffer = toPgn(msg)
+    if ( buffer === undefined ) {
+      console.error('invalid input: %s', line)
+      return
+    }
     pgn = msg
   } else {
     pgn = parseActisense(msg)
+
+    if ( isNaN(pgn.prio) || isNaN(pgn.pgn) || isNaN(pgn.dst) || isNaN(pgn.src) ) {
+      console.error('invalid input: ' + line)
+      return
+    }
+    
     canid = encodeCanId(pgn)
     buffer = pgn.data
   }
@@ -92,13 +110,17 @@ rl.on('line', function (line) {
   if ( buffer.length > 8 || pgn.pgn == 126720 ) {
     var pgns = getPlainPGNs(buffer)
     pgns.forEach(pbuffer => {
-      channel.send({id: canid, ext:true, data: pbuffer})
+      if ( !test ) {
+        channel.send({id: canid, ext:true, data: pbuffer})
+      }
       if ( logOut ) {
         console.log(binToActisense(pgn, pbuffer, pbuffer.length))
       }
     })                    
   } else {
-    channel.send({id: canid, ext:true, data: buffer})
+    if ( !test ) {
+      channel.send({id: canid, ext:true, data: buffer})
+    }
     if ( logOut ) {
       console.log(binToActisense(pgn, buffer, buffer.length))
     }

package/lib/n2kDevice.js

@@ -169,6 +169,7 @@ function handleISORequest(device, n2kMsg) {
     sendConfigInformation(device)
     break;
   case 60928:   // ISO address claim request
+    debug('sending address claim %j', device.addressClaim)
     device.sendPGN(device.addressClaim)
     break;
   case 126464:
@@ -339,7 +340,7 @@ function sendISORequest(device, pgn, src, dst=255) {
 
 
 function sendProductInformation(device) {
-  debug("Sending product info..")
+  debug("Sending product info %j", device.productInfo)
 
   device.sendPGN(device.productInfo)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.9",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,8 @@
     "actisense-file": "./bin/actisense-file",
     "actisense-n2k-tcp": "./bin/actisense-n2k-tcp",
     "candumpjs": "./bin/candumpjs",
-    "ikonvert-serial": "./bin/ikonvert-serial"
+    "ikonvert-serial": "./bin/ikonvert-serial",
+    "cansend": "./bin/cansend"
   },
   "jest": {
     "rootDir": "lib"