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

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [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
+- Collapsible device cards — click the device header to expand/collapse
+- Collapsible switch cards — click the switch header to expand/collapse
+- Summary info shown when collapsed (switch count for devices, type/delay for switches)
+- Chevron indicator (▶) with rotation animation for open/closed state
+
 ## [1.5.0] - 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,10 @@
   "device": "جهاز",
   "deviceName": "اسم الجهاز",
   "addDevice": "إضافة جهاز",
-  "removeDevice": "إزالة الجهاز"
+  "removeDevice": "إزالة الجهاز",
+  "behaviorIndependentDesc": "كل مفتاح يعمل بشكل مستقل. تشغيل أو إيقاف أحدها لا يؤثر على الآخرين.",
+  "behaviorSingleDesc": "يمكن تشغيل مفتاح واحد فقط في نفس الوقت. تشغيل واحد يقوم بإيقاف جميع الآخرين تلقائياً.",
+  "masterSwitch": "المفتاح الرئيسي",
+  "masterSwitchDesc": "يضيف مفتاحاً رئيسياً يقوم بتشغيل أو إيقاف جميع المفاتيح دفعة واحدة.",
+  "switchSingular": "مفتاح"
 }

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,10 @@
   "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"
 }

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,10 @@
   "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"
 }

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,10 @@
   "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"
 }

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,10 @@
   "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"
 }

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,10 @@
   "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"
 }

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

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

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

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

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,10 @@
   "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"
 }

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,10 @@
   "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"
 }

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,10 @@
   "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"
 }

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

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

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,10 @@
   "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"
 }

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

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

package/homebridge-ui/public/index.html

@@ -52,29 +52,58 @@
   }
   .device-card {
     border: 2px solid var(--ui-device-border);
-    border-radius: 10px; padding: 20px; margin-bottom: 20px;
+    border-radius: 10px; margin-bottom: 20px;
     background: var(--ui-device-bg);
+    overflow: hidden;
   }
   .device-header {
     display: flex; justify-content: space-between; align-items: center;
-    margin-bottom: 16px; padding-bottom: 10px;
-    border-bottom: 1px solid var(--ui-border);
+    padding: 14px 20px; cursor: pointer; user-select: none;
   }
-  .device-header strong {
+  .device-header:hover { opacity: 0.85; }
+  .device-header-left {
+    display: flex; align-items: center; gap: 10px;
+  }
+  .device-header-left strong {
     font-size: 16px; color: var(--ui-accent);
   }
+  .device-header-left .chevron {
+    font-size: 12px; color: var(--ui-text-muted);
+    transition: transform 0.2s;
+    display: inline-block;
+  }
+  .device-header-left .chevron.open { transform: rotate(90deg); }
+  .device-header-right { display: flex; align-items: center; gap: 8px; }
+  .device-body { padding: 0 20px 20px; }
+  .device-body.collapsed { display: none; }
   .switch-card {
     border: 1px solid var(--ui-border);
-    border-radius: 8px; padding: 16px; margin-bottom: 12px;
+    border-radius: 8px; margin-bottom: 12px;
     background: var(--ui-card-bg);
-    position: relative;
+    position: relative; overflow: hidden;
   }
-  .switch-card .switch-header {
-    display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;
+  .switch-header {
+    display: flex; justify-content: space-between; align-items: center;
+    padding: 12px 16px; cursor: pointer; user-select: none;
   }
-  .switch-card .switch-header strong {
-    font-size: 14px;
-    color: var(--ui-text);
+  .switch-header:hover { opacity: 0.85; }
+  .switch-header-left {
+    display: flex; align-items: center; gap: 8px;
+  }
+  .switch-header-left strong {
+    font-size: 14px; color: var(--ui-text);
+  }
+  .switch-header-left .chevron {
+    font-size: 11px; color: var(--ui-text-muted);
+    transition: transform 0.2s;
+    display: inline-block;
+  }
+  .switch-header-left .chevron.open { transform: rotate(90deg); }
+  .switch-header-right { display: flex; align-items: center; gap: 8px; }
+  .switch-body { padding: 0 16px 16px; }
+  .switch-body.collapsed { display: none; }
+  .switch-summary {
+    font-size: 12px; color: var(--ui-text-muted); margin-left: 4px;
   }
   .btn {
     padding: 8px 16px; border: none; border-radius: 6px;
@@ -82,6 +111,7 @@
   }
   .btn-danger { background: #dc3545; color: #fff; }
   .btn-danger:hover { background: #c82333; }
+  .btn-sm { padding: 4px 10px; font-size: 12px; }
   .btn-primary { background: var(--ui-accent); color: #fff; }
   .btn-primary:hover { opacity: 0.85; }
   .btn-outline {
@@ -103,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>
@@ -150,6 +185,15 @@
     config.devices = [];
   }
 
+  // Track expand/collapse state
+  const expandedDevices = new Set(config.devices.map((_, i) => i));
+  const expandedSwitches = new Set();
+  config.devices.forEach((dev, di) => {
+    (dev.switches || []).forEach((_, si) => {
+      expandedSwitches.add(`${di}_${si}`);
+    });
+  });
+
   const app = document.getElementById('app');
 
   function render() {
@@ -178,28 +222,76 @@
     });
 
     document.getElementById('btn-add-device').addEventListener('click', () => {
+      const di = config.devices.length;
       config.devices.push({
         name: '',
         switchBehavior: 'independent',
         switches: [{ name: '', type: 'outlet', defaultState: false, delayOff: 0 }],
       });
+      expandedDevices.add(di);
+      expandedSwitches.add(`${di}_0`);
       render();
       save();
     });
 
+    // Device toggle
+    document.querySelectorAll('.device-toggle').forEach(el => {
+      el.addEventListener('click', (e) => {
+        if (e.target.closest('.btn')) return;
+        const di = parseInt(el.dataset.dev);
+        if (expandedDevices.has(di)) {
+          expandedDevices.delete(di);
+        } else {
+          expandedDevices.add(di);
+        }
+        render();
+      });
+    });
+
+    // Switch toggle
+    document.querySelectorAll('.switch-toggle').forEach(el => {
+      el.addEventListener('click', (e) => {
+        if (e.target.closest('.btn')) return;
+        const key = `${el.dataset.dev}_${el.dataset.sw}`;
+        if (expandedSwitches.has(key)) {
+          expandedSwitches.delete(key);
+        } else {
+          expandedSwitches.add(key);
+        }
+        render();
+      });
+    });
+
     // Device-level events
     document.querySelectorAll('.dev-field').forEach(input => {
       input.addEventListener('change', () => {
         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') {
+          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;
         save();
       });
     });
 
     document.querySelectorAll('.btn-remove-device').forEach(btn => {
-      btn.addEventListener('click', () => {
-        config.devices.splice(parseInt(btn.dataset.dev), 1);
+      btn.addEventListener('click', (e) => {
+        e.stopPropagation();
+        const di = parseInt(btn.dataset.dev);
+        config.devices.splice(di, 1);
+        rebuildExpandState();
         render();
         save();
       });
@@ -209,17 +301,21 @@
     document.querySelectorAll('.btn-add-switch').forEach(btn => {
       btn.addEventListener('click', () => {
         const di = parseInt(btn.dataset.dev);
+        const si = config.devices[di].switches.length;
         config.devices[di].switches.push({ name: '', type: 'outlet', defaultState: false, delayOff: 0 });
+        expandedSwitches.add(`${di}_${si}`);
         render();
         save();
       });
     });
 
     document.querySelectorAll('.btn-remove-switch').forEach(btn => {
-      btn.addEventListener('click', () => {
+      btn.addEventListener('click', (e) => {
+        e.stopPropagation();
         const di = parseInt(btn.dataset.dev);
         const si = parseInt(btn.dataset.sw);
         config.devices[di].switches.splice(si, 1);
+        rebuildExpandState();
         render();
         save();
       });
@@ -242,69 +338,123 @@
     });
   }
 
+  function rebuildExpandState() {
+    const newDevices = new Set();
+    config.devices.forEach((_, i) => {
+      if (expandedDevices.has(i)) newDevices.add(i);
+    });
+    expandedDevices.clear();
+    newDevices.forEach(i => expandedDevices.add(i));
+
+    const newSwitches = new Set();
+    config.devices.forEach((dev, di) => {
+      (dev.switches || []).forEach((_, si) => {
+        if (expandedSwitches.has(`${di}_${si}`)) newSwitches.add(`${di}_${si}`);
+      });
+    });
+    expandedSwitches.clear();
+    newSwitches.forEach(k => expandedSwitches.add(k));
+  }
+
   function renderDevice(dev, di) {
     const switches = dev.switches || [];
+    const isOpen = expandedDevices.has(di);
+    const devLabel = dev.name || `${t.device || 'Device'} #${di + 1}`;
+    const switchCount = switches.length;
+    const isSingle = dev.switchBehavior === 'single';
+
     return `
       <div class="device-card">
-        <div class="device-header">
-          <strong>${t.device || 'Device'} #${di + 1}</strong>
-          <button class="btn btn-danger btn-remove-device" data-dev="${di}">${t.removeDevice || 'Remove Device'}</button>
+        <div class="device-header device-toggle" data-dev="${di}">
+          <div class="device-header-left">
+            <span class="chevron ${isOpen ? 'open' : ''}">&#9654;</span>
+            <strong>${esc(devLabel)}</strong>
+            ${!isOpen ? `<span class="switch-summary">(${switchCount} ${switchCount === 1 ? (t.switchSingular || 'switch') : (t.switches || 'switches').toLowerCase()})</span>` : ''}
+          </div>
+          <div class="device-header-right">
+            <button class="btn btn-danger btn-sm btn-remove-device" data-dev="${di}">${t.removeDevice || 'Remove Device'}</button>
+          </div>
         </div>
 
-        <div class="inline-row">
-          <div class="form-group">
-            <label>${t.deviceName || 'Device Name'}</label>
-            <input type="text" class="dev-field" data-dev="${di}" data-field="name" value="${esc(dev.name || '')}">
+        <div class="device-body ${isOpen ? '' : 'collapsed'}">
+          <div class="inline-row">
+            <div class="form-group">
+              <label>${t.deviceName || 'Device Name'}</label>
+              <input type="text" class="dev-field" data-dev="${di}" data-field="name" value="${esc(dev.name || '')}">
+            </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="single" ${isSingle ? 'selected' : ''}>${t.behaviorSingle || 'Single'}</option>
+              </select>
+            </div>
           </div>
-          <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>
-            </select>
+
+          ${isSingle ? `
+          <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>
+            </div>
           </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('')}
+          ${switches.map((sw, si) => renderSwitch(sw, di, si)).join('')}
 
-        <button class="btn btn-primary btn-add-switch" data-dev="${di}">+ ${t.addSwitch || 'Add Switch'}</button>
+          <button class="btn btn-primary btn-add-switch" data-dev="${di}">+ ${t.addSwitch || 'Add Switch'}</button>
+        </div>
       </div>
     `;
   }
 
   function renderSwitch(sw, di, si) {
+    const isOpen = expandedSwitches.has(`${di}_${si}`);
+    const swLabel = sw.name || `#${si + 1}`;
+
     return `
       <div class="switch-card">
-        <div class="switch-header">
-          <strong>#${si + 1}</strong>
-          <button class="btn btn-danger btn-remove-switch" data-dev="${di}" data-sw="${si}">${t.removeSwitch || 'Remove'}</button>
-        </div>
-        <div class="inline-row">
-          <div class="form-group">
-            <label>${t.switchName || 'Switch Name'}</label>
-            <input type="text" class="sw-field" data-dev="${di}" data-sw="${si}" data-field="name" value="${esc(sw.name || '')}">
+        <div class="switch-header switch-toggle" data-dev="${di}" data-sw="${si}">
+          <div class="switch-header-left">
+            <span class="chevron ${isOpen ? 'open' : ''}">&#9654;</span>
+            <strong>${esc(swLabel)}</strong>
+            ${!isOpen ? `<span class="switch-summary">${sw.type || 'outlet'}${sw.delayOff ? ` / ${sw.delayOff}ms` : ''}</span>` : ''}
           </div>
-          <div class="form-group">
-            <label>${t.switchType || 'Switch Type'}</label>
-            <select class="sw-field" data-dev="${di}" data-sw="${si}" data-field="type">
-              <option value="switch" ${sw.type === 'switch' ? 'selected' : ''}>${t.typeSwitch || 'Switch'}</option>
-              <option value="outlet" ${sw.type === 'outlet' || !sw.type ? 'selected' : ''}>${t.typeOutlet || 'Outlet'}</option>
-            </select>
+          <div class="switch-header-right">
+            <button class="btn btn-danger btn-sm btn-remove-switch" data-dev="${di}" data-sw="${si}">${t.removeSwitch || 'Remove'}</button>
           </div>
         </div>
-        <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 class="switch-body ${isOpen ? '' : 'collapsed'}">
+          <div class="inline-row">
+            <div class="form-group">
+              <label>${t.switchName || 'Switch Name'}</label>
+              <input type="text" class="sw-field" data-dev="${di}" data-sw="${si}" data-field="name" value="${esc(sw.name || '')}">
+            </div>
+            <div class="form-group">
+              <label>${t.switchType || 'Switch Type'}</label>
+              <select class="sw-field" data-dev="${di}" data-sw="${si}" data-field="type">
+                <option value="switch" ${sw.type === 'switch' ? 'selected' : ''}>${t.typeSwitch || 'Switch'}</option>
+                <option value="outlet" ${sw.type === 'outlet' || !sw.type ? 'selected' : ''}>${t.typeOutlet || 'Outlet'}</option>
+              </select>
+            </div>
           </div>
-          <div class="form-group">
-            <label>${t.defaultState || 'Default State'}</label>
-            <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 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">
+              <label>${t.defaultState || 'Default State'}</label>
+              <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>
             </div>
           </div>
         </div>

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 === 'single' && 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, switches, services, hasMaster);
 
     if (isNew) {
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
@@ -97,9 +101,10 @@ class MultipleSwitchPlatform {
     this.cachedAccessories.delete(uuid);
   }
 
-  reconcileServices(accessory, switches, services) {
+  reconcileServices(accessory, switches, services, hasMaster) {
     const activeSubtypes = new Set();
 
+    // Create regular switches
     switches.forEach((sw, index) => {
       const subtype = `switch_${index}`;
       activeSubtypes.add(subtype);
@@ -121,6 +126,26 @@ 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;
+      }
+    }
+
+    // Remove stale services
     const servicesToRemove = accessory.services.filter((s) => {
       return s.subtype && !activeSubtypes.has(s.subtype);
     });
@@ -140,32 +165,39 @@ 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'}`);
+
+        // 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;
+            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.0",
+  "version": "1.6.0-beta.1",
   "description": "Multiple switch platform for Homebridge",
   "homepage": "https://github.com/azadaydinli/homebridge-multiple-switch",
   "main": "index.js",