@rfranzoi/scrypted-mqtt-securitysystem 1.0.39 → 1.0.41

package/dist/main.nodejs.js

@@ -34028,84 +34028,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-// --- Preload: silenzia SOLO il warning facoltativo di sdk.json ---
-(() => {
-    const swallow = (orig) => (...args) => {
-        const txt = args.map(a => typeof a === 'string' ? a : (a?.message || '')).join(' ');
-        if (txt.includes('failed to load custom interface descriptors'))
-            return;
-        return orig(...args);
-    };
-    console.error = swallow(console.error.bind(console));
-    console.warn = swallow(console.warn.bind(console));
-})();
-// Runtime SDK via require (evita esecuzione anticipata del bundler)
+// --- Silence ONLY the optional sdk.json warning from @scrypted/sdk ---
+const __origConsoleError = console.error.bind(console);
+console.error = (...args) => {
+    const first = args?.[0];
+    const msg = typeof first === 'string' ? first : (first?.message || '');
+    if (typeof msg === 'string' && msg.includes('failed to load custom interface descriptors')) {
+        // swallow just this warning
+        return;
+    }
+    __origConsoleError(...args);
+};
+// Carica lo SDK (non tipizziamo qui per non perdere le proprietà runtime)
 const sdk = __webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js");
-const { ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, SecuritySystemMode, systemManager, } = sdk;
+// Valori runtime (enum/classi/manager) dal modulo SDK
+const { ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, // valore (enum)
+SecuritySystemMode, // valore (enum)
+systemManager,
+// ⚠️ NON destrutturare deviceManager: va letto sempre "al volo" da sdk.deviceManager.
+ } = sdk;
 const mqtt_1 = __importDefault(__webpack_require__(/*! mqtt */ "./node_modules/mqtt/build/index.js"));
 /** utils */
-function normalize(s) { return (s || '').trim().toLowerCase(); }
 function truthy(v) {
     if (!v)
         return false;
-    const s = normalize(v);
-    return s === '1' || s === 'true' || s === 'online' || s === 'yes' || s === 'on' || s === 'ok' || s === 'open';
+    const s = v.toString().trim().toLowerCase();
+    return s === '1' || s === 'true' || s === 'online' || s === 'yes' || s === 'on' || s === 'ok';
 }
 function falsy(v) {
     if (!v)
         return false;
-    const s = normalize(v);
-    return s === '0' || s === 'false' || s === 'offline' || s === 'no' || s === 'off' || s === 'closed' || s === 'close';
-}
-function clamp(n, min, max) { return Math.max(min, Math.min(max, n)); }
-function deepEqual(a, b) { try {
-    return JSON.stringify(a) === JSON.stringify(b);
-}
-catch {
-    return a === b;
-} }
-/** Match topic con wildcard MQTT (+, #) oppure confronto esatto */
-function topicMatches(topic, pattern) {
-    if (!pattern)
-        return false;
-    if (pattern === topic)
-        return true;
-    if (!pattern.includes('+') && !pattern.includes('#'))
-        return false;
-    // Escapa tutto tranne '/'
-    const esc = pattern.replace(/[-/\\^$*?.()|[\]{}]/g, '\\$&');
-    const rx = '^' + esc
-        .replace(/\\\+/g, '[^/]+') // '+' => un segmento
-        .replace(/\\\#/g, '.+'); // '#" => qualsiasi suffisso
-    try {
-        return new RegExp(rx + '$').test(topic);
-    }
-    catch {
-        return false;
-    }
+    const s = v.toString().trim().toLowerCase();
+    return s === '0' || s === 'false' || s === 'offline' || s === 'no' || s === 'off';
 }
-/** set + emit evento scrypted */
-function setAndEmit(dev, key, value, iface, log) {
-    if (dev[key] === value)
-        return;
-    dev[key] = value;
-    try {
-        dev.onDeviceEvent?.(iface, value);
-    }
-    catch { }
-    try {
-        if (log)
-            dev.console?.log?.(log);
-    }
-    catch { }
+function normalize(s) {
+    return (s || '').trim().toLowerCase();
+}
+function clamp(n, min, max) {
+    return Math.max(min, Math.min(max, n));
 }
-/** Outgoing predefiniti (PAI-like). Chiavi numeriche per compat enum */
+/** SecuritySystem outgoing defaults (PAI-like)
+ *  Nota: usare number come chiave evita stranezze con gli enum in TS. */
 const DEFAULT_OUTGOING = {
     [SecuritySystemMode.Disarmed]: 'disarm',
     [SecuritySystemMode.HomeArmed]: 'arm_home',
     [SecuritySystemMode.AwayArmed]: 'arm_away',
     [SecuritySystemMode.NightArmed]: 'arm_night',
 };
+/** Parse incoming payload -> final mode (ignore transition states) */
 function payloadToMode(payload) {
     if (payload == null)
         return;
@@ -34118,6 +34088,7 @@ function payloadToMode(payload) {
         return SecuritySystemMode.AwayArmed;
     if (['arm_night', 'night', 'armed_night', 'sleep', 'arm_sleep', 'armed_sleep'].includes(p))
         return SecuritySystemMode.NightArmed;
+    // transitori: non cambiano il mode
     if (['entry_delay', 'exit_delay', 'pending', 'arming', 'disarming'].includes(p))
         return undefined;
     return undefined;
@@ -34127,148 +34098,58 @@ class BaseMqttSensor extends ScryptedDeviceBase {
         super(nativeId);
         this.cfg = cfg;
     }
+    /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
-        const raw = payload?.toString() ?? '';
-        const np = normalize(raw);
-        // Online
-        if (topicMatches(topic, this.cfg.topics.online)) {
+        const p = payload?.toString() ?? '';
+        const np = normalize(p);
+        // online
+        if (topic === this.cfg.topics.online) {
             if (truthy(np) || np === 'online')
-                setAndEmit(this, 'online', true, ScryptedInterface.Online, `[${this.name}] online=true`);
-            else if (falsy(np) || np === 'offline')
-                setAndEmit(this, 'online', false, ScryptedInterface.Online, `[${this.name}] online=false`);
+                this.online = true;
+            if (falsy(np) || np === 'offline')
+                this.online = false;
         }
-        // Tamper
-        if (topicMatches(topic, this.cfg.topics.tamper)) {
+        // tamper
+        if (topic === this.cfg.topics.tamper) {
             if (truthy(np) || ['tamper', 'intrusion', 'cover', 'motion', 'magnetic'].includes(np)) {
-                const t = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
-                setAndEmit(this, 'tampered', t, ScryptedInterface.TamperSensor, `[${this.name}] tampered=${t}`);
+                this.tampered = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
             }
             else if (falsy(np)) {
-                setAndEmit(this, 'tampered', false, ScryptedInterface.TamperSensor, `[${this.name}] tampered=false`);
+                this.tampered = false;
             }
         }
-        // Battery
-        if (topicMatches(topic, this.cfg.topics.batteryLevel)) {
-            const n = clamp(parseFloat(raw), 0, 100);
+        // battery
+        if (topic === this.cfg.topics.batteryLevel) {
+            const n = clamp(parseFloat(p), 0, 100);
             if (isFinite(n))
-                setAndEmit(this, 'batteryLevel', n, ScryptedInterface.Battery, `[${this.name}] batteryLevel=${n}`);
+                this.batteryLevel = n;
         }
-        else if (topicMatches(topic, this.cfg.topics.lowBattery) && !this.cfg.topics.batteryLevel) {
-            const n = truthy(np) ? 10 : 100;
-            setAndEmit(this, 'batteryLevel', n, ScryptedInterface.Battery, `[${this.name}] batteryLevel=${n} (lowBattery)`);
+        else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
+            // se abbiamo SOLO lowBattery (bool):
+            this.batteryLevel = truthy(np) ? 10 : 100;
         }
-        // Primario
-        this.handlePrimary(topic, np, raw);
+        // primary handled by subclasses
+        this.handlePrimary(topic, np, p);
     }
 }
-/** === SENSORI: parsing robusto + eventi === */
 class ContactMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np, raw) {
-        if (!topicMatches(topic, this.cfg.topics.contact))
-            return;
-        let val;
-        // stringhe comuni (True/False compresi via normalize)
-        if (['open', 'opened', '1', 'true', 'on', 'yes'].includes(np))
-            val = true;
-        else if (['closed', 'close', '0', 'false', 'off', 'no', 'shut'].includes(np))
-            val = false;
-        // JSON comuni
-        if (val === undefined) {
-            try {
-                const j = JSON.parse(raw);
-                if (typeof j?.open === 'boolean')
-                    val = !!j.open;
-                else if (typeof j?.opened === 'boolean')
-                    val = !!j.opened;
-                else if (typeof j?.contact === 'boolean')
-                    val = !j.contact; // contact:false => aperto
-                else if (typeof j?.state === 'string') {
-                    const s = normalize(j.state);
-                    if (s === 'open')
-                        val = true;
-                    if (s === 'closed')
-                        val = false;
-                }
-            }
-            catch { }
-        }
-        if (val !== undefined) {
-            setAndEmit(this, 'entryOpen', val, ScryptedInterface.EntrySensor, `[${this.name}] entryOpen=${val} (${topic})`);
-        }
-        else {
-            this.console?.debug?.(`Contact payload non gestito (${this.cfg.id}) topic=${topic} raw="${raw}"`);
+    handlePrimary(topic, np) {
+        if (topic === this.cfg.topics.contact) {
+            this.entryOpen = truthy(np);
         }
     }
 }
 class MotionMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np, raw) {
-        if (!topicMatches(topic, this.cfg.topics.motion))
-            return;
-        let val;
-        if (['motion', 'detected', 'active', '1', 'true', 'on', 'yes'].includes(np))
-            val = true;
-        else if (['clear', 'inactive', 'no_motion', 'none', '0', 'false', 'off', 'no'].includes(np))
-            val = false;
-        if (val === undefined) {
-            try {
-                const j = JSON.parse(raw);
-                if (typeof j?.motion === 'boolean')
-                    val = !!j.motion;
-                else if (typeof j?.occupancy === 'boolean')
-                    val = !!j.occupancy;
-                else if (typeof j?.presence === 'boolean')
-                    val = !!j.presence;
-                else if (typeof j?.state === 'string') {
-                    const s = normalize(j.state);
-                    if (['on', 'motion', 'detected', 'active'].includes(s))
-                        val = true;
-                    if (['off', 'clear', 'inactive'].includes(s))
-                        val = false;
-                }
-            }
-            catch { }
-        }
-        if (val !== undefined) {
-            setAndEmit(this, 'motionDetected', val, ScryptedInterface.MotionSensor, `[${this.name}] motionDetected=${val} (${topic})`);
-        }
-        else {
-            this.console?.debug?.(`Motion payload non gestito (${this.cfg.id}) topic=${topic} raw="${raw}"`);
+    handlePrimary(topic, np) {
+        if (topic === this.cfg.topics.motion) {
+            this.motionDetected = truthy(np);
         }
     }
 }
 class OccupancyMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np, raw) {
-        if (!topicMatches(topic, this.cfg.topics.occupancy))
-            return;
-        let val;
-        if (['occupied', 'presence', 'present', '1', 'true', 'on', 'yes'].includes(np))
-            val = true;
-        else if (['unoccupied', 'vacant', 'absent', '0', 'false', 'off', 'no', 'clear'].includes(np))
-            val = false;
-        if (val === undefined) {
-            try {
-                const j = JSON.parse(raw);
-                if (typeof j?.occupied === 'boolean')
-                    val = !!j.occupied;
-                else if (typeof j?.presence === 'boolean')
-                    val = !!j.presence;
-                else if (typeof j?.occupancy === 'boolean')
-                    val = !!j.occupancy;
-                else if (typeof j?.state === 'string') {
-                    const s = normalize(j.state);
-                    if (['occupied', 'presence', 'present', 'on'].includes(s))
-                        val = true;
-                    if (['vacant', 'absent', 'clear', 'off'].includes(s))
-                        val = false;
-                }
-            }
-            catch { }
-        }
-        if (val !== undefined) {
-            setAndEmit(this, 'occupied', val, ScryptedInterface.OccupancySensor, `[${this.name}] occupied=${val} (${topic})`);
-        }
-        else {
-            this.console?.debug?.(`Occupancy payload non gestito (${this.cfg.id}) topic=${topic} raw="${raw}"`);
+    handlePrimary(topic, np) {
+        if (topic === this.cfg.topics.occupancy) {
+            this.occupied = truthy(np);
         }
     }
 }
@@ -34276,17 +34157,17 @@ class OccupancyMqttSensor extends BaseMqttSensor {
 class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
     constructor() {
         super();
+        // sensor management
         this.sensorsCfg = [];
         this.devices = new Map();
-        this.discoveryPostponed = false;
-        // Tipo in UI (best-effort)
+        // (facoltativo) Imposta il device type in UI
         setTimeout(() => {
             try {
                 systemManager.getDeviceById(this.id)?.setType?.(ScryptedDeviceType.SecuritySystem);
             }
             catch { }
         });
-        // Stato di default
+        // Default state
         this.securitySystemState = this.securitySystemState || {
             mode: SecuritySystemMode.Disarmed,
             supportedModes: [
@@ -34297,9 +34178,12 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             ],
         };
         this.online = this.online ?? false;
+        // Load sensors config and announce devices
         this.loadSensorsFromStorage();
-        this.safeDiscoverSensors();
+        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);
@@ -34316,7 +34200,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         }
         catch { }
     }
-    /** ---- Settings ---- */
+    // helpers persistenza
     saveSensorsToStorage() {
         try {
             this.storage.setItem('sensorsJson', JSON.stringify(this.sensorsCfg));
@@ -34325,14 +34209,17 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             this.console.error('saveSensorsToStorage error', e);
         }
     }
+    /** ---- Settings UI ---- */
     async getSettings() {
         const out = [
+            // MQTT Core
             { group: 'MQTT', key: 'brokerUrl', title: 'Broker URL', placeholder: 'mqtt://127.0.0.1:1883', value: this.storage.getItem('brokerUrl') || 'mqtt://127.0.0.1:1883' },
             { group: 'MQTT', key: 'username', title: 'Username', type: 'string', value: this.storage.getItem('username') || '' },
             { group: 'MQTT', key: 'password', title: 'Password', type: 'password', value: this.storage.getItem('password') || '' },
             { group: 'MQTT', key: 'clientId', title: 'Client ID', placeholder: 'scrypted-paradox', value: this.storage.getItem('clientId') || 'scrypted-paradox' },
             { group: 'MQTT', key: 'tls', title: 'Use TLS', type: 'boolean', value: this.storage.getItem('tls') === 'true' },
             { group: 'MQTT', key: 'rejectUnauthorized', title: 'Reject Unauthorized (TLS)', type: 'boolean', value: this.storage.getItem('rejectUnauthorized') !== 'false', description: 'Disattiva solo con broker self-signed.' },
+            // Alarm Topics
             { group: 'Alarm Topics', key: 'topicSetTarget', title: 'Set Target State (publish)', placeholder: 'paradox/control/partitions/Area_1', value: this.storage.getItem('topicSetTarget') || '' },
             { group: 'Alarm Topics', key: 'topicGetTarget', title: 'Get Target State (subscribe)', placeholder: 'paradox/states/partitions/Area_1/target_state', value: this.storage.getItem('topicGetTarget') || '' },
             { group: 'Alarm Topics', key: 'topicGetCurrent', title: 'Get Current State (subscribe)', placeholder: 'paradox/states/partitions/Area_1/current_state', value: this.storage.getItem('topicGetCurrent') || '' },
@@ -34341,23 +34228,31 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             { 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' },
         ];
-        // 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: 'Toggle ON to create the sensor.' });
+        // ---- 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.' });
+        // ---- UI per sensori esistenti ----
         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'] });
-            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 (supporta +/#)' });
-            else if (cfg.kind === 'motion')
-                out.push({ group: gid, key: `sensor.${cfg.id}.topic.motion`, title: 'Motion Detected Topic', value: cfg.topics.motion || '' });
-            else
-                out.push({ group: gid, key: `sensor.${cfg.id}.topic.occupancy`, title: 'Occupancy Detected Topic', value: cfg.topics.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' });
+            }
+            else if (cfg.kind === 'motion') {
+                out.push({ group: gid, key: `sensor.${cfg.id}.topic.motion`, title: 'Motion Detected Topic', value: cfg.topics.motion || '', placeholder: 'paradox/states/zones/XYZ/open' });
+            }
+            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 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;
@@ -34372,14 +34267,16 @@ class ParadoxMqttSecuritySystem extends 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');
             this.storage.removeItem('new.create');
-            this.safeDiscoverSensors(true);
+            await this.discoverSensors();
             await this.connectMqtt(true);
             return;
         }
+        // --- Edit/Remove sensore esistente ---
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
             const sid = m[1];
@@ -34390,33 +34287,40 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 return;
             }
             if (prop === 'remove' && String(value) === 'true') {
+                // elimina
                 this.sensorsCfg = this.sensorsCfg.filter(s => s.id !== sid);
                 this.saveSensorsToStorage();
                 try {
+                    this.devices.delete(`sensor:${sid}`);
                     sdk?.deviceManager?.onDeviceRemoved?.(`sensor:${sid}`);
                 }
                 catch { }
+                // pulisci flag
                 this.storage.removeItem(key);
-                this.safeDiscoverSensors(true);
+                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();
             }
             this.saveSensorsToStorage();
-            this.safeDiscoverSensors(true);
+            await this.discoverSensors();
             await this.connectMqtt(true);
             return;
         }
+        // --- Altro (MQTT / Alarm settings) ---
         if (key === 'sensorsJson') {
+            // non più mostrato, ma se presente da vecchie versioni
             this.loadSensorsFromStorage();
-            this.safeDiscoverSensors(true);
+            await this.discoverSensors();
             await this.connectMqtt(true);
         }
         else {
@@ -34424,12 +34328,15 @@ class ParadoxMqttSecuritySystem extends 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 {
                 sdk?.deviceManager?.onDeviceRemoved?.(nativeId);
             }
@@ -34443,6 +34350,7 @@ class ParadoxMqttSecuritySystem extends 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) {
@@ -34450,21 +34358,15 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
-    safeDiscoverSensors(triggeredByChange = false) {
+    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO (con retry se manager non pronto) ===== */
+    async discoverSensors() {
         const dmAny = sdk?.deviceManager;
         if (!dmAny) {
-            if (!this.discoveryPostponed) {
-                this.console.log('Device discovery postponed: deviceManager not ready yet.');
-                this.discoveryPostponed = true;
-            }
+            this.console.warn('deviceManager not ready yet, retrying in 1s…');
+            setTimeout(() => this.discoverSensors().catch(e => this.console.error('discoverSensors retry error', e)), 1000);
             return;
         }
-        this.discoveryPostponed = false;
-        this.discoverSensors(dmAny);
-        if (triggeredByChange)
-            this.console.log('Sensors discovered/updated.');
-    }
-    discoverSensors(dmAny) {
+        // 1) Prepara i manifest
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
@@ -34481,11 +34383,23 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 interfaces.push(ScryptedInterface.Battery);
             return { nativeId, name: cfg.name, type: ScryptedDeviceType.Sensor, interfaces };
         });
-        if (typeof dmAny.onDevicesChanged === 'function')
+        // 2) Annuncio
+        if (typeof dmAny.onDevicesChanged === 'function') {
             dmAny.onDevicesChanged({ devices: manifests });
-        else if (typeof dmAny.onDeviceDiscovered === 'function')
-            for (const m of manifests)
+            this.console.log('Annunciati (batch):', manifests.map(m => m.nativeId).join(', '));
+        }
+        else if (typeof dmAny.onDeviceDiscovered === 'function') {
+            for (const m of manifests) {
                 dmAny.onDeviceDiscovered(m);
+                this.console.log('Annunciato:', m.nativeId);
+            }
+        }
+        else {
+            this.console.warn('deviceManager has no discovery methods yet, retrying in 1s…');
+            setTimeout(() => this.discoverSensors().catch(e => this.console.error('discoverSensors retry error', e)), 1000);
+            return;
+        }
+        // 3) Istanzia/aggiorna
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34502,15 +34416,18 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 dev.cfg = cfg;
             }
             const hasBattery = !!(cfg.topics.batteryLevel || cfg.topics.lowBattery);
-            if (hasBattery && dev.batteryLevel === undefined)
-                setAndEmit(dev, 'batteryLevel', 100, ScryptedInterface.Battery, `[${cfg.name}] batteryLevel=100 (default)`);
+            if (hasBattery && dev.batteryLevel === undefined) {
+                dev.batteryLevel = 100;
+            }
         }
+        // 4) Rimuovi quelli spariti
         const announced = new Set(manifests.map(m => m.nativeId));
         for (const [nativeId] of this.devices) {
             if (!announced.has(nativeId)) {
                 try {
                     this.devices.delete(nativeId);
-                    dmAny.onDeviceRemoved?.(nativeId);
+                    sdk?.deviceManager?.onDeviceRemoved?.(nativeId);
+                    this.console.log('Rimosso:', nativeId);
                 }
                 catch { }
             }
@@ -34524,7 +34441,13 @@ class ParadoxMqttSecuritySystem extends 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;
@@ -34533,71 +34456,77 @@ class ParadoxMqttSecuritySystem extends 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]
-                .filter(Boolean).forEach(x => subs.add(String(x)));
+                .filter(Boolean)
+                .forEach(x => subs.add(String(x)));
         }
         return Array.from(subs);
     }
     async connectMqtt(_reconnect = false) {
         const subs = this.collectAllSubscriptions();
-        if (!subs.length && !this.storage.getItem('topicSetTarget'))
+        if (!subs.length && !this.storage.getItem('topicSetTarget')) {
             this.console.warn('Configura almeno un topic nelle impostazioni.');
+        }
         if (this.client) {
             try {
                 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') || '';
         const tOnline = this.storage.getItem('topicOnline') || '';
         client.on('connect', () => {
             this.console.log('MQTT connected');
-            setAndEmit(this, 'online', true, ScryptedInterface.Online, `[Alarm] online=true`);
-            if (subs.length)
-                client.subscribe(subs, { qos: 0 }, (err) => { if (err)
-                    this.console.error('subscribe error', err); });
-            this.safeDiscoverSensors(true);
+            this.online = true;
+            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', () => { this.console.log('MQTT closed'); setAndEmit(this, 'online', false, ScryptedInterface.Online, `[Alarm] online=false`); });
+        client.on('close', () => { this.console.log('MQTT closed'); this.online = false; });
         client.on('error', (e) => { this.console.error('MQTT error', e); });
         client.on('message', (topic, payload) => {
             try {
-                const raw = payload?.toString() ?? '';
-                const np = normalize(raw);
-                if (topicMatches(topic, tOnline)) {
+                const p = payload?.toString() ?? '';
+                const np = normalize(p);
+                // ---- Alarm handling ----
+                if (topic === tOnline) {
                     if (truthy(np) || np === 'online')
-                        setAndEmit(this, 'online', true, ScryptedInterface.Online, `[Alarm] online=true (${topic})`);
-                    else if (falsy(np) || np === 'offline')
-                        setAndEmit(this, 'online', false, ScryptedInterface.Online, `[Alarm] online=false (${topic})`);
+                        this.online = true;
+                    if (falsy(np) || np === 'offline')
+                        this.online = false;
                     return;
                 }
-                if (topicMatches(topic, tTamper)) {
+                if (topic === tTamper) {
                     if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np)) {
-                        const t = ['cover', 'intrusion'].find(x => x === np) || true;
-                        setAndEmit(this, 'tampered', t, ScryptedInterface.TamperSensor, `[Alarm] tampered=${t} (${topic})`);
+                        this.tampered = ['cover', 'intrusion'].find(x => x === np) || true;
                     }
                     else if (falsy(np)) {
-                        setAndEmit(this, 'tampered', false, ScryptedInterface.TamperSensor, `[Alarm] tampered=false (${topic})`);
+                        this.tampered = false;
                     }
                     return;
                 }
-                if (topicMatches(topic, tCurrent)) {
+                if (topic === tCurrent) {
                     const mode = payloadToMode(payload);
                     const isAlarm = ['alarm', 'triggered'].includes(np);
                     const current = this.securitySystemState || { mode: SecuritySystemMode.Disarmed };
@@ -34611,26 +34540,18 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                         ],
                         triggered: isAlarm || undefined,
                     };
-                    if (!deepEqual(this.securitySystemState, newState)) {
-                        this.securitySystemState = newState;
-                        try {
-                            this.onDeviceEvent?.(ScryptedInterface.SecuritySystem, newState);
-                        }
-                        catch { }
-                        this.console.log(`[Alarm] currentState=${JSON.stringify(newState)} (${topic})`);
-                    }
+                    this.securitySystemState = newState;
                     return;
                 }
-                if (topicMatches(topic, tTarget)) {
+                if (topic === tTarget) {
                     this.pendingTarget = payloadToMode(payload);
-                    this.console.log(`[Alarm] target reported: "${raw}" -> ${this.pendingTarget} (${topic})`);
+                    this.console.log('Target state reported:', p, '->', this.pendingTarget);
                     return;
                 }
-                // Sensors: se discovery rimandata, riprova
-                if (this.discoveryPostponed)
-                    this.safeDiscoverSensors(true);
-                for (const dev of this.devices.values())
+                // ---- Sensor dispatch ----
+                for (const dev of this.devices.values()) {
                     dev.handleMqtt(topic, payload);
+                }
             }
             catch (e) {
                 this.console.error('MQTT message handler error', e);
@@ -34655,7 +34576,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
     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() {

package/package.json

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