@canboat/canboatjs 2.3.0 → 2.4.1

package/lib/canbus.js

@@ -23,7 +23,6 @@ const { toPgn } = require('./toPgn')
 const Parser = require('./fromPgn').Parser
 const _ = require('lodash')
 const CanDevice = require('./candevice')
-const spawn = require('child_process').spawn
 const { getPlainPGNs } = require('./utilities')
 const { encodeCanId, parseCanId } = require('./canId')
 const { toActisenseSerialFormat, parseActisense } = require('./stringMsg')
@@ -92,6 +91,7 @@ function CanbusStream (options) {
   var canDevice = options.canDevice || 'can0'
   if ( !this.socketcan || this.options.useSocketCanWriter ) {
     this.socketCanWriter = null
+    const spawn = require('child_process').spawn
     var hasWriter = spawn('sh', ['-c', 'which socketcan-writer'])
 
     const setProviderError = this.setProviderError.bind(this)

package/lib/discovery.js

@@ -16,7 +16,6 @@
  */
 
 const debug = require('debug')('canboatjs:discovery')
-const dgram = require('dgram')
 const { isYDRAW } = require('./stringMsg')
 
 module.exports = function discover(app) {
@@ -33,6 +32,7 @@ module.exports = function discover(app) {
     })
 
     if ( !exists ) {
+      const dgram = require('dgram')
       let socket = dgram.createSocket('udp4')
       socket.on('message', function (buffer, remote) {
         const msg = buffer.toString('utf8')

package/lib/fromPgn.js

@@ -248,7 +248,15 @@ class Parser extends EventEmitter {
         var repeating = fields.slice(fields.length-RepeatingFields)
         pgn.fields.list = []
 
-        while ( bs.bitsLeft > 0 ) {
+        let count
+
+        if ( pgnData.RepeatingFieldSet1CountField !== undefined ) {
+          count = pgn.fields[pgnData.Fields[pgnData.RepeatingFieldSet1CountField-1].Name]
+        } else {
+          count = 2048
+        }
+
+        while ( bs.bitsLeft > 0  && --count >= 0 ) {
           var group = {}
           repeating.forEach(field => {
             if ( bs.bitsLeft > 0 ) {
@@ -364,7 +372,9 @@ class Parser extends EventEmitter {
   //Yacht Devices NMEA2000 Wifi gateway
   parseYDGW02(pgn_data, cb) {
     try {
+      //consoleLog('HELLO FROM CANBIOATJS')
       const { data, direction, error, ...pgn } = parseYDRAW(pgn_data)
+      //consoleLog('HELLO FROM CANBIOATJS 2')
       if (!error && direction === 'R') {
         const bs = new BitStream(data)
         delete pgn.format
@@ -374,10 +384,12 @@ class Parser extends EventEmitter {
           return res
         }
       } else if ( error ) {
+        consoleLog(error)
         cb && cb(error)
         this.emit('error', pgn_data, error)
       }
     } catch ( error ) {
+      consoleLog(error)
       cb && cb(error)
       this.emit('error', pgn_data, error)
     }

package/lib/ikonvert.js

@@ -23,7 +23,6 @@ const {toPgn, pgnToiKonvertSerialFormat} = require('./toPgn')
 const Parser = require('./fromPgn').Parser
 const _ = require('lodash')
 const CanDevice = require('./candevice')
-const spawn = require('child_process').spawn
 const { defaultTransmitPGNs } = require('./codes')
 const { parseCanId } = require('./canId')
 

package/lib/serial.js

@@ -17,7 +17,6 @@
 const debug = require('debug')('signalk:actisense-serial')
 const debugOut = require('debug')('signalk:actisense-out')
 const Transform = require('stream').Transform
-const SerialPort = require('serialport')
 const isArray = require('lodash').isArray
 const BitStream = require('bit-buffer').BitStream
 const BitView = require('bit-buffer').BitView
@@ -113,6 +112,7 @@ SerialStream.prototype.start = function () {
   }
 
   if ( !this.options.fromFile ) {
+    const SerialPort = require('serialport')
     this.serial = new SerialPort(this.options.device, {
       baudRate: this.options.baudrate || 115200
     })

package/lib/stringMsg.js

@@ -101,6 +101,7 @@ exports.parseYDRAW = (input) => {
   const parts = input.split(' ')
   if ( parts.length < 4 ) return buildErr('YDRAW', 'Invalid parts.', input)
   const [ time, direction, canId, ...data ] = parts // time format HH:mm:ss.SSS
+  //consoleLog('parseYDRAW build')
   return buildMsg(
     parseCanIdStr(canId), 'YDRAW', arrBuff(data),
     { direction, time }

package/lib/utilities.js

@@ -16,7 +16,6 @@
 
 const { keys, map, padCharsStart, trimChars } = require('lodash/fp')
 
-
 function getPlainPGNs(buffer) {
   var res = []
   var bucket = 0x40 // 64

package/lib/venus-mqtt.js

@@ -1,5 +1,4 @@
 
-const net = require('net')
 const Transform = require('stream').Transform
 const mqtt = require('mqtt');
 const debug = require('debug')('venus-mqtt')

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
     "dev-test": "jest --watch",
     "test": "jest && mocha --exit",
+    "code-coverage": "jest --coverage && nyc mocha --exit",
     "create-release": "github-create-release --owner canboat --repository canboatjs",
     "release": "git tag -d v$npm_package_version && git tag v$npm_package_version && git push --tags && git push && npm run create-release",
-    "build_ios": "webpack ios.js -o ios_canboat.js"
+    "build_ios": "webpack -c ./webpack.config.js --mode development ./ios.js -o ios_canboat.js"
   },
   "bin": {
     "analyzerjs": "./bin/analyzerjs",
@@ -68,6 +69,7 @@
     "@signalk/github-create-release": "^1.0.1",
     "@signalk/server-api": "^1.39.0",
     "baconjs": "^1.0.1",
+    "buffer": "^6.0.3",
     "chai": "^4.1.2",
     "chai-json-equal": "0.0.1",
     "chai-string": "^1.5.0",
@@ -75,11 +77,11 @@
     "jest": "^24.7.1",
     "mocha": "^5.0.0",
     "moment": "^2.24.0",
-    "webpack": "^4.41.5",
-    "webpack-cli": "^3.3.10"
+    "nyc": "^15.1.0",
+    "webpack-cli": "^5.1.4"
   },
   "optionalDependencies": {
-    "serialport": "^9.0.7",
+    "serialport": "11.x.x",
     "socketcan": "^4.0.3"
   },
   "repository": {