@rfranzoi/scrypted-mqtt-securitysystem 1.0.19 → 1.0.21

package/dist/main.nodejs.js

@@ -34083,9 +34083,6 @@ function normalize(s) {
 function clamp(n, min, max) {
     return Math.max(min, Math.min(max, n));
 }
-function delay(ms) {
-    return new Promise(res => setTimeout(res, ms));
-}
 /** SecuritySystem outgoing defaults (PAI-like) */
 const DEFAULT_OUTGOING = {
     [sdk_1.SecuritySystemMode.Disarmed]: 'disarm',
@@ -34115,7 +34112,7 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
     constructor(nativeId, cfg) {
         super(nativeId);
         this.cfg = cfg;
-        this.online = this.online ?? true;
+        // ⚠️ Non impostare stati qui: il discovery non è ancora completato
     }
     /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
@@ -34144,7 +34141,9 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
                 this.batteryLevel = n;
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            // sintetizza se non c'è batteryLevel
+            // Solo se abbiamo il topic lowBattery e NON c'è un batteryLevel numerico:
+            // True  -> 10% (warning)
+            // False -> 100% (ok)
             this.batteryLevel = truthy(np) ? 10 : 100;
         }
         // primary handled by subclasses
@@ -34208,7 +34207,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         this.online = this.online ?? false;
         // Load sensors config and announce devices
         this.loadSensorsFromStorage();
-        this.discoverSensors();
+        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
@@ -34276,7 +34275,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     async getDevice(nativeId) {
         return this.devices.get(nativeId);
     }
-    async releaseDevice(id, nativeId) {
+    async releaseDevice(_id, nativeId) {
         try {
             const dev = this.devices.get(nativeId);
             if (dev) {
@@ -34303,75 +34302,71 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
-    /** ===== discoverSensors con interfacce dinamiche (Battery/Tamper opzionali) ===== */
+    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO ===== */
     async discoverSensors() {
+        // 1) Prepara i manifest (niente istanze qui)
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
-            // Interfacce di base: Online sempre
-            const interfaces = [sdk_1.ScryptedInterface.Online];
-            // Aggiungi primaria in base al kind
-            switch (cfg.kind) {
-                case 'contact':
-                    interfaces.unshift(sdk_1.ScryptedInterface.EntrySensor);
-                    break;
-                case 'motion':
-                    interfaces.unshift(sdk_1.ScryptedInterface.MotionSensor);
-                    break;
-                case 'occupancy':
-                    interfaces.unshift(sdk_1.ScryptedInterface.OccupancySensor);
-                    break;
-            }
-            // Tamper solo se presente il topic
+            const interfaces = [
+                sdk_1.ScryptedInterface.Online,
+            ];
+            // Tamper solo se c'è un topic tamper
             if (t.tamper)
                 interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
-            // Battery solo se presente batteryLevel o lowBattery
-            if (t.batteryLevel || t.lowBattery)
+            // 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);
+            // Battery solo se previsto
+            if (t.batteryLevel || t.lowBattery) {
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
-            // Tipo generico "Sensor": le capacità sono date dalle interfacce
-            const type = sdk_1.ScryptedDeviceType.Sensor;
-            // create/update instance
-            let dev = this.devices.get(nativeId);
-            if (!dev) {
-                if (cfg.kind === 'contact')
-                    dev = new ContactMqttSensor(nativeId, cfg);
-                else if (cfg.kind === 'motion')
-                    dev = new MotionMqttSensor(nativeId, cfg);
-                else
-                    dev = new OccupancyMqttSensor(nativeId, cfg);
-                this.devices.set(nativeId, dev);
-            }
-            else {
-                dev.cfg = cfg;
-                // se non c'è più batteria nei topic, pulisci eventuale valore residuo
-                if (!(t.batteryLevel || t.lowBattery)) {
-                    try {
-                        dev.batteryLevel = undefined;
-                    }
-                    catch { }
-                }
             }
             return {
                 nativeId,
                 name: cfg.name,
-                type,
+                type: sdk_1.ScryptedDeviceType.Sensor,
                 interfaces,
             };
         });
-        // Annuncio in batch se disponibile, altrimenti uno per volta con un piccolo delay
-        const dm = deviceManager;
-        if (typeof dm.onDevicesChanged === 'function') {
-            dm.onDevicesChanged({ devices: manifests });
+        // 2) Annuncia i device
+        const dmAny = deviceManager;
+        if (typeof dmAny.onDevicesChanged === 'function') {
+            dmAny.onDevicesChanged({ devices: manifests });
             this.console.log('Annunciati (batch):', manifests.map(m => m.nativeId).join(', '));
         }
         else {
             for (const m of manifests) {
                 deviceManager.onDeviceDiscovered(m);
                 this.console.log('Annunciato:', m.nativeId);
-                await delay(50);
             }
         }
-        // Rimuovi eventuali sensori non più presenti
+        // 3) Istanzia/aggiorna le classi DOPO l’annuncio
+        for (const cfg of this.sensorsCfg) {
+            const nativeId = `sensor:${cfg.id}`;
+            let dev = this.devices.get(nativeId);
+            if (!dev) {
+                if (cfg.kind === 'contact')
+                    dev = new ContactMqttSensor(nativeId, cfg);
+                else if (cfg.kind === 'motion')
+                    dev = new MotionMqttSensor(nativeId, cfg);
+                else
+                    dev = new OccupancyMqttSensor(nativeId, cfg);
+                this.devices.set(nativeId, dev);
+            }
+            else {
+                dev.cfg = cfg;
+            }
+            // ★ Default “OK” se abbiamo Battery ma nessun valore ancora ricevuto
+            const hasBattery = !!(cfg.topics.batteryLevel || cfg.topics.lowBattery);
+            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)) {
@@ -34415,14 +34410,14 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         // sensors
         for (const s of this.sensorsCfg) {
-            const t = s.topics;
+            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)));
         }
         return Array.from(subs);
     }
-    async connectMqtt(reconnect = false) {
+    async connectMqtt(_reconnect = false) {
         const subs = this.collectAllSubscriptions();
         if (!subs.length && !this.storage.getItem('topicSetTarget')) {
             this.console.warn('Configura almeno un topic nelle impostazioni.');

package/package.json

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