@rfranzoi/scrypted-mqtt-securitysystem 1.0.45 → 1.0.46

package/dist/main.nodejs.js

@@ -34112,7 +34112,19 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
     constructor(nativeId, cfg) {
         super(nativeId);
         this.cfg = cfg;
-        // non impostare stati qui: l'annuncio device deve avvenire prima
+    }
+    /** setter centralizzato: cambia lo stato SOLO se diverso e poi emette l'evento relativo */
+    setAndEmit(prop, val, iface) {
+        const prev = this[prop];
+        if (prev === val)
+            return;
+        this[prop] = val;
+        try {
+            this.onDeviceEvent(iface, val);
+        }
+        catch (e) {
+            this.console?.warn?.('onDeviceEvent error', iface, e);
+        }
     }
     /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
@@ -34121,62 +34133,75 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
         // online
         if (topic === this.cfg.topics.online) {
             if (truthy(np) || np === 'online')
-                this.online = true;
+                this.setAndEmit('online', true, sdk_1.ScryptedInterface.Online);
             if (falsy(np) || np === 'offline')
-                this.online = false;
+                this.setAndEmit('online', false, sdk_1.ScryptedInterface.Online);
         }
         // tamper
         if (topic === this.cfg.topics.tamper) {
             if (truthy(np) || ['tamper', 'intrusion', 'cover', 'motion', 'magnetic'].includes(np)) {
-                this.tampered = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
+                const value = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
+                this.setAndEmit('tampered', value, sdk_1.ScryptedInterface.TamperSensor);
             }
             else if (falsy(np)) {
-                this.tampered = false;
+                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor);
             }
         }
         // battery
         if (topic === this.cfg.topics.batteryLevel) {
             const n = clamp(parseFloat(p), 0, 100);
             if (isFinite(n))
-                this.batteryLevel = n;
+                this.setAndEmit('batteryLevel', n, sdk_1.ScryptedInterface.Battery);
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
             // Solo se abbiamo lowBattery (booleano) ma NON batteryLevel:
-            // True  -> 10% (warning)
-            // False -> 100% (ok)
-            this.batteryLevel = truthy(np) ? 10 : 100;
+            this.setAndEmit('batteryLevel', truthy(np) ? 10 : 100, sdk_1.ScryptedInterface.Battery);
         }
         // primary handled by subclasses
         this.handlePrimary(topic, np, p);
     }
 }
 class ContactMqttSensor extends BaseMqttSensor {
-    constructor(nativeId, cfg) {
-        super(nativeId, cfg);
-    }
     handlePrimary(topic, np, _raw) {
         if (topic === this.cfg.topics.contact) {
-            this.entryOpen = truthy(np);
+            const v = truthy(np);
+            // usa il setter che emette l'evento di EntrySensor
+            this.setAndEmit?.('entryOpen', v, sdk_1.ScryptedInterface.EntrySensor);
+            // fallback per sicurezza (in alcune minifiche setAndEmit non è visibile):
+            if (this.setAndEmit === undefined) {
+                if (this.entryOpen !== v) {
+                    this.entryOpen = v;
+                    this.onDeviceEvent(sdk_1.ScryptedInterface.EntrySensor, v);
+                }
+            }
         }
     }
 }
 class MotionMqttSensor extends BaseMqttSensor {
-    constructor(nativeId, cfg) {
-        super(nativeId, cfg);
-    }
     handlePrimary(topic, np, _raw) {
         if (topic === this.cfg.topics.motion) {
-            this.motionDetected = truthy(np);
+            const v = truthy(np);
+            this.setAndEmit?.('motionDetected', v, sdk_1.ScryptedInterface.MotionSensor);
+            if (this.setAndEmit === undefined) {
+                if (this.motionDetected !== v) {
+                    this.motionDetected = v;
+                    this.onDeviceEvent(sdk_1.ScryptedInterface.MotionSensor, v);
+                }
+            }
         }
     }
 }
 class OccupancyMqttSensor extends BaseMqttSensor {
-    constructor(nativeId, cfg) {
-        super(nativeId, cfg);
-    }
     handlePrimary(topic, np, _raw) {
         if (topic === this.cfg.topics.occupancy) {
-            this.occupied = truthy(np);
+            const v = truthy(np);
+            this.setAndEmit?.('occupied', v, sdk_1.ScryptedInterface.OccupancySensor);
+            if (this.setAndEmit === undefined) {
+                if (this.occupied !== v) {
+                    this.occupied = v;
+                    this.onDeviceEvent(sdk_1.ScryptedInterface.OccupancySensor, v);
+                }
+            }
         }
     }
 }
@@ -34440,6 +34465,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             const hasBattery = !!(cfg.topics.batteryLevel || cfg.topics.lowBattery);
             if (hasBattery && dev.batteryLevel === undefined) {
                 dev.batteryLevel = 100;
+                try {
+                    dev.onDeviceEvent(sdk_1.ScryptedInterface.Battery, 100);
+                }
+                catch { }
             }
         }
         // 4) Rimuovi quelli spariti
@@ -34517,6 +34546,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         client.on('connect', () => {
             this.console.log('MQTT connected');
             this.online = true;
+            try {
+                this.onDeviceEvent(sdk_1.ScryptedInterface.Online, true);
+            }
+            catch { }
             if (subs.length) {
                 client.subscribe(subs, { qos: 0 }, (err) => {
                     if (err)
@@ -34525,7 +34558,14 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             }
         });
         client.on('reconnect', () => this.console.log('MQTT reconnecting...'));
-        client.on('close', () => { this.console.log('MQTT closed'); this.online = false; });
+        client.on('close', () => {
+            this.console.log('MQTT closed');
+            this.online = false;
+            try {
+                this.onDeviceEvent(sdk_1.ScryptedInterface.Online, false);
+            }
+            catch { }
+        });
         client.on('error', (e) => { this.console.error('MQTT error', e); });
         client.on('message', (topic, payload) => {
             try {
@@ -34533,18 +34573,37 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 const np = normalize(p);
                 // ---- Alarm handling ----
                 if (topic === tOnline) {
-                    if (truthy(np) || np === 'online')
+                    if (truthy(np) || np === 'online') {
                         this.online = true;
-                    if (falsy(np) || np === 'offline')
+                        try {
+                            this.onDeviceEvent(sdk_1.ScryptedInterface.Online, true);
+                        }
+                        catch { }
+                    }
+                    if (falsy(np) || np === 'offline') {
                         this.online = false;
+                        try {
+                            this.onDeviceEvent(sdk_1.ScryptedInterface.Online, false);
+                        }
+                        catch { }
+                    }
                     return;
                 }
                 if (topic === tTamper) {
                     if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np)) {
-                        this.tampered = ['cover', 'intrusion'].find(x => x === np) || true;
+                        const val = ['cover', 'intrusion'].find(x => x === np) || true;
+                        this.tampered = val;
+                        try {
+                            this.onDeviceEvent(sdk_1.ScryptedInterface.TamperSensor, val);
+                        }
+                        catch { }
                     }
                     else if (falsy(np)) {
                         this.tampered = false;
+                        try {
+                            this.onDeviceEvent(sdk_1.ScryptedInterface.TamperSensor, false);
+                        }
+                        catch { }
                     }
                     return;
                 }
@@ -34563,6 +34622,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                         triggered: isAlarm || undefined,
                     };
                     this.securitySystemState = newState;
+                    try {
+                        this.onDeviceEvent(sdk_1.ScryptedInterface.SecuritySystem, newState);
+                    }
+                    catch { }
                     return;
                 }
                 if (topic === tTarget) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rfranzoi/scrypted-mqtt-securitysystem",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "Scrypted plugin: Paradox Security System via MQTT (PAI/PAI-MQTT style).",
   "license": "MIT",
   "main": "dist/main.nodejs.js",