homebridge-multiple-switch 1.6.0-beta.7 → 1.6.0-beta.9

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## [1.6.0-beta.7] - 2026-03-21
+## [1.6.0-beta.9] - 2026-03-22
+
+### Fixed
+- Homebridge v2 compatibility — plugin now shows green checkmark in v2 readiness check
+- Switch ordering in HomeKit — services are now linked to ServiceLabel with
+  ServiceLabelIndex for deterministic ordering (requires re-adding accessory in HomeKit
+  if previously cached)
 
 ### Changed
 - Master switch type now defaults to Switch instead of Outlet (both UI and backend)

package/index.js

@@ -117,22 +117,40 @@ class MultipleSwitchPlatform {
     const subtypeServices = accessory.services.filter((s) => s.subtype);
     subtypeServices.forEach((s) => accessory.removeService(s));
 
+    // Remove existing ServiceLabel if present, then re-add to ensure ordering
+    const existingLabel = accessory.services.find(
+      (s) => s.UUID === this.Service.ServiceLabel.UUID
+    );
+    if (existingLabel) accessory.removeService(existingLabel);
+
+    const labelService = accessory.addService(this.Service.ServiceLabel);
+    labelService.setCharacteristic(
+      this.Characteristic.ServiceLabelNamespace,
+      this.Characteristic.ServiceLabelNamespace.ARABIC_NUMERALS
+    );
+
+    let labelIndex = 1;
+    const orderedServices = [];
+
     // 1. Create master switch FIRST if enabled (appears at top in HomeKit)
     if (hasMaster) {
       const MasterServiceClass = this.getServiceClass(device.masterSwitchType || 'switch');
       const masterService = accessory.addService(MasterServiceClass, 'Master', MASTER_SUBTYPE);
 
       this.setServiceName(masterService, 'Master');
+      masterService.addOptionalCharacteristic(this.Characteristic.ServiceLabelIndex);
+      masterService.setCharacteristic(this.Characteristic.ServiceLabelIndex, labelIndex++);
       this.configureMasterHandler(accessory, masterService, services);
 
       services.set(MASTER_SUBTYPE, masterService);
+      orderedServices.push(masterService);
 
       if (accessory.context.switchStates[MASTER_SUBTYPE] === undefined) {
         accessory.context.switchStates[MASTER_SUBTYPE] = false;
       }
     }
 
-    // 2. Create regular switches in order
+    // 2. Create regular switches in config order
     switches.forEach((sw, index) => {
       const subtype = `switch_${index}`;
 
@@ -140,15 +158,26 @@ class MultipleSwitchPlatform {
       const service = accessory.addService(ServiceClass, sw.name, subtype);
 
       this.setServiceName(service, sw.name);
+      service.addOptionalCharacteristic(this.Characteristic.ServiceLabelIndex);
+      service.setCharacteristic(this.Characteristic.ServiceLabelIndex, labelIndex++);
       this.configureSwitchHandlers(accessory, service, sw, subtype, services);
 
       services.set(subtype, service);
+      orderedServices.push(service);
 
       if (accessory.context.switchStates[subtype] === undefined) {
         accessory.context.switchStates[subtype] = sw.defaultState || false;
       }
     });
 
+    // Link all services to ServiceLabel for HomeKit ordering
+    for (const svc of orderedServices) {
+      labelService.addLinkedService(svc);
+    }
+
+    // Log service order for debugging
+    this.log.info(`[${device.name}] Service order: ${orderedServices.map((s, i) => `${i + 1}. ${s.displayName}`).join(', ')}`);
+
     // Clean up states for removed switches
     const activeKeys = new Set(services.keys());
     for (const key of Object.keys(accessory.context.switchStates)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-multiple-switch",
-  "version": "1.6.0-beta.7",
+  "version": "1.6.0-beta.9",
   "description": "Multiple switch platform for Homebridge",
   "homepage": "https://github.com/azadaydinli/homebridge-multiple-switch",
   "main": "index.js",
@@ -31,6 +31,6 @@
   },
   "engines": {
     "node": ">=18.0.0",
-    "homebridge": ">=1.3.0"
+    "homebridge": "^1.3.0 || ^2.0.0-beta.0"
   }
 }