@canboat/canboatjs 1.22.0 → 1.22.1

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
@@ -111,8 +111,8 @@ class Parser extends EventEmitter {
     }
 
     trace(`${pgn.pgn} ${len} ${pgnData.Length} ${pgnData.RepeatingFields} ${couldBeMulti}`)
-    if ( coalesced || len > 0x8 || (this.format == FORMAT_FAST && !this.mixedFormat) ) {
-      this.format = FORMAT_FAST
+    if ( coalesced || len > 0x8 || (this.format == FORMAT_COALESCED && !this.mixedFormat) ) {
+      this.format = FORMAT_COALESCED
       if ( sourceString ) {
         pgn.input = [ sourceString ]
       }
@@ -137,7 +137,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}`)
 
@@ -159,7 +158,8 @@ class Parser extends EventEmitter {
           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(
@@ -169,20 +169,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 ]
     }
@@ -667,7 +665,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
   }
 }
 

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