@switchbot/homebridge-switchbot 5.1.0-beta.1 → 5.1.0-beta.10

package/dist/homebridge-ui/public/js/render.ts

@@ -5,6 +5,22 @@ const SPACES_REGEX = /\s/g
 const CAMELCASE_REGEX = /([A-Z])/g
 const FIRST_CHAR_REGEX = /^./
 
+async function copyTextWithFallback(text: string): Promise<void> {
+  try {
+    await navigator.clipboard.writeText(text)
+  } catch {
+    const textarea = document.createElement('textarea')
+    textarea.value = text
+    textarea.setAttribute('readonly', '')
+    textarea.style.cssText = 'position:fixed;left:-9999px;opacity:0;pointer-events:none'
+    document.body.appendChild(textarea)
+    textarea.select()
+    textarea.setSelectionRange(0, textarea.value.length)
+    document.execCommand('copy')
+    textarea.remove()
+  }
+}
+
 /**
  * Get RSSI signal quality level and color based on dBm value
  * @param rssi Signal strength in dBm (typically -30 to -90)
@@ -119,7 +135,6 @@ export function renderSignalQualityBadge(rssi: number | undefined): HTMLElement
     border-radius: 3px;
     font-size: 10px;
     font-weight: 600;
-    margin-left: 8px;
   `
   badge.title = quality.description
 
@@ -927,6 +942,7 @@ export function renderDeviceList(list: any[]): void {
 
   status.textContent = `Found ${list.length} device(s)`
   ul.classList.add('device-grid')
+  ul.style.padding = '0'
   ul.innerHTML = ''
 
   // Show remove all button when devices exist
@@ -941,6 +957,7 @@ export function renderDeviceList(list: any[]): void {
     li.style.display = 'flex'
     li.style.flexDirection = 'column'
     li.style.alignItems = 'stretch'
+    li.style.padding = '5px 8px'
     li.style.marginBottom = '0'
 
     const info = document.createElement('div')
@@ -950,14 +967,15 @@ export function renderDeviceList(list: any[]): void {
 
     const nameContainer = document.createElement('div')
     nameContainer.style.display = 'flex'
-    nameContainer.style.flexDirection = 'column'
-    nameContainer.style.alignItems = 'flex-start'
-    nameContainer.style.gap = '0'
+    nameContainer.style.alignItems = 'center'
+    nameContainer.style.marginBottom = '0'
+    nameContainer.style.flexWrap = 'wrap'
+    nameContainer.style.gap = '4px'
 
     const name = document.createElement('div')
     name.style.fontWeight = '500'
     name.style.fontSize = '13px'
-    name.textContent = d.name || d.id
+    name.textContent = d.configDeviceName || d.name || d.id
 
     const expandedDetails = document.createElement('div')
     expandedDetails.style.display = 'none'
@@ -978,25 +996,8 @@ export function renderDeviceList(list: any[]): void {
       expandBtn.style.transform = isHidden ? 'rotate(180deg)' : 'rotate(0deg)'
     }
 
-    const code = document.createElement('code')
-    code.textContent = d.id
-    code.style.fontSize = '10px'
-    code.style.opacity = '0.75'
-    code.style.marginLeft = '0'
-    code.style.whiteSpace = 'normal'
-    code.style.overflowWrap = 'anywhere'
-    code.style.wordBreak = 'break-word'
-    code.style.maxWidth = '100%'
-
-    const headerRow = document.createElement('div')
-    headerRow.style.display = 'inline-flex'
-    headerRow.style.alignItems = 'center'
-    headerRow.style.gap = '4px'
-    headerRow.appendChild(name)
-    headerRow.appendChild(expandBtn)
-
-    nameContainer.appendChild(headerRow)
-    nameContainer.appendChild(code)
+    nameContainer.appendChild(name)
+    nameContainer.appendChild(expandBtn)
 
     // Add signal strength visualization if RSSI is available
     if (d.rssi !== undefined && d.rssi !== null && d.rssi !== 0) {
@@ -1005,15 +1006,17 @@ export function renderDeviceList(list: any[]): void {
     }
 
     const meta = document.createElement('div')
-    meta.style.opacity = '0.75'
-    meta.style.marginTop = '0'
-    meta.style.fontSize = '11px'
-
-    const typeText = d.type ? `type: ${d.type}` : ''
-    const connText = d.connectionPreference ? `conn: ${d.connectionPreference}` : ''
+    meta.style.opacity = '0.7'
+    meta.style.fontSize = '10px'
+    meta.style.fontFamily = 'monospace'
+
+    const deviceIdentifier = d.deviceId || d.id
+    const id = `ID: ${deviceIdentifier}`
+    const typeText = d.configDeviceType || d.type ? `Type: ${d.configDeviceType || d.type}` : ''
+    const connText = d.connectionPreference ? `Conn: ${d.connectionPreference}` : ''
     const extText = d.externalPublishProtocol && d.externalPublishProtocol !== 'none' ? `external: ${d.externalPublishProtocol}` : ''
-    const roomText = d.room ? `room: ${d.room}` : ''
-    meta.textContent = [typeText, connText, extText, roomText].filter(Boolean).join(' | ')
+    const roomText = d.room ? `Room: ${d.room}` : ''
+    meta.textContent = [id, typeText, connText, extText, roomText].filter(Boolean).join(' | ')
 
     info.appendChild(nameContainer)
     info.appendChild(meta)
@@ -1044,7 +1047,9 @@ export function renderDeviceList(list: any[]): void {
     copyBtn.style.fontSize = '11px'
     copyBtn.addEventListener('click', async () => {
       try {
-        await navigator.clipboard.writeText(d.id)
+        if (deviceIdentifier) {
+          await copyTextWithFallback(deviceIdentifier)
+        }
         copyBtn.textContent = 'Copied'
         copyBtn.classList.add('success')
         setTimeout(() => {
@@ -1073,8 +1078,8 @@ export function renderDeviceList(list: any[]): void {
 
     buttons.appendChild(editBtn)
     buttons.appendChild(copyBtn)
-    buttons.appendChild(createConnectionTestControls(d))
     buttons.appendChild(deleteBtn)
+    buttons.appendChild(createConnectionTestControls(d))
 
     li.appendChild(info)
     li.appendChild(buttons)

package/dist/homebridge-ui/public/js/toast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toast.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/toast.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,CAAA;AA6BnB,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAElE;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAEhE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAElE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAE/D"}
+{"version":3,"file":"toast.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/toast.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,CAAA;AA4BnB,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAElE;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAEhE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAElE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAE/D"}

package/dist/homebridge-ui/public/js/toast.js

@@ -5,10 +5,9 @@ function showToast(method, message, title = 'SwitchBot') {
         // Defensive: check for window and homebridge existence
         const hb = typeof window !== 'undefined' ? window.homebridge : undefined;
         const toast = hb && typeof hb.toast === 'object' ? hb.toast : undefined;
-        const fn = toast && typeof toast[method] === 'function' ? toast[method] : undefined;
-        if (fn) {
+        if (toast && typeof toast[method] === 'function') {
             try {
-                fn(message, title);
+                toast[method](message, title);
                 return;
             }
             catch (err) {

package/dist/homebridge-ui/public/js/toast.js.map

@@ -1 +1 @@
-{"version":3,"file":"toast.js","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/toast.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,CAAA;AACnB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,SAAS,SAAS,CAChB,MAAgD,EAChD,OAAe,EACf,KAAK,GAAG,WAAW;IAEnB,IAAI,CAAC;QACH,uDAAuD;QACvD,MAAM,EAAE,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAE,MAAc,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;QACjF,MAAM,KAAK,GAAG,EAAE,IAAI,OAAO,EAAE,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;QACvE,MAAM,EAAE,GAAG,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACnF,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC;gBACH,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;gBAClB,OAAM;YACR,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,SAAS,EAAE,GAAG,CAAC,CAAA;YAC3C,CAAC;QACH,CAAC;QACD,2BAA2B;QAC3B,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,KAAK,KAAK,MAAM,OAAO,EAAE,CAAC,CAAA;IACvD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,eAAe,EAAE,CAAC,CAAC,CAAA;QAC7C,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,KAAK,KAAK,MAAM,OAAO,EAAE,CAAC,CAAA;IACvD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,KAAc;IAC1D,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAe,EAAE,KAAc;IACxD,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,KAAc;IAC1D,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAe,EAAE,KAAc;IACvD,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC"}
+{"version":3,"file":"toast.js","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/toast.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,CAAA;AACnB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,SAAS,SAAS,CAChB,MAAgD,EAChD,OAAe,EACf,KAAK,GAAG,WAAW;IAEnB,IAAI,CAAC;QACH,uDAAuD;QACvD,MAAM,EAAE,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAE,MAAc,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;QACjF,MAAM,KAAK,GAAG,EAAE,IAAI,OAAO,EAAE,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;QACvE,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;YACjD,IAAI,CAAC;gBACH,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;gBAC7B,OAAM;YACR,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,SAAS,EAAE,GAAG,CAAC,CAAA;YAC3C,CAAC;QACH,CAAC;QACD,2BAA2B;QAC3B,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,KAAK,KAAK,MAAM,OAAO,EAAE,CAAC,CAAA;IACvD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,eAAe,EAAE,CAAC,CAAC,CAAA;QAC7C,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,KAAK,KAAK,MAAM,OAAO,EAAE,CAAC,CAAA;IACvD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,KAAc;IAC1D,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAe,EAAE,KAAc;IACxD,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,KAAc;IAC1D,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAe,EAAE,KAAc;IACvD,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC"}

package/dist/homebridge-ui/public/js/toast.ts

@@ -10,10 +10,9 @@ function showToast(
     // Defensive: check for window and homebridge existence
     const hb = typeof window !== 'undefined' ? (window as any).homebridge : undefined
     const toast = hb && typeof hb.toast === 'object' ? hb.toast : undefined
-    const fn = toast && typeof toast[method] === 'function' ? toast[method] : undefined
-    if (fn) {
+    if (toast && typeof toast[method] === 'function') {
       try {
-        fn(message, title)
+        toast[method](message, title)
         return
       } catch (err) {
         uiLog.warn(`Toast ${method} threw:`, err)

package/dist/index.js

@@ -1,6 +1,6 @@
+import { SwitchBotHAPPlatform } from './Platform.HAP.js';
+import { SwitchBotMatterPlatform } from './Platform.Matter.js';
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
-import { SwitchBotHAPPlatform } from './SwitchBotHAPPlatform.js';
-import { SwitchBotMatterPlatform } from './SwitchBotMatterPlatform.js';
 import { createPlatformProxy } from './utils.js';
 /**
  * Registers the SwitchBot platform with Homebridge.

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD;;;;;;;;;GASG;AACH,eAAe,CAAC,GAAQ,EAAQ,EAAE;IAChC,MAAM,SAAS,GAAG,mBAAmB,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,CAAA;IACpF,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,SAAgB,CAAC,CAAA;AACpE,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD;;;;;;;;;GASG;AACH,eAAe,CAAC,GAAQ,EAAQ,EAAE;IAChC,MAAM,SAAS,GAAG,mBAAmB,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,CAAA;IACpF,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,SAAgB,CAAC,CAAA;AACpE,CAAC,CAAA"}

package/docs/variables/default.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html class="default" lang="en" data-base="../"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>default | @switchbot/homebridge-switchbot</title><meta name="description" content="Documentation for @switchbot/homebridge-switchbot"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/icons.js" id="tsd-icons-script"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => window.app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><a href="../index.html" class="title">@switchbot/homebridge-switchbot</a><div id="tsd-toolbar-links"></div><button id="tsd-search-trigger" class="tsd-widget" aria-label="Search"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-search"></use></svg></button><dialog id="tsd-search" aria-label="Search"><input role="combobox" id="tsd-search-input" aria-controls="tsd-search-results" aria-autocomplete="list" aria-expanded="true" autocapitalize="off" autocomplete="off" placeholder="Search the docs" maxLength="100"/><ul role="listbox" id="tsd-search-results"></ul><div id="tsd-search-status" aria-live="polite" aria-atomic="true"><div>Preparing search index...</div></div></dialog><a href="#" class="tsd-widget menu" id="tsd-toolbar-menu-trigger" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-menu"></use></svg></a></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb" aria-label="Breadcrumb"><li><a href="" aria-current="page">default</a></li></ul><h1>Variable default</h1></div><div class="tsd-signature"><span class="tsd-kind-variable">default</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">api</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">API</span><span class="tsd-signature-symbol">)</span> <span class="tsd-signature-symbol">=&gt;</span> <span class="tsd-signature-type">void</span></div><div class="tsd-comment tsd-typography"><p>Registers the SwitchBot platform with Homebridge.</p>
 </div><div class="tsd-type-declaration"><h4>Type Declaration</h4><ul class="tsd-parameters"><li class="tsd-parameter-signature"><ul class="tsd-signatures"><li class="tsd-signature" id="__type"><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">api</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">API</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">void</span></li><li class="tsd-description"><div class="tsd-parameters"><h4 class="tsd-parameters-title">Parameters</h4><ul class="tsd-parameter-list"><li><span><span class="tsd-kind-parameter">api</span>: <span class="tsd-signature-type">API</span></span><div class="tsd-comment tsd-typography"><p>The Homebridge API instance.</p>
-</div></li></ul></div><h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4></li></ul></li></ul></div><aside class="tsd-sources"><ul><li>Defined in <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/blob/c12da554d58005474bfa08e2e8abd1ed5882b64b/src/index.ts#L22">index.ts:22</a></li></ul></aside></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><svg width="20" height="20" viewBox="0 0 24 24" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-chevronDown"></use></svg><h3>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="../modules.html">@switchbot/homebridge-switchbot</a><ul class="tsd-small-nested-navigation" id="tsd-nav-container"><li>Loading...</li></ul></nav></div></div></div><footer></footer><div class="overlay"></div></body></html>
+</div></li></ul></div><h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4></li></ul></li></ul></div><aside class="tsd-sources"><ul><li>Defined in <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/blob/232580f7c1a983dfd8db64d7c7cac73920a648db/src/index.ts#L22">index.ts:22</a></li></ul></aside></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><svg width="20" height="20" viewBox="0 0 24 24" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-chevronDown"></use></svg><h3>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="../modules.html">@switchbot/homebridge-switchbot</a><ul class="tsd-small-nested-navigation" id="tsd-nav-container"><li>Loading...</li></ul></nav></div></div></div><footer></footer><div class="overlay"></div></body></html>

package/package.json

@@ -2,7 +2,7 @@
   "name": "@switchbot/homebridge-switchbot",
   "displayName": "SwitchBot",
   "type": "module",
-  "version": "5.1.0-beta.1",
+  "version": "5.1.0-beta.10",
   "description": "The SwitchBot plugin allows you to access your SwitchBot device(s) from HomeKit.",
   "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
   "contributors": [
@@ -32,6 +32,7 @@
   },
   "keywords": [
     "homebridge-plugin",
+    "homebridge-matter",
     "switchbot",
     "lights",
     "fan",
@@ -92,28 +93,21 @@
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^2.2.3",
-    "class-validator": "^0.15.1",
-    "node-switchbot": "^4.0.1"
+    "node-switchbot": "^4.0.2"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^8.2.0",
-    "@types/debug": "^4.1.13",
-    "@types/fs-extra": "^11.0.4",
     "@types/node": "^25.6.0",
-    "@types/semver": "^7.7.1",
-    "@types/source-map-support": "^0.5.10",
-    "@vitest/coverage-v8": "^4.1.4",
+    "@vitest/coverage-v8": "^4.1.5",
     "esbuild": "^0.28.0",
-    "eslint": "^10.2.0",
+    "eslint": "^10.3.0",
     "eslint-plugin-format": "^2.0.1",
-    "eslint-plugin-html": "^8.1.4",
-    "eslint-plugin-perfectionist": "^5.8.0",
-    "homebridge": "^2.0.0-beta.89",
-    "homebridge-config-ui-x": "^5.21.0",
+    "eslint-plugin-perfectionist": "^5.9.0",
+    "homebridge": "^2.0.1",
     "nodemon": "^3.1.14",
     "shx": "^0.4.0",
     "typedoc": "^0.28.19",
-    "typescript": "^6.0.2",
-    "vitest": "^4.1.4"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
   }
 }

package/src/{SwitchBotHAPPlatform.ts → Platform.HAP.ts}

@@ -1,6 +1,7 @@
-import type { SwitchBotPluginConfig } from './settings.js'
 import type { API, Logger, PlatformConfig } from 'homebridge'
 
+import type { SwitchBotPluginConfig } from './settings.js'
+
 import { createDevice } from './deviceFactory.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
 import { SwitchBotClient } from './switchbotClient.js'
@@ -214,7 +215,9 @@ export class SwitchBotHAPPlatform {
           }
         }
         if (!accessory) {
-          accessory = new (this.api as any).platformAccessory(d.name || type, uuid)
+          // Use the PlatformAccessory constructor from the HAP API
+          const PlatformAccessory = (this.api as any).hap?.PlatformAccessory || (this.api as any).platformAccessory
+          accessory = new PlatformAccessory(d.name || type, uuid)
           try {
             accessory.context = accessory.context || {}
             accessory.context.deviceId = d.id

package/src/{SwitchBotMatterPlatform.ts → Platform.Matter.ts}

@@ -1,6 +1,7 @@
-import type { SwitchBotPluginConfig } from './settings.js'
 import type { API, Logger, PlatformConfig } from 'homebridge'
 
+import type { SwitchBotPluginConfig } from './settings.js'
+
 import { createDevice } from './deviceFactory.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
 import { SwitchBotClient } from './switchbotClient.js'

package/src/homebridge-ui/public/css/styles.css

@@ -201,7 +201,7 @@ label {
 }
 
 input {
-  width: 100%;
+  margin-right: 4px;
   max-width: 400px;
   padding: 6px 8px;
   border: 1px solid #d1d5db;

package/src/homebridge-ui/public/index.html

@@ -9,8 +9,34 @@
 </head>
 
 <body>
+
   <h1>🤖 SwitchBot Configuration</h1>
 
+  <!-- ...existing code... -->
+
+  <!-- Centered legacy view button at the bottom -->
+  <div class="centered-toggle-btn">
+    <button id="legacyViewBtn">Legacy View</button>
+    <button id="dynamicViewBtn" style="display: none;">Dynamic View</button>
+  </div>
+  <style>
+    .centered-toggle-btn {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+      margin-top: 32px;
+      margin-bottom: 12px;
+      gap: 12px;
+    }
+    #legacyViewBtn, #dynamicViewBtn {
+      font-size: 12px;
+      padding: 4px 10px;
+    }
+  </style>
+
+  <div id="dynamicUiContainer">
+
   <!-- v4 config incompatibility warning – shown dynamically by app.js -->
   <div id="v4ConfigWarning" class="v4-config-warning" style="display: none">
     <strong>⚠️ Incompatible v4 Configuration Detected</strong>
@@ -104,10 +130,6 @@
     <button id="discoverBtn" onclick="discoverDevices()" style="margin-bottom: 8px">
       🔍 Discover
     </button>
-    <button id="cancelDiscoverBtn"
-      style="margin-left: 6px; margin-bottom: 8px; display: none; padding: 6px 10px; font-size: 11px" class="secondary">
-      Cancel
-    </button>
     <div id="discoverStatus" style="margin-bottom: 6px; font-size: 11px"></div>
     <div id="discoverDevicesFound" style="margin-bottom: 6px; font-size: 11px; display: none"></div>
     <div id="discoverPhaseProgress" class="discover-phase-progress" style="display: none">
@@ -231,8 +253,18 @@
     </form>
   </div>
 
+  </div> <!-- end dynamicUiContainer -->
+
+  <div id="legacyViewContainer" style="display: none;">
+    <div class="card compact">
+      <h2>Legacy Config View</h2>
+      <div id="legacyConfigForm"></div>
+    </div>
+  </div>
+
   <script type="module" src="js/app.js"></script>
   <script type="module" src="js/advanced-settings.js"></script>
+  <script type="module" src="js/legacy-view.js"></script>
 </body>
 
 </html>

package/src/homebridge-ui/public/js/advanced-settings.ts

@@ -46,10 +46,11 @@ async function saveAdvancedSettings(): Promise<void> {
     if (!Array.isArray(pluginConfigBlocks) || !pluginConfigBlocks.length) {
       throw new Error('No plugin config blocks returned from Homebridge')
     }
-    // Find the SwitchBot config block
-    const idx = pluginConfigBlocks.findIndex(c => (c.platform || c.name || '').toLowerCase().includes('switchbot'))
+    // Find or add the SwitchBot config block
+    let idx = pluginConfigBlocks.findIndex(c => (c.platform || c.name || '').toLowerCase().includes('switchbot'))
     if (idx === -1) {
-      throw new Error('SwitchBot config not found')
+      pluginConfigBlocks.push({ platform: 'SwitchBot' })
+      idx = pluginConfigBlocks.length - 1
     }
     const config = pluginConfigBlocks[idx]
     // Update config values from UI

package/src/homebridge-ui/public/js/api.ts

@@ -300,7 +300,22 @@ export async function addDevicesInBulk(
   if (!resp || resp.success === false) {
     throw new Error(resp?.data?.message || 'Bulk add failed')
   }
-  return resp.data || resp
+  return normalizeBulkAddDevicesResponse(resp)
+}
+
+export function normalizeBulkAddDevicesResponse(resp: any): any {
+  const payload = resp?.data && typeof resp.data === 'object' ? resp.data : resp
+  const addedCount = Number(payload?.addedCount ?? payload?.added ?? 0)
+  const skippedCount = Number(payload?.skippedCount ?? payload?.skipped ?? 0)
+  const updatedCount = Number(payload?.updatedCount ?? payload?.updated ?? 0)
+
+  return {
+    ...payload,
+    success: resp?.success ?? true,
+    addedCount,
+    skippedCount,
+    updatedCount,
+  }
 }
 
 export async function updateDevice(

package/src/homebridge-ui/public/js/app.ts

@@ -3,6 +3,29 @@ import { loadCredentialStatus, saveCredentials } from './credentials.js'
 import { initRemoveAllButton, loadConfiguredDevices } from './devices.js'
 import { discoverDevices, initializeDiscoverySettings } from './discovery.js'
 
+// Ensure SwitchBot config block exists before any UI actions
+async function ensureSwitchBotConfigBlock(): Promise<void> {
+  try {
+    if (typeof homebridge.getPluginConfig !== 'function' || typeof homebridge.updatePluginConfig !== 'function') {
+      return
+    }
+    let configArr = await homebridge.getPluginConfig()
+    if (!Array.isArray(configArr)) {
+      configArr = []
+    }
+    const idx = configArr.findIndex(c => (c.platform || c.name || '').toLowerCase().includes('switchbot'))
+    if (idx === -1) {
+      configArr.push({ platform: 'SwitchBot' })
+      await homebridge.updatePluginConfig(configArr)
+      if (typeof homebridge.savePluginConfig === 'function') {
+        await homebridge.savePluginConfig()
+      }
+    }
+  } catch (_e) {
+    // Ignore errors
+  }
+}
+
 ;
 
 (window as any).loadCredentialStatus = loadCredentialStatus
@@ -24,7 +47,9 @@ async function checkV4Config(): Promise<void> {
 }
 
 // Initialize on page load
+
 async function init(): Promise<void> {
+  await ensureSwitchBotConfigBlock()
   await checkV4Config()
   await loadCredentialStatus()
   await initializeDiscoverySettings()

package/src/homebridge-ui/public/js/credentials.ts

@@ -63,14 +63,20 @@ export async function saveCredentials(): Promise<void> {
     if (typeof homebridge.getPluginConfig !== 'function' || typeof homebridge.updatePluginConfig !== 'function') {
       throw new TypeError('Homebridge UI API not available')
     }
-    const configArr = await homebridge.getPluginConfig()
-    if (!Array.isArray(configArr) || configArr.length === 0) {
-      throw new Error('No plugin config found')
+    let configArr = await homebridge.getPluginConfig()
+    if (!Array.isArray(configArr)) {
+      configArr = []
+    }
+    let idx = configArr.findIndex(c => (c.platform || c.name || '').toLowerCase() === 'switchbot')
+    if (idx === -1) {
+      // Add new SwitchBot platform config
+      configArr.push({ platform: 'SwitchBot' })
+      idx = configArr.length - 1
     }
-    const config = configArr[0]
+    const config = configArr[idx]
     config.openApiToken = token
     config.openApiSecret = secret
-    await homebridge.updatePluginConfig([config])
+    await homebridge.updatePluginConfig(configArr)
     if (typeof homebridge.savePluginConfig === 'function') {
       await homebridge.savePluginConfig()
     }

package/src/homebridge-ui/public/js/discovery.ts

@@ -394,7 +394,6 @@ function setDiscoveryGroupExpanded(groupKey: string, expanded: boolean): void {
 
 export async function discoverDevices(): Promise<void> {
   const btn = document.getElementById('discoverBtn') as HTMLButtonElement
-  const cancelBtn = document.getElementById('cancelDiscoverBtn') as HTMLButtonElement | null
   const status = document.getElementById('discoverStatus')
   const phaseProgress = document.getElementById('discoverPhaseProgress') as HTMLElement | null
   const phaseFill = document.getElementById('discoverPhaseFill') as HTMLElement | null
@@ -424,7 +423,6 @@ export async function discoverDevices(): Promise<void> {
   const startedAt = Date.now()
   let phaseStartedAt = startedAt
   let phase = 'Preparing discovery...'
-  let cancelled = false
 
   // --- Real-time RSSI polling additions ---
   // (bleScanDurationSeconds is now only used in bleSettings below)
@@ -936,32 +934,8 @@ export async function discoverDevices(): Promise<void> {
       devicesFoundDisplay.classList.remove('discovery-scanning-pulse')
     }
 
-    if (cancelBtn) {
-      cancelBtn.style.display = 'inline-block'
-      cancelBtn.disabled = false
-      cancelBtn.onclick = () => {
-        cancelled = true
-        const totalSeconds = Math.max(0, Math.floor((Date.now() - startedAt) / 1000))
-        status.textContent = `Discovery cancelled (${totalSeconds}s total)`
-        if (phaseProgress) {
-          phaseProgress.style.display = 'none'
-        }
-        if (devicesFoundDisplay) {
-          devicesFoundDisplay.style.display = 'none'
-          devicesFoundDisplay.classList.remove('discovery-scanning-pulse')
-        }
-        cancelBtn.style.display = 'none'
-        btn.disabled = false
-        btn.textContent = '🔍 Discover Devices'
-        hideBusyUi()
-      }
-    }
-
     if (bleSettings.bleEnabled) {
       const bleDevicesRaw = await apiDiscoverDevices('ble', bleSettings)
-      if (cancelled) {
-        return
-      }
 
       discoveredDevices = dedupeById(bleDevicesRaw)
       uiLog.info('BLE discover response:', bleDevicesRaw)
@@ -988,9 +962,6 @@ export async function discoverDevices(): Promise<void> {
 
     try {
       const openApiDevicesRaw = await apiDiscoverDevices('openapi')
-      if (cancelled) {
-        return
-      }
 
       uiLog.info('OpenAPI discover response:', openApiDevicesRaw)
       discoveredDevices = mergeDiscoveredDevices(discoveredDevices, openApiDevicesRaw)
@@ -1096,9 +1067,6 @@ export async function discoverDevices(): Promise<void> {
     setDiscoveryCache(discoveredDevices)
     updateLastScannedStatus()
   } catch (e) {
-    if (cancelled) {
-      return
-    }
     uiLog.error('Discovery error:', e)
     status.textContent = `Error: ${e instanceof Error ? e.message : 'Discovery failed'}`
     status.classList.add('error')
@@ -1123,11 +1091,6 @@ export async function discoverDevices(): Promise<void> {
     }
     btn.disabled = false
     btn.textContent = '🔍 Discover Devices'
-    if (cancelBtn) {
-      cancelBtn.disabled = false
-      cancelBtn.style.display = 'none'
-      cancelBtn.onclick = null
-    }
   }
 }