@rfranzoi/scrypted-mqtt-securitysystem 1.0.90 → 1.0.93

package/dist/main.nodejs.js

@@ -34241,9 +34241,10 @@ function payloadToModeLoose(payload) {
     return undefined;
 }
 class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
-    constructor(nativeId, cfg) {
+    constructor(nativeId, cfg, publishBypass) {
         super(nativeId);
         this.cfg = cfg;
+        this.publishBypass = publishBypass;
     }
     /** setter centralizzato + evento + (log opzionale) */
     setAndEmit(prop, val, iface, logContext) {
@@ -34299,7 +34300,17 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
             });
             return;
         }
-        // 4) LOW BATTERY (bool)
+        // 4) BYPASS STATE
+        if (topic === this.cfg.bypass?.state) {
+            if (truthy(np)) {
+                this.setAndEmit('on', true, sdk_1.ScryptedInterface.OnOff, { topic, raw, propLabel: 'bypass' });
+            }
+            else if (falsy(np)) {
+                this.setAndEmit('on', false, sdk_1.ScryptedInterface.OnOff, { topic, raw, propLabel: 'bypass' });
+            }
+            return;
+        }
+        // 5) LOW BATTERY (bool)
         if (topic === topics.lowBattery) {
             const isLow = np === 'true' ||
                 np === '1' ||
@@ -34322,7 +34333,7 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
             }
             return;
         }
-        // 5) BATTERY LEVEL (0..100)
+        // 6) BATTERY LEVEL (0..100)
         if (topic === topics.batteryLevel) {
             const n = Number(raw);
             if (isFinite(n)) {
@@ -34342,6 +34353,34 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
             return;
         }
     }
+    async turnOn() {
+        const bypass = this.cfg.bypass;
+        if (!bypass?.control) {
+            this.console?.warn?.('Bypass control topic non configurato.');
+            return;
+        }
+        const payload = (bypass.payloadOn || 'bypass').trim() || 'bypass';
+        if (this.publishBypass(this.cfg, payload))
+            this.setAndEmit('on', true, sdk_1.ScryptedInterface.OnOff, { propLabel: 'bypass' });
+    }
+    async turnOff() {
+        const bypass = this.cfg.bypass;
+        if (!bypass?.control) {
+            this.console?.warn?.('Bypass control topic non configurato.');
+            return;
+        }
+        const payload = (bypass.payloadOff || 'clear_bypass').trim() || 'clear_bypass';
+        if (this.publishBypass(this.cfg, payload))
+            this.setAndEmit('on', false, sdk_1.ScryptedInterface.OnOff, { propLabel: 'bypass' });
+    }
+    async setPowerState(on) {
+        if (on)
+            return this.turnOn();
+        return this.turnOff();
+    }
+    async setOn(on) {
+        return this.setPowerState(on);
+    }
 }
 class ContactMqttSensor extends BaseMqttSensor {
     handlePrimary(topic, np, raw) {
@@ -34367,72 +34406,12 @@ class OccupancyMqttSensor extends BaseMqttSensor {
         }
     }
 }
-class BypassMqttSwitch extends sdk_1.ScryptedDeviceBase {
-    constructor(nativeId, cfg, parent) {
-        super(nativeId);
-        this.cfg = cfg;
-        this.parent = parent;
-    }
-    updateConfig(cfg) {
-        this.cfg = cfg;
-    }
-    setOn(val, logContext) {
-        if (this.on === val)
-            return;
-        this.on = val;
-        try {
-            this.onDeviceEvent(sdk_1.ScryptedInterface.OnOff, val);
-        }
-        catch (e) {
-            this.console?.warn?.('onDeviceEvent error', e);
-        }
-        if (RUNTIME.logSensors) {
-            const source = logContext?.source ? ` ${logContext.source}` : '';
-            const extra = logContext?.topic ? ` (${logContext.topic}="${logContext.raw ?? ''}")` : '';
-            this.console?.log?.(`[Bypass] ${this.cfg.zoneName} [${this.cfg.id}] on -> ${val}${source}${extra}`);
-        }
-    }
-    handleMqtt(topic, payload) {
-        if (topic !== this.cfg.topics.state)
-            return;
-        const raw = payload?.toString() ?? '';
-        const np = normalize(raw);
-        if (truthy(np))
-            this.setOn(true, { topic, raw, source: 'state' });
-        else if (falsy(np))
-            this.setOn(false, { topic, raw, source: 'state' });
-    }
-    async turnOn() {
-        if (RUNTIME.logSensors) {
-            const topic = this.cfg.topics?.control || '';
-            this.console?.log?.(`[Bypass] cmd ON ${this.cfg.zoneName} [${this.cfg.id}] -> ${topic}`);
-        }
-        const payload = (this.cfg.payloadOn || 'bypass').trim() || 'bypass';
-        if (this.parent.publishBypass(this.cfg, payload))
-            this.setOn(true, { source: 'local' });
-    }
-    async turnOff() {
-        if (RUNTIME.logSensors) {
-            const topic = this.cfg.topics?.control || '';
-            this.console?.log?.(`[Bypass] cmd OFF ${this.cfg.zoneName} [${this.cfg.id}] -> ${topic}`);
-        }
-        const payload = (this.cfg.payloadOff || 'clear_bypass').trim() || 'clear_bypass';
-        if (this.parent.publishBypass(this.cfg, payload))
-            this.setOn(false, { source: 'local' });
-    }
-    async setPowerState(on) {
-        if (on)
-            return this.turnOn();
-        return this.turnOff();
-    }
-}
 /** ----------------- Main Plugin ----------------- */
 class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     constructor() {
         super();
         // sensor management
         this.sensorsCfg = [];
-        this.bypassCfg = [];
         this.devices = new Map();
         // carica flag runtime
         updateRuntimeFromStorage((k) => this.storage.getItem(k) || '');
@@ -34456,7 +34435,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));
@@ -34537,14 +34515,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 = [
@@ -34579,8 +34549,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         ];
         // ---- 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.' });
-        // ---- UI Add Bypass Switch ----
-        out.push({ group: 'Add Bypass Switch', key: 'bypass.new.id', title: 'New Bypass ID', placeholder: 'zona-1', value: this.storage.getItem('bypass.new.id') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.zoneName', title: 'Zone Name', placeholder: 'Zona 1', value: this.storage.getItem('bypass.new.zoneName') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.topic.control', title: 'Control Topic', placeholder: 'paradox/control/zones/Zona_1', value: this.storage.getItem('bypass.new.topic.control') || '' }, { group: 'Add Bypass Switch', key: 'bypass.new.topic.state', title: 'State Topic', placeholder: 'paradox/states/zones/Zona_1/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 per sensori esistenti ----
         for (const cfg of this.sensorsCfg) {
             const gid = `Sensor: ${cfg.name} [${cfg.id}]`;
@@ -34591,12 +34559,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 per bypass esistenti ----
-        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/Zona_1' }, { group: gid, key: `bypass.${cfg.id}.topic.state`, title: 'State Topic', value: cfg.topics.state || '', placeholder: 'paradox/states/zones/Zona_1/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/Zona_1' }, { group: gid, key: `sensor.${cfg.id}.bypass.state`, title: 'Bypass State Topic', value: cfg.bypass?.state || '', placeholder: 'paradox/states/zones/Zona_1/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;
     }
@@ -34629,44 +34592,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: id mancante');
-                return;
-            }
-            if (this.bypassCfg.find(b => b.id === id)) {
-                this.console.warn('Create bypass: id già esistente');
-                return;
-            }
-            this.bypassCfg.push({
-                id,
-                zoneName,
-                topics: { control, state },
-                payloadOn,
-                payloadOff,
-            });
-            this.saveBypassToStorage();
-            // pulizia campi "bypass.new.*"
-            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 sensore esistente ---
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
@@ -34700,53 +34625,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 bypass esistente ---
-        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 non trovato', bid);
-                return;
-            }
-            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();
+            else if (prop.startsWith('bypass.')) {
+                const bk = prop.substring('bypass.'.length);
+                cfg.bypass = cfg.bypass || {};
+                cfg.bypass[bk] = String(value).trim();
             }
-            this.saveBypassToStorage();
+            this.saveSensorsToStorage();
             await this.discoverDevices();
             await this.connectMqtt(true);
             return;
         }
         // --- Altro (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);
         }
@@ -34756,6 +34647,8 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     }
     /** ---- DeviceProvider ---- */
     async getDevice(nativeId) {
+        if (RUNTIME.logSensors)
+            this.console.log(`[DeviceProvider] getDevice ${nativeId}`);
         const existing = this.devices.get(nativeId);
         if (existing)
             return existing;
@@ -34766,11 +34659,11 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 return undefined;
             let dev;
             if (cfg.kind === 'contact')
-                dev = new ContactMqttSensor(nativeId, cfg);
+                dev = new ContactMqttSensor(nativeId, cfg, this.publishSensorBypass.bind(this));
             else if (cfg.kind === 'motion')
-                dev = new MotionMqttSensor(nativeId, cfg);
+                dev = new MotionMqttSensor(nativeId, cfg, this.publishSensorBypass.bind(this));
             else
-                dev = new OccupancyMqttSensor(nativeId, cfg);
+                dev = new OccupancyMqttSensor(nativeId, cfg, this.publishSensorBypass.bind(this));
             this.devices.set(nativeId, dev);
             const hasBattery = !!(cfg.topics.batteryLevel && cfg.topics.batteryLevel.trim())
                 || !!(cfg.topics.lowBattery && cfg.topics.lowBattery.trim());
@@ -34783,17 +34676,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             }
             return dev;
         }
-        if (nativeId.startsWith('bypass:')) {
-            const bid = nativeId.substring('bypass:'.length);
-            const cfg = this.bypassCfg.find(b => b.id === bid);
-            if (!cfg)
-                return undefined;
-            const dev = new BypassMqttSwitch(nativeId, cfg, this);
-            if (dev.on === undefined)
-                dev.on = false;
-            this.devices.set(nativeId, dev);
-            return dev;
-        }
         return undefined;
     }
     async releaseDevice(_id, nativeId) {
@@ -34815,31 +34697,22 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             const raw = this.storage.getItem('sensorsJson') || '[]';
             const parsed = JSON.parse(raw);
             // sanitize
-            this.sensorsCfg = (parsed || []).filter(x => x && x.id && x.name && x.kind && x.topics);
-        }
-        catch (e) {
-            this.console.error('Invalid sensorsJson:', e);
-            this.sensorsCfg = [];
-        }
-    }
-    loadBypassFromStorage() {
-        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 => ({
+            this.sensorsCfg = (parsed || []).filter(x => x && x.id && x.name && x.kind && x.topics).map(x => ({
                 id: String(x.id),
-                zoneName: String(x.zoneName),
-                topics: {
-                    control: x.topics?.control || '',
-                    state: x.topics?.state || '',
+                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',
                 },
-                payloadOn: String(x.payloadOn || 'bypass'),
-                payloadOff: String(x.payloadOff || 'clear_bypass'),
             }));
         }
         catch (e) {
-            this.console.error('Invalid bypassJson:', e);
-            this.bypassCfg = [];
+            this.console.error('Invalid sensorsJson:', e);
+            this.sensorsCfg = [];
         }
     }
     /** ===== discoverDevices: annuncia PRIMA, istanzia DOPO ===== */
@@ -34861,19 +34734,18 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             // Battery solo se definita davvero
             if ((t.batteryLevel && t.batteryLevel.trim()) || (t.lowBattery && t.lowBattery.trim()))
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
+            const hasBypass = !!(cfg.bypass?.control?.trim() || cfg.bypass?.state?.trim());
+            if (hasBypass)
+                interfaces.push(sdk_1.ScryptedInterface.OnOff);
             manifests.push({ nativeId, name: cfg.name, type: sdk_1.ScryptedDeviceType.Sensor, interfaces });
         }
-        for (const cfg of this.bypassCfg) {
-            const nativeId = `bypass:${cfg.id}`;
-            const zoneName = (cfg.zoneName || '').trim() || cfg.id;
-            const name = `${zoneName} Bypass`;
-            const interfaces = [sdk_1.ScryptedInterface.OnOff];
-            manifests.push({ nativeId, name, type: sdk_1.ScryptedDeviceType.Switch, interfaces });
-        }
         // 2) annuncio
         const dmAny = deviceManager;
         if (typeof dmAny.onDevicesChanged === 'function') {
-            dmAny.onDevicesChanged({ devices: manifests });
+            const payload = { devices: manifests };
+            if (this.nativeId)
+                payload.providerNativeId = this.nativeId;
+            dmAny.onDevicesChanged(payload);
             this.console.log('Annunciati (batch):', manifests.map(m => m.nativeId).join(', '));
         }
         else {
@@ -34888,11 +34760,11 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             let dev = this.devices.get(nativeId);
             if (!dev) {
                 if (cfg.kind === 'contact')
-                    dev = new ContactMqttSensor(nativeId, cfg);
+                    dev = new ContactMqttSensor(nativeId, cfg, this.publishSensorBypass.bind(this));
                 else if (cfg.kind === 'motion')
-                    dev = new MotionMqttSensor(nativeId, cfg);
+                    dev = new MotionMqttSensor(nativeId, cfg, this.publishSensorBypass.bind(this));
                 else
-                    dev = new OccupancyMqttSensor(nativeId, cfg);
+                    dev = new OccupancyMqttSensor(nativeId, cfg, this.publishSensorBypass.bind(this));
                 this.devices.set(nativeId, dev);
             }
             else {
@@ -34909,17 +34781,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 catch { }
             }
         }
-        for (const cfg of this.bypassCfg) {
-            const nativeId = `bypass:${cfg.id}`;
-            let dev = this.devices.get(nativeId);
-            if (!dev) {
-                dev = new BypassMqttSwitch(nativeId, cfg, this);
-                this.devices.set(nativeId, dev);
-            }
-            else {
-                dev.updateConfig(cfg);
-            }
-        }
         // 4) cleanup
         const announced = new Set(manifests.map(m => m.nativeId));
         for (const [nativeId] of this.devices) {
@@ -34965,14 +34826,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         // sensors
         for (const s of this.sensorsCfg) {
             const t = s.topics || {};
-            [t.contact, t.motion, t.occupancy, t.batteryLevel, t.lowBattery, t.tamper, t.online]
-                .filter((x) => !!x && String(x).trim().length > 0)
-                .forEach(x => subs.add(String(x)));
-        }
-        // bypass switches
-        for (const b of this.bypassCfg) {
-            const t = b.topics || {};
-            [t.state]
+            [t.contact, t.motion, t.occupancy, t.batteryLevel, t.lowBattery, t.tamper, t.online, s.bypass?.state]
                 .filter((x) => !!x && String(x).trim().length > 0)
                 .forEach(x => subs.add(String(x)));
         }
@@ -35121,8 +34975,8 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.console.log(`[Alarm] published target "${payload}" to ${topic}`);
         });
     }
-    publishBypass(cfg, payload) {
-        const topic = cfg.topics?.control?.trim();
+    publishSensorBypass(cfg, payload) {
+        const topic = cfg.bypass?.control?.trim();
         if (!topic || !this.client) {
             this.console.warn('Bypass topic control o MQTT non configurati.');
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rfranzoi/scrypted-mqtt-securitysystem",
-  "version": "1.0.90",
+  "version": "1.0.93",
   "description": "Scrypted plugin: Paradox Security System via MQTT (PAI/PAI-MQTT style).",
   "license": "MIT",
   "main": "dist/main.nodejs.js",
@@ -42,7 +42,8 @@
       "SecuritySystem",
       "Settings",
       "TamperSensor",
-      "Online"
+      "Online",
+      "DeviceProvider"
     ]
   }
 }