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

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## [1.7.0-beta.10] - 2026-05-17
+
+### Fixed
+- Auto-off timer leak: rapidly toggling a switch no longer accumulates stale timeouts — each new auto-off cancels the previous one
+- Duplicate device name now logs a clear warning instead of silently causing UUID collision
+
+## [1.7.0-beta.9] - 2026-05-17
+
+### Changed
+- Default State is now a 3-option dropdown: **Remember Last State** / **On** / **Off**
+  - Remember: keeps the last known state across restarts (new default)
+  - On: always starts ON on every Homebridge restart
+  - Off: always starts OFF on every Homebridge restart
+- Backward compatible: old boolean `true`/`false` configs still work correctly
+
+## [1.7.0-beta.8] - 2026-05-17
+
+### Changed
+- Default State now applies on every Homebridge restart, not just on first creation — switches always start in their configured default state
+
+## [1.7.0-beta.7] - 2026-05-17
+
+### Fixed
+- `"type"` removed from switch schema `required` array (field no longer exists at switch level)
+- New devices and switches no longer include stale `type` field on creation
+- Removed unused `masterSwitchType` key from all 14 i18n locale files
+
+## [1.7.0-beta.6] - 2026-05-17
+
+### Changed
+- Master Switch now uses the device-level switch type automatically — separate type selector removed
+
+### Removed
+- Master Switch Type selector from UI and schema (`masterSwitchType` config field is no longer used)
+
+## [1.7.0-beta.5] - 2026-05-17
+
+### Changed
+- Switch fields (Switch Name, Auto Turn Off, Default State) now use the same 3-equal-column grid as device fields
+
+## [1.7.0-beta.4] - 2026-05-17
+
+### Changed
+- Auto Turn Off column narrowed to 120px so Default State checkbox has more breathing room
+
+## [1.7.0-beta.3] - 2026-05-17
+
+### Changed
+- Switch card: Switch Name, Auto Turn Off and Default State are now on a single compact row
+
+## [1.7.0-beta.2] - 2026-05-17
+
+### Fixed
+- Switch Type description now appears below the dropdown, consistent with Switch Behavior Mode
+
 ## [1.7.0-beta.1] - 2026-05-17
 
 ### Changed

package/config.schema.json

@@ -46,7 +46,7 @@
             },
             "masterSwitch": {
               "title": "Master Switch",
-              "description": "Add a master switch that turns all switches on or off at once. Only available in Single mode.",
+              "description": "Add a master switch that turns all switches on or off at once. Uses the same type as the device.",
               "type": "boolean",
               "default": false
             },
@@ -64,9 +64,14 @@
                   },
                   "defaultState": {
                     "title": "Default State",
-                    "description": "Initial power state when Homebridge starts.",
-                    "type": "boolean",
-                    "default": false
+                    "description": "Switch state on every Homebridge restart.",
+                    "type": "string",
+                    "default": "remember",
+                    "oneOf": [
+                      { "title": "Remember Last State", "enum": ["remember"] },
+                      { "title": "On", "enum": ["on"] },
+                      { "title": "Off", "enum": ["off"] }
+                    ]
                   },
                   "delayOff": {
                     "title": "Auto Turn Off (ms)",
@@ -76,7 +81,7 @@
                     "minimum": 0
                   }
                 },
-                "required": ["name", "type"]
+                "required": ["name"]
               }
             }
           },

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

@@ -15,7 +15,8 @@
   "typeSwitch": "مفتاح",
   "typeOutlet": "مقبس",
   "defaultState": "الحالة الافتراضية",
-  "defaultStateDesc": "حالة الطاقة الأولية عند بدء تشغيل Homebridge.",
+  "defaultStateDesc": "حالة المفتاح عند كل إعادة تشغيل لـ Homebridge.",
+  "remember": "تذكر آخر حالة",
   "delayOff": "إيقاف تلقائي (مللي ثانية)",
   "delayOffDesc": "يتم الإيقاف تلقائيًا بعد هذا العدد من المللي ثانية. اضبط على 0 للتعطيل.",
   "addSwitch": "إضافة مفتاح",
@@ -33,6 +34,5 @@
   "behaviorSingleDesc": "يمكن تشغيل مفتاح واحد فقط في نفس الوقت. تشغيل واحد يقوم بإيقاف جميع الآخرين تلقائياً.",
   "masterSwitch": "المفتاح الرئيسي",
   "masterSwitchDesc": "يضيف مفتاحاً رئيسياً يقوم بتشغيل أو إيقاف جميع المفاتيح دفعة واحدة.",
-  "switchSingular": "مفتاح",
-  "masterSwitchType": "نوع المفتاح الرئيسي"
+  "switchSingular": "مفتاح"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Schalter",
   "typeOutlet": "Steckdose",
   "defaultState": "Standardzustand",
-  "defaultStateDesc": "Anfänglicher Energiezustand beim Start von Homebridge.",
+  "defaultStateDesc": "Schaltzustand bei jedem Neustart von Homebridge.",
+  "remember": "Letzten Zustand merken",
   "delayOff": "Automatisch ausschalten (ms)",
   "delayOffDesc": "Schaltet nach dieser Anzahl von Millisekunden automatisch aus. Zum Deaktivieren auf 0 setzen.",
   "addSwitch": "Schalter hinzufügen",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "Schalter"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Switch",
   "typeOutlet": "Outlet",
   "defaultState": "Default State",
-  "defaultStateDesc": "Initial power state when Homebridge starts.",
+  "defaultStateDesc": "Switch state on every Homebridge restart.",
+  "remember": "Remember Last State",
   "delayOff": "Auto Turn Off (ms)",
   "delayOffDesc": "Automatically turn off after this many milliseconds. Set to 0 to disable.",
   "addSwitch": "Add Switch",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "switch"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Interruptor",
   "typeOutlet": "Enchufe",
   "defaultState": "Estado predeterminado",
-  "defaultStateDesc": "Estado de energía inicial cuando Homebridge se inicia.",
+  "defaultStateDesc": "Estado del interruptor en cada reinicio de Homebridge.",
+  "remember": "Recordar último estado",
   "delayOff": "Apagado automático (ms)",
   "delayOffDesc": "Se apaga automáticamente después de estos milisegundos. Establecer en 0 para desactivar.",
   "addSwitch": "Agregar interruptor",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "interruptor"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Interrupteur",
   "typeOutlet": "Prise",
   "defaultState": "État par défaut",
-  "defaultStateDesc": "État d'alimentation initial au démarrage de Homebridge.",
+  "defaultStateDesc": "État de l'interrupteur à chaque redémarrage de Homebridge.",
+  "remember": "Mémoriser le dernier état",
   "delayOff": "Arrêt automatique (ms)",
   "delayOffDesc": "S'éteint automatiquement après ce nombre de millisecondes. Mettre à 0 pour désactiver.",
   "addSwitch": "Ajouter un interrupteur",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "interrupteur"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Interruttore",
   "typeOutlet": "Presa",
   "defaultState": "Stato predefinito",
-  "defaultStateDesc": "Stato di alimentazione iniziale all'avvio di Homebridge.",
+  "defaultStateDesc": "Stato dell'interruttore ad ogni riavvio di Homebridge.",
+  "remember": "Ricorda ultimo stato",
   "delayOff": "Spegnimento automatico (ms)",
   "delayOffDesc": "Si spegne automaticamente dopo questi millisecondi. Impostare a 0 per disattivare.",
   "addSwitch": "Aggiungi interruttore",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "interruttore"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "スイッチ",
   "typeOutlet": "コンセント",
   "defaultState": "デフォルト状態",
-  "defaultStateDesc": "Homebridge 起動時の初期電源状態。",
+  "defaultStateDesc": "Homebridge を再起動するたびのスイッチ状態。",
+  "remember": "最後の状態を記憶",
   "delayOff": "自動オフ（ミリ秒）",
   "delayOffDesc": "指定したミリ秒後に自動的にオフになります。無効にするには 0 に設定してください。",
   "addSwitch": "スイッチを追加",
@@ -33,6 +34,5 @@
   "behaviorSingleDesc": "同時に1つのスイッチのみオンにできます。1つをオンにすると他はすべて自動的にオフになります。",
   "masterSwitch": "マスタースイッチ",
   "masterSwitchDesc": "すべてのスイッチを一度にオン/オフするマスタースイッチを追加します。",
-  "switchSingular": "スイッチ",
-  "masterSwitchType": "マスタースイッチタイプ"
+  "switchSingular": "スイッチ"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "스위치",
   "typeOutlet": "콘센트",
   "defaultState": "기본 상태",
-  "defaultStateDesc": "Homebridge 시작 시 초기 전원 상태.",
+  "defaultStateDesc": "Homebridge를 재시작할 때마다의 스위치 상태.",
+  "remember": "마지막 상태 기억",
   "delayOff": "자동 꺼짐 (ms)",
   "delayOffDesc": "지정된 밀리초 후 자동으로 꺼집니다. 비활성화하려면 0으로 설정하세요.",
   "addSwitch": "스위치 추가",
@@ -33,6 +34,5 @@
   "behaviorSingleDesc": "한 번에 하나의 스위치만 켤 수 있습니다. 하나를 켜면 다른 모든 것이 자동으로 꺼집니다.",
   "masterSwitch": "마스터 스위치",
   "masterSwitchDesc": "모든 스위치를 한 번에 켜거나 끄는 마스터 스위치를 추가합니다.",
-  "switchSingular": "스위치",
-  "masterSwitchType": "마스터 스위치 유형"
+  "switchSingular": "스위치"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Schakelaar",
   "typeOutlet": "Stopcontact",
   "defaultState": "Standaardstatus",
-  "defaultStateDesc": "Initiële voedingsstatus wanneer Homebridge opstart.",
+  "defaultStateDesc": "Schakelaarstatus bij elke herstart van Homebridge.",
+  "remember": "Laatste status onthouden",
   "delayOff": "Automatisch uitschakelen (ms)",
   "delayOffDesc": "Schakelt automatisch uit na dit aantal milliseconden. Stel in op 0 om uit te schakelen.",
   "addSwitch": "Schakelaar toevoegen",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "schakelaar"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Przełącznik",
   "typeOutlet": "Gniazdko",
   "defaultState": "Stan domyślny",
-  "defaultStateDesc": "Początkowy stan zasilania przy uruchomieniu Homebridge.",
+  "defaultStateDesc": "Stan przełącznika przy każdym ponownym uruchomieniu Homebridge.",
+  "remember": "Zapamiętaj ostatni stan",
   "delayOff": "Automatyczne wyłączenie (ms)",
   "delayOffDesc": "Automatycznie wyłącza się po podanej liczbie milisekund. Ustaw 0, aby wyłączyć.",
   "addSwitch": "Dodaj przełącznik",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "przełącznik"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Interruptor",
   "typeOutlet": "Tomada",
   "defaultState": "Estado padrão",
-  "defaultStateDesc": "Estado de energia inicial quando o Homebridge inicia.",
+  "defaultStateDesc": "Estado do interruptor em cada reinício do Homebridge.",
+  "remember": "Lembrar último estado",
   "delayOff": "Desligamento automático (ms)",
   "delayOffDesc": "Desliga automaticamente após estes milissegundos. Defina como 0 para desativar.",
   "addSwitch": "Adicionar interruptor",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "interruptor"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Выключатель",
   "typeOutlet": "Розетка",
   "defaultState": "Состояние по умолчанию",
-  "defaultStateDesc": "Начальное состояние питания при запуске Homebridge.",
+  "defaultStateDesc": "Состояние переключателя при каждом перезапуске Homebridge.",
+  "remember": "Запомнить последнее состояние",
   "delayOff": "Автоматическое выключение (мс)",
   "delayOffDesc": "Автоматически выключается через указанное количество миллисекунд. Установите 0 для отключения.",
   "addSwitch": "Добавить переключатель",
@@ -33,6 +34,5 @@
   "behaviorSingleDesc": "Одновременно может быть включён только один переключатель. Включение одного автоматически выключает все остальные.",
   "masterSwitch": "Главный переключатель",
   "masterSwitchDesc": "Добавляет главный переключатель, который включает или выключает все переключатели одновременно.",
-  "switchSingular": "переключатель",
-  "masterSwitchType": "Тип главного переключателя"
+  "switchSingular": "переключатель"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "Anahtar",
   "typeOutlet": "Priz",
   "defaultState": "Varsayılan Durum",
-  "defaultStateDesc": "Homebridge başladığında başlangıç güç durumu.",
+  "defaultStateDesc": "Her Homebridge yeniden başlatmasında anahtarın durumu.",
+  "remember": "Son Durumu Hatırla",
   "delayOff": "Otomatik Kapanma (ms)",
   "delayOffDesc": "Belirtilen milisaniye sonra otomatik kapanır. Devre dışı bırakmak için 0 yazın.",
   "addSwitch": "Anahtar Ekle",
@@ -33,6 +34,5 @@
   "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"
+  "switchSingular": "anahtar"
 }

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

@@ -15,7 +15,8 @@
   "typeSwitch": "开关",
   "typeOutlet": "插座",
   "defaultState": "默认状态",
-  "defaultStateDesc": "Homebridge 启动时的初始电源状态。",
+  "defaultStateDesc": "每次 Homebridge 重启时的开关状态。",
+  "remember": "记住上次状态",
   "delayOff": "自动关闭（毫秒）",
   "delayOffDesc": "在指定的毫秒数后自动关闭。设置为 0 以禁用。",
   "addSwitch": "添加开关",
@@ -33,6 +34,5 @@
   "behaviorSingleDesc": "同一时间只能有一个开关处于打开状态。打开一个会自动关闭所有其他开关。",
   "masterSwitch": "主开关",
   "masterSwitchDesc": "添加一个主开关，可以一次性打开或关闭所有开关。",
-  "switchSingular": "开关",
-  "masterSwitchType": "主开关类型"
+  "switchSingular": "开关"
 }

package/homebridge-ui/public/index.html

@@ -233,7 +233,8 @@
       config.devices.push({
         name: '',
         switchBehavior: 'independent',
-        switches: [{ name: '', type: 'outlet', defaultState: false, delayOff: 0 }],
+        switchType: 'outlet',
+        switches: [{ name: '', defaultState: 'remember', delayOff: 0 }],
       });
       expandedDevices.add(di);
       expandedSwitches.add(`${di}_0`);
@@ -289,22 +290,11 @@
       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();
-      });
-    });
 
     document.querySelectorAll('.btn-remove-device').forEach(btn => {
       btn.addEventListener('click', (e) => {
@@ -322,7 +312,7 @@
       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 });
+        config.devices[di].switches.push({ name: '', defaultState: 'remember', delayOff: 0 });
         expandedSwitches.add(`${di}_${si}`);
         render();
         save();
@@ -347,7 +337,7 @@
         const si = parseInt(input.dataset.sw);
         const field = input.dataset.field;
         if (field === 'defaultState') {
-          config.devices[di].switches[si][field] = input.checked;
+          config.devices[di].switches[si][field] = input.value;
         } else if (field === 'delayOff') {
           config.devices[di].switches[si][field] = parseInt(input.value) || 0;
         } else {
@@ -414,30 +404,22 @@
             </div>
             <div class="form-group">
               <label>${t.switchType || 'Switch Type'}</label>
-              <div class="desc">${t.switchTypeDesc || ''}</div>
               <select class="dev-field" data-dev="${di}" data-field="switchType">
                 <option value="outlet" ${!dev.switchType || dev.switchType === 'outlet' ? 'selected' : ''}>${t.typeOutlet || 'Outlet'}</option>
                 <option value="switch" ${dev.switchType === 'switch' ? 'selected' : ''}>${t.typeSwitch || 'Switch'}</option>
               </select>
+              <div class="desc" style="margin-top:6px">${t.switchTypeDesc || ''}</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 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>
-              ${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>
           ` : ''}
@@ -456,6 +438,8 @@
     const isOpen = expandedSwitches.has(`${di}_${si}`);
     const swLabel = sw.name || `#${si + 1}`;
     const typeLabel = deviceSwitchType === 'switch' ? (t.typeSwitch || 'Switch') : (t.typeOutlet || 'Outlet');
+    const ds = sw.defaultState;
+    const dsValue = (ds === true || ds === 'on') ? 'on' : (ds === false || ds === 'off') ? 'off' : 'remember';
 
     return `
       <div class="switch-card">
@@ -470,21 +454,22 @@
           </div>
         </div>
         <div class="switch-body ${isOpen ? '' : 'collapsed'}">
-          <div class="inline-row">
-            <div class="form-group">
+          <div class="inline-row" style="grid-template-columns: 1fr 1fr 1fr; align-items: end;">
+            <div class="form-group" style="margin-bottom:0">
               <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">
+            <div class="form-group" style="margin-bottom:0">
               <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>
-          <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="form-group" style="margin-bottom:0">
+              <label>${t.defaultState || 'Default State'}</label>
+              <select class="sw-field" data-dev="${di}" data-sw="${si}" data-field="defaultState">
+                <option value="remember" ${dsValue === 'remember' ? 'selected' : ''}>${t.remember || 'Remember'}</option>
+                <option value="on" ${dsValue === 'on' ? 'selected' : ''}>${t.on || 'On'}</option>
+                <option value="off" ${dsValue === 'off' ? 'selected' : ''}>${t.off || 'Off'}</option>
+              </select>
             </div>
           </div>
         </div>

package/index.js

@@ -23,6 +23,7 @@ class MultipleSwitchPlatform {
     this.Characteristic = api.hap.Characteristic;
     this.cachedAccessories = new Map();
     this.deviceServices = new Map();
+    this.autoOffTimers = new Map();
 
     this.api.on('didFinishLaunching', () => {
       this.log.info('MultipleSwitchPlatform started.');
@@ -78,6 +79,10 @@ class MultipleSwitchPlatform {
     const hasMaster = behavior === 'independent' && device.masterSwitch === true;
     const uuid = this.api.hap.uuid.generate(name);
 
+    if (this.deviceServices.has(uuid)) {
+      this.log.warn(`Duplicate device name "${name}" detected. Each device must have a unique name.`);
+    }
+
     let accessory = this.cachedAccessories.get(uuid);
     const isNew = !accessory;
 
@@ -119,7 +124,7 @@ class MultipleSwitchPlatform {
 
     // Create master switch if enabled
     if (hasMaster) {
-      const MasterServiceClass = this.getServiceClass(device.masterSwitchType || 'switch');
+      const MasterServiceClass = this.getServiceClass(device.switchType || 'outlet');
       const masterService = accessory.addService(MasterServiceClass, 'Master', MASTER_SUBTYPE);
 
       this.setServiceName(masterService, 'Master');
@@ -145,8 +150,16 @@ class MultipleSwitchPlatform {
 
       services.set(subtype, service);
 
-      if (accessory.context.switchStates[subtype] === undefined) {
-        accessory.context.switchStates[subtype] = sw.defaultState || false;
+      const ds = sw.defaultState;
+      if (ds === false || ds === 'off') {
+        accessory.context.switchStates[subtype] = false;
+      } else if (ds === true || ds === 'on') {
+        accessory.context.switchStates[subtype] = true;
+      } else {
+        // 'remember' or undefined — keep existing state; initialise to false on first run
+        if (accessory.context.switchStates[subtype] === undefined) {
+          accessory.context.switchStates[subtype] = false;
+        }
       }
     });
 
@@ -204,13 +217,19 @@ class MultipleSwitchPlatform {
   }
 
   scheduleAutoOff(accessory, service, sw, subtype) {
-    setTimeout(() => {
+    const timerKey = `${accessory.UUID}_${subtype}`;
+    if (this.autoOffTimers.has(timerKey)) {
+      clearTimeout(this.autoOffTimers.get(timerKey));
+    }
+    const timer = setTimeout(() => {
+      this.autoOffTimers.delete(timerKey);
       if (accessory.context.switchStates[subtype]) {
         accessory.context.switchStates[subtype] = false;
         service.updateCharacteristic(this.Characteristic.On, false);
         this.log.info(`[${sw.name}] auto-off after ${sw.delayOff}ms`);
       }
     }, sw.delayOff);
+    this.autoOffTimers.set(timerKey, timer);
   }
 
   getServiceClass(type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-multiple-switch",
-  "version": "1.7.0-beta.1",
+  "version": "1.7.0-beta.10",
   "description": "Multiple switch platform for Homebridge",
   "homepage": "https://github.com/azadaydinli/homebridge-multiple-switch",
   "main": "index.js",