dsc-itv2-client 1.0.22 → 1.0.23

package/package.json

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

@@ -379,9 +379,23 @@ export class ITV2Client extends EventEmitter {
             case CMD.TIME_DATE_BROADCAST:
                 this._handleTimeDateBroadcast(parsed);
                 break;
+            case CMD.ZONE_STATUS:
+                this._handleZoneStatusResponse(parsed);
+                break;
+            case CMD.PARTITION_STATUS:
+                this._handlePartitionStatusResponse(parsed);
+                break;
+            case CMD.GLOBAL_STATUS:
+                this._handleGlobalStatusResponse(parsed);
+                break;
             default:
                 if (this.handshakeState === 'ESTABLISHED') {
-                    this._log(`[Session] Unhandled command ${CMD_NAMES[cmd] || '0x' + cmd?.toString(16)}`);
+                    const cmdHex = cmd ? '0x' + cmd.toString(16).padStart(4, '0') : 'null';
+                    const cmdName = CMD_NAMES[cmd] || 'UNKNOWN';
+                    this._logMinimal(`[Session] Received command ${cmdName} (${cmdHex})`);
+                    if (parsed.commandData && parsed.commandData.length > 0) {
+                        this._logMinimal(`[Session] Data (${parsed.commandData.length} bytes): ${parsed.commandData.toString('hex')}`);
+                    }
                     this._sendPacket(this.session.buildSimpleAck());
                 }
                 break;
@@ -569,10 +583,17 @@ export class ITV2Client extends EventEmitter {
     }
 
     _handleCommandResponse(parsed) {
-        const responseCode = parsed.commandData?.[0] || 0;
+        const data = parsed.commandData;
+        const responseCode = data?.[0] || 0;
         const appSeqAsEcho = parsed.appSequence;
 
-        this._log(`[Handshake] Got COMMAND_RESPONSE (echoed app_seq: ${appSeqAsEcho}, response_code: ${responseCode}), sending ACK`);
+        this._log(`[Session] Got COMMAND_RESPONSE (app_seq: ${appSeqAsEcho}, response_code: ${responseCode})`);
+
+        // Log full data in established state for debugging query responses
+        if (this.handshakeState === 'ESTABLISHED' && data && data.length > 1) {
+            this._logMinimal(`[Command Response] Response code: ${responseCode}, data (${data.length} bytes): ${data.toString('hex')}`);
+            this.emit('command:response', { responseCode, appSequence: appSeqAsEcho, data });
+        }
 
         const ack = this.session.buildSimpleAck();
         this._sendPacket(ack);
@@ -655,6 +676,75 @@ export class ITV2Client extends EventEmitter {
         this._sendPacket(this.session.buildSimpleAck());
     }
 
+    // ==================== Status Query Response Handlers ====================
+
+    _handleZoneStatusResponse(parsed) {
+        const data = parsed.commandData;
+        this._logMinimal(`[Zone Status] Received zone status response`);
+        this._log(`[Zone Status] Raw data (${data?.length || 0} bytes): ${data?.toString('hex') || 'none'}`);
+
+        if (data && data.length >= 3) {
+            // Response format: [ZoneNumber 2B BE][StatusByte 1B][...more zones...]
+            const zoneNum = data.readUInt16BE(0);
+            const statusByte = data[2];
+
+            // Update internal state
+            const fullStatus = this.eventHandler.handleZoneStatus(zoneNum, statusByte);
+
+            this._logMinimal(`[Zone Status] Zone ${zoneNum}: ${fullStatus.open ? 'OPEN' : 'CLOSED'} (0x${statusByte.toString(16)})`);
+
+            // Emit event with full status
+            this.emit('zone:statusResponse', zoneNum, fullStatus);
+            this.emit('zone:status', zoneNum, fullStatus);
+        } else {
+            this._log(`[Zone Status] Empty or invalid response`);
+        }
+
+        this._sendPacket(this.session.buildSimpleAck());
+    }
+
+    _handlePartitionStatusResponse(parsed) {
+        const data = parsed.commandData;
+        this._logMinimal(`[Partition Status] Received partition status response`);
+        this._log(`[Partition Status] Raw data (${data?.length || 0} bytes): ${data?.toString('hex') || 'none'}`);
+
+        if (data && data.length >= 3) {
+            // Response format: [PartitionNumber 2B BE][StatusBytes...]
+            const partitionNum = data.readUInt16BE(0);
+            const statusBytes = data.slice(2);
+
+            this._logMinimal(`[Partition Status] Partition ${partitionNum}: status bytes ${statusBytes.toString('hex')}`);
+
+            // Emit raw event - let consumers parse the detailed status
+            this.emit('partition:statusResponse', partitionNum, statusBytes);
+        } else {
+            this._log(`[Partition Status] Empty or invalid response`);
+        }
+
+        this._sendPacket(this.session.buildSimpleAck());
+    }
+
+    _handleGlobalStatusResponse(parsed) {
+        const data = parsed.commandData;
+        this._logMinimal(`[Global Status] Received global status response`);
+        this._log(`[Global Status] Raw data (${data?.length || 0} bytes): ${data?.toString('hex') || 'none'}`);
+
+        if (data && data.length > 0) {
+            // Emit raw event with full data
+            this.emit('global:statusResponse', data);
+
+            // Log byte breakdown for debugging
+            this._log(`[Global Status] Byte breakdown:`);
+            for (let i = 0; i < data.length && i < 32; i++) {
+                this._log(`  Byte ${i}: 0x${data[i].toString(16).padStart(2, '0')} (${data[i]})`);
+            }
+        } else {
+            this._log(`[Global Status] Empty response`);
+        }
+
+        this._sendPacket(this.session.buildSimpleAck());
+    }
+
     // ==================== Utility Methods ====================
 
     _handleError(error) {