@rfranzoi/scrypted-mqtt-securitysystem 1.0.48 → 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',
@@ -34149,6 +34153,7 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
                 this.setAndEmit('batteryLevel', n, sdk_1.ScryptedInterface.Battery);
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
+            // 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)
@@ -34204,14 +34209,17 @@ 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: [
@@ -34222,9 +34230,12 @@ 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);
@@ -34241,7 +34252,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         catch { }
     }
-    /** ---- Helpers parsing ---- */
+    // ====== Strict parsing helpers ======
     parseJsonArray(key, fallback) {
         try {
             const raw = (this.storage.getItem(key) || '').trim();
@@ -34256,45 +34267,46 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             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);
+        const np = normalize(payload?.toString?.() ?? String(payload ?? ''));
         if (!this.useStrict())
             return payloadToModeLoose(np);
-        // strict: usa SOLO i token configurati
-        const { union } = this.getStrictTokens();
-        if (union.has('disarmed') && np === 'disarmed')
+        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 (union.has('armed_home') && np === 'armed_home')
+        if (currentVals.has('armed_home') && np === 'armed_home')
             return sdk_1.SecuritySystemMode.HomeArmed;
-        if (union.has('armed_away') && np === 'armed_away')
+        if (currentVals.has('armed_away') && np === 'armed_away')
             return sdk_1.SecuritySystemMode.AwayArmed;
-        if (union.has('armed_night') && np === 'armed_night')
+        if (currentVals.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();
+            const triggered = new Set(this.parseJsonArray('triggeredValues', ['triggered', 'alarm']));
             return triggered.has(np);
         }
-        // loose
         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 {
@@ -34327,6 +34339,11 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             { 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.' });
@@ -34334,6 +34351,7 @@ 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' });
             }
@@ -34343,13 +34361,15 @@ 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) {
+        // salva sempre nella storage la value del campo (così resta in UI)
         this.storage.setItem(key, String(value));
-        // Add Sensor
+        // --- Add Sensor workflow ---
         if (key === 'new.create' && String(value) === 'true') {
             const id = (this.storage.getItem('new.id') || '').trim();
             const name = (this.storage.getItem('new.name') || '').trim() || id;
@@ -34364,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');
@@ -34372,7 +34393,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // Edit/Remove sensore
+        // --- Edit/Remove sensore esistente ---
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
             const sid = m[1];
@@ -34383,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 {
@@ -34390,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();
@@ -34408,8 +34433,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // altro
+        // --- 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);
@@ -34419,12 +34445,15 @@ 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);
-            if (dev)
+            if (dev) {
                 this.devices.delete(nativeId);
+            }
             try {
                 deviceManager.onDeviceRemoved?.(nativeId);
             }
@@ -34438,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) {
@@ -34447,21 +34477,25 @@ 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);
-            if ((t.batteryLevel && t.batteryLevel.trim()) || (t.lowBattery && t.lowBattery.trim()))
+            // Battery solo se previsto
+            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
@@ -34476,7 +34510,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.console.log('Annunciato:', m.nativeId);
             }
         }
-        // 3) Istanzia/aggiorna
+        // 3) Istanzia/aggiorna DOPO l’annuncio
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34492,9 +34526,17 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             else {
                 dev.cfg = cfg;
             }
-            // niente default batteria qui
+            // 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) cleanup
+        // 4) Rimuovi quelli spariti
         const announced = new Set(manifests.map(m => m.nativeId));
         for (const [nativeId] of this.devices) {
             if (!announced.has(nativeId)) {
@@ -34515,7 +34557,13 @@ 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;
@@ -34524,11 +34572,13 @@ 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]
@@ -34547,13 +34597,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') || '';
@@ -34565,9 +34615,12 @@ 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', () => {
@@ -34583,6 +34636,7 @@ 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;
@@ -34645,8 +34699,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     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);
@@ -34668,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() {
@@ -34680,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.48",
+  "version": "1.0.49",
   "description": "Scrypted plugin: Paradox Security System via MQTT (PAI/PAI-MQTT style).",
   "license": "MIT",
   "main": "dist/main.nodejs.js",