@rfranzoi/scrypted-mqtt-securitysystem 1.0.17 → 1.0.19

package/dist/main.nodejs.js

@@ -34083,6 +34083,9 @@ 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',
@@ -34275,12 +34278,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     }
     async releaseDevice(id, nativeId) {
         try {
-            // chiudi e rimuovi l’istanza locale se esiste
             const dev = this.devices.get(nativeId);
             if (dev) {
                 this.devices.delete(nativeId);
             }
-            // notifica (best effort) la rimozione al device manager
             try {
                 deviceManager.onDeviceRemoved?.(nativeId);
             }
@@ -34302,29 +34303,33 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
+    /** ===== discoverSensors con interfacce dinamiche (Battery/Tamper opzionali) ===== */
     async discoverSensors() {
-        const announced = new Set();
-        for (const cfg of this.sensorsCfg) {
+        const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
-            announced.add(nativeId);
-            let interfaces = [sdk_1.ScryptedInterface.Online, sdk_1.ScryptedInterface.TamperSensor, sdk_1.ScryptedInterface.Battery];
+            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 = [sdk_1.ScryptedInterface.EntrySensor, ...interfaces];
+                    interfaces.unshift(sdk_1.ScryptedInterface.EntrySensor);
                     break;
                 case 'motion':
-                    interfaces = [sdk_1.ScryptedInterface.MotionSensor, ...interfaces];
+                    interfaces.unshift(sdk_1.ScryptedInterface.MotionSensor);
                     break;
                 case 'occupancy':
-                    interfaces = [sdk_1.ScryptedInterface.OccupancySensor, ...interfaces];
+                    interfaces.unshift(sdk_1.ScryptedInterface.OccupancySensor);
                     break;
             }
-            deviceManager.onDeviceDiscovered({
-                nativeId,
-                name: cfg.name,
-                type: sdk_1.ScryptedDeviceType.Sensor,
-                interfaces,
-            });
+            // Tamper solo se presente il topic
+            if (t.tamper)
+                interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
+            // Battery solo se presente batteryLevel o lowBattery
+            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) {
@@ -34337,16 +34342,43 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.devices.set(nativeId, dev);
             }
             else {
-                // update config reference
                 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,
+                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 });
+            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);
             }
         }
-        // drop removed sensors
+        // Rimuovi eventuali sensori non più presenti
+        const announced = new Set(manifests.map(m => m.nativeId));
         for (const [nativeId] of this.devices) {
             if (!announced.has(nativeId)) {
                 try {
                     this.devices.delete(nativeId);
                     deviceManager.onDeviceRemoved?.(nativeId);
+                    this.console.log('Rimosso:', nativeId);
                 }
                 catch { }
             }

package/package.json

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