dsc-itv2-client 2.0.5 → 2.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsc-itv2-client",
   "author": "fajitacat",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Reverse engineered DSC ITV2 Protocol Client Library for TL280/TL280E - Monitor and control DSC Neo alarm panels with real-time zone/partition status, arming, and trouble detail",
   "main": "src/index.js",
   "type": "module",

package/src/ITV2Client.js

@@ -758,6 +758,9 @@ export class ITV2Client extends EventEmitter {
             case CMD.SINGLE_ZONE_BYPASS_STATUS:
                 this._handleZoneBypassNotification(parsed);
                 break;
+            case CMD.ZONE_ALARM_STATUS:
+                this._handleZoneAlarmStatus(parsed);
+                break;
             case CMD.MULTIPLE_MESSAGE:
                 this._handleMultipleMessagePacket(parsed);
                 break;
@@ -1219,6 +1222,10 @@ export class ITV2Client extends EventEmitter {
                     rawBytes: statusBytes.toString('hex'),
                 };
 
+                // Check alarm state change before updating event handler
+                const prevPartState = this.eventHandler.getPartitionState(partitionNum);
+                const wasInAlarm = prevPartState?.alarm || false;
+
                 // Update event handler
                 const armedState = partStatus.awayArmed ? 0x02 :
                     partStatus.stayArmed ? 0x01 :
@@ -1226,6 +1233,22 @@ export class ITV2Client extends EventEmitter {
                     partStatus.armed ? 0x01 : 0x00;
                 this.eventHandler.handlePartitionArming(partitionNum, armedState);
 
+                // Store alarm flag in partition state
+                const currentPartState = this.eventHandler.getPartitionState(partitionNum);
+                if (currentPartState) {
+                    currentPartState.alarm = partStatus.alarm;
+                    currentPartState.alarmInMemory = partStatus.alarmInMemory;
+                }
+
+                // Emit alarm events on state change
+                if (partStatus.alarm && !wasInAlarm) {
+                    this._logMinimal(`[Partition ${partitionNum}] ALARM!`);
+                    this.emit('partition:alarm', { partition: partitionNum, ...partStatus });
+                } else if (!partStatus.alarm && wasInAlarm) {
+                    this._logMinimal(`[Partition ${partitionNum}] Alarm restored`);
+                    this.emit('partition:alarm:restored', { partition: partitionNum, ...partStatus });
+                }
+
                 this.emit('partition:statusResponse', partitionNum, partStatus);
                 this._resolvePendingRequest(CMD.PARTITION_STATUS, partStatus);
             } catch (e) {
@@ -1460,6 +1483,75 @@ export class ITV2Client extends EventEmitter {
         this._ack();
     }
 
+    _handleZoneAlarmStatus(parsed) {
+        // 0x0840 ModuleStatus_Zone_Alarm_Status (from decompiled SDK):
+        // [Partition CompactInt][Count CompactInt][repeated: Zone CompactInt, AlarmType 1B, AlarmState 1B]
+        //
+        // AlarmType: 1=Unknown, 2=Burglary, 3=24HR_Supervisory, 4=Fire, 5=Fire_Supervisory,
+        //   6=CO, 7=Gas, 8=HighTemp, 9=LowTemp, 10=Medical, 11=Panic, 12=Waterflow,
+        //   13=Water_Leakage, 14=Pendant, 15=Tamper, 16=RF_Jam, 17=Hardware_Fault,
+        //   18=Duress, 19=Personal_Emergency, 20=Holdup, 21=Sprinkler
+        // AlarmState: bit 0 = 0 → NotInAlarm, bit 0 = 1 → InAlarm
+        const fullPayload = this._reconstructPayload(parsed);
+        if (!fullPayload || fullPayload.length < 6) {
+            this._ack();
+            return;
+        }
+
+        const ALARM_TYPES = {
+            1: 'Unknown', 2: 'Burglary', 3: '24HR_Supervisory', 4: 'Fire',
+            5: 'Fire_Supervisory', 6: 'CO', 7: 'Gas', 8: 'HighTemp',
+            9: 'LowTemp', 10: 'Medical', 11: 'Panic', 12: 'Waterflow',
+            13: 'Water_Leakage', 14: 'Pendant', 15: 'Tamper', 16: 'RF_Jam',
+            17: 'Hardware_Fault', 18: 'Duress', 19: 'Personal_Emergency',
+            20: 'Holdup', 21: 'Sprinkler',
+        };
+
+        try {
+            let offset = 0;
+            const partition = ITv2Session.decodeVarBytes(fullPayload, offset);
+            offset += partition.bytesRead;
+
+            const count = ITv2Session.decodeVarBytes(fullPayload, offset);
+            offset += count.bytesRead;
+
+            while (offset < fullPayload.length) {
+                const zone = ITv2Session.decodeVarBytes(fullPayload, offset);
+                offset += zone.bytesRead;
+                if (offset >= fullPayload.length) break;
+                const alarmType = fullPayload[offset++];
+                if (offset >= fullPayload.length) break;
+                const alarmState = fullPayload[offset++];
+
+                const inAlarm = !!(alarmState & 0x01);
+                const alarmTypeName = ALARM_TYPES[alarmType] || `Unknown(${alarmType})`;
+
+                this._logMinimal(`[Zone ${zone.value}] Alarm: ${inAlarm ? 'ACTIVE' : 'CLEARED'} (${alarmTypeName}, partition ${partition.value})`);
+
+                const alarmData = {
+                    zone: zone.value,
+                    partition: partition.value,
+                    alarmType,
+                    alarmTypeName,
+                    inAlarm,
+                    timestamp: new Date(),
+                };
+
+                if (inAlarm) {
+                    this.eventHandler.handleZoneAlarm(zone.value, alarmTypeName);
+                    this.emit('zone:alarm', alarmData);
+                    this.emit('partition:alarm', alarmData);
+                } else {
+                    this.emit('zone:alarm:restored', alarmData);
+                    this.emit('partition:alarm:restored', alarmData);
+                }
+            }
+        } catch (e) {
+            this._log(`[Zone Alarm Status] Parse error: ${e.message}`);
+        }
+        this._ack();
+    }
+
     _handleExitDelayNotification(parsed) {
         // 0x0230 NotificationExitDelay (from neohub):
         // [CompactInt:Partition][DelayFlags:1B][CompactInt:DurationInSeconds]