@rfranzoi/scrypted-mqtt-securitysystem 1.0.38 → 1.0.40

package/dist/main.nodejs.js

@@ -34029,7 +34029,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 // --- Preload: silenzia SOLO il warning facoltativo di sdk.json ---
-// Copre console.error e console.warn (alcune versioni usano warn).
 (() => {
     const swallow = (orig) => (...args) => {
         const txt = args.map(a => typeof a === 'string' ? a : (a?.message || '')).join(' ');
@@ -34040,11 +34039,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
     console.error = swallow(console.error.bind(console));
     console.warn = swallow(console.warn.bind(console));
 })();
-// Carica lo SDK (runtime only: niente import ESM per evitare che il bundler lo esegua prima del preload)
+// Carica lo SDK in runtime (evita ESM per garantire l’ordine col preload)
 const sdk = __webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js");
-// Valori runtime dal modulo SDK
-const { ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, // enum (valori)
-SecuritySystemMode, // enum (valori)
+// Valori runtime (enum, classi, manager)
+const { ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, // enum: valori
+SecuritySystemMode, // enum: valori
 systemManager, } = sdk;
 const mqtt_1 = __importDefault(__webpack_require__(/*! mqtt */ "./node_modules/mqtt/build/index.js"));
 /** utils */
@@ -34062,24 +34061,6 @@ function falsy(v) {
 }
 function normalize(s) { return (s || '').trim().toLowerCase(); }
 function clamp(n, min, max) { return Math.max(min, Math.min(max, n)); }
-function deepEqual(a, b) {
-    try {
-        return JSON.stringify(a) === JSON.stringify(b);
-    }
-    catch {
-        return a === b;
-    }
-}
-/** Imposta una property e, se cambia, emette anche l'evento Scrypted corrispondente */
-function setAndEmit(dev, key, value, iface) {
-    if (dev[key] === value)
-        return;
-    dev[key] = value;
-    try {
-        dev.onDeviceEvent?.(iface, value);
-    }
-    catch { }
-}
 /** Outgoing predefiniti (PAI-like). Chiavi numeriche per compatibilità enum */
 const DEFAULT_OUTGOING = {
     [SecuritySystemMode.Disarmed]: 'disarm',
@@ -34112,145 +34093,46 @@ class BaseMqttSensor extends ScryptedDeviceBase {
     handleMqtt(topic, payload) {
         const p = payload?.toString() ?? '';
         const np = normalize(p);
-        // Online
         if (topic === this.cfg.topics.online) {
             if (truthy(np) || np === 'online')
-                setAndEmit(this, 'online', true, ScryptedInterface.Online);
+                this.online = true;
             if (falsy(np) || np === 'offline')
-                setAndEmit(this, 'online', false, ScryptedInterface.Online);
+                this.online = false;
         }
-        // Tamper
         if (topic === this.cfg.topics.tamper) {
             if (truthy(np) || ['tamper', 'intrusion', 'cover', 'motion', 'magnetic'].includes(np)) {
-                const t = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
-                setAndEmit(this, 'tampered', t, ScryptedInterface.TamperSensor);
+                this.tampered = ['cover', 'intrusion', 'motion', 'magnetic'].find(x => x === np) || true;
             }
             else if (falsy(np))
-                setAndEmit(this, 'tampered', false, ScryptedInterface.TamperSensor);
+                this.tampered = false;
         }
-        // Battery
         if (topic === this.cfg.topics.batteryLevel) {
             const n = clamp(parseFloat(p), 0, 100);
             if (isFinite(n))
-                setAndEmit(this, 'batteryLevel', n, ScryptedInterface.Battery);
+                this.batteryLevel = n;
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            const n = truthy(np) ? 10 : 100;
-            setAndEmit(this, 'batteryLevel', n, ScryptedInterface.Battery);
+            this.batteryLevel = truthy(np) ? 10 : 100;
         }
-        // Primary
         this.handlePrimary(topic, np, p);
     }
 }
-/** === SENSORI CON PARSING ROBUSTO + EMISSIONE EVENTI === */
 class ContactMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np, raw) {
-        if (topic !== this.cfg.topics.contact)
-            return;
-        let val;
-        // stringhe comuni
-        if (['open', 'opened', '1', 'true', 'on', 'yes'].includes(np))
-            val = true;
-        else if (['closed', 'close', '0', 'false', 'off', 'no', 'shut'].includes(np))
-            val = false;
-        // JSON comuni
-        if (val === undefined) {
-            try {
-                const j = JSON.parse(raw);
-                if (typeof j?.open === 'boolean')
-                    val = !!j.open;
-                else if (typeof j?.opened === 'boolean')
-                    val = !!j.opened;
-                else if (typeof j?.contact === 'boolean')
-                    val = !j.contact; // contact:false => OPEN
-                else if (typeof j?.state === 'string') {
-                    const s = String(j.state).toLowerCase();
-                    if (s === 'open')
-                        val = true;
-                    if (s === 'closed')
-                        val = false;
-                }
-            }
-            catch { }
-        }
-        if (val !== undefined) {
-            setAndEmit(this, 'entryOpen', val, ScryptedInterface.EntrySensor);
-        }
-        else {
-            this.console?.debug?.(`Contact payload non gestito (${this.cfg.id}): "${raw}"`);
-        }
+    handlePrimary(topic, np) {
+        if (topic === this.cfg.topics.contact)
+            this.entryOpen = truthy(np);
     }
 }
 class MotionMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np, raw) {
-        if (topic !== this.cfg.topics.motion)
-            return;
-        let val;
-        if (['motion', 'detected', 'active', '1', 'true', 'on', 'yes'].includes(np))
-            val = true;
-        else if (['clear', 'inactive', 'no_motion', 'none', '0', 'false', 'off', 'no'].includes(np))
-            val = false;
-        if (val === undefined) {
-            try {
-                const j = JSON.parse(raw);
-                if (typeof j?.motion === 'boolean')
-                    val = !!j.motion;
-                else if (typeof j?.occupancy === 'boolean')
-                    val = !!j.occupancy;
-                else if (typeof j?.presence === 'boolean')
-                    val = !!j.presence;
-                else if (typeof j?.state === 'string') {
-                    const s = String(j.state).toLowerCase();
-                    if (['on', 'motion', 'detected', 'active'].includes(s))
-                        val = true;
-                    if (['off', 'clear', 'inactive'].includes(s))
-                        val = false;
-                }
-            }
-            catch { }
-        }
-        if (val !== undefined) {
-            setAndEmit(this, 'motionDetected', val, ScryptedInterface.MotionSensor);
-        }
-        else {
-            this.console?.debug?.(`Motion payload non gestito (${this.cfg.id}): "${raw}"`);
-        }
+    handlePrimary(topic, np) {
+        if (topic === this.cfg.topics.motion)
+            this.motionDetected = truthy(np);
     }
 }
 class OccupancyMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np, raw) {
-        if (topic !== this.cfg.topics.occupancy)
-            return;
-        let val;
-        if (['occupied', 'presence', 'present', '1', 'true', 'on', 'yes'].includes(np))
-            val = true;
-        else if (['unoccupied', 'vacant', 'absent', '0', 'false', 'off', 'no', 'clear'].includes(np))
-            val = false;
-        if (val === undefined) {
-            try {
-                const j = JSON.parse(raw);
-                if (typeof j?.occupied === 'boolean')
-                    val = !!j.occupied;
-                else if (typeof j?.presence === 'boolean')
-                    val = !!j.presence;
-                else if (typeof j?.occupancy === 'boolean')
-                    val = !!j.occupancy;
-                else if (typeof j?.state === 'string') {
-                    const s = String(j.state).toLowerCase();
-                    if (['occupied', 'presence', 'present', 'on'].includes(s))
-                        val = true;
-                    if (['vacant', 'absent', 'clear', 'off'].includes(s))
-                        val = false;
-                }
-            }
-            catch { }
-        }
-        if (val !== undefined) {
-            setAndEmit(this, 'occupied', val, ScryptedInterface.OccupancySensor);
-        }
-        else {
-            this.console?.debug?.(`Occupancy payload non gestito (${this.cfg.id}): "${raw}"`);
-        }
+    handlePrimary(topic, np) {
+        if (topic === this.cfg.topics.occupancy)
+            this.occupied = truthy(np);
     }
 }
 /** ----------------- Main Plugin ----------------- */
@@ -34259,8 +34141,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         super();
         this.sensorsCfg = [];
         this.devices = new Map();
-        // Evita loop di log: tenta una volta finché deviceManager non c’è, poi riprova su eventi utili.
-        this.discoveryPostponed = false;
+        this.triedDiscoveryOnce = false;
         // Tipo in UI (best-effort)
         setTimeout(() => {
             try {
@@ -34279,7 +34160,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             ],
         };
         this.online = this.online ?? false;
-        // Config sensori e (tentativo) announce
+        // Config sensori e announce
         this.loadSensorsFromStorage();
         this.safeDiscoverSensors(); // non spamma se deviceManager non c'è
         // Connect MQTT
@@ -34325,13 +34206,17 @@ class ParadoxMqttSecuritySystem extends 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' },
+            // ---- Danger Zone ----
+            { group: 'Danger Zone', key: 'danger.resetSensors', title: 'Reset all sensors (wipe)', type: 'boolean', description: 'Cancella tutti i sensori salvati e rimuove i device annunciati.' },
+            { group: 'Danger Zone', key: 'danger.export', title: 'Export sensors JSON (read-only)', value: JSON.stringify(this.sensorsCfg, null, 2), readonly: true },
+            { group: 'Danger Zone', key: 'danger.import', title: 'Import sensors JSON (paste & Save)', type: 'string', placeholder: '[]', description: 'Incolla JSON valido per sovrascrivere l’elenco sensori.' },
         ];
-        // 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: 'Toggle ON to create the sensor.' });
-        // Sensors esistenti
+        // ---- Add Sensor
+        out.push({ group: 'Add Sensor', key: 'new.id', title: 'New Sensor ID', placeholder: 'porta-sogg', value: this.storage.getItem('new.id') || '' }, { group: 'Add Sensor', key: 'new.name', title: 'Name', placeholder: 'Porta Soggiorno', 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: 'Toggle ON e Save per creare.' });
+        // ---- Sensors 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'] });
+            out.push({ group: gid, key: `sensor.${cfg.id}.id`, title: 'ID (read-only)', value: cfg.id, readonly: true, description: 'L’ID identifica il device. Evita spazi/puntini.' }, { 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'] }, { group: gid, key: `sensor.${cfg.id}.renameTo`, title: 'Clone/Rename → New ID', placeholder: 'es. porta-sogg', description: 'Compila e Save per clonare con nuovo ID e rimuovere il vecchio.' });
             if (cfg.kind === 'contact')
                 out.push({ group: gid, key: `sensor.${cfg.id}.topic.contact`, title: 'Contact State Topic', value: cfg.topics.contact || '' });
             else if (cfg.kind === 'motion')
@@ -34344,6 +34229,46 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
     }
     async putSetting(key, value) {
         this.storage.setItem(key, String(value));
+        // ---- Danger Zone: reset all ----
+        if (key === 'danger.resetSensors' && String(value) === 'true') {
+            this.storage.removeItem('danger.resetSensors');
+            // rimuovi device annunciati
+            try {
+                const dm = sdk?.deviceManager;
+                for (const nativeId of Array.from(this.devices.keys())) {
+                    try {
+                        dm?.onDeviceRemoved?.(nativeId);
+                    }
+                    catch { }
+                }
+            }
+            catch { }
+            this.devices.clear();
+            this.sensorsCfg = [];
+            this.saveSensorsToStorage();
+            this.safeDiscoverSensors(true);
+            await this.connectMqtt(true);
+            return;
+        }
+        // ---- Danger Zone: import JSON ----
+        if (key === 'danger.import') {
+            try {
+                const parsed = JSON.parse(String(value) || '[]');
+                if (!Array.isArray(parsed))
+                    throw new Error('JSON non è un array.');
+                // sanifica
+                this.sensorsCfg = (parsed || []).filter(x => x && x.id && x.name && x.kind && x.topics);
+                this.saveSensorsToStorage();
+                this.storage.removeItem('danger.import');
+                this.safeDiscoverSensors(true);
+                await this.connectMqtt(true);
+            }
+            catch (e) {
+                this.console.error('Import JSON error:', e);
+            }
+            return;
+        }
+        // ---- Add Sensor ----
         if (key === 'new.create' && String(value) === 'true') {
             const id = (this.storage.getItem('new.id') || '').trim();
             const name = (this.storage.getItem('new.name') || '').trim() || id;
@@ -34366,6 +34291,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
+        // ---- Edit/Remove/Rename sensore ----
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
             const sid = m[1];
@@ -34375,6 +34301,30 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 this.console.warn('putSetting: sensor non trovato', sid);
                 return;
             }
+            // rename/clone
+            if (prop === 'renameTo') {
+                const newId = String(value).trim();
+                this.storage.removeItem(key);
+                if (!newId)
+                    return;
+                if (this.sensorsCfg.find(s => s.id === newId)) {
+                    this.console.warn('renameTo: ID già esistente:', newId);
+                    return;
+                }
+                const cloned = { ...cfg, id: newId, name: cfg.name };
+                this.sensorsCfg.push(cloned);
+                // rimuovi vecchio
+                this.sensorsCfg = this.sensorsCfg.filter(s => s !== cfg);
+                try {
+                    sdk?.deviceManager?.onDeviceRemoved?.(`sensor:${sid}`);
+                }
+                catch { }
+                this.saveSensorsToStorage();
+                this.safeDiscoverSensors(true);
+                await this.connectMqtt(true);
+                return;
+            }
+            // remove
             if (prop === 'remove' && String(value) === 'true') {
                 this.sensorsCfg = this.sensorsCfg.filter(s => s.id !== sid);
                 this.saveSensorsToStorage();
@@ -34387,6 +34337,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 await this.connectMqtt(true);
                 return;
             }
+            // edit
             if (prop === 'name')
                 cfg.name = String(value);
             else if (prop === 'kind')
@@ -34400,6 +34351,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
+        // Altre impostazioni: riconnetti
         if (key === 'sensorsJson') {
             this.loadSensorsFromStorage();
             this.safeDiscoverSensors(true);
@@ -34436,21 +34388,18 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
-    /** Annuncia i sensori SOLO se deviceManager è pronto. Niente loop infinito. */
+    /** Annuncia i sensori SOLO se deviceManager è pronto. */
     safeDiscoverSensors(triggeredByChange = false) {
         const dmAny = sdk?.deviceManager;
         if (!dmAny) {
-            // Posticipa una sola volta; poi riproviamo su connect MQTT e al primo messaggio
-            if (!this.discoveryPostponed) {
+            if (!this.triedDiscoveryOnce) {
                 this.console.log('Device discovery postponed: deviceManager not ready yet.');
-                this.discoveryPostponed = true;
+                this.triedDiscoveryOnce = true;
             }
             return;
         }
-        this.discoveryPostponed = false;
+        this.triedDiscoveryOnce = false;
         this.discoverSensors(dmAny);
-        if (triggeredByChange)
-            this.console.log('Sensors discovered/updated.');
     }
     /** discoverSensors con deviceManager garantito */
     discoverSensors(dmAny) {
@@ -34497,7 +34446,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             }
             const hasBattery = !!(cfg.topics.batteryLevel || cfg.topics.lowBattery);
             if (hasBattery && dev.batteryLevel === undefined)
-                setAndEmit(dev, 'batteryLevel', 100, ScryptedInterface.Battery);
+                dev.batteryLevel = 100;
         }
         // 4) Cleanup
         const announced = new Set(manifests.map(m => m.nativeId));
@@ -34562,15 +34511,15 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         const tOnline = this.storage.getItem('topicOnline') || '';
         client.on('connect', () => {
             this.console.log('MQTT connected');
-            setAndEmit(this, 'online', true, ScryptedInterface.Online);
+            this.online = true;
             if (subs.length)
                 client.subscribe(subs, { qos: 0 }, (err) => { if (err)
                     this.console.error('subscribe error', err); });
-            // Al primo connect riprova (silenziosamente) ad annunciare i sensori
+            // Al primo connect riprova ad annunciare i sensori
             this.safeDiscoverSensors(true);
         });
         client.on('reconnect', () => this.console.log('MQTT reconnecting...'));
-        client.on('close', () => { this.console.log('MQTT closed'); setAndEmit(this, 'online', false, ScryptedInterface.Online); });
+        client.on('close', () => { this.console.log('MQTT closed'); this.online = false; });
         client.on('error', (e) => { this.console.error('MQTT error', e); });
         client.on('message', (topic, payload) => {
             try {
@@ -34578,26 +34527,23 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 const np = normalize(p);
                 if (topic === tOnline) {
                     if (truthy(np) || np === 'online')
-                        setAndEmit(this, 'online', true, ScryptedInterface.Online);
+                        this.online = true;
                     if (falsy(np) || np === 'offline')
-                        setAndEmit(this, 'online', false, ScryptedInterface.Online);
+                        this.online = false;
                     return;
                 }
                 if (topic === tTamper) {
-                    if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np)) {
-                        const t = ['cover', 'intrusion'].find(x => x === np) || true;
-                        setAndEmit(this, 'tampered', t, ScryptedInterface.TamperSensor);
-                    }
-                    else if (falsy(np)) {
-                        setAndEmit(this, 'tampered', false, ScryptedInterface.TamperSensor);
-                    }
+                    if (truthy(np) || ['tamper', 'intrusion', 'cover'].includes(np))
+                        this.tampered = ['cover', 'intrusion'].find(x => x === np) || true;
+                    else if (falsy(np))
+                        this.tampered = false;
                     return;
                 }
                 if (topic === tCurrent) {
                     const mode = payloadToMode(payload);
                     const isAlarm = ['alarm', 'triggered'].includes(np);
                     const current = this.securitySystemState || { mode: SecuritySystemMode.Disarmed };
-                    const newState = {
+                    this.securitySystemState = {
                         mode: mode ?? current.mode,
                         supportedModes: current.supportedModes ?? [
                             SecuritySystemMode.Disarmed,
@@ -34607,13 +34553,6 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                         ],
                         triggered: isAlarm || undefined,
                     };
-                    if (!deepEqual(this.securitySystemState, newState)) {
-                        this.securitySystemState = newState;
-                        try {
-                            this.onDeviceEvent?.(ScryptedInterface.SecuritySystem, newState);
-                        }
-                        catch { }
-                    }
                     return;
                 }
                 if (topic === tTarget) {
@@ -34621,9 +34560,8 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                     this.console.log('Target state reported:', p, '->', this.pendingTarget);
                     return;
                 }
-                // Dispatch ai sensori
-                // (E prova ad annunciare se era stato posticipato e ora il manager è pronto)
-                if (this.discoveryPostponed)
+                // Dispatch ai sensori + eventuale discover ritardato
+                if (this.triedDiscoveryOnce)
                     this.safeDiscoverSensors(true);
                 for (const dev of this.devices.values())
                     dev.handleMqtt(topic, payload);

package/package.json

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