optolink-bridge 1.1.0 → 1.1.2

package/index.js

@@ -150,8 +150,14 @@ const packetQueue = async.queue(async task => {
   trace && console.log(dateTimeString(), directionName(task.direction), (task.data ?? encodePacket(task.packet, task.direction & fromOpto)).toString('hex'));
 
   const packet = task.packet ?? parsePacket(task.data, task.direction & fromOpto);
+  if (packet.rest?.length) {
+    // if there is any rest, two packets have been sent in the same direction, so unshift the rest as the next packet to the queue
+    packetQueue.unshift({ data: packet.rest, direction: task.direction });
+  }
 
-  if (busState === 0 && task.direction & toOpto && packet.start === 0x16 && 'zero' in packet) {
+  if (task.direction === fromVitoToOpto && packet.start === 0x04) {
+    busState = 0; // reset synchronization
+  } else if (busState === 0 && task.direction & toOpto && packet.start === 0x16 && 'zero' in packet) {
     busState = 1;
   } else if (busState === 1 && task.direction & fromOpto && packet.res === 0x06 && !packet.peek?.length) {
     busState = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optolink-bridge",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Safely bridge the Optolink bus of your Viessmann heating system and publish attributes via MQTT + Home Assistant Device Discovery",
   "keywords": [
     "viessmann",

package/parse_vs2.js

@@ -21,6 +21,14 @@ function when({ tag, type }) {
   }
 }
 
+function assertFunction(text, fn) {
+  const textFunction = function() {
+    return fn.apply(this, arguments);
+  };
+  textFunction.toString = () => text;
+  return textFunction;
+}
+
 /**
  * @returns a function that can be used for readUntil, to only peek a single byte (if any)
  */
@@ -45,9 +53,9 @@ const parser = new Parser()
       0x04: new Parser(), // EOT (end of transmission / sync. start)
       0x16: new Parser() // SYN (synchronous idle / start of transmission)
         .uint16('zero', {
-          assert: function(zero) {
+          assert: assertFunction('not matching the expected 16 00 00 start sequence', function(zero) {
             return !zero; // has to start with 16 00 00 (zero!)
-          }
+          })
         }),
       0x41: new Parser() // VS2_DAP_STANDARD (packet start)
         .uint8('len')
@@ -92,16 +100,13 @@ const parser = new Parser()
         }))
         .uint8('crc', {
           type: 'uint8',
-          assert: function(crc) {
+          assert: assertFunction('a mismatch to the calculated CRC', function(crc) {
             // if raw is not set / empty, we are in the encoding case, CRC will be calculated in the encode function
             return !this.raw?.length || crc256(this.raw, this.len) === crc;
-          }
+          })
         })
         .buffer('rest', {
-          readUntil: 'eof',
-          assert: function(rest) {
-            return !rest.length;
-          }
+          readUntil: 'eof'
         })
     }
   });