homebridge-multiple-switch 1.5.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,66 @@
 # 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
+- Master switch behavior mode — replaced by a more useful master switch option
+  within Single mode
+
+### Changed
+- Switch behavior now only has two modes: Independent and Single
+- Added descriptions to both behavior modes explaining how they work
+
+### Added
+- Master Switch option (available in Single mode only): adds an extra switch
+  that turns all switches on or off at once
+- New i18n keys for behavior descriptions, master switch label/description
+
 ## [1.5.1] - 2026-03-21
 
 ### Added

package/config.schema.json

@@ -31,10 +31,15 @@
               "default": "independent",
               "oneOf": [
                 { "title": "Independent", "enum": ["independent"] },
-                { "title": "Master", "enum": ["master"] },
                 { "title": "Single", "enum": ["single"] }
               ]
             },
+            "masterSwitch": {
+              "title": "Master Switch",
+              "description": "Add a master switch that turns all switches on or off at once. Only available in Single mode.",
+              "type": "boolean",
+              "default": false
+            },
             "switches": {
               "title": "Switches",
               "description": "List of virtual switches in this device.",

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

@@ -5,7 +5,6 @@
   "switchBehavior": "وضع سلوك المفتاح",
   "switchBehaviorDesc": "يتحكم في كيفية تفاعل المفاتيح مع بعضها البعض.",
   "behaviorIndependent": "مستقل",
-  "behaviorMaster": "رئيسي",
   "behaviorSingle": "فردي",
   "switches": "المفاتيح",
   "switchesDesc": "قائمة المفاتيح الافتراضية المراد إنشاؤها.",
@@ -29,5 +28,11 @@
   "device": "جهاز",
   "deviceName": "اسم الجهاز",
   "addDevice": "إضافة جهاز",
-  "removeDevice": "إزالة الجهاز"
+  "removeDevice": "إزالة الجهاز",
+  "behaviorIndependentDesc": "كل مفتاح يعمل بشكل مستقل. تشغيل أو إيقاف أحدها لا يؤثر على الآخرين.",
+  "behaviorSingleDesc": "يمكن تشغيل مفتاح واحد فقط في نفس الوقت. تشغيل واحد يقوم بإيقاف جميع الآخرين تلقائياً.",
+  "masterSwitch": "المفتاح الرئيسي",
+  "masterSwitchDesc": "يضيف مفتاحاً رئيسياً يقوم بتشغيل أو إيقاف جميع المفاتيح دفعة واحدة.",
+  "switchSingular": "مفتاح",
+  "masterSwitchType": "نوع المفتاح الرئيسي"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Schaltverhalten",
   "switchBehaviorDesc": "Steuert, wie die Schalter miteinander interagieren.",
   "behaviorIndependent": "Unabhängig",
-  "behaviorMaster": "Master",
   "behaviorSingle": "Einzeln",
   "switches": "Schalter",
   "switchesDesc": "Liste der zu erstellenden virtuellen Schalter.",
@@ -29,5 +28,11 @@
   "device": "Gerät",
   "deviceName": "Gerätename",
   "addDevice": "Gerät hinzufügen",
-  "removeDevice": "Gerät entfernen"
+  "removeDevice": "Gerät entfernen",
+  "behaviorIndependentDesc": "Jeder Schalter arbeitet unabhängig. Das Ein- oder Ausschalten eines Schalters hat keinen Einfluss auf die anderen.",
+  "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",
+  "masterSwitchType": "Hauptschaltertyp"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Switch Behavior Mode",
   "switchBehaviorDesc": "Controls how switches interact with each other.",
   "behaviorIndependent": "Independent",
-  "behaviorMaster": "Master",
   "behaviorSingle": "Single",
   "switches": "Switches",
   "switchesDesc": "List of virtual switches to create.",
@@ -29,5 +28,11 @@
   "device": "Device",
   "deviceName": "Device Name",
   "addDevice": "Add Device",
-  "removeDevice": "Remove Device"
+  "removeDevice": "Remove Device",
+  "behaviorIndependentDesc": "Each switch works independently. Turning one on or off has no effect on the others.",
+  "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",
+  "masterSwitchType": "Master Switch Type"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Modo de comportamiento",
   "switchBehaviorDesc": "Controla cómo interactúan los interruptores entre sí.",
   "behaviorIndependent": "Independiente",
-  "behaviorMaster": "Maestro",
   "behaviorSingle": "Único",
   "switches": "Interruptores",
   "switchesDesc": "Lista de interruptores virtuales a crear.",
@@ -29,5 +28,11 @@
   "device": "Dispositivo",
   "deviceName": "Nombre del dispositivo",
   "addDevice": "Agregar dispositivo",
-  "removeDevice": "Eliminar dispositivo"
+  "removeDevice": "Eliminar dispositivo",
+  "behaviorIndependentDesc": "Cada interruptor funciona de forma independiente. Encender o apagar uno no afecta a los demás.",
+  "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",
+  "masterSwitchType": "Tipo de interruptor maestro"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Mode de comportement",
   "switchBehaviorDesc": "Contrôle la façon dont les interrupteurs interagissent entre eux.",
   "behaviorIndependent": "Indépendant",
-  "behaviorMaster": "Maître",
   "behaviorSingle": "Unique",
   "switches": "Interrupteurs",
   "switchesDesc": "Liste des interrupteurs virtuels à créer.",
@@ -29,5 +28,11 @@
   "device": "Appareil",
   "deviceName": "Nom de l'appareil",
   "addDevice": "Ajouter un appareil",
-  "removeDevice": "Supprimer l'appareil"
+  "removeDevice": "Supprimer l'appareil",
+  "behaviorIndependentDesc": "Chaque interrupteur fonctionne indépendamment. Activer ou désactiver l'un n'affecte pas les autres.",
+  "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",
+  "masterSwitchType": "Type d'interrupteur principal"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Modalità di comportamento",
   "switchBehaviorDesc": "Controlla come gli interruttori interagiscono tra loro.",
   "behaviorIndependent": "Indipendente",
-  "behaviorMaster": "Master",
   "behaviorSingle": "Singolo",
   "switches": "Interruttori",
   "switchesDesc": "Elenco degli interruttori virtuali da creare.",
@@ -29,5 +28,11 @@
   "device": "Dispositivo",
   "deviceName": "Nome del dispositivo",
   "addDevice": "Aggiungi dispositivo",
-  "removeDevice": "Rimuovi dispositivo"
+  "removeDevice": "Rimuovi dispositivo",
+  "behaviorIndependentDesc": "Ogni interruttore funziona in modo indipendente. Accendere o spegnere uno non influisce sugli altri.",
+  "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",
+  "masterSwitchType": "Tipo di interruttore principale"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "スイッチ動作モード",
   "switchBehaviorDesc": "スイッチ同士の相互作用を制御します。",
   "behaviorIndependent": "独立",
-  "behaviorMaster": "マスター",
   "behaviorSingle": "シングル",
   "switches": "スイッチ",
   "switchesDesc": "作成する仮想スイッチのリスト。",
@@ -29,5 +28,11 @@
   "device": "デバイス",
   "deviceName": "デバイス名",
   "addDevice": "デバイスを追加",
-  "removeDevice": "デバイスを削除"
+  "removeDevice": "デバイスを削除",
+  "behaviorIndependentDesc": "各スイッチは独立して動作します。1つのオン/オフは他に影響しません。",
+  "behaviorSingleDesc": "同時に1つのスイッチのみオンにできます。1つをオンにすると他はすべて自動的にオフになります。",
+  "masterSwitch": "マスタースイッチ",
+  "masterSwitchDesc": "すべてのスイッチを一度にオン/オフするマスタースイッチを追加します。",
+  "switchSingular": "スイッチ",
+  "masterSwitchType": "マスタースイッチタイプ"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "스위치 동작 모드",
   "switchBehaviorDesc": "스위치 간의 상호 작용 방식을 제어합니다.",
   "behaviorIndependent": "독립",
-  "behaviorMaster": "마스터",
   "behaviorSingle": "단일",
   "switches": "스위치",
   "switchesDesc": "생성할 가상 스위치 목록.",
@@ -29,5 +28,11 @@
   "device": "장치",
   "deviceName": "장치 이름",
   "addDevice": "장치 추가",
-  "removeDevice": "장치 삭제"
+  "removeDevice": "장치 삭제",
+  "behaviorIndependentDesc": "각 스위치는 독립적으로 작동합니다. 하나를 켜거나 끄는 것이 다른 것에 영향을 주지 않습니다.",
+  "behaviorSingleDesc": "한 번에 하나의 스위치만 켤 수 있습니다. 하나를 켜면 다른 모든 것이 자동으로 꺼집니다.",
+  "masterSwitch": "마스터 스위치",
+  "masterSwitchDesc": "모든 스위치를 한 번에 켜거나 끄는 마스터 스위치를 추가합니다.",
+  "switchSingular": "스위치",
+  "masterSwitchType": "마스터 스위치 유형"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Schakelaargedrag",
   "switchBehaviorDesc": "Bepaalt hoe de schakelaars met elkaar omgaan.",
   "behaviorIndependent": "Onafhankelijk",
-  "behaviorMaster": "Master",
   "behaviorSingle": "Enkelvoudig",
   "switches": "Schakelaars",
   "switchesDesc": "Lijst van virtuele schakelaars om aan te maken.",
@@ -29,5 +28,11 @@
   "device": "Apparaat",
   "deviceName": "Apparaatnaam",
   "addDevice": "Apparaat toevoegen",
-  "removeDevice": "Apparaat verwijderen"
+  "removeDevice": "Apparaat verwijderen",
+  "behaviorIndependentDesc": "Elke schakelaar werkt onafhankelijk. Het in- of uitschakelen van één heeft geen invloed op de andere.",
+  "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",
+  "masterSwitchType": "Type hoofdschakelaar"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Tryb zachowania przełączników",
   "switchBehaviorDesc": "Kontroluje sposób interakcji przełączników ze sobą.",
   "behaviorIndependent": "Niezależny",
-  "behaviorMaster": "Główny",
   "behaviorSingle": "Pojedynczy",
   "switches": "Przełączniki",
   "switchesDesc": "Lista wirtualnych przełączników do utworzenia.",
@@ -29,5 +28,11 @@
   "device": "Urządzenie",
   "deviceName": "Nazwa urządzenia",
   "addDevice": "Dodaj urządzenie",
-  "removeDevice": "Usuń urządzenie"
+  "removeDevice": "Usuń urządzenie",
+  "behaviorIndependentDesc": "Każdy przełącznik działa niezależnie. Włączenie lub wyłączenie jednego nie wpływa na pozostałe.",
+  "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",
+  "masterSwitchType": "Typ przełącznika głównego"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Modo de comportamento",
   "switchBehaviorDesc": "Controla como os interruptores interagem entre si.",
   "behaviorIndependent": "Independente",
-  "behaviorMaster": "Mestre",
   "behaviorSingle": "Único",
   "switches": "Interruptores",
   "switchesDesc": "Lista de interruptores virtuais a criar.",
@@ -29,5 +28,11 @@
   "device": "Dispositivo",
   "deviceName": "Nome do dispositivo",
   "addDevice": "Adicionar dispositivo",
-  "removeDevice": "Remover dispositivo"
+  "removeDevice": "Remover dispositivo",
+  "behaviorIndependentDesc": "Cada interruptor funciona de forma independente. Ligar ou desligar um não afeta os outros.",
+  "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",
+  "masterSwitchType": "Tipo de interruptor principal"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Режим поведения",
   "switchBehaviorDesc": "Управляет взаимодействием переключателей друг с другом.",
   "behaviorIndependent": "Независимый",
-  "behaviorMaster": "Мастер",
   "behaviorSingle": "Одиночный",
   "switches": "Переключатели",
   "switchesDesc": "Список виртуальных переключателей для создания.",
@@ -29,5 +28,11 @@
   "device": "Устройство",
   "deviceName": "Название устройства",
   "addDevice": "Добавить устройство",
-  "removeDevice": "Удалить устройство"
+  "removeDevice": "Удалить устройство",
+  "behaviorIndependentDesc": "Каждый переключатель работает независимо. Включение или выключение одного не влияет на остальные.",
+  "behaviorSingleDesc": "Одновременно может быть включён только один переключатель. Включение одного автоматически выключает все остальные.",
+  "masterSwitch": "Главный переключатель",
+  "masterSwitchDesc": "Добавляет главный переключатель, который включает или выключает все переключатели одновременно.",
+  "switchSingular": "переключатель",
+  "masterSwitchType": "Тип главного переключателя"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "Anahtar Davranış Modu",
   "switchBehaviorDesc": "Anahtarların birbirleriyle nasıl etkileşime gireceğini kontrol eder.",
   "behaviorIndependent": "Bağımsız",
-  "behaviorMaster": "Ana Kontrol",
   "behaviorSingle": "Tekli",
   "switches": "Anahtarlar",
   "switchesDesc": "Oluşturulacak sanal anahtarların listesi.",
@@ -29,5 +28,11 @@
   "device": "Cihaz",
   "deviceName": "Cihaz Adı",
   "addDevice": "Cihaz Ekle",
-  "removeDevice": "Cihazı Kaldır"
+  "removeDevice": "Cihazı Kaldır",
+  "behaviorIndependentDesc": "Her anahtar bağımsız çalışır. Birini açmak veya kapatmak diğerlerini etkilemez.",
+  "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",
+  "masterSwitchType": "Ana Anahtar Tipi"
 }

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

@@ -5,7 +5,6 @@
   "switchBehavior": "开关行为模式",
   "switchBehaviorDesc": "控制开关之间的交互方式。",
   "behaviorIndependent": "独立",
-  "behaviorMaster": "主控",
   "behaviorSingle": "单选",
   "switches": "开关",
   "switchesDesc": "要创建的虚拟开关列表。",
@@ -29,5 +28,11 @@
   "device": "设备",
   "deviceName": "设备名称",
   "addDevice": "添加设备",
-  "removeDevice": "删除设备"
+  "removeDevice": "删除设备",
+  "behaviorIndependentDesc": "每个开关独立工作。打开或关闭一个不会影响其他开关。",
+  "behaviorSingleDesc": "同一时间只能有一个开关处于打开状态。打开一个会自动关闭所有其他开关。",
+  "masterSwitch": "主开关",
+  "masterSwitchDesc": "添加一个主开关，可以一次性打开或关闭所有开关。",
+  "switchSingular": "开关",
+  "masterSwitchType": "主开关类型"
 }

package/homebridge-ui/public/index.html

@@ -133,6 +133,11 @@
     background: var(--ui-input-bg);
     color: var(--ui-text);
   }
+  .master-option {
+    margin-top: 12px; padding: 12px 14px;
+    border: 1px dashed var(--ui-border);
+    border-radius: 8px; background: var(--ui-card-bg);
+  }
 </style>
 
 <div id="app"></div>
@@ -180,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');
 
@@ -232,7 +232,6 @@
     // Device toggle
     document.querySelectorAll('.device-toggle').forEach(el => {
       el.addEventListener('click', (e) => {
-        // Don't toggle if clicking a button inside header
         if (e.target.closest('.btn')) return;
         const di = parseInt(el.dataset.dev);
         if (expandedDevices.has(di)) {
@@ -264,6 +263,33 @@
         const di = parseInt(input.dataset.dev);
         const field = input.dataset.field;
         config.devices[di][field] = input.value;
+        // If switching away from independent, disable masterSwitch
+        if (field === 'switchBehavior' && input.value !== 'independent') {
+          delete config.devices[di].masterSwitch;
+        }
+        render();
+        save();
+      });
+    });
+
+    // Master switch toggle
+    document.querySelectorAll('.master-toggle').forEach(input => {
+      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();
       });
     });
@@ -273,7 +299,6 @@
         e.stopPropagation();
         const di = parseInt(btn.dataset.dev);
         config.devices.splice(di, 1);
-        // Rebuild expand state
         rebuildExpandState();
         render();
         save();
@@ -322,7 +347,6 @@
   }
 
   function rebuildExpandState() {
-    // Keep devices that still exist expanded
     const newDevices = new Set();
     config.devices.forEach((_, i) => {
       if (expandedDevices.has(i)) newDevices.add(i);
@@ -345,6 +369,9 @@
     const isOpen = expandedDevices.has(di);
     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">
@@ -368,14 +395,34 @@
             <div class="form-group">
               <label>${t.switchBehavior || 'Switch Behavior Mode'}</label>
               <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="master" ${dev.switchBehavior === 'master' ? 'selected' : ''}>${t.behaviorMaster || 'Master'}</option>
-                <option value="single" ${dev.switchBehavior === 'single' ? 'selected' : ''}>${t.behaviorSingle || 'Single'}</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>
+
+          ${isIndependent ? `
+          <div class="master-option">
+            <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>
+          ` : ''}
 
-          <div class="section-title">${t.switches || 'Switches'}</div>
+          <div class="section-title" style="margin-top:16px">${t.switches || 'Switches'}</div>
 
           ${switches.map((sw, si) => renderSwitch(sw, di, si)).join('')}
 

package/index.js

@@ -8,6 +8,8 @@ const SERVICE_TYPES = {
   outlet: 'Outlet',
 };
 
+const MASTER_SUBTYPE = 'master_switch';
+
 module.exports = (api) => {
   api.registerPlatform(PLATFORM_NAME, MultipleSwitchPlatform);
 };
@@ -73,6 +75,7 @@ class MultipleSwitchPlatform {
 
     const name = device.name || 'Multiple Switch Panel';
     const behavior = device.switchBehavior || 'independent';
+    const hasMaster = behavior === 'independent' && device.masterSwitch === true;
     const uuid = this.api.hap.uuid.generate(name);
 
     let accessory = this.cachedAccessories.get(uuid);
@@ -83,12 +86,13 @@ class MultipleSwitchPlatform {
     }
 
     accessory.context.switchBehavior = behavior;
+    accessory.context.hasMaster = hasMaster;
     accessory.context.switchStates = accessory.context.switchStates || {};
 
     const services = new Map();
     this.deviceServices.set(uuid, services);
 
-    this.reconcileServices(accessory, switches, services);
+    this.reconcileServices(accessory, device, switches, services, hasMaster);
 
     if (isNew) {
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
@@ -97,21 +101,51 @@ class MultipleSwitchPlatform {
     this.cachedAccessories.delete(uuid);
   }
 
-  reconcileServices(accessory, switches, services) {
-    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;
+      }
+    }
+
+    // 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);
@@ -121,10 +155,13 @@ class MultipleSwitchPlatform {
       }
     });
 
-    const servicesToRemove = accessory.services.filter((s) => {
-      return s.subtype && !activeSubtypes.has(s.subtype);
-    });
-    servicesToRemove.forEach((s) => accessory.removeService(s));
+    // 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];
+      }
+    }
   }
 
   configureSwitchHandlers(accessory, service, sw, subtype, services) {
@@ -140,32 +177,37 @@ class MultipleSwitchPlatform {
           this.turnOffOthers(accessory, subtype, services);
         }
 
-        if (behavior === 'master') {
-          this.setAll(accessory, value, services);
-        }
-
         if (value && sw.delayOff > 0) {
           this.scheduleAutoOff(accessory, service, sw, subtype);
         }
       });
   }
 
+  configureMasterHandler(accessory, masterService, services) {
+    masterService.getCharacteristic(this.Characteristic.On)
+      .onGet(() => accessory.context.switchStates[MASTER_SUBTYPE] ?? false)
+      .onSet((value) => {
+        accessory.context.switchStates[MASTER_SUBTYPE] = value;
+        this.log.info(`[Master] ${value ? 'ON' : 'OFF'}`);
+
+        for (const [key, svc] of services) {
+          if (key !== MASTER_SUBTYPE) {
+            accessory.context.switchStates[key] = value;
+            svc.updateCharacteristic(this.Characteristic.On, value);
+          }
+        }
+      });
+  }
+
   turnOffOthers(accessory, excludeSubtype, services) {
     for (const [key, svc] of services) {
-      if (key !== excludeSubtype) {
+      if (key !== excludeSubtype && key !== MASTER_SUBTYPE) {
         accessory.context.switchStates[key] = false;
         svc.updateCharacteristic(this.Characteristic.On, false);
       }
     }
   }
 
-  setAll(accessory, value, services) {
-    for (const [key, svc] of services) {
-      accessory.context.switchStates[key] = value;
-      svc.updateCharacteristic(this.Characteristic.On, value);
-    }
-  }
-
   scheduleAutoOff(accessory, service, sw, subtype) {
     setTimeout(() => {
       if (accessory.context.switchStates[subtype]) {

package/package.json

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