@rfranzoi/scrypted-mqtt-securitysystem 1.0.48 → 1.0.50

package/dist/main.nodejs.js

@@ -34064,6 +34064,15 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const sdk_1 = __importStar(__webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js"));
 const mqtt_1 = __importDefault(__webpack_require__(/*! mqtt */ "./node_modules/mqtt/build/index.js"));
 const { systemManager, deviceManager } = sdk_1.default;
+/** ---------- RUNTIME FLAGS (aggiornati da Settings) ---------- */
+const RUNTIME = {
+    logSensors: false,
+    logMqttAll: false,
+};
+function updateRuntimeFromStorage(get) {
+    RUNTIME.logSensors = (get('logSensors') || '') === 'true';
+    RUNTIME.logMqttAll = (get('logMqttAll') || '') === 'true';
+}
 /** utils */
 function truthy(v) {
     if (!v)
@@ -34086,7 +34095,7 @@ const DEFAULT_OUTGOING = {
     [sdk_1.SecuritySystemMode.AwayArmed]: 'arm_away',
     [sdk_1.SecuritySystemMode.NightArmed]: 'arm_night',
 };
-/** Fallback (non-strict) parser con sinonimi */
+/** Parser loose con sinonimi (usato se strict=OFF) */
 function payloadToModeLoose(payload) {
     if (payload == null)
         return;
@@ -34108,8 +34117,8 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
         super(nativeId);
         this.cfg = cfg;
     }
-    /** setter centralizzato + evento */
-    setAndEmit(prop, val, iface) {
+    /** setter centralizzato + evento + (log opzionale) */
+    setAndEmit(prop, val, iface, logContext) {
         const prev = this[prop];
         if (prev === val)
             return;
@@ -34120,6 +34129,11 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
         catch (e) {
             this.console?.warn?.('onDeviceEvent error', iface, e);
         }
+        if (RUNTIME.logSensors) {
+            const label = logContext?.propLabel || prop;
+            const extra = logContext?.topic ? ` (${logContext.topic}="${logContext.raw ?? ''}")` : '';
+            this.console?.log?.(`[Sensor] ${this.cfg.name} [${this.cfg.id}] ${label} -> ${JSON.stringify(val)}${extra}`);
+        }
     }
     /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
@@ -34128,75 +34142,58 @@ class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
         // online
         if (topic === this.cfg.topics.online) {
             if (truthy(np) || np === 'online')
-                this.setAndEmit('online', true, sdk_1.ScryptedInterface.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);
+                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);
+                this.setAndEmit('tampered', value, sdk_1.ScryptedInterface.TamperSensor, { topic, raw, propLabel: 'tampered' });
             }
             else if (falsy(np)) {
-                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor);
+                this.setAndEmit('tampered', false, sdk_1.ScryptedInterface.TamperSensor, { topic, raw, propLabel: 'tampered' });
             }
         }
         // 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);
+                this.setAndEmit('batteryLevel', n, sdk_1.ScryptedInterface.Battery, { topic, raw, propLabel: 'batteryLevel' });
         }
         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);
+                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);
+                this.setAndEmit('batteryLevel', 100, sdk_1.ScryptedInterface.Battery, { topic, raw, propLabel: 'batteryLevel (ok)' });
         }
         // primary handled by subclasses
         this.handlePrimary(topic, np, raw);
     }
 }
 class ContactMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
+    handlePrimary(topic, np, raw) {
         if (topic === this.cfg.topics.contact) {
             const v = truthy(np);
-            this.setAndEmit?.('entryOpen', v, sdk_1.ScryptedInterface.EntrySensor);
-            if (this.setAndEmit === undefined) {
-                if (this.entryOpen !== v) {
-                    this.entryOpen = v;
-                    this.onDeviceEvent(sdk_1.ScryptedInterface.EntrySensor, v);
-                }
-            }
+            this.setAndEmit('entryOpen', v, sdk_1.ScryptedInterface.EntrySensor, { topic, raw, propLabel: 'entryOpen' });
         }
     }
 }
 class MotionMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
+    handlePrimary(topic, np, raw) {
         if (topic === this.cfg.topics.motion) {
             const v = truthy(np);
-            this.setAndEmit?.('motionDetected', v, sdk_1.ScryptedInterface.MotionSensor);
-            if (this.setAndEmit === undefined) {
-                if (this.motionDetected !== v) {
-                    this.motionDetected = v;
-                    this.onDeviceEvent(sdk_1.ScryptedInterface.MotionSensor, v);
-                }
-            }
+            this.setAndEmit('motionDetected', v, sdk_1.ScryptedInterface.MotionSensor, { topic, raw, propLabel: 'motionDetected' });
         }
     }
 }
 class OccupancyMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
+    handlePrimary(topic, np, raw) {
         if (topic === this.cfg.topics.occupancy) {
             const v = truthy(np);
-            this.setAndEmit?.('occupied', v, sdk_1.ScryptedInterface.OccupancySensor);
-            if (this.setAndEmit === undefined) {
-                if (this.occupied !== v) {
-                    this.occupied = v;
-                    this.onDeviceEvent(sdk_1.ScryptedInterface.OccupancySensor, v);
-                }
-            }
+            this.setAndEmit('occupied', v, sdk_1.ScryptedInterface.OccupancySensor, { topic, raw, propLabel: 'occupied' });
         }
     }
 }
@@ -34204,14 +34201,19 @@ class OccupancyMqttSensor extends BaseMqttSensor {
 class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     constructor() {
         super();
+        // sensor management
         this.sensorsCfg = [];
         this.devices = new Map();
+        // carica flag runtime
+        updateRuntimeFromStorage((k) => this.storage.getItem(k) || '');
+        // (facoltativo) Imposta il device type in UI
         setTimeout(() => {
             try {
                 systemManager.getDeviceById(this.id)?.setType?.(sdk_1.ScryptedDeviceType.SecuritySystem);
             }
             catch { }
         });
+        // Default state
         this.securitySystemState = this.securitySystemState || {
             mode: sdk_1.SecuritySystemMode.Disarmed,
             supportedModes: [
@@ -34222,9 +34224,12 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             ],
         };
         this.online = this.online ?? false;
+        // Load sensors config and announce devices
         this.loadSensorsFromStorage();
         this.discoverSensors().catch(e => this.console.error('discoverSensors error', e));
+        // Connect on start
         this.connectMqtt().catch(e => this.console.error('MQTT connect error:', e));
+        // chiusura pulita del client MQTT ai reload/stop del plugin
         try {
             process.once('SIGTERM', () => { try {
                 this.client?.end(true);
@@ -34241,7 +34246,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         }
         catch { }
     }
-    /** ---- Helpers parsing ---- */
+    // ====== Strict parsing helpers ======
     parseJsonArray(key, fallback) {
         try {
             const raw = (this.storage.getItem(key) || '').trim();
@@ -34256,45 +34261,42 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             return fallback;
         }
     }
-    getStrictTokens() {
-        const target = this.parseJsonArray('targetStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed']);
-        const current = this.parseJsonArray('currentStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed', 'triggered']);
-        const triggered = this.parseJsonArray('triggeredValues', ['triggered', 'alarm']);
-        const union = new Set([...target, ...current]);
-        return {
-            union,
-            triggered: new Set(triggered),
-        };
-    }
     useStrict() {
         return this.storage.getItem('strictParsing') === 'true';
     }
     parseIncomingMode(payload) {
-        const p = payload?.toString?.() ?? String(payload ?? '');
-        const np = normalize(p);
+        const np = normalize(payload?.toString?.() ?? String(payload ?? ''));
         if (!this.useStrict())
             return payloadToModeLoose(np);
-        // strict: usa SOLO i token configurati
-        const { union } = this.getStrictTokens();
-        if (union.has('disarmed') && np === 'disarmed')
+        const currentVals = new Set(this.parseJsonArray('currentStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed', 'triggered']));
+        if (currentVals.has('disarmed') && np === 'disarmed')
             return sdk_1.SecuritySystemMode.Disarmed;
-        if (union.has('armed_home') && np === 'armed_home')
+        if (currentVals.has('armed_home') && np === 'armed_home')
             return sdk_1.SecuritySystemMode.HomeArmed;
-        if (union.has('armed_away') && np === 'armed_away')
+        if (currentVals.has('armed_away') && np === 'armed_away')
             return sdk_1.SecuritySystemMode.AwayArmed;
-        if (union.has('armed_night') && np === 'armed_night')
+        if (currentVals.has('armed_night') && np === 'armed_night')
             return sdk_1.SecuritySystemMode.NightArmed;
-        // transitori/altro: ignora
         return undefined;
     }
     isTriggeredToken(np) {
         if (this.useStrict()) {
-            const { triggered } = this.getStrictTokens();
+            const triggered = new Set(this.parseJsonArray('triggeredValues', ['triggered', 'alarm']));
             return triggered.has(np);
         }
-        // loose
         return np === 'triggered' || np === 'alarm';
     }
+    /** Token di publish preferito (strict=ON usa targetStateValues) */
+    preferredTokenForMode(mode) {
+        const t = this.parseJsonArray('targetStateValues', ['armed_home', 'armed_away', 'armed_night', 'disarmed']);
+        const pick = (...cands) => cands.find(c => t.includes(c));
+        switch (mode) {
+            case sdk_1.SecuritySystemMode.Disarmed: return pick('disarmed', 'disarm') || 'disarmed';
+            case sdk_1.SecuritySystemMode.HomeArmed: return pick('armed_home', 'arm_home', 'home', 'stay') || 'armed_home';
+            case sdk_1.SecuritySystemMode.AwayArmed: return pick('armed_away', 'arm_away', 'away') || 'armed_away';
+            case sdk_1.SecuritySystemMode.NightArmed: return pick('armed_night', 'arm_night', 'night', 'sleep') || 'armed_night';
+        }
+    }
     // helpers persistenza
     saveSensorsToStorage() {
         try {
@@ -34327,6 +34329,14 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             { group: 'Parsing / State tokens', key: 'targetStateValues', title: 'Accepted Target State Values (JSON array)', placeholder: '["armed_home","armed_away","armed_night","disarmed"]', value: this.storage.getItem('targetStateValues') || '["armed_home","armed_away","armed_night","disarmed"]' },
             { 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: '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.' },
         ];
         // ---- 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.' });
@@ -34334,22 +34344,22 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         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'] });
-            if (cfg.kind === 'contact') {
+            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') {
+            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 {
+            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' });
         }
         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
+        // aggiorna i flag runtime ogni volta
+        updateRuntimeFromStorage((k) => this.storage.getItem(k) || '');
+        // --- 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;
@@ -34364,6 +34374,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             }
             this.sensorsCfg.push({ id, name, kind, topics: {} });
             this.saveSensorsToStorage();
+            // pulizia campi "new.*"
             this.storage.removeItem('new.id');
             this.storage.removeItem('new.name');
             this.storage.removeItem('new.kind');
@@ -34372,7 +34383,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // Edit/Remove sensore
+        // --- Edit/Remove sensore esistente ---
         const m = key.match(/^sensor\.([^\.]+)\.(.+)$/);
         if (m) {
             const sid = m[1];
@@ -34383,6 +34394,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 return;
             }
             if (prop === 'remove' && String(value) === 'true') {
+                // elimina
                 this.sensorsCfg = this.sensorsCfg.filter(s => s.id !== sid);
                 this.saveSensorsToStorage();
                 try {
@@ -34390,6 +34402,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                     deviceManager.onDeviceRemoved?.(`sensor:${sid}`);
                 }
                 catch { }
+                // pulisci flag
                 this.storage.removeItem(key);
                 await this.discoverSensors();
                 await this.connectMqtt(true);
@@ -34408,7 +34421,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             await this.connectMqtt(true);
             return;
         }
-        // altro
+        // --- Altro (MQTT / Alarm settings / parsing / payloads / logging) ---
         if (key === 'sensorsJson') {
             this.loadSensorsFromStorage();
             await this.discoverSensors();
@@ -34438,6 +34451,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         try {
             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) {
@@ -34447,24 +34461,25 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     }
     /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO ===== */
     async discoverSensors() {
-        // 1) Manifests
+        // 1) manifest
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
             const interfaces = [sdk_1.ScryptedInterface.Online];
-            if (t.tamper)
-                interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
             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);
+            if (t.tamper)
+                interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
+            // Battery solo se definita davvero
             if ((t.batteryLevel && t.batteryLevel.trim()) || (t.lowBattery && t.lowBattery.trim()))
                 interfaces.push(sdk_1.ScryptedInterface.Battery);
             return { nativeId, name: cfg.name, type: sdk_1.ScryptedDeviceType.Sensor, interfaces };
         });
-        // 2) Annuncio
+        // 2) annuncio
         const dmAny = deviceManager;
         if (typeof dmAny.onDevicesChanged === 'function') {
             dmAny.onDevicesChanged({ devices: manifests });
@@ -34476,7 +34491,7 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.console.log('Annunciato:', m.nativeId);
             }
         }
-        // 3) Istanzia/aggiorna
+        // 3) istanzia/aggiorna
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34492,7 +34507,16 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             else {
                 dev.cfg = cfg;
             }
-            // niente default batteria qui
+            // default OK per battery se non abbiamo ancora un valore
+            const hasBattery = !!(cfg.topics.batteryLevel && cfg.topics.batteryLevel.trim())
+                || !!(cfg.topics.lowBattery && cfg.topics.lowBattery.trim());
+            if (hasBattery && dev.batteryLevel === undefined) {
+                dev.batteryLevel = 100;
+                try {
+                    dev.onDeviceEvent(sdk_1.ScryptedInterface.Battery, 100);
+                }
+                catch { }
+            }
         }
         // 4) cleanup
         const announced = new Set(manifests.map(m => m.nativeId));
@@ -34515,7 +34539,13 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         const clientId = this.storage.getItem('clientId') || 'scrypted-paradox';
         const tls = this.storage.getItem('tls') === 'true';
         const rejectUnauthorized = this.storage.getItem('rejectUnauthorized') !== 'false';
-        const opts = { clientId, username, password, clean: true, reconnectPeriod: 3000 };
+        const opts = {
+            clientId,
+            username,
+            password,
+            clean: true,
+            reconnectPeriod: 3000,
+        };
         if (tls) {
             opts.protocol = 'mqtts';
             opts.rejectUnauthorized = rejectUnauthorized;
@@ -34524,11 +34554,13 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     }
     collectAllSubscriptions() {
         const subs = new Set();
+        // alarm
         for (const k of ['topicGetTarget', 'topicGetCurrent', 'topicTamper', 'topicOnline']) {
             const v = this.storage.getItem(k);
             if (v)
                 subs.add(v);
         }
+        // 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]
@@ -34547,13 +34579,13 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                 this.client.end(true);
             }
             catch { }
-            ;
             this.client = undefined;
         }
         const { url, opts } = this.getMqttOptions();
         this.console.log(`Connecting MQTT ${url} ...`);
         const client = mqtt_1.default.connect(url, opts);
         this.client = client;
+        // cache alarm topics
         const tTarget = this.storage.getItem('topicGetTarget') || '';
         const tCurrent = this.storage.getItem('topicGetCurrent') || '';
         const tTamper = this.storage.getItem('topicTamper') || '';
@@ -34583,6 +34615,9 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
             try {
                 const p = payload?.toString() ?? '';
                 const np = normalize(p);
+                if (RUNTIME.logMqttAll)
+                    this.console.log(`[MQTT] ${topic} -> "${p}"`);
+                // ---- Alarm handling ----
                 if (topic === tOnline) {
                     if (truthy(np) || np === 'online') {
                         this.online = true;
@@ -34637,11 +34672,14 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
                         this.onDeviceEvent(sdk_1.ScryptedInterface.SecuritySystem, newState);
                     }
                     catch { }
+                    if (RUNTIME.logSensors)
+                        this.console.log(`[Alarm] current: mode=${newState.mode} triggered=${!!newState.triggered} (${topic}="${p}")`);
                     return;
                 }
                 if (topic === tTarget) {
                     this.pendingTarget = this.parseIncomingMode(payload);
-                    this.console.log('Target state reported:', p, '->', this.pendingTarget);
+                    if (RUNTIME.logSensors)
+                        this.console.log(`[Alarm] target reported: "${p}" -> ${this.pendingTarget}`);
                     return;
                 }
                 // ---- Sensor dispatch ----
@@ -34666,8 +34704,25 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         this.client.publish(topic, payload, { qos, retain }, (err) => {
             if (err)
                 this.console.error('publish error', err);
+            else if (RUNTIME.logSensors)
+                this.console.log(`[Alarm] published target "${payload}" to ${topic}`);
         });
     }
+    /** Payload publish: override → strict tokens → default arm_* */
+    getOutgoing(mode) {
+        const overrides = {
+            [sdk_1.SecuritySystemMode.Disarmed]: this.storage.getItem('payloadDisarm') || null,
+            [sdk_1.SecuritySystemMode.HomeArmed]: this.storage.getItem('payloadHome') || null,
+            [sdk_1.SecuritySystemMode.AwayArmed]: this.storage.getItem('payloadAway') || null,
+            [sdk_1.SecuritySystemMode.NightArmed]: this.storage.getItem('payloadNight') || null,
+        };
+        const override = overrides[mode];
+        if (override && override.trim().length)
+            return override.trim();
+        if (this.useStrict())
+            return this.preferredTokenForMode(mode);
+        return DEFAULT_OUTGOING[mode];
+    }
     async armSecuritySystem(mode) {
         const payload = this.getOutgoing(mode);
         this.console.log('armSecuritySystem', mode, '->', payload);
@@ -34680,15 +34735,6 @@ class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
         this.pendingTarget = sdk_1.SecuritySystemMode.Disarmed;
         this.publishSetTarget(payload);
     }
-    getOutgoing(mode) {
-        const map = {
-            [sdk_1.SecuritySystemMode.Disarmed]: this.storage.getItem('payloadDisarm') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.Disarmed],
-            [sdk_1.SecuritySystemMode.HomeArmed]: this.storage.getItem('payloadHome') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.HomeArmed],
-            [sdk_1.SecuritySystemMode.AwayArmed]: this.storage.getItem('payloadAway') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.AwayArmed],
-            [sdk_1.SecuritySystemMode.NightArmed]: this.storage.getItem('payloadNight') || DEFAULT_OUTGOING[sdk_1.SecuritySystemMode.NightArmed],
-        };
-        return map[mode];
-    }
 }
 exports["default"] = ParadoxMqttSecuritySystem;
 

package/package.json

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