@marcel2215/homebridge-supla-plugin 2.1.28 → 2.1.30

package/README.md

@@ -14,12 +14,36 @@
 
 This is an accessory plugin for Supla devices. It allows you to control your Supla devices with HomeKit and Siri.
 
-Supports Homebridge 1.6 or later, including Homebridge 2.1.1. Homebridge 2 requires Node.js 22.12 or 24.
+Supports Homebridge 1.6 or later, including Homebridge 2.1.1, on Node.js 22.12+ or Node.js 24.
 
 ### How it works
 
 This plugin uses the mqtt protocol to communicate with the Supla server. It subscribes to the topics of the devices you want to control and publishes the commands you send to the devices.
 
+Discovered channel metadata is cached in a versioned, per-platform-instance file under Homebridge's storage directory. A legacy
+`channels` value is migrated once for compatibility; the plugin does not rewrite Homebridge's `config.json` at runtime.
+Cached cloud-topic accessories can be safely migrated in place because their topic contains the Supla account name. Older
+roller-shutter topics contain no account identity, so they receive a new account-scoped HomeKit identity by default. Set
+`migrateUnscopedLegacyAccessories` to `true` only for a one-time migration when you know the cached accessories belong to the
+currently configured account; do not enable it when changing accounts.
+
+Supla captions are retained in Unicode NFC form, so Polish diacritics and other scripts are not passed through an ASCII-only
+sanitizer. HomeKit-facing names preserve Unicode letters and numbers while mapping only typography unsupported by HAP and respecting
+the Name characteristic's 64 UTF-16-code-unit limit. Generated, blank, malformed, or partial-discovery captions never replace a
+meaningful cached name; an existing name changes only with durable retained-caption evidence or a complete authoritative snapshot.
+The plugin does not write HomeKit's user-controlled `ConfiguredName` characteristic.
+Accessory UUIDs and service identities are based only on the account plus channel IDs (or a stable legacy topic), never on captions;
+renaming a channel therefore does not create a new HomeKit accessory.
+
+MQTT publish completion confirms delivery to the MQTT client/broker, not physical-device application. HomeKit setters surface
+transport failures, and state is reconciled from subsequent Supla state topics.
+
+Electricity meters retain the existing HomeKit `LightSensor` service for automation and accessory-identity compatibility.
+`CurrentAmbientLightLevel` is therefore a compatibility carrier, not a lux reading: its numeric value uses the one Supla metric and
+unit shown explicitly in the service name (for example, `Voltage; V` or `Active power; W`). On first setup the plugin selects one
+metric deterministically from the retained snapshot and persists that choice. It will not silently switch units on later starts; if
+the selected metric is absent, the service remains unavailable. The generic `value` metric is labeled `unknown unit`.
+
 
 ### How to use
 
@@ -30,3 +54,45 @@ $ npm i homebridge-supla-plugin
 2. Configure the plugin. You can find your MQTT credentials in the [Supla Cloud](https://cloud.supla.org/).
 3. Restart Homebridge
 4. Plugin will automatically discover your devices and add them to HomeKit
+
+### Front-gate safety model
+
+Supla front gates controlled through the non-idempotent `open_close` action need a closed end-stop sensor. If the sensor is on a
+separate channel, the plugin pairs it only when there is one unambiguous candidate. Configure one of these overrides if automatic
+pairing is not possible:
+
+```json
+{
+  "frontGateSensorTopic": "supla/USER/devices/123/channels/456"
+}
+```
+
+Alternatively, use `frontGateSensorDeviceId` and `frontGateSensorChannelId`. A missing or ambiguous sensor keeps the gate unavailable.
+The legacy control-channel sensor fallback is disabled unless `frontGateSensorFallbackToControlChannel` is explicitly enabled.
+
+With only a closed sensor, `false` means “not fully closed”; it does not prove that the gate is fully open or reveal its direction.
+The plugin therefore reports an unproven non-closed position as HomeKit `STOPPED` and rejects ambiguous open and close requests by
+default:
+
+```json
+{
+  "frontGateUnknownOpenPolicy": "reject",
+  "frontGateUnknownClosePolicy": "reject",
+  "frontGateAssumeOpenAfterTravel": false
+}
+```
+
+Optional compatibility policies are:
+
+- `accept_non_closed` for open requests: accepts any non-closed position without sending a pulse.
+- `single_pulse_best_effort` for close requests: sends one pulse but continues reporting `STOPPED` until hard evidence arrives.
+- `seek_closed` for close requests: sends up to `frontGateSeekClosedMaxPulses` pulses, one full travel interval apart, until the closed
+  sensor activates. The search can initially move the gate in the opposite direction and must only be enabled with that behavior
+  understood.
+
+`frontGateAssumeOpenAfterTravel` is also an approximation and is disabled by default. An IR remote cannot be observed by the plugin,
+so external IR use can always invalidate a direction estimate until new sensor evidence arrives.
+
+Front-gate action publications always use MQTT QoS 0 and `retain: false`, independently of the global command settings. Retained
+`execute_action` messages are ignored by the state estimator; any old retained action already stored on the broker should be removed.
+MQTT 5 enables a No Local subscription for safer self-echo handling by setting `mqttProtocolVersion` to `5`, if the broker supports it.

package/config.schema.json

@@ -2,7 +2,18 @@
   "pluginAlias": "SuplaPlatform",
   "pluginType": "platform",
   "singular": true,
+  "strictValidation": false,
   "schema": {
+    "type": "object",
+    "required": [
+      "name",
+      "host",
+      "port",
+      "username",
+      "password"
+    ],
+    "additionalProperties": true,
+    "properties": {
     "name": {
       "title": "Name",
       "type": "string",
@@ -58,95 +69,88 @@
         "auto"
       ]
     },
-    "gateControlMode": {
-      "title": "Gate Control Mode",
-      "type": "string",
-      "default": "execute_action",
-      "enum": [
-        "execute_action",
-        "toggle"
-      ]
-    },
-    "gateExecuteActionOpen": {
-      "title": "Gate Execute Action Open",
-      "type": "string",
-      "default": "open_close"
-    },
-    "gateExecuteActionClose": {
-      "title": "Gate Execute Action Close",
-      "type": "string",
-      "default": "open_close"
+    "migrateUnscopedLegacyAccessories": {
+      "title": "Adopt Legacy Unscoped Accessories",
+      "type": "boolean",
+      "default": false,
+      "description": "One-time compatibility opt-in for legacy roller-shutter accessories whose cached topics contain no Supla account identity. Leave disabled after changing accounts."
     },
     "gateExecuteActionToggle": {
-      "title": "Gate Execute Action Toggle",
+      "title": "Front Gate Toggle Action",
       "type": "string",
       "default": "open_close"
     },
-    "gatePartialHiMode": {
-      "title": "Gate Partial Hi Mode",
-      "type": "string",
-      "default": "moving",
-      "enum": [
-        "moving",
-        "open_endstop",
-        "pedestrian_endstop",
-        "ignore"
-      ]
-    },
-    "gateReverseFollowUpDelayMs": {
-      "title": "Gate Reverse Follow-up Delay (ms)",
+    "frontGateFullTravelMs": {
+      "title": "Front Gate Full Travel (ms)",
       "type": "number",
-      "default": 3000
+      "default": 25000,
+      "minimum": 5000,
+      "maximum": 120000
     },
-    "gateOpenAssumeDelayMs": {
-      "title": "Gate Open Assume Delay (ms)",
+    "frontGateReversePauseMs": {
+      "title": "Front Gate Reverse Pause (ms)",
       "type": "number",
-      "default": 22000
+      "default": 3000,
+      "minimum": 3000,
+      "maximum": 15000
     },
-    "gateCommandCooldownMs": {
-      "title": "Gate Command Cooldown (ms)",
+    "frontGateMinimumPulseGapMs": {
+      "title": "Front Gate Minimum Pulse Gap (ms)",
       "type": "number",
-      "default": 700
+      "default": 3000,
+      "minimum": 0,
+      "maximum": 15000
     },
-    "gatePublishRetryDelayMs": {
-      "title": "Gate Publish Retry Delay (ms)",
-      "type": "number",
-      "default": 300
+    "frontGateUnknownOpenPolicy": {
+      "title": "Unknown-State Open Policy",
+      "type": "string",
+      "default": "reject",
+      "enum": [
+        "reject",
+        "accept_non_closed"
+      ]
     },
-    "gateStrictReverseDoublePulse": {
-      "title": "Gate Strict Reverse Double Pulse",
-      "type": "boolean",
-      "default": true
+    "frontGateUnknownClosePolicy": {
+      "title": "Unknown-State Close Policy",
+      "type": "string",
+      "default": "reject",
+      "enum": [
+        "reject",
+        "single_pulse_best_effort",
+        "seek_closed"
+      ]
+    },
+    "frontGateSeekClosedMaxPulses": {
+      "title": "Seek-Closed Maximum Pulses",
+      "type": "number",
+      "default": 3,
+      "minimum": 1,
+      "maximum": 3
     },
-    "gateDebugTimeline": {
-      "title": "Gate Debug Timeline",
+    "frontGateAssumeOpenAfterTravel": {
+      "title": "Assume Fully Open After Travel Time",
       "type": "boolean",
       "default": false
     },
-    "frontGateFullTravelMs": {
-      "title": "Front Gate Full Travel (ms)",
-      "type": "number",
-      "default": 25000
-    },
-    "frontGateReversePauseMs": {
-      "title": "Front Gate Reverse Pause (ms)",
-      "type": "number",
-      "default": 900
+    "frontGateSensorTopic": {
+      "title": "Front Gate Sensor Base Topic",
+      "type": "string",
+      "default": ""
     },
-    "frontGateWrongDirectionRunMs": {
-      "title": "Front Gate Wrong Direction Run (ms)",
-      "type": "number",
-      "default": 700
+    "frontGateSensorDeviceId": {
+      "title": "Front Gate Sensor Device ID",
+      "type": "string",
+      "default": ""
     },
-    "frontGateMinimumPulseGapMs": {
-      "title": "Front Gate Minimum Pulse Gap (ms)",
-      "type": "number",
-      "default": 400
+    "frontGateSensorChannelId": {
+      "title": "Front Gate Sensor Channel ID",
+      "type": "string",
+      "default": ""
     },
-    "frontGateCloseRetryLimit": {
-      "title": "Front Gate Close Retry Limit",
-      "type": "number",
-      "default": 1
+    "frontGateSensorFallbackToControlChannel": {
+      "title": "Use Control Channel as Sensor Fallback",
+      "type": "boolean",
+      "default": false
     },
     "gateLockControlMode": {
       "title": "Gate Lock Control Mode",
@@ -170,7 +174,9 @@
     "gateLockPulseSeconds": {
       "title": "Gate Lock Pulse Seconds",
       "type": "number",
-      "default": 0
+      "default": 1,
+      "minimum": 0.1,
+      "maximum": 60
     },
     "gateLockSetOnPayload": {
       "title": "Gate Lock Set On Payload",
@@ -222,6 +228,15 @@
       "type": "number",
       "default": 0
     },
+    "mqttProtocolVersion": {
+      "title": "MQTT Protocol Version",
+      "type": "number",
+      "default": 4,
+      "enum": [
+        4,
+        5
+      ]
+    },
     "commandQos": {
       "title": "Command QoS",
       "type": "number",
@@ -239,18 +254,20 @@
     },
     "username": {
       "title": "Username",
-      "type": "string",
-      "default": "admin"
+      "type": "string"
     },
     "password": {
       "title": "Password",
       "type": "string",
-      "default": "admin"
+      "format": "password"
     },
     "channels": {
       "title": "Cached Channels",
       "type": "string",
-      "default": "[]"
+      "description": "Deprecated legacy cache. It is read once for migration and is no longer written.",
+      "deprecated": true,
+      "hidden": true
+    }
     }
   }
 }

package/dist/Accesories/ActionTriggerAccessory.d.ts

@@ -6,7 +6,6 @@ export declare class ActionTriggerAccessory {
     private readonly accessory;
     private readonly context;
     private service;
-    private connected;
     constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
     private parseEvent;
 }

package/dist/Accesories/ActionTriggerAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionTriggerAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ActionTriggerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,sBAAsB;IAK/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,SAAS,CAAQ;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAmC/C,OAAO,CAAC,UAAU;CAUnB"}
+{"version":3,"file":"ActionTriggerAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ActionTriggerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,sBAAsB;IAI/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,OAAO,CAAU;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAoC/C,OAAO,CAAC,UAAU;CAanB"}

package/dist/Accesories/ActionTriggerAccessory.js

@@ -6,32 +6,38 @@ class ActionTriggerAccessory {
         this.platform = platform;
         this.accessory = accessory;
         this.context = context;
-        this.connected = true;
         this.accessory.getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
             .setCharacteristic(this.platform.Characteristic.Model, 'ActionTrigger');
         this.service = this.accessory.getService(this.platform.Service.StatelessProgrammableSwitch)
             || this.accessory.addService(this.platform.Service.StatelessProgrammableSwitch);
         this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-        this.platform.registerMqttHandler(`${this.context.topic}/state/action`, (message) => {
+        this.platform.registerMqttHandler(`${this.context.topic}/state/action`, (message, _topic, packet) => {
+            if (packet.retain) {
+                this.platform.log.debug(`Ignoring retained action trigger event for ${this.context.channelCaption}`);
+                return;
+            }
             const event = this.parseEvent(message.toString());
+            if (event === undefined) {
+                this.platform.log.debug(`Ignoring unknown action trigger payload for ${this.context.channelCaption}`);
+                return;
+            }
             this.platform.log.debug(`Action trigger ${this.context.channelCaption} event=${event}`);
             this.service.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent, event);
         }, this.accessory.UUID);
-        this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
-            this.connected = this.platform.parseBoolean(message.toString());
-            this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
-        }, this.accessory.UUID);
     }
     parseEvent(payload) {
         const value = payload.trim().toLowerCase();
-        if (value === '1' || value.includes('double')) {
+        if (['1', 'double', 'double_press'].includes(value)) {
             return this.platform.Characteristic.ProgrammableSwitchEvent.DOUBLE_PRESS;
         }
-        if (value === '2' || value.includes('long') || value.includes('hold')) {
+        if (['2', 'long', 'long_press', 'hold'].includes(value)) {
             return this.platform.Characteristic.ProgrammableSwitchEvent.LONG_PRESS;
         }
-        return this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS;
+        if (['0', 'single', 'single_press', 'click'].includes(value)) {
+            return this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS;
+        }
+        return undefined;
     }
 }
 exports.ActionTriggerAccessory = ActionTriggerAccessory;

package/dist/Accesories/ActionTriggerAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionTriggerAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ActionTriggerAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,sBAAsB;IAIjC,YACmB,QAAuB,EACvB,SAA4B,EAC5B,OAA4B;QAF5B,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC5B,YAAO,GAAP,OAAO,CAAqB;QALvC,cAAS,GAAG,IAAI,CAAC;QAOvB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC;aACrE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAE1E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC;eACtF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAElF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEzF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,eAAe,EACpC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,kBAAkB,IAAI,CAAC,OAAO,CAAC,cAAc,UAAU,KAAK,EAAE,CAC/D,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QACjG,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,EACvC,CAAC,OAAO,EAAE,EAAE;YACV,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC/B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EACxC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvB,CAAC;QACJ,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,OAAe;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC;QAC3E,CAAC;QACD,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,CAAC,UAAU,CAAC;QACzE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC;IAC3E,CAAC;CACF;AApDD,wDAoDC"}
+{"version":3,"file":"ActionTriggerAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ActionTriggerAccessory.ts"],"names":[],"mappings":"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"}

package/dist/Accesories/AirQualityAccessory.d.ts

@@ -7,10 +7,12 @@ export declare class AirQualityAccessory {
     private readonly context;
     private service;
     private value;
-    private connected;
+    private connected?;
+    private hasValue;
     private kind;
     constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
     handleAirQualityGet(): Promise<CharacteristicValue>;
+    private updateFault;
     private updateMeasurements;
     private resolveKind;
     private toAirQuality;

package/dist/Accesories/AirQualityAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AirQualityAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/AirQualityAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,IAAI,CAAiB;gBAGV,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAuCzC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIzD,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,YAAY;CA8BrB"}
+{"version":3,"file":"AirQualityAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/AirQualityAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAT1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,SAAS,CAAC,CAAU;IAC5B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,IAAI,CAAiB;gBAGV,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAyDzC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IASzD,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,YAAY;CA8BrB"}

package/dist/Accesories/AirQualityAccessory.js

@@ -7,8 +7,12 @@ class AirQualityAccessory {
         this.accessory = accessory;
         this.context = context;
         this.value = 0;
-        this.connected = true;
+        this.hasValue = false;
         this.kind = this.resolveKind();
+        // Caption heuristics are only a legacy bootstrap. Persist the selected
+        // measurement semantics so a later channel rename cannot silently switch
+        // PM10 thresholds/characteristics to PM2.5 (or vice versa) after restart.
+        this.accessory.context.suplaAirQualityKind = this.kind;
         this.accessory.getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
             .setCharacteristic(this.platform.Characteristic.Model, 'AirQualitySensor');
@@ -18,20 +22,43 @@ class AirQualityAccessory {
         this.service.getCharacteristic(this.platform.Characteristic.AirQuality)
             .onGet(this.handleAirQualityGet.bind(this));
         this.platform.registerMqttHandler(`${this.context.topic}/state/value`, (message) => {
-            const value = parseFloat(message.toString());
-            if (!Number.isNaN(value)) {
+            const value = this.platform.parseFiniteNumberStrict(message.toString());
+            if (value !== undefined && value >= 0) {
                 this.value = value;
+                this.hasValue = true;
                 this.updateMeasurements();
+                this.updateFault();
             }
         }, this.accessory.UUID);
         this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
-            this.connected = this.platform.parseBoolean(message.toString());
-            this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
+            const connected = this.platform.parseBooleanStrict(message.toString());
+            if (connected === undefined) {
+                return;
+            }
+            this.connected = connected;
+            if (!connected) {
+                this.hasValue = false;
+            }
+            this.updateFault();
+        }, this.accessory.UUID);
+        this.platform.registerMqttTransportHandler?.((transportConnected) => {
+            if (!transportConnected) {
+                this.connected = undefined;
+                this.hasValue = false;
+                this.updateFault();
+            }
         }, this.accessory.UUID);
+        this.updateFault();
     }
     async handleAirQualityGet() {
+        if (this.connected !== true || !this.hasValue) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
         return this.toAirQuality(this.value);
     }
+    updateFault() {
+        this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected === true && this.hasValue ? 0 : 1);
+    }
     updateMeasurements() {
         if (this.kind === 'pm25') {
             this.service.updateCharacteristic(this.platform.Characteristic.PM2_5Density, this.value);
@@ -42,6 +69,21 @@ class AirQualityAccessory {
         this.service.updateCharacteristic(this.platform.Characteristic.AirQuality, this.toAirQuality(this.value));
     }
     resolveKind() {
+        const persisted = this.accessory.context.suplaAirQualityKind;
+        if (persisted === 'pm10' || persisted === 'pm25') {
+            return persisted;
+        }
+        const functionName = (this.context.channelFunction ?? '')
+            .toUpperCase()
+            .replace(/[^A-Z0-9]+/g, '');
+        if (functionName.includes('PM10')) {
+            return 'pm10';
+        }
+        if (functionName.includes('PM25') || functionName.includes('PM2')) {
+            return 'pm25';
+        }
+        // Old Supla metadata can expose only GENERAL_PURPOSE_MEASUREMENT. Retain
+        // the former caption inference once, then use the persisted value above.
         const caption = (this.context.channelCaption ?? '').toLowerCase();
         if (caption.includes('pm10')) {
             return 'pm10';

package/dist/Accesories/AirQualityAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"AirQualityAccessory.js","sourceRoot":"","sources":["../../src/Accesories/AirQualityAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AirQualityAccessory.js","sourceRoot":"","sources":["../../src/Accesories/AirQualityAccessory.ts"],"names":[],"mappings":"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"}

package/dist/Accesories/ContactSensorAccessory.d.ts

@@ -7,8 +7,10 @@ export declare class ContactSensorAccessory {
     private readonly context;
     private service;
     private state;
-    private connected;
+    private connected?;
+    private hasState;
     constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
     handleStateGet(): Promise<CharacteristicValue>;
+    private updateFault;
 }
 //# sourceMappingURL=ContactSensorAccessory.d.ts.map

package/dist/Accesories/ContactSensorAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContactSensorAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ContactSensorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,sBAAsB;IAM/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAoE;IACjF,OAAO,CAAC,SAAS,CAAQ;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAsCzC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAGrD"}
+{"version":3,"file":"ContactSensorAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ContactSensorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,sBAAsB;IAO/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAoE;IACjF,OAAO,CAAC,SAAS,CAAC,CAAU;IAC5B,OAAO,CAAC,QAAQ,CAAS;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAuDzC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IASpD,OAAO,CAAC,WAAW;CAQpB"}

package/dist/Accesories/ContactSensorAccessory.js

@@ -7,7 +7,7 @@ class ContactSensorAccessory {
         this.accessory = accessory;
         this.context = context;
         this.state = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
-        this.connected = true;
+        this.hasState = false;
         this.accessory.getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
             .setCharacteristic(this.platform.Characteristic.Model, 'ContactSensor');
@@ -17,20 +17,48 @@ class ContactSensorAccessory {
         this.service.getCharacteristic(this.platform.Characteristic.ContactSensorState)
             .onGet(this.handleStateGet.bind(this));
         this.platform.registerMqttHandler(`${this.context.topic}/state/hi`, (message) => {
-            const closed = this.platform.parseBoolean(message.toString());
+            const closed = this.platform.parseBooleanStrict(message.toString());
+            if (closed === undefined) {
+                return;
+            }
+            this.hasState = true;
             this.state = closed
                 ? this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED
                 : this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
             this.service.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.state);
+            this.updateFault();
         }, this.accessory.UUID);
         this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
-            this.connected = this.platform.parseBoolean(message.toString());
-            this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
+            const connected = this.platform.parseBooleanStrict(message.toString());
+            if (connected === undefined) {
+                return;
+            }
+            this.connected = connected;
+            if (!connected) {
+                this.hasState = false;
+            }
+            this.updateFault();
         }, this.accessory.UUID);
+        this.platform.registerMqttTransportHandler?.((transportConnected) => {
+            if (!transportConnected) {
+                this.connected = undefined;
+                this.hasState = false;
+                this.updateFault();
+            }
+        }, this.accessory.UUID);
+        this.updateFault();
     }
     async handleStateGet() {
+        if (this.connected !== true || !this.hasState) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
         return this.state;
     }
+    updateFault() {
+        this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected === true && this.hasState
+            ? this.platform.Characteristic.StatusFault.NO_FAULT
+            : this.platform.Characteristic.StatusFault.GENERAL_FAULT);
+    }
 }
 exports.ContactSensorAccessory = ContactSensorAccessory;
 //# sourceMappingURL=ContactSensorAccessory.js.map

package/dist/Accesories/ContactSensorAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContactSensorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ContactSensorAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,sBAAsB;IAKjC,YACmB,QAAuB,EACvB,SAA4B,EAC5B,OAA4B;QAF5B,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC5B,YAAO,GAAP,OAAO,CAAqB;QANvC,UAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;QACzE,cAAS,GAAG,IAAI,CAAC;QAOvB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC;aACrE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAE1E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;eACxE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEpE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEzF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;aAC5E,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,WAAW,EAChC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,GAAG,MAAM;gBACjB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB;gBAClE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;YACzE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACjG,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,EACvC,CAAC,OAAO,EAAE,EAAE;YACV,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC/B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EACxC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvB,CAAC;QACJ,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAjDD,wDAiDC"}
+{"version":3,"file":"ContactSensorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ContactSensorAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,sBAAsB;IAMjC,YACmB,QAAuB,EACvB,SAA4B,EAC5B,OAA4B;QAF5B,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC5B,YAAO,GAAP,OAAO,CAAqB;QAPvC,UAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;QAEzE,aAAQ,GAAG,KAAK,CAAC;QAOvB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC;aACrE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAE1E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;eACxE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEpE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEzF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;aAC5E,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,WAAW,EAChC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,MAAM;gBACjB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB;gBAClE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;YACzE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/F,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,EACvC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACxB,CAAC;YACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,4BAA4B,EAAE,CAAC,CAAC,kBAAkB,EAAE,EAAE;YAClE,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9C,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAE7C,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC/B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EACxC,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ;YACtC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ;YACnD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,aAAa,CAC3D,CAAC;IACJ,CAAC;CACF;AAjFD,wDAiFC"}

package/dist/Accesories/DimmerAccessory.d.ts

@@ -9,14 +9,16 @@ export declare class DimmerAccessory {
     private state;
     private brightness;
     private connected;
-    private overcurrent;
+    private overcurrent?;
+    private hasState;
+    private hasBrightness;
     private updateTimer?;
     constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
     handleOnGet(): Promise<CharacteristicValue>;
     handleOnSet(value: CharacteristicValue): Promise<void>;
     handleBrightnessGet(): Promise<CharacteristicValue>;
     handleBrightnessSet(value: CharacteristicValue): Promise<void>;
-    private updateFault;
     private clearUpdateTimer;
+    private assertAvailable;
 }
 //# sourceMappingURL=DimmerAccessory.d.ts.map