@rfranzoi/scrypted-mqtt-securitysystem 1.0.13 → 1.0.15

package/dist/main.nodejs.js

@@ -34087,7 +34087,7 @@ const DEFAULT_OUTGOING = {
     [sdk_1.SecuritySystemMode.NightArmed]: 'arm_night',
 };
 /** Common incoming synonyms → SecuritySystemMode
- *  (FIX: gli stati transitori non alterano la modalità) */
+ *  (transitori non alterano la modalità corrente) */
 function payloadToMode(payload) {
     if (payload == null)
         return;
@@ -34101,7 +34101,7 @@ function payloadToMode(payload) {
         return sdk_1.SecuritySystemMode.AwayArmed;
     if (['arm_night', 'night', 'armed_night', 'sleep', 'arm_sleep', 'armed_sleep'].includes(p))
         return sdk_1.SecuritySystemMode.NightArmed;
-    // transitional / ignore for mode changes
+    // transitori: non cambiano il mode
     if (['entry_delay', 'exit_delay', 'pending', 'arming', 'disarming'].includes(p))
         return undefined;
     return undefined;
@@ -34130,18 +34130,21 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         // Connect on start
         this.connectMqtt().catch(e => this.console.error('MQTT connect error:', e));
         // chiusura pulita del client MQTT ai reload/stop del plugin
-        process.once('SIGTERM', () => { try {
-            this.client?.end(true);
-        }
-        catch { } });
-        process.once('SIGINT', () => { try {
-            this.client?.end(true);
-        }
-        catch { } });
-        process.on('exit', () => { try {
-            this.client?.end(true);
+        try {
+            process.once('SIGTERM', () => { try {
+                this.client?.end(true);
+            }
+            catch { } });
+            process.once('SIGINT', () => { try {
+                this.client?.end(true);
+            }
+            catch { } });
+            process.on('exit', () => { try {
+                this.client?.end(true);
+            }
+            catch { } });
         }
-        catch { } });
+        catch { }
     }
     // --- Settings UI ---
     async getSettings() {
@@ -34191,12 +34194,11 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         return { url, opts };
     }
     async connectMqtt(reconnect = false) {
-        const subs = [
-            this.storage.getItem('topicGetTarget'),
-            this.storage.getItem('topicGetCurrent'),
-            this.storage.getItem('topicTamper'),
-            this.storage.getItem('topicOnline'),
-        ].filter(Boolean);
+        const tTarget = this.storage.getItem('topicGetTarget') || '';
+        const tCurrent = this.storage.getItem('topicGetCurrent') || '';
+        const tTamper = this.storage.getItem('topicTamper') || '';
+        const tOnline = this.storage.getItem('topicOnline') || '';
+        const subs = [tTarget, tCurrent, tTamper, tOnline].filter(Boolean);
         if (!subs.length && !this.storage.getItem('topicSetTarget')) {
             this.console.warn('Configura almeno un topic nelle impostazioni.');
         }
@@ -34228,7 +34230,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             try {
                 const p = payload?.toString() ?? '';
                 // Online
-                if (topic === this.storage.getItem('topicOnline')) {
+                if (topic === tOnline) {
                     if (truthy(p) || p.toLowerCase() === 'online')
                         this.online = true;
                     if (falsy(p) || p.toLowerCase() === 'offline')
@@ -34236,7 +34238,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     return;
                 }
                 // Tamper
-                if (topic === this.storage.getItem('topicTamper')) {
+                if (topic === tTamper) {
                     const np = normalize(p);
                     if (truthy(np) || ['tamper', 'intrusion', 'cover', 'motion', 'magnetic'].includes(np)) {
                         this.tampered = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
@@ -34246,8 +34248,8 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     }
                     return;
                 }
-                // Target/Current → mode/triggered
-                if ([this.storage.getItem('topicGetTarget'), this.storage.getItem('topicGetCurrent')].includes(topic)) {
+                // CURRENT state → aggiorna il mode mostrato
+                if (topic === tCurrent) {
                     const mode = payloadToMode(payload);
                     const isAlarm = ['alarm', 'triggered'].includes(normalize(p));
                     const current = this.securitySystemState || { mode: sdk_1.SecuritySystemMode.Disarmed };
@@ -34264,6 +34266,12 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     this.securitySystemState = newState;
                     return;
                 }
+                // TARGET state → NON cambia il mode; lo memorizziamo solo come pending
+                if (topic === tTarget) {
+                    this.pendingTarget = payloadToMode(payload);
+                    this.console.log('Target state reported:', p, '->', this.pendingTarget);
+                    return;
+                }
             }
             catch (e) {
                 this.console.error('MQTT message handler error', e);
@@ -34288,17 +34296,16 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     async armSecuritySystem(mode) {
         const payload = this.getOutgoing(mode);
         this.console.log('armSecuritySystem', mode, '->', payload);
+        this.pendingTarget = mode; // memorizza target, ma NON cambiare il current
         this.publishSetTarget(payload);
-        // Optimistic UI update until broker echoes target/current state
-        const st = this.securitySystemState || { mode: sdk_1.SecuritySystemMode.Disarmed };
-        this.securitySystemState = { ...st, mode, triggered: false };
+        // niente update ottimistico: HomeKit vedrà Target ≠ Current e mostrerà "Arming..."
     }
     async disarmSecuritySystem() {
         const payload = this.getOutgoing(sdk_1.SecuritySystemMode.Disarmed);
         this.console.log('disarmSecuritySystem ->', payload);
+        this.pendingTarget = sdk_1.SecuritySystemMode.Disarmed;
         this.publishSetTarget(payload);
-        const st = this.securitySystemState || { mode: sdk_1.SecuritySystemMode.Disarmed };
-        this.securitySystemState = { ...st, mode: sdk_1.SecuritySystemMode.Disarmed, triggered: false };
+        // niente update ottimistico: aspetta il feedback CURRENT
     }
     getOutgoing(mode) {
         const map = {

package/package.json

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