@canboat/canboatjs 2.4.0 → 2.4.2

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

@@ -165,6 +165,13 @@ class Parser extends EventEmitter {
        }
         bs.view.buffer.copy(packet.buffer, 0, FASTPACKET_BUCKET_0_OFFSET, 8)
         trace(`${pgn.pgn} targetStart: 0 sourceStart: ${FASTPACKET_BUCKET_0_OFFSET}`)
+      } else if ( !packet.buffer ) {
+        //we got a non-zero bucket, but we never got the zero bucket
+        debug(`PGN ${pgn.pgn} malformed packet for ${pgn.src} received; got a non-zero bucket first`)
+        cb && cb(`Could not parse ${JSON.stringify(pgn)}`)
+        bs.byteIndex = start
+        delete this.devices[pgn.src][pgn.pgn]
+        return
       } else {
         if (packet.lastPacket + 1 != packetIndex) {
           debug(`PGN ${pgn.pgn} malformed packet for ${pgn.src} received; expected ${packet.lastPacket+1} but got ${packetIndex}`)
@@ -392,7 +399,7 @@ class Parser extends EventEmitter {
     return undefined
   }
 
-  //Yacht Devices NMEA2000 Wifi gateway
+  //Actisense W2k-1
   parseActisenceN2KAscii(pgn_data, cb) {
     try {
       const { data, error, ...pgn } = parseActisenseN2KASCII(pgn_data)

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/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,16 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "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",
+    "build_prod_ios": "webpack -c ./webpack.config.js --mode production ./ios.js -o ios_canboat.js"
   },
   "bin": {
     "analyzerjs": "./bin/analyzerjs",
@@ -68,6 +70,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,8 +78,8 @@
     "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": "11.x.x",