@rfranzoi/scrypted-mqtt-securitysystem 1.0.41 → 1.0.43

package/dist/main.nodejs.js

@@ -34044,9 +34044,7 @@ const sdk = __webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/s
 // 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;
+systemManager, deviceManager, } = sdk;
 const mqtt_1 = __importDefault(__webpack_require__(/*! mqtt */ "./node_modules/mqtt/build/index.js"));
 /** utils */
 function truthy(v) {
@@ -34292,7 +34290,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 this.saveSensorsToStorage();
                 try {
                     this.devices.delete(`sensor:${sid}`);
-                    sdk?.deviceManager?.onDeviceRemoved?.(`sensor:${sid}`);
+                    deviceManager.onDeviceRemoved?.(`sensor:${sid}`);
                 }
                 catch { }
                 // pulisci flag
@@ -34338,7 +34336,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 this.devices.delete(nativeId);
             }
             try {
-                sdk?.deviceManager?.onDeviceRemoved?.(nativeId);
+                deviceManager.onDeviceRemoved?.(nativeId);
             }
             catch { }
         }
@@ -34358,48 +34356,42 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
-    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO (con retry se manager non pronto) ===== */
+    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO ===== */
     async discoverSensors() {
-        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);
-            return;
-        }
-        // 1) Prepara i manifest
+        // 1) Prepara i manifest (niente istanze qui)
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
             const interfaces = [ScryptedInterface.Online];
+            // Tamper solo se c'è un topic tamper
             if (t.tamper)
                 interfaces.push(ScryptedInterface.TamperSensor);
+            // Interfaccia primaria
             if (cfg.kind === 'contact')
                 interfaces.unshift(ScryptedInterface.EntrySensor);
             else if (cfg.kind === 'motion')
                 interfaces.unshift(ScryptedInterface.MotionSensor);
             else
                 interfaces.unshift(ScryptedInterface.OccupancySensor);
-            if (t.batteryLevel || t.lowBattery)
+            // Battery solo se previsto
+            if (t.batteryLevel || t.lowBattery) {
                 interfaces.push(ScryptedInterface.Battery);
+            }
             return { nativeId, name: cfg.name, type: ScryptedDeviceType.Sensor, interfaces };
         });
         // 2) Annuncio
+        const dmAny = deviceManager;
         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') {
+        else {
             for (const m of manifests) {
-                dmAny.onDeviceDiscovered(m);
+                deviceManager.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
+        // 3) Istanzia/aggiorna DOPO l’annuncio
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34415,6 +34407,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             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;
@@ -34426,7 +34419,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             if (!announced.has(nativeId)) {
                 try {
                     this.devices.delete(nativeId);
-                    sdk?.deviceManager?.onDeviceRemoved?.(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.41",
+  "version": "1.0.43",
   "description": "Scrypted plugin: Paradox Security System via MQTT (PAI/PAI-MQTT style).",
   "license": "MIT",
   "main": "dist/main.nodejs.js",