@canboat/canboatjs 2.5.3 → 2.5.5

package/.github/workflows/test.yml

@@ -0,0 +1,28 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI & Test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x, 18.x, 20.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: npm test

package/lib/fromPgn.js

@@ -24,7 +24,6 @@ const BitStream = require('bit-buffer').BitStream
 const BitView = require('bit-buffer').BitView
 const Int64LE = require('int64-buffer').Int64LE
 const Uint64LE = require('int64-buffer').Uint64LE
-const { parse: parseDate } = require('date-fns')
 
 const { getPGNFromCanId } = require('./utilities')
 const { getIndustryName, getManufacturerName } = require('./codes')
@@ -120,9 +119,7 @@ class Parser extends EventEmitter {
       })
     }
 
-    const RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
-
-    trace(`${pgn.pgn} ${len} ${pgnData.Length} ${RepeatingFields} ${couldBeMulti}`)
+    trace(`${pgn.pgn} ${len} ${pgnData.Length} ${couldBeMulti}`)
     if ( coalesced || len > 0x8 || (this.format == FORMAT_COALESCED && !this.mixedFormat) ) {
       this.format = FORMAT_COALESCED
       if ( sourceString ) {
@@ -204,6 +201,8 @@ class Parser extends EventEmitter {
       pgn.input = [ sourceString ]
     }
 
+    let RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
+
     pgn.fields = {}
     try {
       var fields = pgnData.Fields
@@ -246,6 +245,7 @@ class Parser extends EventEmitter {
             if ( value == null ) {
               value = pgnData.Fields[i].Match
             }
+            RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
           }
         }
 
@@ -611,6 +611,7 @@ function readField(options, runPostProcessor, pgn, field, bs, fields) {
       }
       if ( options.checkForInvalidFields !== false && max !== 'undefined' &&
            field.FieldType !== 'LOOKUP' &&
+           field.FieldType !== 'FIELDTYPE_LOOKUP' &&
            field.BitLength > 1 &&
            max - value <= 0 ) {
         //console.log(`Bad field ${field.Name} ${max - value}`)
@@ -633,7 +634,8 @@ function readField(options, runPostProcessor, pgn, field, bs, fields) {
         value = Number.parseFloat(value.toFixed(precision))
       }
 
-      if (field.FieldType === 'LOOKUP' &&
+      if ((field.FieldType === 'LOOKUP' ||
+           field.FieldType === 'FIELDTYPE_LOOKUP') &&
           runPostProcessor &&
           (_.isUndefined(options.resolveEnums) ||
            options.resolveEnums)) {

package/lib/stringMsg.js

@@ -8,7 +8,6 @@ const {
 const {
   buildCanId, encodeCanIdString, parseCanId, parseCanIdStr,
 } = require('./canId')
-const { parse: parseDate } = require('date-fns')
 
 /**
  * Helper function that helps merge canId fields with format, data, and others.
@@ -113,10 +112,26 @@ exports.encodeYDRAW = ({ data, ...canIdInfo }) => {
   return pgns.map(buffer => canId + ' ' + byteString(buffer, ' '))
 }
 
+const get0183Sentence = (msg) => {
+  let sentence = msg
+  if (sentence.charAt(0) === '\\') {
+    split = sentence.split('\\')
+    if ( split.length < 3 ) {
+      return false
+    }
+    sentence = split[2]
+  }
+  return sentence
+}
+
 // $PCDIN,01F119,00000000,0F,2AAF00D1067414FF*59
-exports.isPCDIN = startsWith('$PCDIN,')
+exports.isPCDIN = (msg) => {
+  const sentence = get0183Sentence(msg)
+  return sentence.startsWith('$PCDIN,')
+}
 exports.parsePCDIN = (input) => {
-  const [ prefix, pgn, timeHex, src, data ] = input.split(',')
+  const sentence = get0183Sentence(input)
+  const [ prefix, pgn, timeHex, src, data ] = sentence.split(',')
   let timer = parseInt(timeHex, 32)
   
   timer = timer / 1024
@@ -137,9 +152,13 @@ exports.encodePCDIN = ({ prefix = '$PCDIN', pgn, data, dst = 255}) => {
 }
 
 // $MXPGN,01F801,2801,C1308AC40C5DE343*19
-exports.isMXPGN = startsWith('$MXPGN,')
+exports.isMXPGN = (msg) => {
+  const sentence = get0183Sentence(msg)
+  return sentence.startsWith('$MXPGN,')
+}
 exports.parseMXPGN = (input) => {
-  const [ prefix, pgn, attr_word, data ] = input.split(',')
+  const sentence = get0183Sentence(input)
+  const [ prefix, pgn, attr_word, data ] = sentence.split(',')
 
   const send_prio_len = (parseInt(attr_word.substr(0,2), 16).toString(2)).padStart(8, '0');
   const addr = (parseInt(attr_word.substr(2,2), 16));

package/lib/toPgn.js

@@ -190,7 +190,8 @@ function writeField(bs, pgn_number, field, data, value, fields, bitLength) {
       }
     } else if ( type && fieldTypeMappers[type] ) {
       value = fieldTypeMappers[type](field, value)
-    } else if (field.FieldType === 'LOOKUP' && _.isString(value)) {
+    } else if ((field.FieldType === 'LOOKUP' ||
+                field.FieldType === 'FIELDTYPE_LOOKUP') && _.isString(value)) {
       if (!(field.Id === "timeStamp" && value < 60)) {
         value = lookup(field, value)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -57,7 +57,6 @@
   "dependencies": {
     "@canboat/pgns": "3.x.x",
     "bit-buffer": "0.2.3",
-    "date-fns": "2.0.0-alpha.27",
     "debug": "^4.3.4",
     "dnssd": "^0.4.1",
     "int64-buffer": "^0.1.10",