@rfranzoi/scrypted-mqtt-securitysystem 1.0.35 → 1.0.37

package/dist/main.nodejs.js

@@ -34028,25 +34028,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-// --- 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)
+// --- Preload: silenzia SOLO il warning facoltativo di sdk.json ---
+// Copre console.error e console.warn (alcune versioni usano warn).
+(() => {
+    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));
+})();
+// Carica lo SDK (runtime only: niente import ESM per evitare che il bundler lo esegua prima del preload)
 const sdk = __webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js");
-// 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;
+// Valori runtime dal modulo SDK
+const { ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, // enum (valori)
+SecuritySystemMode, // enum (valori)
+systemManager, } = sdk;
 const mqtt_1 = __importDefault(__webpack_require__(/*! mqtt */ "./node_modules/mqtt/build/index.js"));
 /** utils */
 function truthy(v) {
@@ -34061,21 +34060,16 @@ 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));
-}
-/** SecuritySystem outgoing defaults (PAI-like)
- *  Nota: usare number come chiave evita stranezze con gli enum in TS. */
+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 compatibilità enum */
 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) */
+/** Parse incoming payload -> final mode (ignora transitori) */
 function payloadToMode(payload) {
     if (payload == null)
         return;
@@ -34088,7 +34082,6 @@ 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;
@@ -34098,76 +34091,178 @@ class BaseMqttSensor extends ScryptedDeviceBase {
         super(nativeId);
         this.cfg = cfg;
     }
-    /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
         const p = payload?.toString() ?? '';
         const np = normalize(p);
-        // online
         if (topic === this.cfg.topics.online) {
             if (truthy(np) || np === 'online')
                 this.online = true;
             if (falsy(np) || np === 'offline')
                 this.online = false;
         }
-        // tamper
         if (topic === this.cfg.topics.tamper) {
             if (truthy(np) || ['tamper', 'intrusion', 'cover', 'motion', 'magnetic'].includes(np)) {
                 this.tampered = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
             }
-            else if (falsy(np)) {
+            else if (falsy(np))
                 this.tampered = false;
-            }
         }
-        // battery
         if (topic === this.cfg.topics.batteryLevel) {
             const n = clamp(parseFloat(p), 0, 100);
             if (isFinite(n))
                 this.batteryLevel = n;
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            // se abbiamo SOLO lowBattery (bool):
             this.batteryLevel = truthy(np) ? 10 : 100;
         }
-        // primary handled by subclasses
         this.handlePrimary(topic, np, p);
     }
 }
+/** === SENSORI CON PARSING ROBUSTO PER HOMEKIT === */
 class ContactMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
-        if (topic === this.cfg.topics.contact) {
-            this.entryOpen = truthy(np);
+    handlePrimary(topic, np, raw) {
+        if (topic !== this.cfg.topics.contact)
+            return;
+        // stringhe comuni
+        if (['open', 'opened', '1', 'true', 'on', 'yes'].includes(np)) {
+            this.entryOpen = true;
+            return;
+        }
+        if (['closed', 'close', '0', 'false', 'off', 'no', 'shut'].includes(np)) {
+            this.entryOpen = false;
+            return;
+        }
+        // JSON comuni
+        try {
+            const j = JSON.parse(raw);
+            if (typeof j?.open === 'boolean') {
+                this.entryOpen = !!j.open;
+                return;
+            }
+            if (typeof j?.opened === 'boolean') {
+                this.entryOpen = !!j.opened;
+                return;
+            }
+            if (typeof j?.contact === 'boolean') {
+                this.entryOpen = !j.contact;
+                return;
+            } // contact:false => OPEN
+            if (typeof j?.state === 'string') {
+                const s = String(j.state).toLowerCase();
+                if (s === 'open') {
+                    this.entryOpen = true;
+                    return;
+                }
+                if (s === 'closed') {
+                    this.entryOpen = false;
+                    return;
+                }
+            }
         }
+        catch { }
+        this.console?.debug?.(`Contact payload non gestito (${this.cfg.id}): "${raw}"`);
     }
 }
 class MotionMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
-        if (topic === this.cfg.topics.motion) {
-            this.motionDetected = truthy(np);
+    handlePrimary(topic, np, raw) {
+        if (topic !== this.cfg.topics.motion)
+            return;
+        if (['motion', 'detected', 'active', '1', 'true', 'on', 'yes'].includes(np)) {
+            this.motionDetected = true;
+            return;
+        }
+        if (['clear', 'inactive', 'no_motion', 'none', '0', 'false', 'off', 'no'].includes(np)) {
+            this.motionDetected = false;
+            return;
+        }
+        try {
+            const j = JSON.parse(raw);
+            if (typeof j?.motion === 'boolean') {
+                this.motionDetected = !!j.motion;
+                return;
+            }
+            if (typeof j?.occupancy === 'boolean') {
+                this.motionDetected = !!j.occupancy;
+                return;
+            }
+            if (typeof j?.presence === 'boolean') {
+                this.motionDetected = !!j.presence;
+                return;
+            }
+            if (typeof j?.state === 'string') {
+                const s = String(j.state).toLowerCase();
+                if (['on', 'motion', 'detected', 'active'].includes(s)) {
+                    this.motionDetected = true;
+                    return;
+                }
+                if (['off', 'clear', 'inactive'].includes(s)) {
+                    this.motionDetected = false;
+                    return;
+                }
+            }
         }
+        catch { }
+        this.console?.debug?.(`Motion payload non gestito (${this.cfg.id}): "${raw}"`);
     }
 }
 class OccupancyMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
-        if (topic === this.cfg.topics.occupancy) {
-            this.occupied = truthy(np);
+    handlePrimary(topic, np, raw) {
+        if (topic !== this.cfg.topics.occupancy)
+            return;
+        if (['occupied', 'presence', 'present', '1', 'true', 'on', 'yes'].includes(np)) {
+            this.occupied = true;
+            return;
+        }
+        if (['unoccupied', 'vacant', 'absent', '0', 'false', 'off', 'no', 'clear'].includes(np)) {
+            this.occupied = false;
+            return;
+        }
+        try {
+            const j = JSON.parse(raw);
+            if (typeof j?.occupied === 'boolean') {
+                this.occupied = !!j.occupied;
+                return;
+            }
+            if (typeof j?.presence === 'boolean') {
+                this.occupied = !!j.presence;
+                return;
+            }
+            if (typeof j?.occupancy === 'boolean') {
+                this.occupied = !!j.occupancy;
+                return;
+            }
+            if (typeof j?.state === 'string') {
+                const s = String(j.state).toLowerCase();
+                if (['occupied', 'presence', 'present', 'on'].includes(s)) {
+                    this.occupied = true;
+                    return;
+                }
+                if (['vacant', 'absent', 'clear', 'off'].includes(s)) {
+                    this.occupied = false;
+                    return;
+                }
+            }
         }
+        catch { }
+        this.console?.debug?.(`Occupancy payload non gestito (${this.cfg.id}): "${raw}"`);
     }
 }
 /** ----------------- Main Plugin ----------------- */
 class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
     constructor() {
         super();
-        // sensor management
         this.sensorsCfg = [];
         this.devices = new Map();
-        // (facoltativo) Imposta il device type in UI
+        // Evita loop di log: tenta una volta finché deviceManager non c’è, poi riprova su eventi utili.
+        this.discoveryPostponed = false;
+        // Tipo in UI (best-effort)
         setTimeout(() => {
             try {
                 systemManager.getDeviceById(this.id)?.setType?.(ScryptedDeviceType.SecuritySystem);
             }
             catch { }
         });
-        // Default state
+        // Stato di default
         this.securitySystemState = this.securitySystemState || {
             mode: SecuritySystemMode.Disarmed,
             supportedModes: [
@@ -34178,12 +34273,12 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             ],
         };
         this.online = this.online ?? false;
-        // Load sensors config and announce devices
+        // Config sensori e (tentativo) announce
         this.loadSensorsFromStorage();
-        this.discoverSensors().catch((e) => this.console.error('discoverSensors error', e));
-        // Connect on start
+        this.safeDiscoverSensors(); // non spamma se deviceManager non c'è
+        // Connect MQTT
         this.connectMqtt().catch((e) => this.console.error('MQTT connect error:', e));
-        // chiusura pulita del client MQTT ai reload/stop del plugin
+        // Shutdown pulito
         try {
             process.once('SIGTERM', () => { try {
                 this.client?.end(true);
@@ -34200,7 +34295,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         }
         catch { }
     }
-    // helpers persistenza
+    /** ---- Settings ---- */
     saveSensorsToStorage() {
         try {
             this.storage.setItem('sensorsJson', JSON.stringify(this.sensorsCfg));
@@ -34209,17 +34304,14 @@ 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') || '' },
@@ -34228,31 +34320,24 @@ 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' },
         ];
-        // ---- 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 ----
+        // 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.' });
+        // Sensors 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'] });
-            // 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
+            if (cfg.kind === 'contact')
+                out.push({ group: gid, key: `sensor.${cfg.id}.topic.contact`, title: 'Contact State Topic', value: cfg.topics.contact || '' });
+            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 || '' });
             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;
@@ -34267,16 +34352,14 @@ 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');
-            await this.discoverSensors();
+            this.safeDiscoverSensors(true);
             await this.connectMqtt(true);
             return;
         }
-        // --- Edit/Remove sensore esistente ---
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
             const sid = m[1];
@@ -34287,40 +34370,33 @@ 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);
-                await this.discoverSensors();
+                this.safeDiscoverSensors(true);
                 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();
-            await this.discoverSensors();
+            this.safeDiscoverSensors(true);
             await this.connectMqtt(true);
             return;
         }
-        // --- Altro (MQTT / Alarm settings) ---
         if (key === 'sensorsJson') {
-            // non più mostrato, ma se presente da vecchie versioni
             this.loadSensorsFromStorage();
-            await this.discoverSensors();
+            this.safeDiscoverSensors(true);
             await this.connectMqtt(true);
         }
         else {
@@ -34328,15 +34404,12 @@ 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);
             }
@@ -34350,7 +34423,6 @@ 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) {
@@ -34358,15 +34430,25 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
-    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO (con retry se manager non pronto) ===== */
-    async discoverSensors() {
+    /** Annuncia i sensori SOLO se deviceManager è pronto. Niente loop infinito. */
+    safeDiscoverSensors(triggeredByChange = false) {
         const dmAny = sdk?.deviceManager;
         if (!dmAny) {
-            this.console.warn('deviceManager not ready yet, retrying in 1s…');
-            setTimeout(() => this.discoverSensors().catch(e => this.console.error('discoverSensors retry error', e)), 1000);
+            // Posticipa una sola volta; poi riproviamo su connect MQTT e al primo messaggio
+            if (!this.discoveryPostponed) {
+                this.console.log('Device discovery postponed: deviceManager not ready yet.');
+                this.discoveryPostponed = true;
+            }
             return;
         }
-        // 1) Prepara i manifest
+        this.discoveryPostponed = false;
+        this.discoverSensors(dmAny);
+        if (triggeredByChange)
+            this.console.log('Sensors discovered/updated.');
+    }
+    /** discoverSensors con deviceManager garantito */
+    discoverSensors(dmAny) {
+        // 1) Manifests
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
@@ -34386,18 +34468,10 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         // 2) Annuncio
         if (typeof dmAny.onDevicesChanged === 'function') {
             dmAny.onDevicesChanged({ devices: manifests });
-            this.console.log('Annunciati (batch):', manifests.map(m => m.nativeId).join(', '));
         }
         else if (typeof dmAny.onDeviceDiscovered === 'function') {
-            for (const m of manifests) {
+            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) {
@@ -34416,18 +34490,16 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 dev.cfg = cfg;
             }
             const hasBattery = !!(cfg.topics.batteryLevel || cfg.topics.lowBattery);
-            if (hasBattery && dev.batteryLevel === undefined) {
+            if (hasBattery && dev.batteryLevel === undefined)
                 dev.batteryLevel = 100;
-            }
         }
-        // 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)) {
                 try {
                     this.devices.delete(nativeId);
-                    sdk?.deviceManager?.onDeviceRemoved?.(nativeId);
-                    this.console.log('Rimosso:', nativeId);
+                    dmAny.onDeviceRemoved?.(nativeId);
                 }
                 catch { }
             }
@@ -34441,13 +34513,7 @@ 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;
@@ -34456,38 +34522,34 @@ 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') || '';
@@ -34495,12 +34557,11 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         client.on('connect', () => {
             this.console.log('MQTT connected');
             this.online = true;
-            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); });
+            // Al primo connect riprova (silenziosamente) ad annunciare i sensori
+            this.safeDiscoverSensors(true);
         });
         client.on('reconnect', () => this.console.log('MQTT reconnecting...'));
         client.on('close', () => { this.console.log('MQTT closed'); this.online = false; });
@@ -34509,7 +34570,6 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             try {
                 const p = payload?.toString() ?? '';
                 const np = normalize(p);
-                // ---- Alarm handling ----
                 if (topic === tOnline) {
                     if (truthy(np) || np === 'online')
                         this.online = true;
@@ -34518,19 +34578,17 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                     return;
                 }
                 if (topic === tTamper) {
-                    if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np)) {
+                    if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np))
                         this.tampered = ['cover', 'intrusion'].find(x => x === np) || true;
-                    }
-                    else if (falsy(np)) {
+                    else if (falsy(np))
                         this.tampered = false;
-                    }
                     return;
                 }
                 if (topic === tCurrent) {
                     const mode = payloadToMode(payload);
                     const isAlarm = ['alarm', 'triggered'].includes(np);
                     const current = this.securitySystemState || { mode: SecuritySystemMode.Disarmed };
-                    const newState = {
+                    this.securitySystemState = {
                         mode: mode ?? current.mode,
                         supportedModes: current.supportedModes ?? [
                             SecuritySystemMode.Disarmed,
@@ -34540,7 +34598,6 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                         ],
                         triggered: isAlarm || undefined,
                     };
-                    this.securitySystemState = newState;
                     return;
                 }
                 if (topic === tTarget) {
@@ -34548,10 +34605,12 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                     this.console.log('Target state reported:', p, '->', this.pendingTarget);
                     return;
                 }
-                // ---- Sensor dispatch ----
-                for (const dev of this.devices.values()) {
+                // Dispatch ai sensori
+                // (E prova ad annunciare se era stato posticipato e ora il manager è pronto)
+                if (this.discoveryPostponed)
+                    this.safeDiscoverSensors(true);
+                for (const dev of this.devices.values())
                     dev.handleMqtt(topic, payload);
-                }
             }
             catch (e) {
                 this.console.error('MQTT message handler error', e);
@@ -34576,7 +34635,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
     async armSecuritySystem(mode) {
         const payload = this.getOutgoing(mode);
         this.console.log('armSecuritySystem', mode, '->', payload);
-        this.pendingTarget = mode; // memorizza target, ma NON cambiare il current
+        this.pendingTarget = mode;
         this.publishSetTarget(payload);
     }
     async disarmSecuritySystem() {

package/package.json

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