homebridge-multiple-switch 1.6.0-beta.6 → 1.6.0-beta.8

package/CHANGELOG.md

@@ -1,12 +1,13 @@
 # Changelog
 
-## [1.6.0-beta.6] - 2026-03-21
+## [1.6.0-beta.8] - 2026-03-22
 
 ### Fixed
-- Behavior mode select now matches device name width (description moved below both
-  columns instead of inside the narrow select column)
+- Homebridge v2 compatibility — plugin now shows green checkmark in v2 readiness check
+- Switch ordering in HomeKit now follows config order using ServiceLabelIndex
+
+### Changed
 - Master switch type now defaults to Switch instead of Outlet (both UI and backend)
-- Default state checkbox now vertically centered with the auto turn off input field
 
 ## [1.6.0-beta.5] - 2026-03-21
 

package/homebridge-ui/public/index.html

@@ -398,9 +398,9 @@
                 <option value="independent" ${isIndependent ? 'selected' : ''}>${t.behaviorIndependent || 'Independent'}</option>
                 <option value="single" ${isSingle ? 'selected' : ''}>${t.behaviorSingle || 'Single'}</option>
               </select>
+              <div class="desc" style="margin-top:6px">${behaviorDesc}</div>
             </div>
           </div>
-          ${behaviorDesc ? `<div class="desc" style="margin-top:2px">${behaviorDesc}</div>` : ''}
 
           ${isIndependent ? `
           <div class="master-option">
@@ -462,14 +462,14 @@
               </select>
             </div>
           </div>
-          <div class="inline-row" style="align-items:end">
+          <div class="inline-row">
             <div class="form-group">
               <label>${t.delayOff || 'Auto Turn Off (ms)'}</label>
               <input type="number" class="sw-field" data-dev="${di}" data-sw="${si}" data-field="delayOff" min="0" value="${sw.delayOff || 0}">
             </div>
-            <div class="form-group" style="display:flex;flex-direction:column;justify-content:end">
+            <div class="form-group">
               <label>${t.defaultState || 'Default State'}</label>
-              <div class="toggle-wrap" style="height:37px;display:flex;align-items:center">
+              <div class="toggle-wrap" style="margin-top:6px">
                 <input type="checkbox" class="sw-field" data-dev="${di}" data-sw="${si}" data-field="defaultState" ${sw.defaultState ? 'checked' : ''}>
                 <span>${sw.defaultState ? (t.on || 'On') : (t.off || 'Off')}</span>
               </div>

package/index.js

@@ -117,12 +117,28 @@ 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;
+
     // 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);
@@ -132,7 +148,7 @@ class MultipleSwitchPlatform {
       }
     }
 
-    // 2. Create regular switches in order
+    // 2. Create regular switches in config order
     switches.forEach((sw, index) => {
       const subtype = `switch_${index}`;
 
@@ -140,6 +156,8 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-multiple-switch",
-  "version": "1.6.0-beta.6",
+  "version": "1.6.0-beta.8",
   "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"
   }
 }