dsc-itv2-client 1.0.27 → 1.0.29

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsc-itv2-client",
   "author": "fajitacat",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Reverse engineered DSC ITV2 Protocol Client Library for TL280R Communicator - Monitor and control DSC alarm panels",
   "main": "src/index.js",
   "type": "module",

package/src/ITV2Client.js

@@ -943,13 +943,13 @@ export class ITV2Client extends EventEmitter {
     _log(message) {
         if (this.logLevel === 'verbose') {
             const timestamp = new Date().toISOString();
-            console.log(`[${timestamp}] ${message}`);
+            console.log(`dsc itv2: [${timestamp}] ${message}`);
         }
     }
 
     _logMinimal(message) {
         if (this.logLevel === 'minimal' || this.logLevel === 'verbose') {
-            console.log(message);
+            console.log(`dsc itv2: ${message}`);
         }
     }
 
@@ -966,7 +966,7 @@ export class ITV2Client extends EventEmitter {
                 .join('');
 
             const offset = i.toString(16).padStart(4, '0').toUpperCase();
-            console.log(`${offset}  ${hex.padEnd(48)}  |${ascii}|`);
+            console.log(`dsc itv2: ${offset}  ${hex.padEnd(48)}  |${ascii}|`);
         }
     }
 }

package/src/itv2-session.js

@@ -845,18 +845,21 @@ export class ITv2Session {
    * @returns {Buffer} - Complete packet ready to send
    */
   buildCommandRequest(innerCommand, innerPayload = Buffer.alloc(0)) {
-    // Get next application sequence number
-    const appSeq = this.appSequence;
-    this.appSequence = (this.appSequence + 1) & 0xFF;
-
-    // Build 0x0800 payload: [AppSeqNum][CommandToRequest BE][InnerPayload]
-    const payload = Buffer.alloc(3 + innerPayload.length);
+    // Predict the appSeq that buildCommand will assign (it increments before using).
+    // The inner 0x0800 AppSequenceNumber MUST match the outer frame appSeq —
+    // the panel uses the inner appSeq to correlate follow-up data responses.
+    const appSeq = (this.appSequence + 1) & 0xFF;
+
+    // Build 0x0800 payload: [AppSeqNum][CommandToRequest 2B BE][ByteArray(InnerPayload)]
+    // SDK uses StoreByteArray with sizeMode=-1 (VarBytes length prefix)
+    const wrappedPayload = this.encodeByteArray(innerPayload);
+    const payload = Buffer.alloc(3 + wrappedPayload.length);
     payload[0] = appSeq;
     payload.writeUInt16BE(innerCommand, 1);  // Command in big-endian (per SDK CUInt16Map::StoreValue)
-    innerPayload.copy(payload, 3);
+    wrappedPayload.copy(payload, 3);
 
     this.log(`[Session] Building 0x0800 Command Request: innerCmd=0x${innerCommand.toString(16)}, appSeq=${appSeq}`);
-    this.log(`[Session] Inner payload: ${innerPayload.toString('hex')}`);
+    this.log(`[Session] Inner payload: ${innerPayload.toString('hex')}, wrapped: ${wrappedPayload.toString('hex')}`);
 
     return this.buildCommand(CMD.STATUS_REQUEST, payload);
   }