dsc-itv2-client 1.0.10 → 1.0.11

package/package.json

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

@@ -196,8 +196,6 @@ export class ITV2Client extends EventEmitter {
                 const logger = this.logLevel === 'verbose' ? this._log.bind(this) : () => {
                 };
                 this.session = new ITv2Session(this.integrationId, this.accessCode, logger);
-                this.emit('session:connecting');
-                this._logMinimal(`[Session] Panel connecting from ${this.panelAddress}`);
             }
 
             const parsed = this.session.parsePacket(data);
@@ -223,12 +221,27 @@ export class ITV2Client extends EventEmitter {
             this._routePacket(parsed);
 
         } catch (err) {
+            // During WAITING state, parse errors are expected (stale encrypted packets from previous session)
+            if (this.handshakeState === 'WAITING') {
+                this._log(`[Recovery] Ignoring malformed packet while waiting for fresh handshake: ${err.message}`);
+                // Reset session to ensure we start fresh on next valid packet
+                if (this.session) {
+                    this.session.disableAes();
+                    this.session = null;
+                }
+                return;
+            }
+
             this._log(`[Error] ${err.message}`);
             this.emit('error', err);
 
-            // Reset on parse errors
-            if (this.handshakeState !== 'WAITING' && this.handshakeState !== 'SENT_CMD_RESPONSE_1') {
+            // Reset on parse errors during handshake
+            if (this.handshakeState !== 'SENT_CMD_RESPONSE_1') {
                 this._log('[Recovery] Parse error, resetting to wait for panel restart');
+                if (this.session) {
+                    this.session.disableAes();
+                    this.session = null;
+                }
                 this.handshakeState = 'WAITING';
             }
         }
@@ -295,6 +308,10 @@ export class ITV2Client extends EventEmitter {
         this._log(`[Session] OPEN_SESSION received:`);
         this._log(`  Device Type: ${deviceType}`);
         this._log(`  Encryption Type: ${encryptionType}`);
+
+        // Emit connecting event now that we have a valid OPEN_SESSION
+        this.emit('session:connecting');
+        this._logMinimal(`[Session] Panel connecting from ${this.panelAddress}`);
         this._logMinimal('[Handshake] Starting session establishment...');
 
         // Handle panel restart mid-handshake