@rfranzoi/scrypted-mqtt-securitysystem 1.0.52 → 1.0.55

package/dist/main.nodejs.js

@@ -34139,38 +34139,77 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
     handleMqtt(topic, payload) {
         const raw = payload?.toString() ?? '';
         const np = normalize(raw);
-        // online
-        if (topic === this.cfg.topics.online) {
-            if (truthy(np) || np === 'online')
-                this.setAndEmit('online', true, sdk_1.ScryptedInterface.Online, { topic, raw, propLabel: 'online' });
-            if (falsy(np) || np === 'offline')
-                this.setAndEmit('online', false, sdk_1.ScryptedInterface.Online, { topic, raw, propLabel: 'online' });
-        }
-        // tamper
-        if (topic === this.cfg.topics.tamper) {
-            if (truthy(np) || ['tamper', 'intrusion', 'cover', 'motion', 'magnetic'].includes(np)) {
-                const value = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
-                this.setAndEmit('tampered', value, sdk_1.ScryptedInterface.TamperSensor, { topic, raw, propLabel: 'tampered' });
+        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.setAndEmit('tampered', val, sdk_1.ScryptedInterface.TamperSensor, {
+                    topic,
+                    raw,
+                    propLabel: 'tampered',
+                });
             }
             else if (falsy(np)) {
-                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor, { topic, raw, propLabel: 'tampered' });
+                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor, {
+                    topic,
+                    raw,
+                    propLabel: 'tampered',
+                });
             }
+            return;
         }
-        // battery
-        if (topic === this.cfg.topics.batteryLevel) {
-            const n = clamp(parseFloat(raw), 0, 100);
-            if (Number.isFinite(n))
-                this.setAndEmit('batteryLevel', n, sdk_1.ScryptedInterface.Battery, { topic, raw, propLabel: 'batteryLevel' });
+        // 3) ONLINE
+        if (topic === topics.online) {
+            const online = truthy(np) || np === 'online';
+            this.setAndEmit('online', online, sdk_1.ScryptedInterface.Online, {
+                topic,
+                raw,
+                propLabel: 'online',
+            });
+            return;
+        }
+        // 4) LOW BATTERY (bool)
+        if (topic === topics.lowBattery) {
+            const isLow = np === 'true' ||
+                np === '1' ||
+                np === 'on' ||
+                np === 'low' ||
+                np === 'battery_low' ||
+                truthy(np);
+            this.lowBattery = isLow;
+            try {
+                this.onDeviceEvent(sdk_1.ScryptedInterface.Battery, isLow);
+            }
+            catch (e) {
+                this.console?.warn?.('Battery low event error', e);
+            }
+            if (RUNTIME.logSensors) {
+                this.console?.log?.(`[Sensor] ${this.cfg.name} [${this.cfg.id}] lowBattery -> ${isLow} (${topic}="${raw}")`);
+            }
+            return;
         }
-        else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            // solo se abbiamo lowBattery (bool) ma NON batteryLevel
-            if (truthy(np))
-                this.setAndEmit('batteryLevel', 10, sdk_1.ScryptedInterface.Battery, { topic, raw, propLabel: 'batteryLevel (low)' });
-            else if (falsy(np) && this.batteryLevel === undefined)
-                this.setAndEmit('batteryLevel', 100, sdk_1.ScryptedInterface.Battery, { topic, raw, propLabel: 'batteryLevel (ok)' });
+        // 5) BATTERY LEVEL (0..100)
+        if (topic === topics.batteryLevel) {
+            const n = Number(raw);
+            if (isFinite(n)) {
+                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 (e) {
+                    this.console?.warn?.('Battery level event error', e);
+                }
+            }
+            return;
         }
-        // primary handled by subclasses
-        this.handlePrimary(topic, np, raw);
     }
 }
 class ContactMqttSensor extends BaseMqttSensor {

package/package.json

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