@rfranzoi/scrypted-mqtt-securitysystem 1.0.50 → 1.0.54

package/dist/main.nodejs.js

@@ -34139,38 +34139,94 @@ 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' });
+        // 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) {
+            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 { }
             }
             else if (falsy(np)) {
-                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor, { topic, raw, propLabel: 'tampered' });
+                this.tampered = false;
+                try {
+                    this.onDeviceEvent(sdk_1.ScryptedInterface.TamperSensor, false);
+                }
+                catch { }
             }
+            return;
+        }
+        // ONLINE
+        if (topic === this.topics.online) {
+            const online = truthy(np) || np === 'online';
+            this.online = online;
+            try {
+                this.onDeviceEvent(sdk_1.ScryptedInterface.Online, online);
+            }
+            catch { }
+            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' });
+        // 🔋 LOW BATTERY (bool) – QUI LA PATCH
+        if (topic === this.topics.lowBattery) {
+            const isLow = np === 'true' ||
+                np === '1' ||
+                np === 'on' ||
+                np === 'low' ||
+                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);
+            }
+            catch { }
+            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)' });
+        // 🔋 BATTERY LEVEL (0..100) – per quando userai Battery Level Topic
+        if (topic === this.topics.batteryLevel) {
+            const n = Number(raw);
+            if (isFinite(n)) {
+                const pct = Math.max(0, Math.min(100, n));
+                this.batteryLevel = pct;
+                try {
+                    this.onDeviceEvent(sdk_1.ScryptedInterface.Battery, { level: pct });
+                }
+                catch { }
+            }
+            return;
         }
-        // primary handled by subclasses
-        this.handlePrimary(topic, np, raw);
     }
 }
 class ContactMqttSensor extends BaseMqttSensor {
@@ -34330,13 +34386,13 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             { group: 'Parsing / State tokens', key: 'currentStateValues', title: 'Accepted Current State Values (JSON array)', placeholder: '["armed_home","armed_away","armed_night","disarmed","triggered"]', value: this.storage.getItem('currentStateValues') || '["armed_home","armed_away","armed_night","disarmed","triggered"]' },
             { group: 'Parsing / State tokens', key: 'triggeredValues', title: 'Triggered tokens (JSON array)', placeholder: '["triggered","alarm"]', value: this.storage.getItem('triggeredValues') || '["triggered","alarm"]' },
             // --- Publish Payloads (override) ---
-            { group: 'Publish Payloads (override)', key: 'payloadDisarm', title: 'Payload for Disarm', placeholder: 'disarmed', value: this.storage.getItem('payloadDisarm') || '', description: 'Se vuoto: usa targetStateValues (strict ON) o i default arm_*/disarm (strict OFF).' },
+            { group: 'Publish Payloads (override)', key: 'payloadDisarm', title: 'Payload for Disarm', placeholder: 'disarmed', value: this.storage.getItem('payloadDisarm') || '', description: 'If empty, use targetStateValues (strict ON) or the arm_*/disarm defaults (strict OFF).' },
             { group: 'Publish Payloads (override)', key: 'payloadHome', title: 'Payload for Home Armed', placeholder: 'armed_home', value: this.storage.getItem('payloadHome') || '' },
             { group: 'Publish Payloads (override)', key: 'payloadAway', title: 'Payload for Away Armed', placeholder: 'armed_away', value: this.storage.getItem('payloadAway') || '' },
             { group: 'Publish Payloads (override)', key: 'payloadNight', title: 'Payload for Night Armed', placeholder: 'armed_night', value: this.storage.getItem('payloadNight') || '' },
             // --- Logging ---
             { group: 'Logging', key: 'logSensors', title: 'Log sensor state changes', type: 'boolean', value: this.storage.getItem('logSensors') === 'true' },
-            { group: 'Logging', key: 'logMqttAll', title: 'Log ALL MQTT messages', type: 'boolean', value: this.storage.getItem('logMqttAll') === 'true', description: 'Attenzione: molto verboso.' },
+            { group: 'Logging', key: 'logMqttAll', title: 'Log ALL MQTT messages', type: 'boolean', value: this.storage.getItem('logMqttAll') === 'true', description: 'Warning: this will be very verbose.' },
         ];
         // ---- UI Add Sensor ----
         out.push({ group: 'Add Sensor', key: 'new.id', title: 'New Sensor ID', placeholder: 'porta-ingresso', value: this.storage.getItem('new.id') || '' }, { group: 'Add Sensor', key: 'new.name', title: 'Name', placeholder: 'Porta Ingresso', value: this.storage.getItem('new.name') || '' }, { group: 'Add Sensor', key: 'new.kind', title: 'Type', value: this.storage.getItem('new.kind') || 'contact', choices: ['contact', 'motion', 'occupancy'] }, { group: 'Add Sensor', key: 'new.create', title: 'Create sensor', type: 'boolean', description: 'Fill the fields above and toggle this on to create the sensor. After creation, restart this plugin to see the accessory listed below. To show it in HomeKit, restart the HomeKit plugin as well.' });

package/package.json

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