@rfranzoi/scrypted-mqtt-securitysystem 1.0.47 → 1.0.49

package/dist/main.nodejs.js

@@ -34077,8 +34077,12 @@ function falsy(v) {
     const s = v.toString().trim().toLowerCase();
     return s === '0' || s === 'false' || s === 'offline' || s === 'no' || s === 'off';
 }
-function normalize(s) { return (s || '').trim().toLowerCase(); }
-function clamp(n, min, max) { return Math.max(min, Math.min(max, n)); }
+function normalize(s) {
+    return (s || '').trim().toLowerCase();
+}
+function clamp(n, min, max) {
+    return Math.max(min, Math.min(max, n));
+}
 /** SecuritySystem outgoing defaults (PAI-like) */
 const DEFAULT_OUTGOING = {
     [sdk_1.SecuritySystemMode.Disarmed]: 'disarm',
@@ -34086,8 +34090,8 @@ const DEFAULT_OUTGOING = {
     [sdk_1.SecuritySystemMode.AwayArmed]: 'arm_away',
     [sdk_1.SecuritySystemMode.NightArmed]: 'arm_night',
 };
-/** Parse incoming payload -> final mode (ignore transition states) */
-function payloadToMode(payload) {
+/** Fallback (non-strict) parser con sinonimi */
+function payloadToModeLoose(payload) {
     if (payload == null)
         return;
     const p = normalize(payload.toString());
@@ -34108,7 +34112,7 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
         super(nativeId);
         this.cfg = cfg;
     }
-    /** setter centralizzato: cambia lo stato SOLO se diverso e poi emette l'evento relativo */
+    /** setter centralizzato + evento */
     setAndEmit(prop, val, iface) {
         const prev = this[prop];
         if (prev === val)
@@ -34144,19 +34148,16 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
         }
         // battery
         if (topic === this.cfg.topics.batteryLevel) {
-            // aggiorna solo con numeri validi 0..100
             const n = clamp(parseFloat(raw), 0, 100);
             if (Number.isFinite(n))
                 this.setAndEmit('batteryLevel', n, sdk_1.ScryptedInterface.Battery);
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            // LowBattery booleano: quando TRUE -> 10%; quando FALSE non forzare nulla, lascia il valore precedente
+            // Se abbiamo solo lowBattery: true => 10%, false => 100% (ma solo se non c'è già un valore)
             if (truthy(np))
                 this.setAndEmit('batteryLevel', 10, sdk_1.ScryptedInterface.Battery);
-            else if (falsy(np) && this.batteryLevel === undefined) {
-                // se è il primo messaggio ed è "ok", metti 100 (altrimenti resta undefined)
+            else if (falsy(np) && this.batteryLevel === undefined)
                 this.setAndEmit('batteryLevel', 100, sdk_1.ScryptedInterface.Battery);
-            }
         }
         // primary handled by subclasses
         this.handlePrimary(topic, np, raw);
@@ -34251,6 +34252,61 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         catch { }
     }
+    // ====== Strict parsing helpers ======
+    parseJsonArray(key, fallback) {
+        try {
+            const raw = (this.storage.getItem(key) || '').trim();
+            if (!raw)
+                return fallback;
+            const arr = JSON.parse(raw);
+            if (!Array.isArray(arr))
+                return fallback;
+            return arr.map((x) => normalize(String(x))).filter(Boolean);
+        }
+        catch {
+            return fallback;
+        }
+    }
+    useStrict() {
+        return this.storage.getItem('strictParsing') === 'true';
+    }
+    parseIncomingMode(payload) {
+        const np = normalize(payload?.toString?.() ?? String(payload ?? ''));
+        if (!this.useStrict())
+            return payloadToModeLoose(np);
+        const currentVals = new Set(this.parseJsonArray('currentStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed', 'triggered']));
+        if (currentVals.has('disarmed') && np === 'disarmed')
+            return sdk_1.SecuritySystemMode.Disarmed;
+        if (currentVals.has('armed_home') && np === 'armed_home')
+            return sdk_1.SecuritySystemMode.HomeArmed;
+        if (currentVals.has('armed_away') && np === 'armed_away')
+            return sdk_1.SecuritySystemMode.AwayArmed;
+        if (currentVals.has('armed_night') && np === 'armed_night')
+            return sdk_1.SecuritySystemMode.NightArmed;
+        return undefined;
+    }
+    isTriggeredToken(np) {
+        if (this.useStrict()) {
+            const triggered = new Set(this.parseJsonArray('triggeredValues', ['triggered', 'alarm']));
+            return triggered.has(np);
+        }
+        return np === 'triggered' || np === 'alarm';
+    }
+    /** Sceglie il token di publish preferito per ciascuna modalità usando targetStateValues quando strict=ON */
+    preferredTokenForMode(mode) {
+        const t = this.parseJsonArray('targetStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed']);
+        const pick = (...cands) => cands.find(c => t.includes(c));
+        switch (mode) {
+            case sdk_1.SecuritySystemMode.Disarmed:
+                return pick('disarmed', 'disarm') || 'disarmed';
+            case sdk_1.SecuritySystemMode.HomeArmed:
+                return pick('armed_home', 'arm_home', 'home', 'stay') || 'armed_home';
+            case sdk_1.SecuritySystemMode.AwayArmed:
+                return pick('armed_away', 'arm_away', 'away') || 'armed_away';
+            case sdk_1.SecuritySystemMode.NightArmed:
+                return pick('armed_night', 'arm_night', 'night', 'sleep') || 'armed_night';
+        }
+    }
     // helpers persistenza
     saveSensorsToStorage() {
         try {
@@ -34278,6 +34334,16 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             { group: 'Alarm Topics', key: 'topicOnline', title: 'Get Online (subscribe)', placeholder: 'paradox/interface/availability', value: this.storage.getItem('topicOnline') || '' },
             { group: 'Publish Options', key: 'qos', title: 'QoS', type: 'integer', value: parseInt(this.storage.getItem('qos') || '0') },
             { group: 'Publish Options', key: 'retain', title: 'Retain', type: 'boolean', value: this.storage.getItem('retain') === 'true' },
+            // --- Parsing / State tokens ---
+            { group: 'Parsing / State tokens', key: 'strictParsing', title: 'Use strict tokens (disable synonyms)', type: 'boolean', value: this.storage.getItem('strictParsing') === 'true' },
+            { group: 'Parsing / State tokens', key: 'targetStateValues', title: 'Accepted Target State Values (JSON array)', placeholder: '["armed_home","armed_away","armed_night","disarmed"]', value: this.storage.getItem('targetStateValues') || '["armed_home","armed_away","armed_night","disarmed"]' },
+            { group: 'Parsing / State tokens', key: 'currentStateValues', title: 'Accepted Current State Values (JSON array)', placeholder: '["armed_home","armed_away","armed_night","disarmed","triggered"]', value: this.storage.getItem('currentStateValues') || '["armed_home","armed_away","armed_night","disarmed","triggered"]' },
+            { group: 'Parsing / State tokens', key: 'triggeredValues', title: 'Triggered tokens (JSON array)', placeholder: '["triggered","alarm"]', value: this.storage.getItem('triggeredValues') || '["triggered","alarm"]' },
+            // --- Publish Payloads (override) ---
+            { group: 'Publish Payloads (override)', key: 'payloadDisarm', title: 'Payload for Disarm', placeholder: 'disarmed', value: this.storage.getItem('payloadDisarm') || '', description: 'Se vuoto: usa targetStateValues (strict ON) o i default arm_*/disarm (strict OFF).' },
+            { group: 'Publish Payloads (override)', key: 'payloadHome', title: 'Payload for Home Armed', placeholder: 'armed_home', value: this.storage.getItem('payloadHome') || '' },
+            { group: 'Publish Payloads (override)', key: 'payloadAway', title: 'Payload for Away Armed', placeholder: 'armed_away', value: this.storage.getItem('payloadAway') || '' },
+            { group: 'Publish Payloads (override)', key: 'payloadNight', title: 'Payload for Night Armed', placeholder: 'armed_night', value: this.storage.getItem('payloadNight') || '' },
         ];
         // ---- UI Add Sensor ----
         out.push({ group: 'Add Sensor', key: 'new.id', title: 'New Sensor ID', placeholder: 'porta-ingresso', value: this.storage.getItem('new.id') || '' }, { group: 'Add Sensor', key: 'new.name', title: 'Name', placeholder: 'Porta Ingresso', value: this.storage.getItem('new.name') || '' }, { group: 'Add Sensor', key: 'new.kind', title: 'Type', value: this.storage.getItem('new.kind') || 'contact', choices: ['contact', 'motion', 'occupancy'] }, { group: 'Add Sensor', key: 'new.create', title: 'Create sensor', type: 'boolean', description: 'Fill the fields above and toggle this on to create the sensor. After creation, restart this plugin to see the accessory listed below. To show it in HomeKit, restart the HomeKit plugin as well.' });
@@ -34301,6 +34367,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         return out;
     }
     async putSetting(key, value) {
+        // salva sempre nella storage la value del campo (così resta in UI)
         this.storage.setItem(key, String(value));
         // --- Add Sensor workflow ---
         if (key === 'new.create' && String(value) === 'true') {
@@ -34317,6 +34384,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             }
             this.sensorsCfg.push({ id, name, kind, topics: {} });
             this.saveSensorsToStorage();
+            // pulisci i campi "new.*"
             this.storage.removeItem('new.id');
             this.storage.removeItem('new.name');
             this.storage.removeItem('new.kind');
@@ -34336,6 +34404,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 return;
             }
             if (prop === 'remove' && String(value) === 'true') {
+                // elimina
                 this.sensorsCfg = this.sensorsCfg.filter(s => s.id !== sid);
                 this.saveSensorsToStorage();
                 try {
@@ -34343,15 +34412,18 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     deviceManager.onDeviceRemoved?.(`sensor:${sid}`);
                 }
                 catch { }
+                // pulisci flag
                 this.storage.removeItem(key);
                 await this.discoverSensors();
                 await this.connectMqtt(true);
                 return;
             }
-            if (prop === 'name')
+            if (prop === 'name') {
                 cfg.name = String(value);
-            else if (prop === 'kind')
+            }
+            else if (prop === 'kind') {
                 cfg.kind = String(value);
+            }
             else if (prop.startsWith('topic.')) {
                 const tk = prop.substring('topic.'.length);
                 cfg.topics[tk] = String(value).trim();
@@ -34361,8 +34433,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // --- Altro (MQTT / Alarm settings) ---
+        // --- Altro (MQTT / Alarm settings / parsing / payloads) ---
         if (key === 'sensorsJson') {
+            // non più mostrato, ma se presente da vecchie versioni
             this.loadSensorsFromStorage();
             await this.discoverSensors();
             await this.connectMqtt(true);
@@ -34378,8 +34451,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     async releaseDevice(_id, nativeId) {
         try {
             const dev = this.devices.get(nativeId);
-            if (dev)
+            if (dev) {
                 this.devices.delete(nativeId);
+            }
             try {
                 deviceManager.onDeviceRemoved?.(nativeId);
             }
@@ -34393,6 +34467,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         try {
             const raw = this.storage.getItem('sensorsJson') || '[]';
             const parsed = JSON.parse(raw);
+            // sanitize
             this.sensorsCfg = (parsed || []).filter(x => x && x.id && x.name && x.kind && x.topics);
         }
         catch (e) {
@@ -34402,20 +34477,22 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     }
     /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO ===== */
     async discoverSensors() {
-        // 1) Manifests
+        // 1) Prepara i manifest (niente istanze qui)
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
             const interfaces = [sdk_1.ScryptedInterface.Online];
+            // Tamper solo se c'è un topic tamper
             if (t.tamper)
                 interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
+            // Interfaccia primaria
             if (cfg.kind === 'contact')
                 interfaces.unshift(sdk_1.ScryptedInterface.EntrySensor);
             else if (cfg.kind === 'motion')
                 interfaces.unshift(sdk_1.ScryptedInterface.MotionSensor);
             else
                 interfaces.unshift(sdk_1.ScryptedInterface.OccupancySensor);
-            // Espone Battery SOLTANTO se è configurato almeno un topic batteria (stringa non vuota)
+            // Battery solo se previsto
             if ((t.batteryLevel && t.batteryLevel.trim()) || (t.lowBattery && t.lowBattery.trim())) {
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
             }
@@ -34449,7 +34526,15 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             else {
                 dev.cfg = cfg;
             }
-            // <<< RIMOSSO il default batteryLevel=100: niente valore finché non arriva un messaggio >>>
+            // Default “OK” se abbiamo Battery ma nessun valore ancora ricevuto
+            const hasBattery = !!(cfg.topics.batteryLevel && cfg.topics.batteryLevel.trim()) || !!(cfg.topics.lowBattery && cfg.topics.lowBattery.trim());
+            if (hasBattery && dev.batteryLevel === undefined) {
+                dev.batteryLevel = 100;
+                try {
+                    dev.onDeviceEvent(sdk_1.ScryptedInterface.Battery, 100);
+                }
+                catch { }
+            }
         }
         // 4) Rimuovi quelli spariti
         const announced = new Set(manifests.map(m => m.nativeId));
@@ -34588,8 +34673,8 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     return;
                 }
                 if (topic === tCurrent) {
-                    const mode = payloadToMode(payload);
-                    const isAlarm = ['alarm', 'triggered'].includes(np);
+                    const mode = this.parseIncomingMode(payload);
+                    const isAlarm = this.isTriggeredToken(np);
                     const current = this.securitySystemState || { mode: sdk_1.SecuritySystemMode.Disarmed };
                     const newState = {
                         mode: mode ?? current.mode,
@@ -34609,7 +34694,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     return;
                 }
                 if (topic === tTarget) {
-                    this.pendingTarget = payloadToMode(payload);
+                    this.pendingTarget = this.parseIncomingMode(payload);
                     this.console.log('Target state reported:', p, '->', this.pendingTarget);
                     return;
                 }
@@ -34638,10 +34723,25 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.console.error('publish error', err);
         });
     }
+    /** Sceglie il payload di publish rispettando override → strict tokens → default arm_* */
+    getOutgoing(mode) {
+        const overrides = {
+            [sdk_1.SecuritySystemMode.Disarmed]: this.storage.getItem('payloadDisarm') || null,
+            [sdk_1.SecuritySystemMode.HomeArmed]: this.storage.getItem('payloadHome') || null,
+            [sdk_1.SecuritySystemMode.AwayArmed]: this.storage.getItem('payloadAway') || null,
+            [sdk_1.SecuritySystemMode.NightArmed]: this.storage.getItem('payloadNight') || null,
+        };
+        const override = overrides[mode];
+        if (override && override.trim().length)
+            return override.trim();
+        if (this.useStrict())
+            return this.preferredTokenForMode(mode);
+        return DEFAULT_OUTGOING[mode];
+    }
     async armSecuritySystem(mode) {
         const payload = this.getOutgoing(mode);
         this.console.log('armSecuritySystem', mode, '->', payload);
-        this.pendingTarget = mode;
+        this.pendingTarget = mode; // memorizza target, ma NON cambiare il current
         this.publishSetTarget(payload);
     }
     async disarmSecuritySystem() {
@@ -34650,15 +34750,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         this.pendingTarget = sdk_1.SecuritySystemMode.Disarmed;
         this.publishSetTarget(payload);
     }
-    getOutgoing(mode) {
-        const map = {
-            [sdk_1.SecuritySystemMode.Disarmed]: this.storage.getItem('payloadDisarm') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.Disarmed],
-            [sdk_1.SecuritySystemMode.HomeArmed]: this.storage.getItem('payloadHome') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.HomeArmed],
-            [sdk_1.SecuritySystemMode.AwayArmed]: this.storage.getItem('payloadAway') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.AwayArmed],
-            [sdk_1.SecuritySystemMode.NightArmed]: this.storage.getItem('payloadNight') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.NightArmed],
-        };
-        return map[mode];
-    }
 }
 exports["default"] = ParadoxMqttSecuritySystem;
 

package/package.json

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