homebridge-multiple-switch 1.6.0-beta.1 → 1.6.0-beta.10

package/.github/workflows/release.yml

@@ -22,7 +22,17 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Determine npm tag
+        id: npm-tag
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          if echo "$VERSION" | grep -q "beta"; then
+            echo "tag=beta" >> $GITHUB_OUTPUT
+          else
+            echo "tag=latest" >> $GITHUB_OUTPUT
+          fi
+
       - name: Publish to npm
-        run: npm publish
+        run: npm publish --tag ${{ steps.npm-tag.outputs.tag }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## [1.6.0-beta.10] - 2026-03-22
+
+### Fixed
+- Homebridge v2 compatibility — plugin now shows green checkmark in v2 readiness check
+- Switch ordering in HomeKit now follows config order (services recreated in sequence)
+- Removed ServiceLabel/ServiceLabelIndex that caused outlets to render as toggles
+  instead of buttons
+
+### Changed
+- Master switch type now defaults to Switch instead of Outlet (both UI and backend)
+
+## [1.6.0-beta.5] - 2026-03-21
+
+### Fixed
+- Switch names now correctly appear in HomeKit — services are recreated on each
+  start with fresh displayName, Name, and ConfiguredName (cached services kept
+  stale names from initial creation)
+- Master switch now always appears first in HomeKit — all subtype services are
+  removed and recreated in correct order (master first, then switches)
+
+### Changed
+- Master switch type selector now inline with the toggle (same row)
+
+## [1.6.0-beta.4] - 2026-03-21
+
+### Added
+- Master switch type selection (Switch or Outlet) — appears when master switch is enabled
+- `masterSwitchType` config option
+
+### Changed
+- All devices and switches now start collapsed when config UI is opened
+- New devices/switches still open expanded when freshly added
+
+## [1.6.0-beta.3] - 2026-03-21
+
+### Fixed
+- Switch names now display correctly in HomeKit using `ConfiguredName`
+  characteristic (previously all showed the device name)
+- Master switch now always appears first in HomeKit (created before regular switches)
+
+## [1.6.0-beta.2] - 2026-03-21
+
+### Fixed
+- Master Switch now available in Independent mode (was incorrectly in Single mode)
+- Behavior description now appears below the select dropdown instead of above
+
 ## [1.6.0-beta.1] - 2026-03-21
 
 ### Removed

package/homebridge-ui/public/i18n/ar.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "يمكن تشغيل مفتاح واحد فقط في نفس الوقت. تشغيل واحد يقوم بإيقاف جميع الآخرين تلقائياً.",
   "masterSwitch": "المفتاح الرئيسي",
   "masterSwitchDesc": "يضيف مفتاحاً رئيسياً يقوم بتشغيل أو إيقاف جميع المفاتيح دفعة واحدة.",
-  "switchSingular": "مفتاح"
+  "switchSingular": "مفتاح",
+  "masterSwitchType": "نوع المفتاح الرئيسي"
 }

package/homebridge-ui/public/i18n/de.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Es kann nur ein Schalter gleichzeitig eingeschaltet sein. Das Einschalten eines Schalters schaltet alle anderen automatisch aus.",
   "masterSwitch": "Hauptschalter",
   "masterSwitchDesc": "Fügt einen Hauptschalter hinzu, der alle Schalter auf einmal ein- oder ausschaltet.",
-  "switchSingular": "Schalter"
+  "switchSingular": "Schalter",
+  "masterSwitchType": "Hauptschaltertyp"
 }

package/homebridge-ui/public/i18n/en.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Only one switch can be on at a time. Turning one on automatically turns off all others.",
   "masterSwitch": "Master Switch",
   "masterSwitchDesc": "Adds a master switch that turns all switches on or off at once.",
-  "switchSingular": "switch"
+  "switchSingular": "switch",
+  "masterSwitchType": "Master Switch Type"
 }

package/homebridge-ui/public/i18n/es.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Solo un interruptor puede estar encendido a la vez. Encender uno apaga automáticamente todos los demás.",
   "masterSwitch": "Interruptor maestro",
   "masterSwitchDesc": "Agrega un interruptor maestro que enciende o apaga todos los interruptores a la vez.",
-  "switchSingular": "interruptor"
+  "switchSingular": "interruptor",
+  "masterSwitchType": "Tipo de interruptor maestro"
 }

package/homebridge-ui/public/i18n/fr.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Un seul interrupteur peut être activé à la fois. En activer un désactive automatiquement tous les autres.",
   "masterSwitch": "Interrupteur principal",
   "masterSwitchDesc": "Ajoute un interrupteur principal qui active ou désactive tous les interrupteurs en une seule fois.",
-  "switchSingular": "interrupteur"
+  "switchSingular": "interrupteur",
+  "masterSwitchType": "Type d'interrupteur principal"
 }

package/homebridge-ui/public/i18n/it.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Solo un interruttore può essere acceso alla volta. Accenderne uno spegne automaticamente tutti gli altri.",
   "masterSwitch": "Interruttore principale",
   "masterSwitchDesc": "Aggiunge un interruttore principale che accende o spegne tutti gli interruttori contemporaneamente.",
-  "switchSingular": "interruttore"
+  "switchSingular": "interruttore",
+  "masterSwitchType": "Tipo di interruttore principale"
 }

package/homebridge-ui/public/i18n/ja.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "同時に1つのスイッチのみオンにできます。1つをオンにすると他はすべて自動的にオフになります。",
   "masterSwitch": "マスタースイッチ",
   "masterSwitchDesc": "すべてのスイッチを一度にオン/オフするマスタースイッチを追加します。",
-  "switchSingular": "スイッチ"
+  "switchSingular": "スイッチ",
+  "masterSwitchType": "マスタースイッチタイプ"
 }

package/homebridge-ui/public/i18n/ko.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "한 번에 하나의 스위치만 켤 수 있습니다. 하나를 켜면 다른 모든 것이 자동으로 꺼집니다.",
   "masterSwitch": "마스터 스위치",
   "masterSwitchDesc": "모든 스위치를 한 번에 켜거나 끄는 마스터 스위치를 추가합니다.",
-  "switchSingular": "스위치"
+  "switchSingular": "스위치",
+  "masterSwitchType": "마스터 스위치 유형"
 }

package/homebridge-ui/public/i18n/nl.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Er kan slechts één schakelaar tegelijk aan staan. Het inschakelen van één schakelaar schakelt alle andere automatisch uit.",
   "masterSwitch": "Hoofdschakelaar",
   "masterSwitchDesc": "Voegt een hoofdschakelaar toe die alle schakelaars in één keer in- of uitschakelt.",
-  "switchSingular": "schakelaar"
+  "switchSingular": "schakelaar",
+  "masterSwitchType": "Type hoofdschakelaar"
 }

package/homebridge-ui/public/i18n/pl.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Tylko jeden przełącznik może być włączony jednocześnie. Włączenie jednego automatycznie wyłącza wszystkie pozostałe.",
   "masterSwitch": "Przełącznik główny",
   "masterSwitchDesc": "Dodaje przełącznik główny, który włącza lub wyłącza wszystkie przełączniki jednocześnie.",
-  "switchSingular": "przełącznik"
+  "switchSingular": "przełącznik",
+  "masterSwitchType": "Typ przełącznika głównego"
 }

package/homebridge-ui/public/i18n/pt.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Apenas um interruptor pode estar ligado por vez. Ligar um desliga automaticamente todos os outros.",
   "masterSwitch": "Interruptor principal",
   "masterSwitchDesc": "Adiciona um interruptor principal que liga ou desliga todos os interruptores de uma só vez.",
-  "switchSingular": "interruptor"
+  "switchSingular": "interruptor",
+  "masterSwitchType": "Tipo de interruptor principal"
 }

package/homebridge-ui/public/i18n/ru.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Одновременно может быть включён только один переключатель. Включение одного автоматически выключает все остальные.",
   "masterSwitch": "Главный переключатель",
   "masterSwitchDesc": "Добавляет главный переключатель, который включает или выключает все переключатели одновременно.",
-  "switchSingular": "переключатель"
+  "switchSingular": "переключатель",
+  "masterSwitchType": "Тип главного переключателя"
 }

package/homebridge-ui/public/i18n/tr.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "Aynı anda yalnızca bir anahtar açık olabilir. Birini açmak diğerlerini otomatik kapatır.",
   "masterSwitch": "Ana Anahtar",
   "masterSwitchDesc": "Tüm anahtarları tek seferde açan veya kapatan bir ana anahtar ekler.",
-  "switchSingular": "anahtar"
+  "switchSingular": "anahtar",
+  "masterSwitchType": "Ana Anahtar Tipi"
 }

package/homebridge-ui/public/i18n/zh-CN.json

@@ -33,5 +33,6 @@
   "behaviorSingleDesc": "同一时间只能有一个开关处于打开状态。打开一个会自动关闭所有其他开关。",
   "masterSwitch": "主开关",
   "masterSwitchDesc": "添加一个主开关，可以一次性打开或关闭所有开关。",
-  "switchSingular": "开关"
+  "switchSingular": "开关",
+  "masterSwitchType": "主开关类型"
 }

package/homebridge-ui/public/index.html

@@ -185,14 +185,9 @@
     config.devices = [];
   }
 
-  // Track expand/collapse state
-  const expandedDevices = new Set(config.devices.map((_, i) => i));
+  // Track expand/collapse state — all collapsed by default
+  const expandedDevices = new Set();
   const expandedSwitches = new Set();
-  config.devices.forEach((dev, di) => {
-    (dev.switches || []).forEach((_, si) => {
-      expandedSwitches.add(`${di}_${si}`);
-    });
-  });
 
   const app = document.getElementById('app');
 
@@ -268,8 +263,8 @@
         const di = parseInt(input.dataset.dev);
         const field = input.dataset.field;
         config.devices[di][field] = input.value;
-        // If switching away from single, disable masterSwitch
-        if (field === 'switchBehavior' && input.value !== 'single') {
+        // If switching away from independent, disable masterSwitch
+        if (field === 'switchBehavior' && input.value !== 'independent') {
           delete config.devices[di].masterSwitch;
         }
         render();
@@ -282,6 +277,19 @@
       input.addEventListener('change', () => {
         const di = parseInt(input.dataset.dev);
         config.devices[di].masterSwitch = input.checked;
+        if (!input.checked) {
+          delete config.devices[di].masterSwitchType;
+        }
+        render();
+        save();
+      });
+    });
+
+    // Master switch type
+    document.querySelectorAll('.master-type-field').forEach(input => {
+      input.addEventListener('change', () => {
+        const di = parseInt(input.dataset.dev);
+        config.devices[di].masterSwitchType = input.value;
         save();
       });
     });
@@ -362,6 +370,8 @@
     const devLabel = dev.name || `${t.device || 'Device'} #${di + 1}`;
     const switchCount = switches.length;
     const isSingle = dev.switchBehavior === 'single';
+    const isIndependent = dev.switchBehavior === 'independent' || !dev.switchBehavior;
+    const behaviorDesc = isSingle ? (t.behaviorSingleDesc || '') : (t.behaviorIndependentDesc || '');
 
     return `
       <div class="device-card">
@@ -384,22 +394,30 @@
             </div>
             <div class="form-group">
               <label>${t.switchBehavior || 'Switch Behavior Mode'}</label>
-              <div class="desc">${isSingle ? (t.behaviorSingleDesc || '') : (t.behaviorIndependentDesc || '')}</div>
               <select class="dev-field" data-dev="${di}" data-field="switchBehavior">
-                <option value="independent" ${dev.switchBehavior === 'independent' || !dev.switchBehavior ? 'selected' : ''}>${t.behaviorIndependent || 'Independent'}</option>
+                <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>
 
-          ${isSingle ? `
+          ${isIndependent ? `
           <div class="master-option">
-            <div class="toggle-wrap">
-              <input type="checkbox" class="master-toggle" data-dev="${di}" ${dev.masterSwitch ? 'checked' : ''}>
-              <div>
-                <label style="margin-bottom:0">${t.masterSwitch || 'Master Switch'}</label>
-                <div class="desc" style="margin-bottom:0">${t.masterSwitchDesc || ''}</div>
+            <div style="display:flex;align-items:center;justify-content:space-between;gap:12px;flex-wrap:wrap">
+              <div class="toggle-wrap" style="flex:1;min-width:0">
+                <input type="checkbox" class="master-toggle" data-dev="${di}" ${dev.masterSwitch ? 'checked' : ''}>
+                <div>
+                  <label style="margin-bottom:0">${t.masterSwitch || 'Master Switch'}</label>
+                  <div class="desc" style="margin-bottom:0">${t.masterSwitchDesc || ''}</div>
+                </div>
               </div>
+              ${dev.masterSwitch ? `
+              <select class="master-type-field" data-dev="${di}" style="width:auto;min-width:120px;flex-shrink:0">
+                <option value="switch" ${dev.masterSwitchType === 'switch' || !dev.masterSwitchType ? 'selected' : ''}>${t.typeSwitch || 'Switch'}</option>
+                <option value="outlet" ${dev.masterSwitchType === 'outlet' ? 'selected' : ''}>${t.typeOutlet || 'Outlet'}</option>
+              </select>
+              ` : ''}
             </div>
           </div>
           ` : ''}

package/index.js

@@ -75,7 +75,7 @@ class MultipleSwitchPlatform {
 
     const name = device.name || 'Multiple Switch Panel';
     const behavior = device.switchBehavior || 'independent';
-    const hasMaster = behavior === 'single' && device.masterSwitch === true;
+    const hasMaster = behavior === 'independent' && device.masterSwitch === true;
     const uuid = this.api.hap.uuid.generate(name);
 
     let accessory = this.cachedAccessories.get(uuid);
@@ -92,7 +92,7 @@ class MultipleSwitchPlatform {
     const services = new Map();
     this.deviceServices.set(uuid, services);
 
-    this.reconcileServices(accessory, switches, services, hasMaster);
+    this.reconcileServices(accessory, device, switches, services, hasMaster);
 
     if (isNew) {
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
@@ -101,22 +101,51 @@ class MultipleSwitchPlatform {
     this.cachedAccessories.delete(uuid);
   }
 
-  reconcileServices(accessory, switches, services, hasMaster) {
-    const activeSubtypes = new Set();
+  setServiceName(service, displayName) {
+    service.displayName = displayName;
+    service.setCharacteristic(this.Characteristic.Name, displayName);
+    if (this.Characteristic.ConfiguredName) {
+      if (!service.testCharacteristic(this.Characteristic.ConfiguredName)) {
+        service.addOptionalCharacteristic(this.Characteristic.ConfiguredName);
+      }
+      service.setCharacteristic(this.Characteristic.ConfiguredName, displayName);
+    }
+  }
+
+  reconcileServices(accessory, device, switches, services, hasMaster) {
+    // Remove ALL existing subtype services (ensures fresh names and correct order)
+    const subtypeServices = accessory.services.filter((s) => s.subtype);
+    subtypeServices.forEach((s) => accessory.removeService(s));
+
+    // Remove ServiceLabel if left over from previous version
+    const existingLabel = accessory.services.find(
+      (s) => s.UUID === this.Service.ServiceLabel.UUID
+    );
+    if (existingLabel) accessory.removeService(existingLabel);
+
+    // 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');
+      this.configureMasterHandler(accessory, masterService, services);
+
+      services.set(MASTER_SUBTYPE, masterService);
+
+      if (accessory.context.switchStates[MASTER_SUBTYPE] === undefined) {
+        accessory.context.switchStates[MASTER_SUBTYPE] = false;
+      }
+    }
 
-    // Create regular switches
+    // 2. Create regular switches in config order
     switches.forEach((sw, index) => {
       const subtype = `switch_${index}`;
-      activeSubtypes.add(subtype);
 
       const ServiceClass = this.getServiceClass(sw.type);
-      let service = accessory.getServiceById(ServiceClass, subtype);
-
-      if (!service) {
-        service = accessory.addService(ServiceClass, sw.name, subtype);
-      }
+      const service = accessory.addService(ServiceClass, sw.name, subtype);
 
-      service.setCharacteristic(this.Characteristic.Name, sw.name);
+      this.setServiceName(service, sw.name);
       this.configureSwitchHandlers(accessory, service, sw, subtype, services);
 
       services.set(subtype, service);
@@ -126,30 +155,13 @@ class MultipleSwitchPlatform {
       }
     });
 
-    // Create master switch if enabled
-    if (hasMaster) {
-      activeSubtypes.add(MASTER_SUBTYPE);
-
-      let masterService = accessory.getServiceById(this.Service.Switch, MASTER_SUBTYPE);
-      if (!masterService) {
-        masterService = accessory.addService(this.Service.Switch, 'Master', MASTER_SUBTYPE);
-      }
-
-      masterService.setCharacteristic(this.Characteristic.Name, 'Master');
-      this.configureMasterHandler(accessory, masterService, services);
-
-      services.set(MASTER_SUBTYPE, masterService);
-
-      if (accessory.context.switchStates[MASTER_SUBTYPE] === undefined) {
-        accessory.context.switchStates[MASTER_SUBTYPE] = false;
+    // Clean up states for removed switches
+    const activeKeys = new Set(services.keys());
+    for (const key of Object.keys(accessory.context.switchStates)) {
+      if (!activeKeys.has(key)) {
+        delete accessory.context.switchStates[key];
       }
     }
-
-    // Remove stale services
-    const servicesToRemove = accessory.services.filter((s) => {
-      return s.subtype && !activeSubtypes.has(s.subtype);
-    });
-    servicesToRemove.forEach((s) => accessory.removeService(s));
   }
 
   configureSwitchHandlers(accessory, service, sw, subtype, services) {
@@ -178,8 +190,6 @@ class MultipleSwitchPlatform {
         accessory.context.switchStates[MASTER_SUBTYPE] = value;
         this.log.info(`[Master] ${value ? 'ON' : 'OFF'}`);
 
-        // Master ON → all regular switches ON
-        // Master OFF → all regular switches OFF
         for (const [key, svc] of services) {
           if (key !== MASTER_SUBTYPE) {
             accessory.context.switchStates[key] = value;

package/package.json

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