homebridge-bedjet 0.3.2 → 0.3.4

package/dist/accessory.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BedJetAccessory = void 0;
 const BedJet_1 = require("./bedjet/BedJet");
 const constants_1 = require("./bedjet/constants");
+const utils_1 = require("./utils");
 const DEFAULT_MODE_MAP = {
     heat: constants_1.OperatingMode.HEAT,
     turbo: constants_1.OperatingMode.TURBO,
@@ -10,20 +11,6 @@ const DEFAULT_MODE_MAP = {
     cool: constants_1.OperatingMode.COOL,
     dry: constants_1.OperatingMode.DRY,
 };
-/**
- * HomeKit only allows alphanumeric, space, and apostrophe characters in names,
- * starting and ending with alphanumeric. Underscores and other punctuation
- * cause HAP warnings and may prevent the accessory from pairing.
- */
-function sanitizeName(name) {
-    return name
-        .replace(/_/g, ' ') // underscores → spaces
-        .replace(/[^a-zA-Z0-9 ']/g, ' ') // anything else invalid → space
-        .replace(/\s+/g, ' ') // collapse multiple spaces
-        .trim()
-        .replace(/^[^a-zA-Z0-9]+/, '') // must start with alphanumeric
-        .replace(/[^a-zA-Z0-9]+$/, '') || 'BedJet'; // must end with alphanumeric
-}
 // OperatingMode → CurrentHeatingCoolingState value
 const CURRENT_STATE_MAP = {
     [constants_1.OperatingMode.STANDBY]: 0, // OFF
@@ -66,7 +53,7 @@ class BedJetAccessory {
         this.pendingMode = null;
         this.pendingModeTimer = null;
         const { Service, Characteristic } = platform.api.hap;
-        const safeName = sanitizeName(config.name);
+        const safeName = (0, utils_1.sanitizeName)(config.name);
         // AccessoryInformation
         const infoService = this.accessory.getService(Service.AccessoryInformation)
             ?? this.accessory.addService(Service.AccessoryInformation);
@@ -105,13 +92,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 +126,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 +161,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/dist/platform.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BedJetPlatform = exports.PLUGIN_NAME = exports.PLATFORM_NAME = void 0;
 const accessory_1 = require("./accessory");
+const utils_1 = require("./utils");
 exports.PLATFORM_NAME = 'BedJetPlatform';
 exports.PLUGIN_NAME = 'homebridge-bedjet';
 class BedJetPlatform {
@@ -35,15 +36,18 @@ class BedJetPlatform {
             const uuid = this.api.hap.uuid.generate(device.address.toLowerCase());
             this.discoveredUUIDs.push(uuid);
             const existing = this.accessories.get(uuid);
+            const safeName = (0, utils_1.sanitizeName)(device.name);
             if (existing) {
                 this.log.info('Restoring existing accessory from cache:', existing.displayName);
                 existing.context.device = device;
+                // Update the display name in case the config name changed or was invalid
+                existing.displayName = safeName;
                 this.api.updatePlatformAccessories([existing]);
                 new accessory_1.BedJetAccessory(this, existing, device);
             }
             else {
-                this.log.info('Adding new accessory:', device.name);
-                const accessory = new this.api.platformAccessory(device.name, uuid);
+                this.log.info('Adding new accessory:', safeName);
+                const accessory = new this.api.platformAccessory(safeName, uuid);
                 accessory.context.device = device;
                 new accessory_1.BedJetAccessory(this, accessory, device);
                 this.api.registerPlatformAccessories(exports.PLUGIN_NAME, exports.PLATFORM_NAME, [accessory]);

package/dist/utils.d.ts

@@ -0,0 +1,7 @@
+/**
+ * HomeKit only allows alphanumeric, space, and apostrophe characters in
+ * accessory/service names, starting and ending with an alphanumeric character.
+ * Underscores and other punctuation cause HAP warnings and may prevent the
+ * accessory from being added to the Home app.
+ */
+export declare function sanitizeName(name: string): string;

package/dist/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeName = sanitizeName;
+/**
+ * HomeKit only allows alphanumeric, space, and apostrophe characters in
+ * accessory/service names, starting and ending with an alphanumeric character.
+ * Underscores and other punctuation cause HAP warnings and may prevent the
+ * accessory from being added to the Home app.
+ */
+function sanitizeName(name) {
+    return name
+        .replace(/_/g, ' ') // underscores → spaces
+        .replace(/[^a-zA-Z0-9 ']/g, ' ') // other invalid chars → space
+        .replace(/\s+/g, ' ') // collapse runs of spaces
+        .trim()
+        .replace(/^[^a-zA-Z0-9]+/, '') // must start with alphanumeric
+        .replace(/[^a-zA-Z0-9]+$/, '') // must end with alphanumeric
+        || 'BedJet';
+}
+//# sourceMappingURL=utils.js.map

package/package.json

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

package/src/accessory.ts

@@ -3,6 +3,7 @@ import { BedJet } from './bedjet/BedJet';
 import { OperatingMode } from './bedjet/constants';
 import type { BedJetConfig, BedJetState, DefaultMode } from './bedjet/types';
 import type { BedJetPlatform } from './platform';
+import { sanitizeName } from './utils';
 
 const DEFAULT_MODE_MAP: Record<DefaultMode, OperatingMode> = {
   heat:         OperatingMode.HEAT,
@@ -12,20 +13,6 @@ const DEFAULT_MODE_MAP: Record<DefaultMode, OperatingMode> = {
   dry:          OperatingMode.DRY,
 };
 
-/**
- * HomeKit only allows alphanumeric, space, and apostrophe characters in names,
- * starting and ending with alphanumeric. Underscores and other punctuation
- * cause HAP warnings and may prevent the accessory from pairing.
- */
-function sanitizeName(name: string): string {
-  return name
-    .replace(/_/g, ' ')                    // underscores → spaces
-    .replace(/[^a-zA-Z0-9 ']/g, ' ')       // anything else invalid → space
-    .replace(/\s+/g, ' ')                  // collapse multiple spaces
-    .trim()
-    .replace(/^[^a-zA-Z0-9]+/, '')         // must start with alphanumeric
-    .replace(/[^a-zA-Z0-9]+$/, '') || 'BedJet'; // must end with alphanumeric
-}
 
 // OperatingMode → CurrentHeatingCoolingState value
 const CURRENT_STATE_MAP: Record<OperatingMode, number> = {
@@ -130,13 +117,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 +159,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 +208,6 @@ export class BedJetAccessory {
   private async _applyModeAndDefaults(
     mode: OperatingMode,
     applyDefaults: boolean,
-    applyMode: boolean,
   ): Promise<void> {
     const { config } = this;
 

package/src/platform.ts

@@ -1,6 +1,7 @@
 import type { API, DynamicPlatformPlugin, Logging, PlatformAccessory, PlatformConfig } from 'homebridge';
 import { BedJetAccessory } from './accessory';
 import type { BedJetConfig } from './bedjet/types';
+import { sanitizeName } from './utils';
 
 export const PLATFORM_NAME = 'BedJetPlatform';
 export const PLUGIN_NAME   = 'homebridge-bedjet';
@@ -45,15 +46,18 @@ export class BedJetPlatform implements DynamicPlatformPlugin {
       this.discoveredUUIDs.push(uuid);
 
       const existing = this.accessories.get(uuid);
+      const safeName = sanitizeName(device.name);
 
       if (existing) {
         this.log.info('Restoring existing accessory from cache:', existing.displayName);
         existing.context.device = device;
+        // Update the display name in case the config name changed or was invalid
+        existing.displayName = safeName;
         this.api.updatePlatformAccessories([existing]);
         new BedJetAccessory(this, existing, device);
       } else {
-        this.log.info('Adding new accessory:', device.name);
-        const accessory = new this.api.platformAccessory(device.name, uuid);
+        this.log.info('Adding new accessory:', safeName);
+        const accessory = new this.api.platformAccessory(safeName, uuid);
         accessory.context.device = device;
         new BedJetAccessory(this, accessory, device);
         this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);

package/src/utils.ts

@@ -0,0 +1,16 @@
+/**
+ * HomeKit only allows alphanumeric, space, and apostrophe characters in
+ * accessory/service names, starting and ending with an alphanumeric character.
+ * Underscores and other punctuation cause HAP warnings and may prevent the
+ * accessory from being added to the Home app.
+ */
+export function sanitizeName(name: string): string {
+  return name
+    .replace(/_/g, ' ')               // underscores → spaces
+    .replace(/[^a-zA-Z0-9 ']/g, ' ')  // other invalid chars → space
+    .replace(/\s+/g, ' ')             // collapse runs of spaces
+    .trim()
+    .replace(/^[^a-zA-Z0-9]+/, '')    // must start with alphanumeric
+    .replace(/[^a-zA-Z0-9]+$/, '')    // must end with alphanumeric
+    || 'BedJet';
+}