dsc-itv2-client 1.0.12 → 1.0.16

package/package.json

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

@@ -198,12 +198,18 @@ export class ITV2Client extends EventEmitter {
                 this.session = new ITv2Session(this.integrationId, this.accessCode, logger);
             }
 
+            // DEBUG: Log all incoming packets
+            this._logMinimal(`[DEBUG] RX ${data.length} bytes, state=${this.handshakeState}`);
+
             const parsed = this.session.parsePacket(data);
             if (!parsed) {
-                this._log('[Error] Failed to parse packet');
+                this._logMinimal('[DEBUG] Failed to parse packet');
                 return;
             }
 
+            // DEBUG: Log parsed command
+            this._logMinimal(`[DEBUG] Parsed cmd=${parsed.command} (${CMD_NAMES[parsed.command] || 'unknown'})`);
+
             // Verbose logging only
             this._log(`\n[UDP] RX from ${this.panelAddress}:${this.panelPort} (${data.length} bytes)`);
             this._hexDump(data);
@@ -440,7 +446,32 @@ export class ITV2Client extends EventEmitter {
         const response = this.session.buildCommandResponseWithAppSeq(appSeq, 0x00);
         this._sendPacket(response);
 
-        this.handshakeState = 'WAITING_TO_SEND_REQUEST_ACCESS';
+        // Send our REQUEST_ACCESS immediately (panel doesn't ACK our COMMAND_RESPONSE)
+        this._logMinimal('[Handshake] Sending our REQUEST_ACCESS...');
+
+        // Enable encryption with SEND key
+        this.session.sendAesActive = true;
+        this.session.sendAesKey = this.session.derivedSendKey;
+        this._log(`[Handshake] Encrypting REQUEST_ACCESS with SEND key`);
+
+        // Build REQUEST_ACCESS based on detected encryption type
+        let reqAccessPacket;
+        if (this.detectedEncryptionType === 2) {
+            this._log(`[Handshake] Using Type 2 REQUEST_ACCESS`);
+            reqAccessPacket = this.session.buildRequestAccessType2();
+        } else {
+            this._log(`[Handshake] Using Type 1 REQUEST_ACCESS`);
+            reqAccessPacket = this.session.buildRequestAccessType1();
+        }
+
+        this._sendPacket(reqAccessPacket);
+
+        // Enable receive encryption
+        this.session.receiveAesActive = true;
+        this.session.receiveAesKey = this.session.pendingReceiveKey;
+        this._log(`[Handshake] Enabled receive encryption`);
+
+        this.handshakeState = 'SENT_REQUEST_ACCESS';
     }
 
     _handleCommandResponse(parsed) {
@@ -477,6 +508,17 @@ export class ITV2Client extends EventEmitter {
     // ==================== Notification Handlers ====================
 
     _handleLifestyleZoneStatus(parsed) {
+        // If we receive encrypted zone data, session is established (even if we missed the final ACK)
+        if (this.handshakeState === 'SENT_REQUEST_ACCESS') {
+            this.handshakeState = 'ESTABLISHED';
+            this._logMinimal(`[Handshake] Session established (Type ${this.detectedEncryptionType} encryption)`);
+            this.emit('session:established', {
+                encryptionType: this.detectedEncryptionType,
+                sendKey: this.session.derivedSendKey?.toString('hex'),
+                recvKey: this.session.pendingReceiveKey?.toString('hex')
+            });
+        }
+
         const data = parsed.commandData;
 
         if (data && data.length >= 2) {