dsc-itv2-client 1.0.11 → 1.0.13

package/package.json

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

@@ -375,7 +375,7 @@ export class ITV2Client extends EventEmitter {
         } else if (this.handshakeState === 'SENT_REQUEST_ACCESS') {
             // Panel ACKed our REQUEST_ACCESS - session established!
             this.handshakeState = 'ESTABLISHED';
-            this._logMinimal(`✅ Session established (Type ${this.detectedEncryptionType} encryption)`);
+            this._logMinimal(`[Handshake] Session established (Type ${this.detectedEncryptionType} encryption)`);
             this._log(`[Handshake] *** SESSION ESTABLISHED ***`);
             this._log(`[Handshake] Encryption Type: ${this.detectedEncryptionType}`);
             this._log(`[Handshake] SEND key: ${this.session.derivedSendKey?.toString('hex')}`);
@@ -440,7 +440,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._log(`[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) {