homebridge-broadlink-rm-blaster 1.8.0 → 1.10.0

package/CHANGELOG.md

@@ -6,6 +6,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [1.10.0] - 2026-08-21
+
+### Changed
+- MQTT settings: the broker is now a single "Broker" field taking `host:port`
+  (default `localhost:1883`) rather than separate Host and Port fields, and
+  Username/Password only appear once a new "Broker requires authentication"
+  checkbox is ticked.
+- An existing config is folded over to the new shape automatically on startup -
+  the old port is merged into the broker address and the authentication checkbox
+  is set from whether credentials were already filled in. `config.json` is backed
+  up to `config.json.backup` first, same as the existing blank-row cleanup, and
+  nothing is written when there's nothing to change.
+
+## [1.9.0] - 2026-08-21
+
+### Added
+- Simple on/off accessories, advanced accessories, TVs and fans: a "Minimum Time
+  Between Switching On and Off" option (default 1 second). A signal that arrives
+  before that much time has passed since the last accepted one is not sent straight
+  away, and the Home app tile snaps back to reflect the real, unchanged state. It
+  isn't lost either - the first such signal is held and applied once the window
+  clears. Any further signal during that same window is dropped, so a burst of rapid
+  taps or MQTT commands settles as one signal, then one more. Both HomeKit and MQTT
+  behave the same way.
+
 ## [1.8.0] - 2026-08-19
 
 ### Added

package/README.md

@@ -1,4 +1,4 @@
-# Broadlink RM Blaster 1.8.0
+# Broadlink RM Blaster 1.10.0
 
 **This Homebridge plugin has been 100% vibe coded with Claude.**
 

package/config.schema.json

@@ -20,19 +20,20 @@
         "description": "Publish temperature/humidity readings from RM devices to an MQTT broker."
       },
       "mqttHost": {
-        "title": "Host",
+        "title": "Broker",
         "type": "string",
-        "default": "localhost",
+        "default": "localhost:1883",
+        "placeholder": "localhost:1883",
         "required": false,
-        "description": "Broker hostname or IP address.",
+        "description": "Broker hostname or IP address, optionally followed by a port. Without one, port 1883 is used.",
         "condition": {
           "functionBody": "return model.enableMqtt === true;"
         }
       },
-      "mqttPort": {
-        "title": "Port",
-        "type": "integer",
-        "default": 1883,
+      "mqttRequiresAuth": {
+        "title": "Broker requires authentication",
+        "type": "boolean",
+        "default": false,
         "required": false,
         "condition": {
           "functionBody": "return model.enableMqtt === true;"
@@ -43,7 +44,7 @@
         "type": "string",
         "required": false,
         "condition": {
-          "functionBody": "return model.enableMqtt === true;"
+          "functionBody": "return model.enableMqtt === true && model.mqttRequiresAuth === true;"
         }
       },
       "mqttPassword": {
@@ -51,7 +52,7 @@
         "type": "string",
         "required": false,
         "condition": {
-          "functionBody": "return model.enableMqtt === true;"
+          "functionBody": "return model.enableMqtt === true && model.mqttRequiresAuth === true;"
         }
       },
       "mqttBaseTopic": {
@@ -242,6 +243,14 @@
               "type": "string",
               "required": false
             },
+            "switchCooldownSeconds": {
+              "title": "Minimum Time Between Switching On and Off (seconds)",
+              "type": "number",
+              "minimum": 0,
+              "default": 1,
+              "required": false,
+              "description": "A signal that arrives before this much time has passed since the last accepted one is held rather than sent straight away, and applied once the time is up. Any further signal in that same window is dropped."
+            },
             "mqttSubscribe": {
               "title": "Control via MQTT",
               "type": "boolean",
@@ -296,6 +305,14 @@
               "type": "string",
               "required": false
             },
+            "switchCooldownSeconds": {
+              "title": "Minimum Time Between Switching On and Off (seconds)",
+              "type": "number",
+              "minimum": 0,
+              "default": 1,
+              "required": false,
+              "description": "A signal that arrives before this much time has passed since the last accepted one is held rather than sent straight away, and applied once the time is up. Any further signal in that same window is dropped."
+            },
             "timeoutSeconds": {
               "title": "Timeout Between Signals (seconds)",
               "type": "number",
@@ -454,6 +471,14 @@
               "type": "string",
               "required": false
             },
+            "switchCooldownSeconds": {
+              "title": "Minimum Time Between Switching On and Off (seconds)",
+              "type": "number",
+              "minimum": 0,
+              "default": 1,
+              "required": false,
+              "description": "A signal that arrives before this much time has passed since the last accepted one is held rather than sent straight away, and applied once the time is up. Any further signal in that same window is dropped."
+            },
             "onFollowUpName": {
               "title": "Signal After Power On - Name",
               "type": "string",
@@ -750,6 +775,14 @@
               "type": "string",
               "required": false
             },
+            "switchCooldownSeconds": {
+              "title": "Minimum Time Between Switching On and Off (seconds)",
+              "type": "number",
+              "minimum": 0,
+              "default": 1,
+              "required": false,
+              "description": "A signal that arrives before this much time has passed since the last accepted one is held rather than sent straight away, and applied once the time is up. Any further signal in that same window is dropped."
+            },
             "volumeUpCode": {
               "title": "Volume Up Signal",
               "type": "string",
@@ -865,7 +898,7 @@
       "items": [
         "enableMqtt",
         "mqttHost",
-        "mqttPort",
+        "mqttRequiresAuth",
         "mqttUsername",
         {
           "key": "mqttPassword",
@@ -891,6 +924,7 @@
         "accessories[].accessoryType",
         "accessories[].powerOnCode",
         "accessories[].powerOffCode",
+        "accessories[].switchCooldownSeconds",
         "accessories[].mqttSubscribe",
         "accessories[].mqttTopic",
         "accessories[].mqttRetain"
@@ -910,6 +944,7 @@
         "advancedAccessories[].name",
         "advancedAccessories[].rmDevice",
         "advancedAccessories[].offCode",
+        "advancedAccessories[].switchCooldownSeconds",
         "advancedAccessories[].timeoutSeconds",
         "advancedAccessories[].mqttSubscribe",
         "advancedAccessories[].mqttTopic",
@@ -955,6 +990,7 @@
         "fans[].powerToggleCode",
         "fans[].powerOnCode",
         "fans[].powerOffCode",
+        "fans[].switchCooldownSeconds",
         "fans[].onFollowUpName",
         "fans[].onFollowUpCode",
         "fans[].onFollowUpPressCount",
@@ -1035,6 +1071,7 @@
         "tvs[].rmDevice",
         "tvs[].powerOnCode",
         "tvs[].powerOffCode",
+        "tvs[].switchCooldownSeconds",
         "tvs[].volumeUpCode",
         "tvs[].volumeDownCode",
         "tvs[].muteCode",

package/dist/accessories/advancedAccessory.d.ts

@@ -6,10 +6,13 @@ export declare class AdvancedAccessory {
     private readonly accessory;
     private readonly config;
     private readonly ip;
+    private readonly service;
     private readonly mqtt;
+    private readonly cooldown;
     constructor(platform: BroadlinkRMBlasterPlatform, accessory: PlatformAccessory, config: AdvancedAccessoryConfig, ip: string);
     private getOn;
-    private setOn;
+    private setOnFromHomeKit;
+    private applySetOn;
     private turnOff;
     private sendSequence;
     private scheduleAutoReset;

package/dist/accessories/advancedAccessory.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdvancedAccessory = void 0;
 const mqttLink_1 = require("../mqttLink");
+const switchCooldown_1 = require("../switchCooldown");
 const DEFAULT_TIMEOUT_SECONDS = 0.5;
+const DEFAULT_SWITCH_COOLDOWN_SECONDS = 1;
 // How long to wait before resetting an auto-resetting (no offCode) trigger
 // back to off. Not a stylistic choice - HomeKit's own optimistic UI update
 // ignores a follow-up characteristic update that arrives too soon after the
@@ -19,7 +21,9 @@ class AdvancedAccessory {
     accessory;
     config;
     ip;
+    service;
     mqtt;
+    cooldown;
     constructor(platform, accessory, config, ip) {
         this.platform = platform;
         this.accessory = accessory;
@@ -27,15 +31,17 @@ class AdvancedAccessory {
         this.ip = ip;
         const service = this.accessory.getService(this.platform.Service.Switch)
             ?? this.accessory.addService(this.platform.Service.Switch);
+        this.service = service;
         service.setCharacteristic(this.platform.Characteristic.Name, this.config.name);
+        this.cooldown = new switchCooldown_1.SwitchCooldown((this.config.switchCooldownSeconds ?? DEFAULT_SWITCH_COOLDOWN_SECONDS) * 1000);
         service.getCharacteristic(this.platform.Characteristic.On)
             .onGet(() => this.getOn())
-            .onSet((value) => this.setOn(value));
-        this.mqtt = new mqttLink_1.MqttLink(platform, config.name, config, async (command) => {
-            if (command.state !== undefined) {
-                await this.setOn(command.state === 'on');
-                service.updateCharacteristic(this.platform.Characteristic.On, this.getOn());
+            .onSet((value) => this.setOnFromHomeKit(value));
+        this.mqtt = new mqttLink_1.MqttLink(platform, config.name, config, (command) => {
+            if (command.state === undefined) {
+                return;
             }
+            return this.cooldown.applyWhenReady(Date.now(), command.state === 'on', (on) => this.applySetOn(on), undefined, (error) => this.platform.log.error(`Failed to apply a deferred MQTT On/Off to "${this.config.name}": ${error.message}`));
         });
     }
     // Same as every other blaster accessory - no feedback from the device
@@ -43,8 +49,18 @@ class AdvancedAccessory {
     getOn() {
         return Boolean(this.accessory.context.on);
     }
-    async setOn(value) {
+    // Unlike the other accessory types, a same-direction repeat isn't a no-op
+    // here - every accepted On re-fires the signal sequence, which is exactly
+    // what the cooldown needs to guard against, so it gates every accepted
+    // call rather than only genuine state flips.
+    setOnFromHomeKit(value) {
         const on = Boolean(value);
+        return this.cooldown.applyWhenReady(Date.now(), on, (v) => this.applySetOn(v), () => {
+            this.platform.log.warn(`Deferring ${on ? 'On' : 'Off'} for "${this.config.name}" - within the minimum switch interval.`);
+            setTimeout(() => this.service.updateCharacteristic(this.platform.Characteristic.On, this.getOn()), RESET_DELAY_MS);
+        }, (error) => this.platform.log.error(`Failed to apply a deferred On/Off to "${this.config.name}": ${error.message}`));
+    }
+    async applySetOn(on) {
         if (!on) {
             await this.turnOff();
             return;
@@ -53,6 +69,7 @@ class AdvancedAccessory {
             await this.sendSequence();
             this.accessory.context.on = true;
             this.mqtt.publishState(true);
+            this.service.updateCharacteristic(this.platform.Characteristic.On, true);
             this.platform.log.info(`Sent signal sequence to ${this.config.name}`);
         }
         catch (error) {
@@ -69,12 +86,14 @@ class AdvancedAccessory {
             // Momentary trigger - nothing to send, just reflect the state.
             this.accessory.context.on = false;
             this.mqtt.publishState(false);
+            this.service.updateCharacteristic(this.platform.Characteristic.On, false);
             return;
         }
         try {
             await this.platform.broadlinkClient.sendCode(this.ip, this.config.offCode);
             this.accessory.context.on = false;
             this.mqtt.publishState(false);
+            this.service.updateCharacteristic(this.platform.Characteristic.On, false);
             this.platform.log.info(`Sent Off to ${this.config.name}`);
         }
         catch (error) {
@@ -97,8 +116,7 @@ class AdvancedAccessory {
         setTimeout(() => {
             this.accessory.context.on = false;
             this.mqtt.publishState(false);
-            this.accessory.getService(this.platform.Service.Switch)
-                ?.updateCharacteristic(this.platform.Characteristic.On, false);
+            this.service.updateCharacteristic(this.platform.Characteristic.On, false);
         }, RESET_DELAY_MS);
     }
 }

package/dist/accessories/advancedAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"advancedAccessory.js","sourceRoot":"","sources":["../../src/accessories/advancedAccessory.ts"],"names":[],"mappings":";;;AAIA,0CAAuC;AAEvC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC,2EAA2E;AAC3E,2EAA2E;AAC3E,4EAA4E;AAC5E,2EAA2E;AAC3E,oEAAoE;AACpE,0EAA0E;AAC1E,iCAAiC;AACjC,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAa,iBAAiB;IAIT;IACA;IACA;IACA;IANF,IAAI,CAAW;IAEhC,YACmB,QAAoC,EACpC,SAA4B,EAC5B,MAA+B,EAC/B,EAAU;QAHV,aAAQ,GAAR,QAAQ,CAA4B;QACpC,cAAS,GAAT,SAAS,CAAmB;QAC5B,WAAM,GAAN,MAAM,CAAyB;QAC/B,OAAE,GAAF,EAAE,CAAQ;QAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;eAClE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7D,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aACvD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;aACzB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,GAAG,IAAI,mBAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACxE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;gBACzC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,sEAAsE;IACtE,oEAAoE;IAC5D,KAAK;QACX,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,KAA0B;QAC5C,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,MAAM,CAAC,IAAI,MAAO,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACtG,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;YAC5D,MAAM,IAAI,cAAc,sDAAyC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACzB,+DAA+D;YAC/D,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,MAAM,CAAC,IAAI,MAAO,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACtG,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;YAC5D,MAAM,IAAI,cAAc,sDAAyC,CAAC;QACpE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,uBAAuB,CAAC,GAAG,IAAI,CAAC;QACjF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACvE,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC;IAEO,iBAAiB;QACvB,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;gBACrD,EAAE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC,EAAE,cAAc,CAAC,CAAC;IACrB,CAAC;CACF;AA9FD,8CA8FC"}
+{"version":3,"file":"advancedAccessory.js","sourceRoot":"","sources":["../../src/accessories/advancedAccessory.ts"],"names":[],"mappings":"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"}

package/dist/accessories/basicAccessory.d.ts

@@ -10,8 +10,10 @@ export declare class BasicAccessory {
     private readonly ip;
     private readonly service;
     private readonly mqtt;
+    private readonly cooldown;
     constructor(platform: BroadlinkRMBlasterPlatform, accessory: PlatformAccessory, config: BasicAccessoryConfig, ip: string);
     private getOrCreateService;
     private getOn;
-    private setOn;
+    private setOnFromHomeKit;
+    private applySetOn;
 }

package/dist/accessories/basicAccessory.js

@@ -4,6 +4,11 @@ exports.BasicAccessory = void 0;
 exports.selectPowerCode = selectPowerCode;
 exports.powerSignalName = powerSignalName;
 const mqttLink_1 = require("../mqttLink");
+const switchCooldown_1 = require("../switchCooldown");
+const DEFAULT_SWITCH_COOLDOWN_SECONDS = 1;
+// Long enough that HomeKit's own optimistic UI doesn't ignore the update
+// that snaps a refused switch back to its real state.
+const REJECT_RESET_DELAY_MS = 1000;
 function selectPowerCode(config, on) {
     return on ? config.powerOnCode : (config.powerOffCode ?? config.powerOnCode);
 }
@@ -23,6 +28,7 @@ class BasicAccessory {
     ip;
     service;
     mqtt;
+    cooldown;
     constructor(platform, accessory, config, ip) {
         this.platform = platform;
         this.accessory = accessory;
@@ -31,17 +37,18 @@ class BasicAccessory {
         const service = this.getOrCreateService();
         this.service = service;
         service.setCharacteristic(this.platform.Characteristic.Name, this.config.name);
+        this.cooldown = new switchCooldown_1.SwitchCooldown((this.config.switchCooldownSeconds ?? DEFAULT_SWITCH_COOLDOWN_SECONDS) * 1000);
         if (this.config.accessoryType === 'outlet') {
             service.setCharacteristic(this.platform.Characteristic.OutletInUse, true);
         }
         service.getCharacteristic(this.platform.Characteristic.On)
             .onGet(() => this.getOn())
-            .onSet((value) => this.setOn(value));
-        this.mqtt = new mqttLink_1.MqttLink(platform, config.name, config, async (command) => {
-            if (command.state !== undefined) {
-                await this.setOn(command.state === 'on');
-                this.service.updateCharacteristic(this.platform.Characteristic.On, this.getOn());
+            .onSet((value) => this.setOnFromHomeKit(value));
+        this.mqtt = new mqttLink_1.MqttLink(platform, config.name, config, (command) => {
+            if (command.state === undefined) {
+                return;
             }
+            return this.cooldown.applyWhenReady(Date.now(), command.state === 'on', (on) => this.applySetOn(on), undefined, (error) => this.platform.log.error(`Failed to apply a deferred MQTT On/Off to "${this.config.name}": ${error.message}`));
         });
     }
     getOrCreateService() {
@@ -66,13 +73,30 @@ class BasicAccessory {
     getOn() {
         return Boolean(this.accessory.context.on);
     }
-    async setOn(value) {
+    // A signal within the minimum switch interval is refused - the tile
+    // snaps back to its real (unchanged) state shortly after, same
+    // "HomeKit's optimistic UI needs a real delay" lesson as every other
+    // auto-resetting switch in this codebase - but it isn't just dropped:
+    // the first refused signal in a window is still held and applied once
+    // the window clears (see SwitchCooldown.applyWhenReady). A same-state
+    // request is a pure no-op and never touches the cooldown at all.
+    setOnFromHomeKit(value) {
         const on = Boolean(value);
+        if (on === this.getOn()) {
+            return;
+        }
+        return this.cooldown.applyWhenReady(Date.now(), on, (v) => this.applySetOn(v), () => {
+            this.platform.log.warn(`Deferring ${on ? 'On' : 'Off'} for "${this.config.name}" - within the minimum switch interval.`);
+            setTimeout(() => this.service.updateCharacteristic(this.platform.Characteristic.On, this.getOn()), REJECT_RESET_DELAY_MS);
+        }, (error) => this.platform.log.error(`Failed to apply a deferred On/Off to "${this.config.name}": ${error.message}`));
+    }
+    async applySetOn(on) {
         const code = selectPowerCode(this.config, on);
         try {
             await this.platform.broadlinkClient.sendCode(this.ip, code);
             this.accessory.context.on = on;
             this.mqtt.publishState(on);
+            this.service.updateCharacteristic(this.platform.Characteristic.On, on);
             this.platform.log.info(`Sent ${powerSignalName(this.config, on)} to ${this.config.name}`);
         }
         catch (error) {

package/dist/accessories/basicAccessory.js.map

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

package/dist/accessories/fanAccessory.d.ts

@@ -21,12 +21,14 @@ export declare class FanAccessory {
     private readonly speedCount;
     private readonly modes;
     private readonly mqtt;
+    private readonly cooldown;
     private swingSwitchService?;
     private speedDebounceTimer?;
     private pendingSpeedPercent?;
     private pendingActive;
     constructor(platform: BroadlinkRMBlasterPlatform, accessory: PlatformAccessory, config: FanAccessoryConfig, ip: string);
     private applyCommand;
+    private applyMqttActive;
     private usableModes;
     private pruneStaleServices;
     private setUpModeService;
@@ -45,6 +47,7 @@ export declare class FanAccessory {
     private repeat;
     private fail;
     private setActiveFromHomeKit;
+    private setActiveGated;
     private setActive;
     private powerOn;
     private enterSpeedIfNeeded;

package/dist/accessories/fanAccessory.js

@@ -7,11 +7,15 @@ exports.levelForPercent = levelForPercent;
 exports.computeCyclePresses = computeCyclePresses;
 exports.computeStepPresses = computeStepPresses;
 const mqttLink_1 = require("../mqttLink");
+const switchCooldown_1 = require("../switchCooldown");
 const DEFAULT_PRESS_INTERVAL_SECONDS = 0.5;
 const DEFAULT_SPEED_DEBOUNCE_SECONDS = 0.5;
+const DEFAULT_SWITCH_COOLDOWN_SECONDS = 1;
 // Long enough that HomeKit's own optimistic UI doesn't ignore the update
 // that puts a momentary switch back to off.
 const RESYNC_RESET_DELAY_MS = 1000;
+// Same lesson, for a signal refused by the switch cooldown instead.
+const REJECT_RESET_DELAY_MS = 1000;
 // Kept distinct from a feature's subtype, which is just its name.
 const RESYNC_SUBTYPE = '__resync';
 const SWING_SUBTYPE = '__swing';
@@ -70,6 +74,7 @@ class FanAccessory {
     speedCount;
     modes;
     mqtt;
+    cooldown;
     swingSwitchService;
     speedDebounceTimer;
     pendingSpeedPercent;
@@ -83,6 +88,7 @@ class FanAccessory {
         this.speedDebounceMs = (this.config.speedDebounceSeconds ?? DEFAULT_SPEED_DEBOUNCE_SECONDS) * 1000;
         this.speedCount = this.config.speedCount ?? 1;
         this.modes = this.usableModes();
+        this.cooldown = new switchCooldown_1.SwitchCooldown((this.config.switchCooldownSeconds ?? DEFAULT_SWITCH_COOLDOWN_SECONDS) * 1000);
         // getService() returns the first match for a UUID regardless of
         // subtype, so find the fan by its lack of one.
         this.fanService = this.accessory.services.find((service) => service.UUID === this.platform.Service.Fanv2.UUID && !service.subtype) ?? this.accessory.addService(this.platform.Service.Fanv2, this.config.name);
@@ -134,11 +140,11 @@ class FanAccessory {
         if (command.state === 'off') {
             // Off wins outright; a speed alongside it would just switch the fan
             // straight back on.
-            await this.setActive(this.platform.Characteristic.Active.INACTIVE);
+            await this.applyMqttActive(false);
             return;
         }
         if (command.state === 'on') {
-            await this.setActive(this.platform.Characteristic.Active.ACTIVE);
+            await this.applyMqttActive(true);
         }
         if (command.speedPercent !== undefined && this.speedCount > 1) {
             await this.applySpeedPercent(command.speedPercent);
@@ -147,6 +153,13 @@ class FanAccessory {
             await this.applySwing(command.swing);
         }
     }
+    // A command inside the switch cooldown window isn't dropped, same as a
+    // HomeKit one isn't - the first one in a window is held and applied once
+    // it clears (see SwitchCooldown.applyWhenReady). No onRefused here, since
+    // there's no tile to visually snap back for an MQTT-originated command.
+    applyMqttActive(on) {
+        return this.cooldown.applyWhenReady(Date.now(), on, (v) => this.setActive(v ? this.platform.Characteristic.Active.ACTIVE : this.platform.Characteristic.Active.INACTIVE), undefined, (error) => this.platform.log.error(`Failed to apply a deferred MQTT On/Off to "${this.config.name}": ${error.message}`));
+    }
     // A feature's name becomes its service subtype, and HomeKit rejects a
     // second service of the same type without a unique one - so a nameless
     // entry (an empty row left behind in the config UI, say) would take the
@@ -260,6 +273,10 @@ class FanAccessory {
     }
     resyncState() {
         this.cancelPendingSpeed();
+        // A resync abandons a held on/off signal too - it exists to forget
+        // everything the plugin assumes, and firing a queued signal moments
+        // later would immediately contradict that.
+        this.cooldown.cancelPending();
         this.accessory.context.on = false;
         this.accessory.context.speedLevel = 0;
         this.accessory.context.speedEntered = false;
@@ -339,11 +356,29 @@ class FanAccessory {
     setActiveFromHomeKit(value) {
         const wantOn = value === this.platform.Characteristic.Active.ACTIVE;
         if (!wantOn || this.speedCount <= 1) {
-            return this.setActive(value);
+            return this.setActiveGated(value);
         }
         this.pendingActive = true;
         this.scheduleSpeedApply();
     }
+    // The switch-cooldown gate for a HomeKit-originated transition: a signal
+    // within the minimum switch interval is refused - the tile snaps back to
+    // its real (unchanged) state shortly after, same lesson as every other
+    // auto-resetting switch in this codebase - but it isn't just dropped:
+    // the first refused signal in a window is still held and applied once
+    // the window clears (see SwitchCooldown.applyWhenReady). Shared by the
+    // immediate path above and the slider-debounce settle callback below,
+    // since both are "about to actually flip power" decision points.
+    async setActiveGated(value) {
+        const wantOn = value === this.platform.Characteristic.Active.ACTIVE;
+        if (wantOn === this.isOn()) {
+            return;
+        }
+        await this.cooldown.applyWhenReady(Date.now(), wantOn, (v) => this.setActive(v ? this.platform.Characteristic.Active.ACTIVE : this.platform.Characteristic.Active.INACTIVE), () => {
+            this.platform.log.warn(`Deferring ${wantOn ? 'On' : 'Off'} for "${this.config.name}" - within the minimum switch interval.`);
+            setTimeout(() => this.fanService.updateCharacteristic(this.platform.Characteristic.Active, this.getActive()), REJECT_RESET_DELAY_MS);
+        }, (error) => this.platform.log.error(`Failed to apply a deferred On/Off to "${this.config.name}": ${error.message}`));
+    }
     async setActive(value) {
         const wantOn = value === this.platform.Characteristic.Active.ACTIVE;
         if (wantOn === this.isOn()) {
@@ -536,7 +571,9 @@ class FanAccessory {
                 void this.applySpeedPercent(percent);
             }
             else if (wantOn) {
-                void this.setActive(this.platform.Characteristic.Active.ACTIVE);
+                void this.setActiveGated(this.platform.Characteristic.Active.ACTIVE).catch((error) => {
+                    this.platform.log.error(`Failed to turn on "${this.config.name}": ${error.message}`);
+                });
             }
         }, this.speedDebounceMs);
     }