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

package/bin/candumpjs

@@ -4,7 +4,7 @@ const canboatjs = require('../index')
 const Parser = require('../index').FromPgn
 const { parseCanId } = require('../lib/canId')
 const socketcan = require('socketcan')
-
+const { binToActisense } = require('../lib/utilities')
 var parser = new canboatjs.FromPgn()
 
 
@@ -83,16 +83,3 @@ channel.addListener('onMessage', (msg) => {
 channel.start()
 
 
-function binToActisense(pgn, data, length) {
-  return (
-    pgn.timestamp +
-      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
-      new Uint32Array(data)
-      .reduce(function(acc, i) {
-        acc.push(i.toString(16));
-        return acc;
-      }, [])
-      .map(x => (x.length === 1 ? "0" + x : x))
-      .join(",")
-  );
-}

package/bin/cansend

@@ -0,0 +1,106 @@
+#!/usr/bin/env node
+
+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'],
+  string: ['src'],
+})
+
+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`)
+  process.exit(1)
+}
+
+if ( argv['_'].length === 0 ) {
+  console.error('Please specify a device')
+  process.exit(1)
+}
+
+const canDevice = argv['_'][0]
+const srcArg = argv.src
+const logOut = argv['log-output']
+
+const channel = socketcan.createRawChannel(canDevice);
+
+channel.addListener('onStopped', (msg) => {
+  console.error('socketcan stopped')
+})
+
+channel.start()
+
+var readline = require('readline')
+var rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout,
+  terminal: false
+})
+
+var input = []
+
+rl.on('line', function (line) {
+  let msg =  line[0] === '{'  ? JSON.parse(line) : line
+
+  if ( typeof msg === 'string' ) {
+    var split = msg.split(',')
+    if ( srcArg !== undefined ) {
+      split[3] = srcArg
+    }
+    msg = split.join(',')
+  } else {
+    if ( msg.prio === undefined ) {
+      msg.prio = 3
+    }
+    if ( msg.dst === undefined ) {
+      msg.dst = 255
+    }
+    if ( srcArg !== undefined ) {
+      msg.src = srcArg
+    }
+    if ( msg.src === undefined ) {
+      msg.src = 100
+    }
+  }
+
+  var pgn, canid, buffer
+  if ( typeof msg === 'object' ) {
+    canid = encodeCanId(msg)
+    buffer = toPgn(msg)
+    pgn = msg
+  } else {
+    pgn = parseActisense(msg)
+    canid = encodeCanId(pgn)
+    buffer = pgn.data
+  }
+  
+  pgn.timestamp = new Date().toISOString()
+  
+  if ( buffer.length > 8 || pgn.pgn == 126720 ) {
+    var pgns = getPlainPGNs(buffer)
+    pgns.forEach(pbuffer => {
+      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 ( logOut ) {
+      console.log(binToActisense(pgn, buffer, buffer.length))
+    }
+  }
+})

package/lib/canbus.js

@@ -23,7 +23,7 @@ const { toPgn } = require('./toPgn')
 const Parser = require('./fromPgn').Parser
 const _ = require('lodash')
 const CanDevice = require('./candevice')
-const { getPlainPGNs } = require('./utilities')
+const { getPlainPGNs, binToActisense } = require('./utilities')
 const { encodeCanId, parseCanId } = require('./canId')
 const { toActisenseSerialFormat, parseActisense } = require('./stringMsg')
 
@@ -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,28 +160,15 @@ 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
   }
 }
 
-function binToActisense(pgn, data, length) {
-  return (
-    pgn.timestamp +
-      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
-      new Uint32Array(data)
-      .reduce(function(acc, i) {
-        acc.push(i.toString(16));
-        return acc;
-      }, [])
-      .map(x => (x.length === 1 ? "0" + x : x))
-      .join(",")
-  );
-}
-
-
 require('util').inherits(CanbusStream, Transform)
 
 CanbusStream.prototype.start = function () {

package/lib/n2k-actisense.js

@@ -2,6 +2,7 @@ const debug = require('debug')('canboatjs:w2k01')
 const debugData = require('debug')('canboatjs:w2k01-data')
 const { parseCanId, encodeCanId } = require('./canId')
 const BitStream = require('bit-buffer').BitStream
+const { binToActisense } = require('./utilities')
 
 exports.readN2KActisense = function (data, plainText, context, cb) {
   const inBuf = Buffer.from(data)
@@ -105,20 +106,3 @@ exports.encodeN2KActisense  = ({
     
     return bs.view.buffer
   }
-
-
-function binToActisense(pgn, data, length) {
-  return (
-    pgn.timestamp +
-      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
-      new Uint32Array(data)
-      .reduce(function(acc, i) {
-        acc.push(i.toString(16));
-        return acc;
-      }, [])
-      .map(x => (x.length === 1 ? "0" + x : x))
-      .join(",")
-  );
-}
-
-

package/lib/n2kDevice.js

@@ -184,9 +184,10 @@ function handleISORequest(device, n2kMsg) {
 
 function handleGroupFunction(device, n2kMsg) {
   debug('handleGroupFunction %j', n2kMsg)
-  if(n2kMsg.fields.functionCode === 'Request') {
+  const functionCode = n2kMsg.fields.functionCode || n2kMsg.fields["Function Code"] 
+  if(functionCode === 'Request') {
     handleRequestGroupFunction(device, n2kMsg)
-  } else if(n2kMsg.fields.functionCode === 'Command') {
+  } else if(functionCode === 'Command') {
     handleCommandGroupFunction(device, n2kMsg)
   } else {
     debug('Got unsupported Group Function PGN: %j', n2kMsg)
@@ -358,7 +359,7 @@ function sendNAKAcknowledgement(device, src, requestedPGN) {
     "Group Function": 255,
     PGN: requestedPGN
   }
-  device.sendPGN(device, acknowledgement)
+  device.sendPGN(acknowledgement)
 }
 
 function sendPGNList(device, src) {

package/lib/simpleCan.js

@@ -3,7 +3,7 @@ const debug = require('debug')('canboatjs:simpleCan')
 const { encodeCanId, parseCanId } = require('./canId')
 const { toActisenseSerialFormat, parseActisense } = require('./stringMsg')
 const { toPgn } = require('./toPgn')
-const { getPlainPGNs } = require('./utilities')
+const { getPlainPGNs, binToActisense } = require('./utilities')
 const _ = require('lodash')
 
 function SimpleCan (options, messageCb) {
@@ -102,18 +102,4 @@ SimpleCan.prototype.sendActisenseFormat = function (msg) {
   this.sendPGN(msg)
 }
 
-function binToActisense(pgn, data, length) {
-  return (
-    pgn.timestamp +
-      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
-      new Uint32Array(data)
-      .reduce(function(acc, i) {
-        acc.push(i.toString(16));
-        return acc;
-      }, [])
-      .map(x => (x.length === 1 ? "0" + x : x))
-      .join(",")
-  );
-}
-
 module.exports = SimpleCan

package/lib/utilities.js

@@ -85,6 +85,21 @@ function compute0183Checksum (sentence) {
   return '*' + toHexString(c1)
 }
 
+function binToActisense(pgn, data, length) {
+  return (
+    pgn.timestamp +
+      `,${pgn.prio},${pgn.pgn},${pgn.src},${pgn.dst},${length},` +
+      new Uint32Array(data)
+      .reduce(function(acc, i) {
+        acc.push(i.toString(16));
+        return acc;
+      }, [])
+      .map(x => (x.length === 1 ? "0" + x : x))
+      .join(",")
+  );
+}
+
+exports.binToActisense = binToActisense
 exports.compute0183Checksum = compute0183Checksum
 exports.trimWrap = trimChars('()<>[]')
 exports.rmChecksum = str => str.includes('*') ? str.split('*', 1)[0] : str

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.7",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {