homebridge-bedjet 0.3.2 → 0.3.3

package/dist/accessory.js

@@ -105,13 +105,22 @@ class BedJetAccessory {
             return 1; // HEAT / TURBO / EXTENDED_HEAT
         })
             .onSet((value) => {
-            this.setPending(value, 'pendingMode', 'pendingModeTimer');
+            const val = value;
             const wasOff = this.bedjet.state.operatingMode === constants_1.OperatingMode.STANDBY
                 || this.bedjet.state.operatingMode === constants_1.OperatingMode.WAIT;
-            const turningOn = value !== 0;
-            const mode = TARGET_TO_MODE[value] ?? constants_1.OperatingMode.STANDBY;
-            // Apply the requested mode, then defaults (temp/fan) if turning on from off
-            this._applyModeAndDefaults(mode, wasOff && turningOn, false).catch(err => this.platform.log.error(`[${config.name}] setOperatingMode failed: ${err}`));
+            const turningOn = val !== 0;
+            let mode;
+            if (val === 3 || (turningOn && wasOff)) {
+                // Siri sends Auto (3) when turning on — and any turn-on from standby —
+                // should respect the user's configured defaultMode.
+                mode = config.defaultMode
+                    ? DEFAULT_MODE_MAP[config.defaultMode]
+                    : TARGET_TO_MODE[val] ?? constants_1.OperatingMode.HEAT;
+            }
+            else {
+                mode = TARGET_TO_MODE[val] ?? constants_1.OperatingMode.STANDBY;
+            }
+            this._applyModeAndDefaults(mode, wasOff && turningOn).catch(err => this.platform.log.error(`[${config.name}] setOperatingMode failed: ${err}`));
         });
         // FanV2 service
         this.fanService = this.accessory.getService(Service.Fanv2)
@@ -130,7 +139,7 @@ class BedJetAccessory {
                 const mode = this.config.defaultMode
                     ? DEFAULT_MODE_MAP[this.config.defaultMode]
                     : constants_1.OperatingMode.HEAT;
-                this._applyModeAndDefaults(mode, true, true).catch(err => this.platform.log.error(`[${config.name}] turn on failed: ${err}`));
+                this._applyModeAndDefaults(mode, true).catch(err => this.platform.log.error(`[${config.name}] turn on failed: ${err}`));
             }
         });
         this.fanService.getCharacteristic(Characteristic.RotationSpeed)
@@ -165,7 +174,7 @@ class BedJetAccessory {
      * (fan turn-on path); false when HomeKit supplied the mode explicitly
      * (thermostat path).
      */
-    async _applyModeAndDefaults(mode, applyDefaults, applyMode) {
+    async _applyModeAndDefaults(mode, applyDefaults) {
         const { config } = this;
         // Determine HomeKit target state for pending optimistic value
         const pendingState = mode === constants_1.OperatingMode.STANDBY ? 0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-bedjet",
   "displayName": "BedJet",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Homebridge plugin for BedJet V3 via Bluetooth LE",
   "license": "MIT",
   "main": "dist/index.js",

package/src/accessory.ts

@@ -130,13 +130,23 @@ export class BedJetAccessory {
         return 1; // HEAT / TURBO / EXTENDED_HEAT
       })
       .onSet((value: CharacteristicValue) => {
-        this.setPending(value as number, 'pendingMode', 'pendingModeTimer');
+        const val = value as number;
         const wasOff = this.bedjet.state.operatingMode === OperatingMode.STANDBY
           || this.bedjet.state.operatingMode === OperatingMode.WAIT;
-        const turningOn = (value as number) !== 0;
-        const mode = TARGET_TO_MODE[value as number] ?? OperatingMode.STANDBY;
-        // Apply the requested mode, then defaults (temp/fan) if turning on from off
-        this._applyModeAndDefaults(mode, wasOff && turningOn, false).catch(err =>
+        const turningOn = val !== 0;
+
+        let mode: OperatingMode;
+        if (val === 3 || (turningOn && wasOff)) {
+          // Siri sends Auto (3) when turning on — and any turn-on from standby —
+          // should respect the user's configured defaultMode.
+          mode = config.defaultMode
+            ? DEFAULT_MODE_MAP[config.defaultMode]
+            : TARGET_TO_MODE[val] ?? OperatingMode.HEAT;
+        } else {
+          mode = TARGET_TO_MODE[val] ?? OperatingMode.STANDBY;
+        }
+
+        this._applyModeAndDefaults(mode, wasOff && turningOn).catch(err =>
           this.platform.log.error(`[${config.name}] setOperatingMode failed: ${err}`),
         );
       });
@@ -162,7 +172,7 @@ export class BedJetAccessory {
           const mode = this.config.defaultMode
             ? DEFAULT_MODE_MAP[this.config.defaultMode]
             : OperatingMode.HEAT;
-          this._applyModeAndDefaults(mode, true, true).catch(err =>
+          this._applyModeAndDefaults(mode, true).catch(err =>
             this.platform.log.error(`[${config.name}] turn on failed: ${err}`),
           );
         }
@@ -211,7 +221,6 @@ export class BedJetAccessory {
   private async _applyModeAndDefaults(
     mode: OperatingMode,
     applyDefaults: boolean,
-    applyMode: boolean,
   ): Promise<void> {
     const { config } = this;