@rfranzoi/scrypted-mqtt-securitysystem 1.0.95 → 1.0.96

package/dist/main.nodejs.js

@@ -34457,7 +34457,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         super();
         // device management
         this.sensorsCfg = [];
-        this.bypassCfg = [];
         this.devices = new Map();
         // load runtime flags
         updateRuntimeFromStorage((k) => this.storage.getItem(k) || '');
@@ -34481,7 +34480,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         this.online = this.online ?? false;
         // Load configs and announce devices
         this.loadSensorsFromStorage();
-        this.loadBypassFromStorage();
         this.discoverDevices().catch(e => this.console.error('discoverDevices error', e));
         // Connect on start
         this.connectMqtt().catch(e => this.console.error('MQTT connect error:', e));
@@ -34562,14 +34560,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             this.console.error('saveSensorsToStorage error', e);
         }
     }
-    saveBypassToStorage() {
-        try {
-            this.storage.setItem('bypassJson', JSON.stringify(this.bypassCfg));
-        }
-        catch (e) {
-            this.console.error('saveBypassToStorage error', e);
-        }
-    }
     /** ---- Settings UI ---- */
     async getSettings() {
         const out = [
@@ -34604,8 +34594,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         ];
         // ---- UI Add Sensor ----
         out.push({ group: 'Add Sensor', key: 'new.id', title: 'New Sensor ID', placeholder: 'front-door', value: this.storage.getItem('new.id') || '' }, { group: 'Add Sensor', key: 'new.name', title: 'Name', placeholder: 'Front Door', 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.' });
-        // ---- UI Add Bypass Switch ----
-        out.push({ group: 'Add Bypass Switch', key: 'bypass.new.id', title: 'New Bypass ID', placeholder: 'living-room-window', value: this.storage.getItem('bypass.new.id') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.zoneName', title: 'Zone Name', placeholder: 'Living Room Window', value: this.storage.getItem('bypass.new.zoneName') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.topic.control', title: 'Control Topic', placeholder: 'paradox/control/zones/Living_Room_Window', value: this.storage.getItem('bypass.new.topic.control') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.topic.state', title: 'State Topic', placeholder: 'paradox/states/zones/Living_Room_Window/bypassed', value: this.storage.getItem('bypass.new.topic.state') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.payloadOn', title: 'Payload for ON', placeholder: 'bypass', value: this.storage.getItem('bypass.new.payloadOn') || 'bypass' }, { group: 'Add Bypass Switch', key: 'bypass.new.payloadOff', title: 'Payload for OFF', placeholder: 'clear_bypass', value: this.storage.getItem('bypass.new.payloadOff') || 'clear_bypass' }, { group: 'Add Bypass Switch', key: 'bypass.new.create', title: 'Create bypass switch', type: 'boolean', description: 'Fill the fields above and toggle this on to create the bypass switch. After creation, restart this plugin to see the accessory listed below.' });
         // ---- UI for existing sensors ----
         for (const cfg of this.sensorsCfg) {
             const gid = `Sensor: ${cfg.name} [${cfg.id}]`;
@@ -34616,12 +34604,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 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' });
-            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' });
-        }
-        // ---- UI for existing bypass switches ----
-        for (const cfg of this.bypassCfg) {
-            const gid = `Bypass: ${cfg.zoneName} [${cfg.id}]`;
-            out.push({ group: gid, key: `bypass.${cfg.id}.zoneName`, title: 'Zone Name', value: cfg.zoneName }, { group: gid, key: `bypass.${cfg.id}.topic.control`, title: 'Control Topic', value: cfg.topics.control || '', placeholder: 'paradox/control/zones/Living_Room_Window' }, { group: gid, key: `bypass.${cfg.id}.topic.state`, title: 'State Topic', value: cfg.topics.state || '', placeholder: 'paradox/states/zones/Living_Room_Window/bypassed' }, { group: gid, key: `bypass.${cfg.id}.payloadOn`, title: 'Payload for ON', value: cfg.payloadOn || 'bypass' }, { group: gid, key: `bypass.${cfg.id}.payloadOff`, title: 'Payload for OFF', value: cfg.payloadOff || 'clear_bypass' }, { group: gid, key: `bypass.${cfg.id}.remove`, title: 'Remove bypass switch', type: 'boolean' });
+            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}.bypass.control`, title: 'Bypass Control Topic', value: cfg.bypass?.control || '', placeholder: 'paradox/control/zones/Living_Room_Window', description: 'Configuring bypass topics creates a separate bypass switch accessory for this sensor.' }, { group: gid, key: `sensor.${cfg.id}.bypass.state`, title: 'Bypass State Topic', value: cfg.bypass?.state || '', placeholder: 'paradox/states/zones/Living_Room_Window/bypassed' }, { group: gid, key: `sensor.${cfg.id}.bypass.payloadOn`, title: 'Bypass Payload ON', value: cfg.bypass?.payloadOn || 'bypass' }, { group: gid, key: `sensor.${cfg.id}.bypass.payloadOff`, title: 'Bypass Payload OFF', value: cfg.bypass?.payloadOff || 'clear_bypass' }, { group: gid, key: `sensor.${cfg.id}.remove`, title: 'Remove sensor', type: 'boolean' });
         }
         return out;
     }
@@ -34654,44 +34637,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // --- Add Bypass Switch workflow ---
-        if (key === 'bypass.new.create' && String(value) === 'true') {
-            const id = (this.storage.getItem('bypass.new.id') || '').trim();
-            const zoneName = (this.storage.getItem('bypass.new.zoneName') || '').trim() || id;
-            const control = (this.storage.getItem('bypass.new.topic.control') || '').trim();
-            const state = (this.storage.getItem('bypass.new.topic.state') || '').trim();
-            const payloadOn = (this.storage.getItem('bypass.new.payloadOn') || 'bypass').trim() || 'bypass';
-            const payloadOff = (this.storage.getItem('bypass.new.payloadOff') || 'clear_bypass').trim() || 'clear_bypass';
-            if (!id) {
-                this.console.warn('Create bypass: missing id');
-                return;
-            }
-            if (this.bypassCfg.find(b => b.id === id)) {
-                this.console.warn('Create bypass: id already exists');
-                return;
-            }
-            this.bypassCfg.push({
-                id,
-                zoneName,
-                topics: { control, state },
-                payloadOn,
-                payloadOff,
-            });
-            this.saveBypassToStorage();
-            // clear "bypass.new.*" fields
-            this.storage.removeItem('bypass.new.id');
-            this.storage.removeItem('bypass.new.zoneName');
-            this.storage.removeItem('bypass.new.topic.control');
-            this.storage.removeItem('bypass.new.topic.state');
-            this.storage.removeItem('bypass.new.payloadOn');
-            this.storage.removeItem('bypass.new.payloadOff');
-            this.storage.removeItem('bypass.new.create');
-            await this.discoverDevices();
-            await this.connectMqtt(true);
-            return;
-        }
-        if (key.startsWith('bypass.new.'))
-            return;
         // --- Edit/Remove existing sensor ---
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
@@ -34725,53 +34670,19 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 const tk = prop.substring('topic.'.length);
                 cfg.topics[tk] = String(value).trim();
             }
-            this.saveSensorsToStorage();
-            await this.discoverDevices();
-            await this.connectMqtt(true);
-            return;
-        }
-        // --- Edit/Remove existing bypass ---
-        const mb = key.match(/^bypass\.([^\.]+)\.(.+)$/);
-        if (mb) {
-            const bid = mb[1];
-            const prop = mb[2];
-            const cfg = this.bypassCfg.find(b => b.id === bid);
-            if (!cfg) {
-                this.console.warn('putSetting: bypass not found', bid);
-                return;
+            else if (prop.startsWith('bypass.')) {
+                const bk = prop.substring('bypass.'.length);
+                cfg.bypass = cfg.bypass || {};
+                cfg.bypass[bk] = String(value).trim();
             }
-            if (prop === 'remove' && String(value) === 'true') {
-                this.bypassCfg = this.bypassCfg.filter(b => b.id !== bid);
-                this.saveBypassToStorage();
-                try {
-                    this.devices.delete(`bypass:${bid}`);
-                    deviceManager.onDeviceRemoved?.(`bypass:${bid}`);
-                }
-                catch { }
-                this.storage.removeItem(key);
-                await this.discoverDevices();
-                await this.connectMqtt(true);
-                return;
-            }
-            if (prop === 'zoneName')
-                cfg.zoneName = String(value);
-            else if (prop === 'payloadOn')
-                cfg.payloadOn = String(value).trim();
-            else if (prop === 'payloadOff')
-                cfg.payloadOff = String(value).trim();
-            else if (prop.startsWith('topic.')) {
-                const tk = prop.substring('topic.'.length);
-                cfg.topics[tk] = String(value).trim();
-            }
-            this.saveBypassToStorage();
+            this.saveSensorsToStorage();
             await this.discoverDevices();
             await this.connectMqtt(true);
             return;
         }
         // --- Other (MQTT / Alarm settings / parsing / payloads / logging) ---
-        if (key === 'sensorsJson' || key === 'bypassJson') {
+        if (key === 'sensorsJson') {
             this.loadSensorsFromStorage();
-            this.loadBypassFromStorage();
             await this.discoverDevices();
             await this.connectMqtt(true);
         }
@@ -34812,7 +34723,8 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         if (nativeId.startsWith('bypass:')) {
             const bid = nativeId.substring('bypass:'.length);
-            const cfg = this.bypassCfg.find(b => b.id === bid);
+            const sensor = this.sensorsCfg.find(s => s.id === bid);
+            const cfg = sensor ? this.buildBypassConfig(sensor) : undefined;
             if (!cfg)
                 return undefined;
             const dev = new BypassMqttSwitch(nativeId, cfg, this);
@@ -34847,33 +34759,75 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 name: String(x.name),
                 kind: x.kind,
                 topics: x.topics || {},
+                bypass: {
+                    control: x.bypass?.control || '',
+                    state: x.bypass?.state || '',
+                    payloadOn: x.bypass?.payloadOn || 'bypass',
+                    payloadOff: x.bypass?.payloadOff || 'clear_bypass',
+                },
             }));
         }
         catch (e) {
             this.console.error('Invalid sensorsJson:', e);
             this.sensorsCfg = [];
         }
+        this.migrateBypassFromStorage();
     }
-    loadBypassFromStorage() {
+    migrateBypassFromStorage() {
         try {
             const raw = this.storage.getItem('bypassJson') || '[]';
             const parsed = JSON.parse(raw);
-            this.bypassCfg = (parsed || []).filter(x => x && x.id && x.zoneName && x.topics).map(x => ({
-                id: String(x.id),
-                zoneName: String(x.zoneName),
-                topics: {
-                    control: x.topics?.control || '',
-                    state: x.topics?.state || '',
-                },
-                payloadOn: String(x.payloadOn || 'bypass'),
-                payloadOff: String(x.payloadOff || 'clear_bypass'),
-            }));
+            if (!Array.isArray(parsed))
+                return;
+            let changed = false;
+            for (const b of (parsed || [])) {
+                if (!b || !b.id)
+                    continue;
+                const sensor = this.sensorsCfg.find(s => s.id === String(b.id));
+                if (!sensor)
+                    continue;
+                const bypass = sensor.bypass || {};
+                if (!bypass.control && b.topics?.control) {
+                    bypass.control = String(b.topics.control);
+                    changed = true;
+                }
+                if (!bypass.state && b.topics?.state) {
+                    bypass.state = String(b.topics.state);
+                    changed = true;
+                }
+                if ((!bypass.payloadOn || bypass.payloadOn === 'bypass') && b.payloadOn) {
+                    bypass.payloadOn = String(b.payloadOn);
+                    changed = true;
+                }
+                if ((!bypass.payloadOff || bypass.payloadOff === 'clear_bypass') && b.payloadOff) {
+                    bypass.payloadOff = String(b.payloadOff);
+                    changed = true;
+                }
+                sensor.bypass = bypass;
+            }
+            if (changed)
+                this.saveSensorsToStorage();
         }
         catch (e) {
             this.console.error('Invalid bypassJson:', e);
-            this.bypassCfg = [];
         }
     }
+    buildBypassConfig(sensor) {
+        const bypass = sensor.bypass;
+        if (!bypass)
+            return;
+        const control = (bypass.control || '').trim();
+        const state = (bypass.state || '').trim();
+        if (!control && !state)
+            return;
+        return {
+            id: sensor.id,
+            zoneName: (sensor.name || '').trim() || sensor.id,
+            topics: { control, state },
+            payloadOn: (bypass.payloadOn || 'bypass').trim() || 'bypass',
+            payloadOff: (bypass.payloadOff || 'clear_bypass').trim() || 'clear_bypass',
+        };
+    }
     /** ===== discoverDevices: announce first, instantiate after ===== */
     async discoverDevices() {
         // 1) manifest
@@ -34895,7 +34849,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
             manifests.push({ nativeId, name: cfg.name, type: sdk_1.ScryptedDeviceType.Sensor, interfaces });
         }
-        for (const cfg of this.bypassCfg) {
+        for (const sensor of this.sensorsCfg) {
+            const cfg = this.buildBypassConfig(sensor);
+            if (!cfg)
+                continue;
             const nativeId = `bypass:${cfg.id}`;
             const zoneName = (cfg.zoneName || '').trim() || cfg.id;
             const name = `${zoneName} Bypass`;
@@ -34944,7 +34901,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 catch { }
             }
         }
-        for (const cfg of this.bypassCfg) {
+        for (const sensor of this.sensorsCfg) {
+            const cfg = this.buildBypassConfig(sensor);
+            if (!cfg)
+                continue;
             const nativeId = `bypass:${cfg.id}`;
             let dev = this.devices.get(nativeId);
             if (!dev) {
@@ -35005,11 +34965,10 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 .forEach(x => subs.add(String(x)));
         }
         // bypass switches
-        for (const b of this.bypassCfg) {
-            const t = b.topics || {};
-            [t.state]
-                .filter((x) => !!x && String(x).trim().length > 0)
-                .forEach(x => subs.add(String(x)));
+        for (const s of this.sensorsCfg) {
+            const state = s.bypass?.state;
+            if (state && state.trim().length > 0)
+                subs.add(state);
         }
         return Array.from(subs);
     }

package/package.json

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