dsc-itv2-client 1.0.28 → 1.0.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsc-itv2-client",
   "author": "fajitacat",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "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

@@ -333,6 +333,19 @@ export class ITV2Client extends EventEmitter {
         this._sendPacket(packet);
     }
 
+    /**
+     * Send a raw command directly (not wrapped in 0x0800)
+     * Useful for testing different query formats
+     * @param {number} command - Command code (e.g., 0x0812)
+     * @param {Buffer} [payload] - Optional payload data
+     */
+    sendDirect(command, payload = null) {
+        if (!this._checkEstablished()) return;
+        const packet = this.session.buildCommand(command, payload);
+        this._logMinimal(`[Direct] Sending command 0x${command.toString(16).padStart(4, '0')} ${payload ? 'with ' + payload.length + ' bytes payload' : 'no payload'}`);
+        this._sendPacket(packet);
+    }
+
     // ==================== Authentication Methods ====================
 
     /**
@@ -943,13 +956,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 +979,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

@@ -756,31 +756,11 @@ export class ITv2Session {
     return this.buildCommand(CMD.REQUEST_ACCESS, payload);
   }
 
-  // ==================== VarBytes Encoding/Decoding ====================
-
-  /**
-   * Decode a VarBytes value from a buffer at the given offset
-   * Format: [length byte][value bytes in big-endian]
-   * @param {Buffer} buffer - Buffer to read from
-   * @param {number} offset - Starting offset in buffer
-   * @returns {{ value: number, bytesRead: number }} - Decoded value and total bytes consumed
-   */
-  static decodeVarBytes(buffer, offset) {
-    const length = buffer[offset];
-    let value = 0;
-    for (let i = 0; i < length; i++) {
-      value = (value << 8) | buffer[offset + 1 + i];
-    }
-    return { value, bytesRead: 1 + length };
-  }
+  // ==================== VarBytes Encoding ====================
 
   /**
    * Encode a value as VarBytes (DSC protocol variable-length integer)
-   * Format: [length byte][value bytes in big-endian]
-   *
-   * SDK reference: StoreVarBytesValue → CUInt32Map::StoreValue with IsLittleEndian flag
-   * On little-endian systems, StoreValue reverses bytes → big-endian wire format
-   *
+   * Format: [length byte][value bytes in little-endian]
    * @param {number} value - Value to encode
    * @returns {Buffer} - VarBytes encoded buffer
    */
@@ -789,14 +769,14 @@ export class ITv2Session {
       // 1 byte value
       return Buffer.from([0x01, value & 0xFF]);
     } else if (value < 0x10000) {
-      // 2 byte value (big-endian)
-      return Buffer.from([0x02, (value >> 8) & 0xFF, value & 0xFF]);
+      // 2 byte value (little-endian)
+      return Buffer.from([0x02, value & 0xFF, (value >> 8) & 0xFF]);
     } else if (value < 0x1000000) {
-      // 3 byte value (big-endian)
-      return Buffer.from([0x03, (value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF]);
+      // 3 byte value (little-endian)
+      return Buffer.from([0x03, value & 0xFF, (value >> 8) & 0xFF, (value >> 16) & 0xFF]);
     } else {
-      // 4 byte value (big-endian)
-      return Buffer.from([0x04, (value >> 24) & 0xFF, (value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF]);
+      // 4 byte value (little-endian)
+      return Buffer.from([0x04, value & 0xFF, (value >> 8) & 0xFF, (value >> 16) & 0xFF, (value >> 24) & 0xFF]);
     }
   }
 
@@ -849,16 +829,14 @@ export class ITv2Session {
     const appSeq = this.appSequence;
     this.appSequence = (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);
+    // Build 0x0800 payload: [AppSeqNum][CommandToRequest LE][InnerPayload]
+    const payload = Buffer.alloc(3 + innerPayload.length);
     payload[0] = appSeq;
-    payload.writeUInt16BE(innerCommand, 1);  // Command in big-endian (per SDK CUInt16Map::StoreValue)
-    wrappedPayload.copy(payload, 3);
+    payload.writeUInt16LE(innerCommand, 1);  // Command in little-endian
+    innerPayload.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')}, wrapped: ${wrappedPayload.toString('hex')}`);
+    this.log(`[Session] Inner payload: ${innerPayload.toString('hex')}`);
 
     return this.buildCommand(CMD.STATUS_REQUEST, payload);
   }
@@ -1091,41 +1069,33 @@ export class ITv2Session {
 
   // ============ Arm/Disarm Commands ============
 
-  // Wire protocol arm mode bytes (from CSWTCH.68 in SDK binary)
-  // Maps DSC_PartitionArmedState enum → wire byte
-  static ARM_MODE = {
-    STAY:                    0x01,  // StayArmed (enum 2)
-    AWAY:                    0x02,  // AwayArmed (enum 3)
-    STAY_NO_ENTRY_DELAY:     0x08,  // StayArmedWithNoEntryDelay (enum 4)
-    AWAY_NO_ENTRY_DELAY:     0x03,  // AwayArmedWithNoEntryDelay (enum 5)
-    NIGHT:                   0x04,  // NightModeArmed (enum 6)
-    INTERIOR:                0x20,  // InteriorArmed (enum 7)
-    USER:                    0x06,  // UserArmed (enum 8)
-  };
-
   /**
    * Build PARTITION_ARM command
    * @param {number} partition - Partition number (1-8)
-   * @param {number} armMode - Wire protocol arm mode byte (use ITv2Session.ARM_MODE constants)
+   * @param {number} armMode - Arming mode:
+   *   0 = Stay (perimeter only)
+   *   1 = Away (full arm)
+   *   2 = No Entry Delay
+   *   3 = Force Arm (bypass open zones)
    * @param {string} accessCode - Master/user code (e.g., "5555")
    */
   buildPartitionArm(partition, armMode, accessCode) {
     const codeStr = accessCode.toString();
 
     // Payload format from SDK decompiled OnGetRawData (ITV2_Cmd_0900):
-    // [Partition VarBytes][ArmMode 1B][UserCode ByteArray]
+    // [Partition VarBytes][ArmMode 1B][UserCode raw BCD bytes]
     //
-    // VarBytes: [numBytes 1B][value bytes... big-endian]
-    // ByteArray: [length VarBytes][data bytes...]
+    // SDK uses StoreByteArray with flag=0 for UserCode, meaning NO VarBytes
+    // length prefix — just raw BCD bytes to end of packet.
 
     // BCD encoding: each pair of digits as one byte
     const bcdBytes = this._encodeBcd(codeStr);
 
-    // Build payload: [partition VarBytes][mode 1B][userCode ByteArray]
+    // Build payload: [partition VarBytes][mode 1B][userCode raw BCD]
     const payload = Buffer.concat([
       this.encodeVarBytes(partition),
       Buffer.from([armMode]),
-      this.encodeByteArray(bcdBytes)
+      bcdBytes
     ]);
 
     this.log(`[Session] PARTITION_ARM: partition=${partition}, mode=${armMode}, code=${codeStr}`);
@@ -1143,18 +1113,18 @@ export class ITv2Session {
     const codeStr = accessCode.toString();
 
     // Payload format from SDK decompiled OnGetRawData (ITV2_Cmd_0901):
-    // [Partition VarBytes][UserCode ByteArray]
+    // [Partition VarBytes][UserCode raw BCD bytes]
     //
-    // VarBytes: [numBytes 1B][value bytes... big-endian]
-    // ByteArray: [length VarBytes][data bytes...]
+    // SDK uses StoreByteArray with flag=0 for UserCode, meaning NO VarBytes
+    // length prefix — just raw BCD bytes to end of packet.
 
     // BCD encoding: each pair of digits as one byte
     const bcdBytes = this._encodeBcd(codeStr);
 
-    // Build payload: [partition VarBytes][userCode ByteArray]
+    // Build payload: [partition VarBytes][userCode raw BCD]
     const payload = Buffer.concat([
       this.encodeVarBytes(partition),
-      this.encodeByteArray(bcdBytes)
+      bcdBytes
     ]);
 
     this.log(`[Session] PARTITION_DISARM: partition=${partition}, code=${codeStr}`);