homebridge-ac-freedom 1.0.2 → 1.0.4

package/config.schema.json

@@ -83,15 +83,6 @@
                 }
               }
             },
-            "hvacModes": {
-              "title": "Enabled HVAC Modes",
-              "type": "object",
-              "properties": {
-                "auto": { "title": "Auto", "type": "boolean", "default": true },
-                "cool": { "title": "Cool", "type": "boolean", "default": true },
-                "heat": { "title": "Heat", "type": "boolean", "default": true }
-              }
-            },
             "presets": {
               "title": "Enabled Preset Modes (shown as switches in climate card)",
               "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ac-freedom",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "displayName": "AC Freedom",
   "description": "Homebridge plugin for AUX air conditioners via Broadlink (local UDP) and AUX Cloud API",
   "main": "index.js",

package/src/ac-accessory.js

@@ -66,10 +66,11 @@ class AcFreedomAccessory {
 
     this.setupAccessoryInfo();
     this.setupHeaterCooler();
-    this.reorderLinkedServices();
+    this.purgeLinkedServices();
     this.setupFanService();
     this.setupPresetSwitches();
     this.setupDisplaySwitch();
+    this.enforceServiceOrder();
 
     // Start polling
     const interval = (config.pollInterval || 30) * 1000;
@@ -94,7 +95,6 @@ class AcFreedomAccessory {
       || this.accessory.addService(this.Service.HeaterCooler, this.config.name);
 
     const C = this.Characteristic;
-    const hvac = this.config.hvacModes || { auto: true, cool: true, heat: true };
 
     // Active (on/off)
     this.heaterCooler.getCharacteristic(C.Active)
@@ -115,15 +115,15 @@ class AcFreedomAccessory {
         }
       });
 
-    // Target state (auto/heat/cool)
-    const validStates = [];
-    if (hvac.auto) validStates.push(C.TargetHeaterCoolerState.AUTO);
-    if (hvac.heat) validStates.push(C.TargetHeaterCoolerState.HEAT);
-    if (hvac.cool) validStates.push(C.TargetHeaterCoolerState.COOL);
-    if (validStates.length === 0) validStates.push(C.TargetHeaterCoolerState.AUTO);
-
+    // Target state – all HVAC modes always enabled (auto/heat/cool)
     this.heaterCooler.getCharacteristic(C.TargetHeaterCoolerState)
-      .setProps({ validValues: validStates })
+      .setProps({
+        validValues: [
+          C.TargetHeaterCoolerState.AUTO,
+          C.TargetHeaterCoolerState.HEAT,
+          C.TargetHeaterCoolerState.COOL,
+        ],
+      })
       .onGet(() => {
         switch (this.state.mode) {
           case CLOUD_MODE.HEAT: return C.TargetHeaterCoolerState.HEAT;
@@ -179,24 +179,47 @@ class AcFreedomAccessory {
       });
   }
 
-  // ── Reorder linked services ───────────────────────────────────
-  // Remove cached linked services from the accessory so they are
-  // re-added in the correct display order: Fan → Presets → Display.
-  reorderLinkedServices() {
-    const ids = [
-      { type: this.Service.Fanv2, subtype: 'fan' },
-      { type: this.Service.Switch, subtype: 'sleep' },
-      { type: this.Service.Switch, subtype: 'health' },
-      { type: this.Service.Switch, subtype: 'eco' },
-      { type: this.Service.Switch, subtype: 'clean' },
-      { type: this.Service.Switch, subtype: 'display' },
-    ];
-    for (const { type, subtype } of ids) {
+  // ── Purge linked services ────────────────────────────────────
+  // Remove every cached linked service from the accessory AND clear
+  // the HeaterCooler's linked list so they are re-created fresh in
+  // the correct display order: Fan → Presets → Display.
+  purgeLinkedServices() {
+    // 1. Clear HeaterCooler's linked services array
+    this.heaterCooler.linkedServices = [];
+
+    // 2. Remove cached services from the accessory
+    const subtypes = ['fan', 'sleep', 'health', 'eco', 'clean', 'display'];
+    for (const subtype of subtypes) {
+      const type = subtype === 'fan' ? this.Service.Fanv2 : this.Service.Switch;
       const svc = this.accessory.getServiceById(type, subtype);
       if (svc) this.accessory.removeService(svc);
     }
   }
 
+  // ── Enforce service order in accessory ──────────────────────
+  // HomeKit reads the services array order from the HAP database to
+  // determine tile layout.  We sort the array so that Fan always
+  // comes right after HeaterCooler, followed by preset switches and
+  // the display switch.
+  enforceServiceOrder() {
+    const S = this.Service;
+    const rank = (svc) => {
+      if (svc.UUID === S.AccessoryInformation.UUID) return 0;
+      if (svc.UUID === S.HeaterCooler.UUID) return 1;
+      if (svc.UUID === S.Fanv2.UUID) return 2;            // Fan first
+      if (svc.UUID === S.Switch.UUID) {
+        const sub = svc.subtype;
+        if (sub === 'sleep') return 3;
+        if (sub === 'health') return 4;
+        if (sub === 'eco') return 5;
+        if (sub === 'clean') return 6;
+        if (sub === 'display') return 7;
+      }
+      return 99;
+    };
+    this.accessory.services.sort((a, b) => rank(a) - rank(b));
+  }
+
   // ── Fan Service (linked to HeaterCooler) ────────────────────────
   setupFanService() {
     const C = this.Characteristic;