@rfranzoi/scrypted-mqtt-securitysystem 1.0.47 → 1.0.48

package/dist/main.nodejs.js

@@ -34086,8 +34086,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 +34108,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 +34144,15 @@ 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
             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);
@@ -34208,17 +34204,14 @@ class OccupancyMqttSensor extends BaseMqttSensor {
 class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     constructor() {
         super();
-        // sensor management
         this.sensorsCfg = [];
         this.devices = new Map();
-        // (facoltativo) Imposta il device type in UI
         setTimeout(() => {
             try {
                 systemManager.getDeviceById(this.id)?.setType?.(sdk_1.ScryptedDeviceType.SecuritySystem);
             }
             catch { }
         });
-        // Default state
         this.securitySystemState = this.securitySystemState || {
             mode: sdk_1.SecuritySystemMode.Disarmed,
             supportedModes: [
@@ -34229,12 +34222,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             ],
         };
         this.online = this.online ?? false;
-        // Load sensors config and announce devices
         this.loadSensorsFromStorage();
         this.discoverSensors().catch(e => this.console.error('discoverSensors error', e));
-        // Connect on start
         this.connectMqtt().catch(e => this.console.error('MQTT connect error:', e));
-        // chiusura pulita del client MQTT ai reload/stop del plugin
         try {
             process.once('SIGTERM', () => { try {
                 this.client?.end(true);
@@ -34251,6 +34241,60 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         catch { }
     }
+    /** ---- Helpers parsing ---- */
+    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;
+        }
+    }
+    getStrictTokens() {
+        const target = this.parseJsonArray('targetStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed']);
+        const current = this.parseJsonArray('currentStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed', 'triggered']);
+        const triggered = this.parseJsonArray('triggeredValues', ['triggered', 'alarm']);
+        const union = new Set([...target, ...current]);
+        return {
+            union,
+            triggered: new Set(triggered),
+        };
+    }
+    useStrict() {
+        return this.storage.getItem('strictParsing') === 'true';
+    }
+    parseIncomingMode(payload) {
+        const p = payload?.toString?.() ?? String(payload ?? '');
+        const np = normalize(p);
+        if (!this.useStrict())
+            return payloadToModeLoose(np);
+        // strict: usa SOLO i token configurati
+        const { union } = this.getStrictTokens();
+        if (union.has('disarmed') && np === 'disarmed')
+            return sdk_1.SecuritySystemMode.Disarmed;
+        if (union.has('armed_home') && np === 'armed_home')
+            return sdk_1.SecuritySystemMode.HomeArmed;
+        if (union.has('armed_away') && np === 'armed_away')
+            return sdk_1.SecuritySystemMode.AwayArmed;
+        if (union.has('armed_night') && np === 'armed_night')
+            return sdk_1.SecuritySystemMode.NightArmed;
+        // transitori/altro: ignora
+        return undefined;
+    }
+    isTriggeredToken(np) {
+        if (this.useStrict()) {
+            const { triggered } = this.getStrictTokens();
+            return triggered.has(np);
+        }
+        // loose
+        return np === 'triggered' || np === 'alarm';
+    }
     // helpers persistenza
     saveSensorsToStorage() {
         try {
@@ -34278,6 +34322,11 @@ 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"]' },
         ];
         // ---- 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.' });
@@ -34285,7 +34334,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         for (const cfg of this.sensorsCfg) {
             const gid = `Sensor: ${cfg.name} [${cfg.id}]`;
             out.push({ group: gid, key: `sensor.${cfg.id}.name`, title: 'Name', value: cfg.name }, { group: gid, key: `sensor.${cfg.id}.kind`, title: 'Type', value: cfg.kind, choices: ['contact', 'motion', 'occupancy'] });
-            // primary per tipo
             if (cfg.kind === 'contact') {
                 out.push({ group: gid, key: `sensor.${cfg.id}.topic.contact`, title: 'Contact State Topic', value: cfg.topics.contact || '', placeholder: 'paradox/states/zones/XYZ/open' });
             }
@@ -34295,14 +34343,13 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             else {
                 out.push({ group: gid, key: `sensor.${cfg.id}.topic.occupancy`, title: 'Occupancy Detected Topic', value: cfg.topics.occupancy || '', placeholder: 'paradox/states/zones/XYZ/open' });
             }
-            // extra opzionali
             out.push({ group: gid, key: `sensor.${cfg.id}.topic.batteryLevel`, title: 'Battery Level Topic (0..100)', value: cfg.topics.batteryLevel || '' }, { group: gid, key: `sensor.${cfg.id}.topic.lowBattery`, title: 'Low Battery Topic (bool)', value: cfg.topics.lowBattery || '' }, { group: gid, key: `sensor.${cfg.id}.topic.tamper`, title: 'Tamper Topic', value: cfg.topics.tamper || '' }, { group: gid, key: `sensor.${cfg.id}.topic.online`, title: 'Online Topic', value: cfg.topics.online || '' }, { group: gid, key: `sensor.${cfg.id}.remove`, title: 'Remove sensor', type: 'boolean' });
         }
         return out;
     }
     async putSetting(key, value) {
         this.storage.setItem(key, String(value));
-        // --- Add Sensor workflow ---
+        // Add Sensor
         if (key === 'new.create' && String(value) === 'true') {
             const id = (this.storage.getItem('new.id') || '').trim();
             const name = (this.storage.getItem('new.name') || '').trim() || id;
@@ -34325,7 +34372,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // --- Edit/Remove sensore esistente ---
+        // Edit/Remove sensore
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
             const sid = m[1];
@@ -34361,7 +34408,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // --- Altro (MQTT / Alarm settings) ---
+        // altro
         if (key === 'sensorsJson') {
             this.loadSensorsFromStorage();
             await this.discoverSensors();
@@ -34372,9 +34419,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
     }
     /** ---- DeviceProvider ---- */
-    async getDevice(nativeId) {
-        return this.devices.get(nativeId);
-    }
+    async getDevice(nativeId) { return this.devices.get(nativeId); }
     async releaseDevice(_id, nativeId) {
         try {
             const dev = this.devices.get(nativeId);
@@ -34415,10 +34460,8 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 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)
-            if ((t.batteryLevel && t.batteryLevel.trim()) || (t.lowBattery && t.lowBattery.trim())) {
+            if ((t.batteryLevel && t.batteryLevel.trim()) || (t.lowBattery && t.lowBattery.trim()))
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
-            }
             return { nativeId, name: cfg.name, type: sdk_1.ScryptedDeviceType.Sensor, interfaces };
         });
         // 2) Annuncio
@@ -34433,7 +34476,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.console.log('Annunciato:', m.nativeId);
             }
         }
-        // 3) Istanzia/aggiorna DOPO l’annuncio
+        // 3) Istanzia/aggiorna
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34449,9 +34492,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             else {
                 dev.cfg = cfg;
             }
-            // <<< RIMOSSO il default batteryLevel=100: niente valore finché non arriva un messaggio >>>
+            // niente default batteria qui
         }
-        // 4) Rimuovi quelli spariti
+        // 4) cleanup
         const announced = new Set(manifests.map(m => m.nativeId));
         for (const [nativeId] of this.devices) {
             if (!announced.has(nativeId)) {
@@ -34472,13 +34515,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         const clientId = this.storage.getItem('clientId') || 'scrypted-paradox';
         const tls = this.storage.getItem('tls') === 'true';
         const rejectUnauthorized = this.storage.getItem('rejectUnauthorized') !== 'false';
-        const opts = {
-            clientId,
-            username,
-            password,
-            clean: true,
-            reconnectPeriod: 3000,
-        };
+        const opts = { clientId, username, password, clean: true, reconnectPeriod: 3000 };
         if (tls) {
             opts.protocol = 'mqtts';
             opts.rejectUnauthorized = rejectUnauthorized;
@@ -34487,13 +34524,11 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     }
     collectAllSubscriptions() {
         const subs = new Set();
-        // alarm
         for (const k of ['topicGetTarget', 'topicGetCurrent', 'topicTamper', 'topicOnline']) {
             const v = this.storage.getItem(k);
             if (v)
                 subs.add(v);
         }
-        // sensors
         for (const s of this.sensorsCfg) {
             const t = s.topics || {};
             [t.contact, t.motion, t.occupancy, t.batteryLevel, t.lowBattery, t.tamper, t.online]
@@ -34512,13 +34547,13 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.client.end(true);
             }
             catch { }
+            ;
             this.client = undefined;
         }
         const { url, opts } = this.getMqttOptions();
         this.console.log(`Connecting MQTT ${url} ...`);
         const client = mqtt_1.default.connect(url, opts);
         this.client = client;
-        // cache alarm topics for fast compare
         const tTarget = this.storage.getItem('topicGetTarget') || '';
         const tCurrent = this.storage.getItem('topicGetCurrent') || '';
         const tTamper = this.storage.getItem('topicTamper') || '';
@@ -34530,12 +34565,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.onDeviceEvent(sdk_1.ScryptedInterface.Online, true);
             }
             catch { }
-            if (subs.length) {
-                client.subscribe(subs, { qos: 0 }, (err) => {
-                    if (err)
-                        this.console.error('subscribe error', err);
-                });
-            }
+            if (subs.length)
+                client.subscribe(subs, { qos: 0 }, (err) => { if (err)
+                    this.console.error('subscribe error', err); });
         });
         client.on('reconnect', () => this.console.log('MQTT reconnecting...'));
         client.on('close', () => {
@@ -34551,7 +34583,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             try {
                 const p = payload?.toString() ?? '';
                 const np = normalize(p);
-                // ---- Alarm handling ----
                 if (topic === tOnline) {
                     if (truthy(np) || np === 'online') {
                         this.online = true;
@@ -34588,8 +34619,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,14 +34640,13 @@ 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;
                 }
                 // ---- Sensor dispatch ----
-                for (const dev of this.devices.values()) {
+                for (const dev of this.devices.values())
                     dev.handleMqtt(topic, payload);
-                }
             }
             catch (e) {
                 this.console.error('MQTT message handler error', e);

package/package.json

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