@rfranzoi/scrypted-mqtt-securitysystem 1.0.54 → 1.0.56

package/dist/main.nodejs.js

@@ -34139,67 +34139,40 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
     handleMqtt(topic, payload) {
         const raw = payload?.toString() ?? '';
         const np = normalize(raw);
-        // CONTACT
-        if (topic === this.topics.contact) {
-            const open = truthy(np) || np === 'open';
-            this.contact = open;
-            try {
-                this.onDeviceEvent(sdk_1.ScryptedInterface.BinarySensor, open);
-            }
-            catch { }
-            return;
-        }
-        // MOTION
-        if (topic === this.topics.motion) {
-            const motion = truthy(np) || np === 'motion';
-            this.motionDetected = motion;
-            try {
-                this.onDeviceEvent(sdk_1.ScryptedInterface.MotionSensor, motion);
-            }
-            catch { }
-            return;
-        }
-        // OCCUPANCY
-        if (topic === this.topics.occupancy) {
-            const occ = truthy(np) || np === 'occupied';
-            this.occupied = occ;
-            try {
-                this.onDeviceEvent(sdk_1.ScryptedInterface.OccupancySensor, occ);
-            }
-            catch { }
-            return;
-        }
-        // TAMPER
-        if (topic === this.topics.tamper) {
+        const topics = this.cfg.topics || {};
+        // 1) stato primario (contact / motion / occupancy)
+        this.handlePrimary(topic, np, raw);
+        // 2) TAMPER
+        if (topic === topics.tamper) {
             if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np)) {
                 const val = ['cover', 'intrusion'].find(x => x === np) || true;
-                this.tampered = val;
-                try {
-                    this.onDeviceEvent(sdk_1.ScryptedInterface.TamperSensor, val);
-                }
-                catch { }
+                this.setAndEmit('tampered', val, sdk_1.ScryptedInterface.TamperSensor, {
+                    topic,
+                    raw,
+                    propLabel: 'tampered',
+                });
             }
             else if (falsy(np)) {
-                this.tampered = false;
-                try {
-                    this.onDeviceEvent(sdk_1.ScryptedInterface.TamperSensor, false);
-                }
-                catch { }
+                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor, {
+                    topic,
+                    raw,
+                    propLabel: 'tampered',
+                });
             }
             return;
         }
-        // ONLINE
-        if (topic === this.topics.online) {
+        // 3) ONLINE
+        if (topic === topics.online) {
             const online = truthy(np) || np === 'online';
-            this.online = online;
-            try {
-                this.onDeviceEvent(sdk_1.ScryptedInterface.Online, online);
-            }
-            catch { }
+            this.setAndEmit('online', online, sdk_1.ScryptedInterface.Online, {
+                topic,
+                raw,
+                propLabel: 'online',
+            });
             return;
         }
-        // 🔋 LOW BATTERY (bool) – QUI LA PATCH
-        if (topic === this.topics.lowBattery) {
+        // 4) LOW BATTERY (bool)
+        if (topic === topics.lowBattery) {
             const isLow = np === 'true' ||
                 np === '1' ||
                 np === 'on' ||
@@ -34207,23 +34180,36 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
                 np === 'battery_low' ||
                 truthy(np);
             this.lowBattery = isLow;
-            try {
-                // per l’interfaccia Battery di Scrypted un booleano "low" è sufficiente
-                this.onDeviceEvent(sdk_1.ScryptedInterface.Battery, isLow);
+            // Simula anche la percentuale per HomeKit/Scrypted:
+            // low  -> 10%
+            // ok   -> 100%
+            const level = isLow ? 10 : 100;
+            this.setAndEmit('batteryLevel', level, sdk_1.ScryptedInterface.Battery, {
+                topic,
+                raw,
+                propLabel: 'batteryLevel(from lowBattery)',
+            });
+            if (RUNTIME.logSensors) {
+                this.console?.log?.(`[Sensor] ${this.cfg.name} [${this.cfg.id}] lowBattery -> ${isLow}, level -> ${level} (${topic}="${raw}")`);
             }
-            catch { }
             return;
         }
-        // 🔋 BATTERY LEVEL (0..100) – per quando userai Battery Level Topic
-        if (topic === this.topics.batteryLevel) {
+        // 5) BATTERY LEVEL (0..100)
+        if (topic === topics.batteryLevel) {
             const n = Number(raw);
             if (isFinite(n)) {
-                const pct = Math.max(0, Math.min(100, n));
-                this.batteryLevel = pct;
+                const pct = clamp(n, 0, 100);
+                this.setAndEmit('batteryLevel', pct, sdk_1.ScryptedInterface.Battery, {
+                    topic,
+                    raw,
+                    propLabel: 'batteryLevel',
+                });
                 try {
                     this.onDeviceEvent(sdk_1.ScryptedInterface.Battery, { level: pct });
                 }
-                catch { }
+                catch (e) {
+                    this.console?.warn?.('Battery level event error', e);
+                }
             }
             return;
         }

package/package.json

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