@switchbot/homebridge-switchbot 5.0.1 → 5.0.2

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)
@@ -994,7 +1010,8 @@ export function renderDeviceList(list: any[]): void {
     meta.style.fontSize = '10px'
     meta.style.fontFamily = 'monospace'
 
-    const id = `ID: ${d.deviceId || d.id}`
+    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 roomText = d.room ? `Room: ${d.room}` : ''
@@ -1029,7 +1046,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(() => {
@@ -1058,8 +1077,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/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/d950b8418492383290fb3f20b573b22faa39f964/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/beddb5beda694522535549f5627e37285d89cc52/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.0.1",
+  "version": "5.0.2",
   "description": "The SwitchBot plugin allows you to access your SwitchBot device(s) from HomeKit.",
   "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
   "contributors": [

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

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

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
-    }
   }
 }
 

package/src/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)
@@ -994,7 +1010,8 @@ export function renderDeviceList(list: any[]): void {
     meta.style.fontSize = '10px'
     meta.style.fontFamily = 'monospace'
 
-    const id = `ID: ${d.deviceId || d.id}`
+    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 roomText = d.room ? `Room: ${d.room}` : ''
@@ -1029,7 +1046,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(() => {
@@ -1058,8 +1077,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)