@rfranzoi/scrypted-mqtt-securitysystem 1.0.41 → 1.0.42

package/dist/main.nodejs.js

@@ -34024,30 +34024,46 @@ function socketOnError() {
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-// --- Silence ONLY the optional sdk.json warning from @scrypted/sdk ---
-const __origConsoleError = console.error.bind(console);
-console.error = (...args) => {
-    const first = args?.[0];
-    const msg = typeof first === 'string' ? first : (first?.message || '');
-    if (typeof msg === 'string' && msg.includes('failed to load custom interface descriptors')) {
-        // swallow just this warning
-        return;
-    }
-    __origConsoleError(...args);
-};
-// Carica lo SDK (non tipizziamo qui per non perdere le proprietà runtime)
-const sdk = __webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js");
-// Valori runtime (enum/classi/manager) dal modulo SDK
-const { ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, // valore (enum)
-SecuritySystemMode, // valore (enum)
-systemManager,
-// ⚠️ NON destrutturare deviceManager: va letto sempre "al volo" da sdk.deviceManager.
- } = sdk;
+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;
 /** utils */
 function truthy(v) {
     if (!v)
@@ -34067,13 +34083,12 @@ function normalize(s) {
 function clamp(n, min, max) {
     return Math.max(min, Math.min(max, n));
 }
-/** SecuritySystem outgoing defaults (PAI-like)
- *  Nota: usare number come chiave evita stranezze con gli enum in TS. */
+/** SecuritySystem outgoing defaults (PAI-like) */
 const DEFAULT_OUTGOING = {
-    [SecuritySystemMode.Disarmed]: 'disarm',
-    [SecuritySystemMode.HomeArmed]: 'arm_home',
-    [SecuritySystemMode.AwayArmed]: 'arm_away',
-    [SecuritySystemMode.NightArmed]: 'arm_night',
+    [sdk_1.SecuritySystemMode.Disarmed]: 'disarm',
+    [sdk_1.SecuritySystemMode.HomeArmed]: 'arm_home',
+    [sdk_1.SecuritySystemMode.AwayArmed]: 'arm_away',
+    [sdk_1.SecuritySystemMode.NightArmed]: 'arm_night',
 };
 /** Parse incoming payload -> final mode (ignore transition states) */
 function payloadToMode(payload) {
@@ -34081,22 +34096,23 @@ function payloadToMode(payload) {
         return;
     const p = normalize(payload.toString());
     if (['disarm', 'disarmed', 'off', '0', 'idle', 'ready'].includes(p))
-        return SecuritySystemMode.Disarmed;
+        return sdk_1.SecuritySystemMode.Disarmed;
     if (['arm_home', 'home', 'stay', 'armed_home'].includes(p))
-        return SecuritySystemMode.HomeArmed;
+        return sdk_1.SecuritySystemMode.HomeArmed;
     if (['arm_away', 'away', 'armed_away', 'away_armed'].includes(p))
-        return SecuritySystemMode.AwayArmed;
+        return sdk_1.SecuritySystemMode.AwayArmed;
     if (['arm_night', 'night', 'armed_night', 'sleep', 'arm_sleep', 'armed_sleep'].includes(p))
-        return SecuritySystemMode.NightArmed;
+        return sdk_1.SecuritySystemMode.NightArmed;
     // transitori: non cambiano il mode
     if (['entry_delay', 'exit_delay', 'pending', 'arming', 'disarming'].includes(p))
         return undefined;
     return undefined;
 }
-class BaseMqttSensor extends ScryptedDeviceBase {
+class BaseMqttSensor extends sdk_1.ScryptedDeviceBase {
     constructor(nativeId, cfg) {
         super(nativeId);
         this.cfg = cfg;
+        // non impostare stati qui: l'annuncio device deve avvenire prima
     }
     /** Called by parent on each MQTT message */
     handleMqtt(topic, payload) {
@@ -34125,7 +34141,9 @@ class BaseMqttSensor extends ScryptedDeviceBase {
                 this.batteryLevel = n;
         }
         else if (topic === this.cfg.topics.lowBattery && !this.cfg.topics.batteryLevel) {
-            // se abbiamo SOLO lowBattery (bool):
+            // Solo se abbiamo lowBattery (booleano) ma NON batteryLevel:
+            // True  -> 10% (warning)
+            // False -> 100% (ok)
             this.batteryLevel = truthy(np) ? 10 : 100;
         }
         // primary handled by subclasses
@@ -34133,28 +34151,37 @@ class BaseMqttSensor extends ScryptedDeviceBase {
     }
 }
 class ContactMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
+    constructor(nativeId, cfg) {
+        super(nativeId, cfg);
+    }
+    handlePrimary(topic, np, _raw) {
         if (topic === this.cfg.topics.contact) {
             this.entryOpen = truthy(np);
         }
     }
 }
 class MotionMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
+    constructor(nativeId, cfg) {
+        super(nativeId, cfg);
+    }
+    handlePrimary(topic, np, _raw) {
         if (topic === this.cfg.topics.motion) {
             this.motionDetected = truthy(np);
         }
     }
 }
 class OccupancyMqttSensor extends BaseMqttSensor {
-    handlePrimary(topic, np) {
+    constructor(nativeId, cfg) {
+        super(nativeId, cfg);
+    }
+    handlePrimary(topic, np, _raw) {
         if (topic === this.cfg.topics.occupancy) {
             this.occupied = truthy(np);
         }
     }
 }
 /** ----------------- Main Plugin ----------------- */
-class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
+class ParadoxMqttSecuritySystem extends sdk_1.ScryptedDeviceBase {
     constructor() {
         super();
         // sensor management
@@ -34163,26 +34190,26 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         // (facoltativo) Imposta il device type in UI
         setTimeout(() => {
             try {
-                systemManager.getDeviceById(this.id)?.setType?.(ScryptedDeviceType.SecuritySystem);
+                systemManager.getDeviceById(this.id)?.setType?.(sdk_1.ScryptedDeviceType.SecuritySystem);
             }
             catch { }
         });
         // Default state
         this.securitySystemState = this.securitySystemState || {
-            mode: SecuritySystemMode.Disarmed,
+            mode: sdk_1.SecuritySystemMode.Disarmed,
             supportedModes: [
-                SecuritySystemMode.Disarmed,
-                SecuritySystemMode.HomeArmed,
-                SecuritySystemMode.AwayArmed,
-                SecuritySystemMode.NightArmed,
+                sdk_1.SecuritySystemMode.Disarmed,
+                sdk_1.SecuritySystemMode.HomeArmed,
+                sdk_1.SecuritySystemMode.AwayArmed,
+                sdk_1.SecuritySystemMode.NightArmed,
             ],
         };
         this.online = this.online ?? false;
         // Load sensors config and announce devices
         this.loadSensorsFromStorage();
-        this.discoverSensors().catch((e) => this.console.error('discoverSensors error', e));
+        this.discoverSensors().catch(e => this.console.error('discoverSensors error', e));
         // Connect on start
-        this.connectMqtt().catch((e) => this.console.error('MQTT connect error:', e));
+        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 {
@@ -34292,7 +34319,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 this.saveSensorsToStorage();
                 try {
                     this.devices.delete(`sensor:${sid}`);
-                    sdk?.deviceManager?.onDeviceRemoved?.(`sensor:${sid}`);
+                    deviceManager.onDeviceRemoved?.(`sensor:${sid}`);
                 }
                 catch { }
                 // pulisci flag
@@ -34338,7 +34365,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 this.devices.delete(nativeId);
             }
             try {
-                sdk?.deviceManager?.onDeviceRemoved?.(nativeId);
+                deviceManager.onDeviceRemoved?.(nativeId);
             }
             catch { }
         }
@@ -34358,48 +34385,42 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             this.sensorsCfg = [];
         }
     }
-    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO (con retry se manager non pronto) ===== */
+    /** ===== discoverSensors: annuncia PRIMA, istanzia DOPO ===== */
     async discoverSensors() {
-        const dmAny = sdk?.deviceManager;
-        if (!dmAny) {
-            this.console.warn('deviceManager not ready yet, retrying in 1s…');
-            setTimeout(() => this.discoverSensors().catch(e => this.console.error('discoverSensors retry error', e)), 1000);
-            return;
-        }
-        // 1) Prepara i manifest
+        // 1) Prepara i manifest (niente istanze qui)
         const manifests = this.sensorsCfg.map(cfg => {
             const nativeId = `sensor:${cfg.id}`;
             const t = cfg.topics || {};
-            const interfaces = [ScryptedInterface.Online];
+            const interfaces = [sdk_1.ScryptedInterface.Online];
+            // Tamper solo se c'è un topic tamper
             if (t.tamper)
-                interfaces.push(ScryptedInterface.TamperSensor);
+                interfaces.push(sdk_1.ScryptedInterface.TamperSensor);
+            // Interfaccia primaria
             if (cfg.kind === 'contact')
-                interfaces.unshift(ScryptedInterface.EntrySensor);
+                interfaces.unshift(sdk_1.ScryptedInterface.EntrySensor);
             else if (cfg.kind === 'motion')
-                interfaces.unshift(ScryptedInterface.MotionSensor);
+                interfaces.unshift(sdk_1.ScryptedInterface.MotionSensor);
             else
-                interfaces.unshift(ScryptedInterface.OccupancySensor);
-            if (t.batteryLevel || t.lowBattery)
-                interfaces.push(ScryptedInterface.Battery);
-            return { nativeId, name: cfg.name, type: ScryptedDeviceType.Sensor, interfaces };
+                interfaces.unshift(sdk_1.ScryptedInterface.OccupancySensor);
+            // Battery solo se previsto
+            if (t.batteryLevel || t.lowBattery) {
+                interfaces.push(sdk_1.ScryptedInterface.Battery);
+            }
+            return { nativeId, name: cfg.name, type: sdk_1.ScryptedDeviceType.Sensor, interfaces };
         });
         // 2) Annuncio
+        const dmAny = deviceManager;
         if (typeof dmAny.onDevicesChanged === 'function') {
             dmAny.onDevicesChanged({ devices: manifests });
             this.console.log('Annunciati (batch):', manifests.map(m => m.nativeId).join(', '));
         }
-        else if (typeof dmAny.onDeviceDiscovered === 'function') {
+        else {
             for (const m of manifests) {
-                dmAny.onDeviceDiscovered(m);
+                deviceManager.onDeviceDiscovered(m);
                 this.console.log('Annunciato:', m.nativeId);
             }
         }
-        else {
-            this.console.warn('deviceManager has no discovery methods yet, retrying in 1s…');
-            setTimeout(() => this.discoverSensors().catch(e => this.console.error('discoverSensors retry error', e)), 1000);
-            return;
-        }
-        // 3) Istanzia/aggiorna
+        // 3) Istanzia/aggiorna DOPO l’annuncio
         for (const cfg of this.sensorsCfg) {
             const nativeId = `sensor:${cfg.id}`;
             let dev = this.devices.get(nativeId);
@@ -34415,6 +34436,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             else {
                 dev.cfg = cfg;
             }
+            // Default “OK” se abbiamo Battery ma nessun valore ancora ricevuto
             const hasBattery = !!(cfg.topics.batteryLevel || cfg.topics.lowBattery);
             if (hasBattery && dev.batteryLevel === undefined) {
                 dev.batteryLevel = 100;
@@ -34426,7 +34448,7 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
             if (!announced.has(nativeId)) {
                 try {
                     this.devices.delete(nativeId);
-                    sdk?.deviceManager?.onDeviceRemoved?.(nativeId);
+                    deviceManager.onDeviceRemoved?.(nativeId);
                     this.console.log('Rimosso:', nativeId);
                 }
                 catch { }
@@ -34529,14 +34551,14 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
                 if (topic === tCurrent) {
                     const mode = payloadToMode(payload);
                     const isAlarm = ['alarm', 'triggered'].includes(np);
-                    const current = this.securitySystemState || { mode: SecuritySystemMode.Disarmed };
+                    const current = this.securitySystemState || { mode: sdk_1.SecuritySystemMode.Disarmed };
                     const newState = {
                         mode: mode ?? current.mode,
                         supportedModes: current.supportedModes ?? [
-                            SecuritySystemMode.Disarmed,
-                            SecuritySystemMode.HomeArmed,
-                            SecuritySystemMode.AwayArmed,
-                            SecuritySystemMode.NightArmed,
+                            sdk_1.SecuritySystemMode.Disarmed,
+                            sdk_1.SecuritySystemMode.HomeArmed,
+                            sdk_1.SecuritySystemMode.AwayArmed,
+                            sdk_1.SecuritySystemMode.NightArmed,
                         ],
                         triggered: isAlarm || undefined,
                     };
@@ -34580,17 +34602,17 @@ class ParadoxMqttSecuritySystem extends ScryptedDeviceBase {
         this.publishSetTarget(payload);
     }
     async disarmSecuritySystem() {
-        const payload = this.getOutgoing(SecuritySystemMode.Disarmed);
+        const payload = this.getOutgoing(sdk_1.SecuritySystemMode.Disarmed);
         this.console.log('disarmSecuritySystem ->', payload);
-        this.pendingTarget = SecuritySystemMode.Disarmed;
+        this.pendingTarget = sdk_1.SecuritySystemMode.Disarmed;
         this.publishSetTarget(payload);
     }
     getOutgoing(mode) {
         const map = {
-            [SecuritySystemMode.Disarmed]: this.storage.getItem('payloadDisarm') || DEFAULT_OUTGOING[SecuritySystemMode.Disarmed],
-            [SecuritySystemMode.HomeArmed]: this.storage.getItem('payloadHome') || DEFAULT_OUTGOING[SecuritySystemMode.HomeArmed],
-            [SecuritySystemMode.AwayArmed]: this.storage.getItem('payloadAway') || DEFAULT_OUTGOING[SecuritySystemMode.AwayArmed],
-            [SecuritySystemMode.NightArmed]: this.storage.getItem('payloadNight') || DEFAULT_OUTGOING[SecuritySystemMode.NightArmed],
+            [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];
     }

package/package.json

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