@canboat/canboatjs 1.21.1 → 1.22.2

package/README.md

@@ -205,9 +205,9 @@ Output: `!PDGY,127245,255,/Pj/f/9///8=`
 ## Generate YDGW-02 format from canboat json
 
 ```js
-const pgnToYdwgRawFormat = require("./index").pgnToYdwgRawFormat;
+const pgnToYdgwRawFormat = require("./index").pgnToYdgwRawFormat;
 
-const array = pgnToYdwgRawFormat({
+const array = pgnToYdgwRawFormat({
   src: 127,
   prio: 3,
   dst: 255,

package/lib/candevice.js

@@ -177,7 +177,7 @@ function handleGroupFunction(device, n2kMsg) {
       const acknowledgement = {
         pgn: 126208,
         dst: n2kMsg.src,
-        "Function Code": 1,
+        "Function Code": 2,
         "PGN": n2kMsg.fields.PGN,
         "PGN error code": 4,
         "Transmission interval/Priority error code": 0,
@@ -195,7 +195,7 @@ function handleGroupFunction(device, n2kMsg) {
       const acknowledgement = {
         pgn: 126208,
         dst: n2kMsg.src,
-        "Function Code": 1,
+        "Function Code": 2,
         "PGN": n2kMsg.fields.PGN,
         "PGN error code": 4,
       "Transmission interval/Priority error code": 0,

package/lib/codes.test.js

@@ -4,6 +4,7 @@ describe('getManufacturerCode', () => {
   test('Return mfg number from name string', () => {
     expect(getManufacturerCode('Furuno')).toBe(1855)
     expect(getManufacturerCode('Yacht Devices')).toBe(717)
+    expect(getManufacturerCode('TJC Micro')).toBe(963)
   })
 })
 
@@ -11,5 +12,6 @@ describe('getManufacturerName', () => {
   test('Return name string from mfg number', () => {
     expect(getManufacturerName(1855)).toBe('Furuno')
     expect(getManufacturerName(717)).toBe('Yacht Devices')
+    expect(getManufacturerName(963)).toBe('TJC Micro')
   })
 })

package/lib/codesMfgs.json

@@ -136,6 +136,7 @@
   "Teleflex Marine (SeaStar Solutions)": 1850,
   "Thrane and Thrane": 351,
   "Tides Marine": 797,
+  "TJC Micro": 963,
   "Tohatsu Co, JP": 431,
   "Transas USA": 518,
   "Trimble": 1856,

package/lib/fromPgn.js

@@ -39,7 +39,7 @@ const maxUint64 = new Int64LE(0xffffffff, 0xffffffff)
 const maxInt64 = new Int64LE(0x7fffffff, 0xffffffff)
 
 const FORMAT_PLAIN = 0
-const FORMAT_FAST  = 1
+const FORMAT_COALESCED  = 1
 
 const FASTPACKET_INDEX = 0
 const FASTPACKET_SIZE = 1
@@ -99,7 +99,17 @@ class Parser extends EventEmitter {
       pgnList = [ ...customPgns.definitions, ...(pgnList||[]) ]
     }
 
-    let pgnData = pgnList[0]
+    let pgnData
+    let origPGNList = pgnList
+
+    if ( pgnList.length > 1 ) {
+      pgnData = this.findMatchPgn(pgnList)
+    }
+
+    if ( !pgnData ) {
+      pgnData = pgnList[0]
+    }
+    
     let couldBeMulti = false;
 
     if ( pgnList.length > 0 && len == 8 ) {
@@ -111,14 +121,13 @@ class Parser extends EventEmitter {
     }
 
     trace(`${pgn.pgn} ${len} ${pgnData.Length} ${pgnData.RepeatingFields} ${couldBeMulti}`)
-    if ( len > 0x8 || (this.format == FORMAT_FAST && !this.mixedFormat) ) {
-    //if ( (len > 0x8 || pgnData.Type === 'Fast') && coalesced ) {
-      this.format = FORMAT_FAST
+    if ( coalesced || len > 0x8 || (this.format == FORMAT_COALESCED && !this.mixedFormat) ) {
+      this.format = FORMAT_COALESCED
       if ( sourceString ) {
         pgn.input = [ sourceString ]
       }
-    } else if ( pgnData.Length > 0x8 || (len == 0x8 && (pgnData.RepeatingFields || couldBeMulti))) {
-    //} else if ( pgnData.Type === 'Fast' ) {
+    //} else if ( pgnData.Length > 0x8 || (len == 0x8 && (pgnData.RepeatingFields || couldBeMulti))) {
+    } else if ( pgnData.Type === 'Fast' ) {
       //partial packet
       this.format = FORMAT_PLAIN
 
@@ -138,7 +147,6 @@ class Parser extends EventEmitter {
       var start = bs.byteIndex
       var packetIndex = bs.view.buffer.readUInt8(FASTPACKET_INDEX)
       var bucket = packetIndex & FASTPACKET_MAX_INDEX;
-      var maybeBad = false
 
       trace(`${pgn.pgn} partial ${packetIndex} ${bucket} ${packet.size}`)
 
@@ -156,14 +164,12 @@ 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 ( sourceString ) {
-          packet.src.push(sourceString)
-        }
         if (packet.lastPacket + 1 != packetIndex) {
           debug(`PGN ${pgn.pgn} malformed packet for ${pgn.src} received; expected ${packet.lastPacket+1} but got ${packetIndex}`)
           cb && cb(`Could not parse ${JSON.stringify(pgn)}`)
           bs.byteIndex = start
-          maybeBad = true
+          delete this.devices[pgn.src][pgn.pgn] 
+          return
         } else {
           trace(`${pgn.pgn} targetStart: ${FASTPACKET_BUCKET_0_SIZE + FASTPACKET_BUCKET_N_SIZE * (bucket-1)} sourceStart: ${FASTPACKET_BUCKET_N_OFFSET} sourceEned: ${FASTPACKET_BUCKET_N_SIZE}`)
           bs.view.buffer.copy(
@@ -173,20 +179,18 @@ class Parser extends EventEmitter {
           )
         }
       }
-      if ( !maybeBad ) {
-        packet.lastPacket = packetIndex;
-        if (FASTPACKET_BUCKET_0_SIZE + FASTPACKET_BUCKET_N_SIZE * bucket < packet.size)
-        {
-          // Packet is not complete yet
-          trace(`${pgn.pgn} not complete`)
-          return;
-        }
-        var view = new BitView(packet.buffer)
-        bs = new BitStream(view)
-        trace(`${pgn.pgn} done`)
-        pgn.input = packet.src
-        delete this.devices[pgn.src][pgn.pgn]
+      packet.lastPacket = packetIndex;
+      if (FASTPACKET_BUCKET_0_SIZE + FASTPACKET_BUCKET_N_SIZE * bucket < packet.size)
+      {
+        // Packet is not complete yet
+        trace(`${pgn.pgn} not complete`)
+        return;
       }
+      var view = new BitView(packet.buffer)
+      bs = new BitStream(view)
+      trace(`${pgn.pgn} done`)
+      pgn.input = packet.src
+      delete this.devices[pgn.src][pgn.pgn]
     } else if ( sourceString ) {
       pgn.input = [ sourceString ]
     }
@@ -208,16 +212,29 @@ class Parser extends EventEmitter {
           if ( pgnList.length == 0 ) {
             //this.emit('warning', pgn, `no conversion found for pgn`)
             trace('warning no conversion found for pgn %j', pgn)
-            const ts = _.get(pgn, 'timestamp', new Date())
-            pgn.timestamp = _.isDate(ts) ? ts.toISOString() : ts
-            this.emit('pgn', pgn)
-            cb && cb(undefined, pgn)
-            return pgn
+
+            let nonMatch = this.findNonMatchPgn(origPGNList)
+            if ( nonMatch ) {
+              pgnList = [ nonMatch ]
+              pgnData = pgnList[0]
+              fields = pgnData.Fields
+              var postProcessor = fieldTypePostProcessors[field.Type]
+              if ( postProcessor ) {
+                value = postProcessor(pgnData.Fields[i], value)
+              }
+            } else {
+              const ts = _.get(pgn, 'timestamp', new Date())
+              pgn.timestamp = _.isDate(ts) ? ts.toISOString() : ts
+              this.emit('pgn', pgn)
+              cb && cb(undefined, pgn)
+              return pgn
+            }
+          } else {
+            pgnData = pgnList[0]
+            fields = pgnData.Fields
+            //console.log(`using ${JSON.stringify(pgnData, null, 2)}`)
+            value = pgnData.Fields[i].Description
           }
-          pgnData = pgnList[0]
-          fields = pgnData.Fields
-          //console.log(`using ${JSON.stringify(pgnData, null, 2)}`)
-          value = pgnData.Fields[i].Description
         }
 
         if ( !_.isUndefined(value) && value != null ) {
@@ -264,6 +281,18 @@ class Parser extends EventEmitter {
     }
   }
 
+  findNonMatchPgn(pgnList) {
+    return pgnList.find(f => {
+      return !f.Fields.find(f => !_.isUndefined(f.Match))
+    })
+  }
+
+  findMatchPgn(pgnList) {
+    return pgnList.find(f => {
+      return f.Fields.find(f => !_.isUndefined(f.Match))
+    })
+  }
+
   parse(data, cb) {
     if (_.isString(data) ) {
       return this.parseString(data, cb)
@@ -520,17 +549,26 @@ function readField(options, runPostProcessor, pgn, field, bs) {
       if ( field.Resolution && typeof value === 'number' ) {
         var resolution = field.Resolution
 
+        if ( _.isString(resolution) ) {
+          resolution = Number.parseFloat(resolution)
+        }
+
         value = (value * resolution)
+        
+        let precision = 0;
+        for (let r = resolution; (r > 0.0) && (r < 1.0); r = r * 10.0)
+        {
+          precision++;
+        }
+        
+        value = Number.parseFloat(value.toFixed(precision))
 
+        /*
         if ( resolution === 3.125e-8 ) {
           //yes. hack.
           resolution = "0.0000000001"
         }
-
-        if ( _.isString(resolution) &&
-             resolution.indexOf('.') != -1 ) {
-          value = Number.parseFloat(value.toFixed(resolution.length-2))
-        }
+        */
       }
 
       if (field.EnumValues &&
@@ -662,7 +700,13 @@ function readVariableLengthField(options, pgn, field, bs) {
 
   if ( refField ) {
     var bits = (refField.BitLength + 7) & ~7; // Round # of bits in field refField up to complete bytes: 1->8, 7->8, 8->8 etc.
-    return readField(options, false, pgn, refField, bs, bits)
+    let res =  readField(options, false, pgn, refField, bs)
+
+    if ( bits > field.BitLength ) {
+      bs.readBits(bits - refField.BitLength, false)
+    }
+
+    return res
   }
 }
 
@@ -708,7 +752,9 @@ fieldTypeReaders['ASCII string starting with length byte'] = (pgn, field, bs) =>
 fieldTypeReaders["String with start/stop byte"] = (pgn, field, bs) => {
   var len
   var first = bs.readUint8()
-  if ( first == 0x02 ) {
+  if ( first == 0xff ) { // no name, stop reading
+    return ''
+  } else if ( first == 0x02 ) {
     var buf = Buffer.alloc(255)
     var c
     var idx = 0

package/lib/simpleCan.js

@@ -27,9 +27,9 @@ SimpleCan.prototype.start = function () {
       
       pgn.timestamp = new Date().toISOString()
       if ( this.plainText ) {
-        messageCb(binToActisense(pgn, msg.data, msg.data.length))
+        this.messageCb(binToActisense(pgn, msg.data, msg.data.length))
       } else {
-        messageCb({ pgn, length: msg.data.length, data: msg.data })
+        this.messageCb({ pgn, length: msg.data.length, data: msg.data })
       }
     })
   }

package/lib/stringMsg.js

@@ -49,7 +49,7 @@ exports.parseActisense = (input) => {
     buildCanId(prio, pgn, dst, src),
     'Actisense',
     Buffer.from(data.join(''), 'hex'),
-    { len: Number(len), timestamp, coalesced: true },
+    { len: Number(len), timestamp },
   )
 }
 exports.encodeActisense = ({
@@ -153,12 +153,21 @@ exports.encodeMXPGN = ({ prefix = '$MXPGN', pgn, prio, src, data }) => {
 exports.isPDGY = startsWith('!PDGY,')
 exports.parsePDGY = (input) => {
   const parts = input.split(',')
-  if ( parts.length != 7 ) return buildErr('iKonvert', 'Invalid parts.', input)
-  const [ prefix, pgn, prio, src, dst, timer, data ] = parts
-  return buildMsg(
-    buildCanId(prio, pgn, dst, src), 'PDGY', Buffer.from(data, 'base64'),
-    { timer: Number(timer), prefix },
-  )
+  if ( parts.length === 7 ) {
+    const [ prefix, pgn, prio, src, dst, timer, data ] = parts
+    return buildMsg(
+      buildCanId(prio, pgn, dst, src), 'PDGY', Buffer.from(data, 'base64'),
+      { timer: Number(timer), prefix, coalesced: true },
+    )
+  } else if ( parts.length === 4 ) {
+    const [ prefix, pgn, dst, data ] = parts
+    return buildMsg(
+      buildCanId(0, pgn, dst, 0), 'PDGY', Buffer.from(data, 'base64'),
+      { coalesced: true }
+    )
+  } else {
+    return buildErr('iKonvert', 'Invalid parts.', input)
+  }
 }
 exports.encodePDGY = ({ prefix = '!PDGY', pgn, data, dst = 255}) => (
   [ prefix, pgn, dst, data.toString('base64')].join(',')

package/lib/stringMsg.test.js

@@ -65,7 +65,6 @@ describe('parseActisense', () => {
   test('basic msg', () => {
     const msg = '2016-04-09T16:41:09.078Z,3,127257,17,255,8,00,ff,7f,52,00,21,fe,ff'
     expect(parseActisense(msg)).toEqual({
-      coalesced: true,
       data: Buffer.from('00ff7f520021feff', 'hex'),
       dst: 255,
       len: 8,
@@ -99,6 +98,7 @@ describe('parsePDGY', () => {
       prio: 3,
       src: 2,
       timer: 0.563,
+      coalesced: true
     })
   })
   test('long msg', () => {
@@ -111,6 +111,7 @@ describe('parsePDGY', () => {
       prio: 3,
       src: 2,
       timer: 483.236,
+      coalesced: true
     })
   })
 })

package/lib/ydgw02.js

@@ -89,7 +89,7 @@ Ydgw02Stream.prototype.sendPGN = function (pgn) {
 Ydgw02Stream.prototype.sendYdgwPGN = function (msg) {
 
   actisenseToYdgwRawFormat(msg).forEach(raw => {
-    this.sendString(raw)
+    this.sendString(raw + '\r\n')
   })
 
   /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "1.21.1",
+  "version": "1.22.2",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {