@rfranzoi/scrypted-mqtt-securitysystem 1.0.20 → 1.0.22

package/dist/main.nodejs.js

@@ -34112,7 +34112,7 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
     constructor(nativeId, cfg) {
         super(nativeId);
         this.cfg = cfg;
-        // ⚠️ Non toccare stati nel costruttore (discovery non ancora completata)
+        // non impostare stati qui: l'annuncio device deve avvenire prima
     }
     /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
@@ -34141,7 +34141,9 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
                 this.batteryLevel = n;
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            // sintetizza se non c'è batteryLevel
+            // Solo se abbiamo lowBattery (booleano) ma NON batteryLevel:
+            // True  -> 10% (warning)
+            // False -> 100% (ok)
             this.batteryLevel = truthy(np) ? 10 : 100;
         }
         // primary handled by subclasses
@@ -34225,9 +34227,18 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         catch { }
     }
+    // helpers persistenza
+    saveSensorsToStorage() {
+        try {
+            this.storage.setItem('sensorsJson', JSON.stringify(this.sensorsCfg));
+        }
+        catch (e) {
+            this.console.error('saveSensorsToStorage error', e);
+        }
+    }
     /** ---- Settings UI ---- */
     async getSettings() {
-        return [
+        const out = [
             // MQTT Core
             { group: 'MQTT', key: 'brokerUrl', title: 'Broker URL', placeholder: 'mqtt://127.0.0.1:1883', value: this.storage.getItem('brokerUrl') || 'mqtt://127.0.0.1:1883' },
             { group: 'MQTT', key: 'username', title: 'Username', type: 'string', value: this.storage.getItem('username') || '' },
@@ -34243,24 +34254,98 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             { group: 'Alarm Topics', key: 'topicOnline', title: 'Get Online (subscribe)', placeholder: 'paradox/interface/availability', value: this.storage.getItem('topicOnline') || '' },
             { group: 'Publish Options', key: 'qos', title: 'QoS', type: 'integer', value: parseInt(this.storage.getItem('qos') || '0') },
             { group: 'Publish Options', key: 'retain', title: 'Retain', type: 'boolean', value: this.storage.getItem('retain') === 'true' },
-            { group: 'Outgoing Payloads', key: 'payloadDisarm', title: 'Payload Disarm', value: this.storage.getItem('payloadDisarm') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.Disarmed] },
-            { group: 'Outgoing Payloads', key: 'payloadHome', title: 'Payload HomeArmed', value: this.storage.getItem('payloadHome') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.HomeArmed] },
-            { group: 'Outgoing Payloads', key: 'payloadAway', title: 'Payload AwayArmed', value: this.storage.getItem('payloadAway') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.AwayArmed] },
-            { group: 'Outgoing Payloads', key: 'payloadNight', title: 'Payload NightArmed', value: this.storage.getItem('payloadNight') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.NightArmed] },
-            // Sensors config (JSON)
-            {
-                group: 'Sensors',
-                key: 'sensorsJson',
-                title: 'Sensors JSON (contact/motion/occupancy)',
-                description: 'Definisci i sensori e i topic MQTT (vedi README). Incolla JSON; le interruzioni di riga sono accettate.',
-                type: 'string',
-                value: this.storage.getItem('sensorsJson') || '[\n  {\n    "id": "front-door",\n    "name": "Front Door",\n    "kind": "contact",\n    "topics": { "contact": "SYSTEM/zones/front/contact" }\n  }\n]'
-            },
         ];
+        // ---- 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: 'Compila i campi sopra e attiva per creare.' });
+        // ---- UI per sensori esistenti ----
+        for (const cfg of this.sensorsCfg) {
+            const gid = `Sensor: ${cfg.name} [${cfg.id}]`;
+            out.push({ group: gid, key: `sensor.${cfg.id}.name`, title: 'Name', value: cfg.name }, { group: gid, key: `sensor.${cfg.id}.kind`, title: 'Type', value: cfg.kind, choices: ['contact', 'motion', 'occupancy'] });
+            // primary per tipo
+            if (cfg.kind === 'contact') {
+                out.push({ group: gid, key: `sensor.${cfg.id}.topic.contact`, title: 'Contact State Topic', value: cfg.topics.contact || '', placeholder: 'paradox/states/zones/XYZ/open' });
+            }
+            else if (cfg.kind === 'motion') {
+                out.push({ group: gid, key: `sensor.${cfg.id}.topic.motion`, title: 'Motion Detected Topic', value: cfg.topics.motion || '', placeholder: 'paradox/states/zones/XYZ/open' });
+            }
+            else {
+                out.push({ group: gid, key: `sensor.${cfg.id}.topic.occupancy`, title: 'Occupancy Detected Topic', value: cfg.topics.occupancy || '', placeholder: 'paradox/states/zones/XYZ/open' });
+            }
+            // extra opzionali
+            out.push({ group: gid, key: `sensor.${cfg.id}.topic.batteryLevel`, title: 'Battery Level Topic (0..100)', value: cfg.topics.batteryLevel || '' }, { group: gid, key: `sensor.${cfg.id}.topic.lowBattery`, title: 'Low Battery Topic (bool)', value: cfg.topics.lowBattery || '' }, { group: gid, key: `sensor.${cfg.id}.topic.tamper`, title: 'Tamper Topic', value: cfg.topics.tamper || '' }, { group: gid, key: `sensor.${cfg.id}.topic.online`, title: 'Online Topic', value: cfg.topics.online || '' }, { group: gid, key: `sensor.${cfg.id}.remove`, title: 'Remove sensor', type: 'boolean' });
+        }
+        return out;
     }
     async putSetting(key, value) {
+        // salva sempre nella storage la value del campo (così resta in UI)
         this.storage.setItem(key, String(value));
+        // --- Add Sensor workflow ---
+        if (key === 'new.create' && String(value) === 'true') {
+            const id = (this.storage.getItem('new.id') || '').trim();
+            const name = (this.storage.getItem('new.name') || '').trim() || id;
+            const kind = (this.storage.getItem('new.kind') || 'contact').trim();
+            if (!id) {
+                this.console.warn('Create sensor: id mancante');
+                return;
+            }
+            if (this.sensorsCfg.find(s => s.id === id)) {
+                this.console.warn('Create sensor: id già esistente');
+                return;
+            }
+            this.sensorsCfg.push({ id, name, kind, topics: {} });
+            this.saveSensorsToStorage();
+            // pulisci i campi "new.*"
+            this.storage.removeItem('new.id');
+            this.storage.removeItem('new.name');
+            this.storage.removeItem('new.kind');
+            this.storage.removeItem('new.create');
+            await this.discoverSensors();
+            await this.connectMqtt(true);
+            return;
+        }
+        // --- Edit/Remove sensore esistente ---
+        const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
+        if (m) {
+            const sid = m[1];
+            const prop = m[2];
+            const cfg = this.sensorsCfg.find(s => s.id === sid);
+            if (!cfg) {
+                this.console.warn('putSetting: sensor non trovato', sid);
+                return;
+            }
+            if (prop === 'remove' && String(value) === 'true') {
+                // elimina
+                this.sensorsCfg = this.sensorsCfg.filter(s => s.id !== sid);
+                this.saveSensorsToStorage();
+                try {
+                    this.devices.delete(`sensor:${sid}`);
+                    deviceManager.onDeviceRemoved?.(`sensor:${sid}`);
+                }
+                catch { }
+                // pulisci flag
+                this.storage.removeItem(key);
+                await this.discoverSensors();
+                await this.connectMqtt(true);
+                return;
+            }
+            if (prop === 'name') {
+                cfg.name = String(value);
+            }
+            else if (prop === 'kind') {
+                cfg.kind = String(value);
+            }
+            else if (prop.startsWith('topic.')) {
+                const tk = prop.substring('topic.'.length);
+                cfg.topics[tk] = String(value).trim();
+            }
+            this.saveSensorsToStorage();
+            await this.discoverSensors();
+            await this.connectMqtt(true);
+            return;
+        }
+        // --- Altro (MQTT / Alarm settings) ---
         if (key === 'sensorsJson') {
+            // non più mostrato, ma se presente da vecchie versioni
             this.loadSensorsFromStorage();
             await this.discoverSensors();
             await this.connectMqtt(true);
@@ -34305,30 +34390,25 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         // 1) Prepara i manifest (niente istanze qui)
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
-            // interfacce dinamiche
             const t = cfg.topics || {};
-            const interfaces = [
-                sdk_1.ScryptedInterface.Online,
-                sdk_1.ScryptedInterface.TamperSensor,
-            ];
+            const interfaces = [sdk_1.ScryptedInterface.Online];
+            // Tamper solo se c'è un topic tamper
+            if (t.tamper)
+                interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
+            // Interfaccia primaria
             if (cfg.kind === 'contact')
                 interfaces.unshift(sdk_1.ScryptedInterface.EntrySensor);
             else if (cfg.kind === 'motion')
                 interfaces.unshift(sdk_1.ScryptedInterface.MotionSensor);
             else
                 interfaces.unshift(sdk_1.ScryptedInterface.OccupancySensor);
-            // aggiungi Battery solo se previsto
+            // Battery solo se previsto
             if (t.batteryLevel || t.lowBattery) {
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
             }
-            return {
-                nativeId,
-                name: cfg.name,
-                type: sdk_1.ScryptedDeviceType.Sensor,
-                interfaces,
-            };
+            return { nativeId, name: cfg.name, type: sdk_1.ScryptedDeviceType.Sensor, interfaces };
         });
-        // 2) Annuncia i device
+        // 2) Annuncio
         const dmAny = deviceManager;
         if (typeof dmAny.onDevicesChanged === 'function') {
             dmAny.onDevicesChanged({ devices: manifests });
@@ -34340,7 +34420,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.console.log('Annunciato:', m.nativeId);
             }
         }
-        // 3) Istanzia/aggiorna le classi DOPO l’annuncio
+        // 3) Istanzia/aggiorna DOPO l’annuncio
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34356,6 +34436,11 @@ class ParadoxMqttSecuritySystem extends sdk_1.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;
+            }
         }
         // 4) Rimuovi quelli spariti
         const announced = new Set(manifests.map(m => m.nativeId));
@@ -34408,7 +34493,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         return Array.from(subs);
     }
-    async connectMqtt(reconnect = false) {
+    async connectMqtt(_reconnect = false) {
         const subs = this.collectAllSubscriptions();
         if (!subs.length && !this.storage.getItem('topicSetTarget')) {
             this.console.warn('Configura almeno un topic nelle impostazioni.');

package/package.json

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