@switchbot/homebridge-switchbot 5.0.0-beta.134 → 5.0.0-beta.136

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

@@ -15,7 +15,9 @@ export async function loadCredentialStatus(): Promise<void> {
     const tokenStatus = document.getElementById('tokenStatus')
     const secretStatus = document.getElementById('secretStatus')
 
-    if (!tokenStatus || !secretStatus) { return }
+    if (!tokenStatus || !secretStatus) {
+      return
+    }
 
     if (creds.hasToken) {
       tokenStatus.textContent = `✓ Configured (${creds.tokenLength} characters)`
@@ -43,7 +45,9 @@ export async function saveCredentials(): Promise<void> {
   const saveStatus = document.getElementById('saveStatus')
   const saveBtn = document.getElementById('saveBtn') as HTMLButtonElement
 
-  if (!saveStatus || !saveBtn) { return }
+  if (!saveStatus || !saveBtn) {
+    return
+  }
 
   if (!token || !secret) {
     saveStatus.textContent = 'Please enter both token and secret'
@@ -80,7 +84,7 @@ export async function saveCredentials(): Promise<void> {
     ;(document.getElementById('secret') as HTMLInputElement).value = ''
 
     // Reload status to verify save
-    setTimeout(() => loadCredentialStatus(), 500)
+    setTimeout(loadCredentialStatus, 500)
 
     // Clear status message
     setTimeout(() => {

package/src/homebridge-ui/public/js/devices-delete.ts

@@ -1,4 +1,4 @@
-import { deleteDevice as apiDeleteDevice, deleteAllDevices as apiDeleteAllDevices, syncParentPluginConfigFromDisk, fetchDevices } from './api.js'
+import { deleteAllDevices as apiDeleteAllDevices, deleteDevice as apiDeleteDevice, fetchDevices, syncParentPluginConfigFromDisk } from './api.js'
 import { uiLog } from './logger.js'
 import { hideBusyUi, showBusyUi } from './modal.js'
 import { renderDeviceList } from './render.js'

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

@@ -10,7 +10,6 @@ type ImportDiscoveredDeviceResult = {
   address?: string
   encryptionKey?: string
   keyId?: string
-  matterType?: number
 } | null
 
 export async function addDeviceToConfig(device: any, options: { refresh?: boolean, showStatus?: boolean } = {}): Promise<{ added: boolean }> {
@@ -32,7 +31,6 @@ export async function addDeviceToConfig(device: any, options: { refresh?: boolea
       rssi: device.rssi,
       encryptionKey: importValues.encryptionKey,
       keyId: importValues.keyId,
-      matterType: importValues.matterType,
     })
     uiLog.info('Add device response:', resp)
 

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

@@ -1301,9 +1301,15 @@ async function updateDiscoveryView(
     const enableSelectedBtn = document.querySelector('button')?.parentElement?.querySelector('button[aria-label="Enable Selected"]') as HTMLButtonElement | null
     const disableSelectedBtn = document.querySelector('button')?.parentElement?.querySelector('button[aria-label="Disable Selected"]') as HTMLButtonElement | null
     const hasSelection = selectedIds.size > 0
-    if (addSelectedBtn) addSelectedBtn.disabled = !hasSelection
-    if (enableSelectedBtn) enableSelectedBtn.disabled = !hasSelection
-    if (disableSelectedBtn) disableSelectedBtn.disabled = !hasSelection
+    if (addSelectedBtn) {
+      addSelectedBtn.disabled = !hasSelection
+    }
+    if (enableSelectedBtn) {
+      enableSelectedBtn.disabled = !hasSelection
+    }
+    if (disableSelectedBtn) {
+      disableSelectedBtn.disabled = !hasSelection
+    }
   }
   window.removeEventListener('discovery-selection-changed', updateBatchButtonStates)
   window.addEventListener('discovery-selection-changed', updateBatchButtonStates)

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

@@ -1,11 +1,17 @@
+/* eslint-disable no-console */
+const PREFIX = '[SwitchBot UI/html]'
+
 export const uiLog = {
-  info: (message: string, ...parameters: any[]): void => {
-    console.warn('[SwitchBot UI]', message, ...parameters)
+  info: (message: string, ...parameters: any[]) => {
+    console.log(PREFIX, message, ...parameters)
   },
-  warn: (message: string, ...parameters: any[]): void => {
-    console.warn('[SwitchBot UI]', message, ...parameters)
+  warn: (message: string, ...parameters: any[]) => {
+    console.warn(PREFIX, message, ...parameters)
   },
-  error: (message: string, ...parameters: any[]): void => {
-    console.error('[SwitchBot UI]', message, ...parameters)
+  error: (message: string, ...parameters: any[]) => {
+    console.error(PREFIX, message, ...parameters)
+  },
+  debug: (message: string, ...parameters: any[]) => {
+    console.debug(PREFIX, message, ...parameters)
   },
 }

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

@@ -1,7 +1,15 @@
 import { DEVICE_TYPES } from './constants.js'
 import { uiLog } from './logger.js'
 
-export async function importDiscoveredDevice(device: any): Promise<{ configDeviceName: string, configDeviceType: string, address?: string } | null> {
+export async function importDiscoveredDevice(device: any): Promise<{
+  configDeviceName: string
+  configDeviceType: string
+  address?: string
+  connectionPreference?: string
+  room?: string
+  encryptionKey?: string
+  keyId?: string
+} | null> {
   return new Promise((resolve) => {
     const div = document.createElement('div')
     div.style.position = 'fixed'
@@ -91,6 +99,51 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       typeSelect.appendChild(optgroup)
     })
 
+    // --- Connection Preference ---
+    const connectionPrefLabel = document.createElement('label')
+    connectionPrefLabel.textContent = 'Connection Preference'
+    connectionPrefLabel.style.display = 'block'
+    connectionPrefLabel.style.marginBottom = '6px'
+    connectionPrefLabel.style.fontWeight = '500'
+    connectionPrefLabel.style.fontSize = '12px'
+    connectionPrefLabel.style.color = '#6b7280'
+
+    const connectionPrefSelect = document.createElement('select')
+    connectionPrefSelect.style.width = '100%'
+    connectionPrefSelect.style.marginBottom = '12px'
+    connectionPrefSelect.style.padding = '8px 10px'
+    connectionPrefSelect.style.borderRadius = '6px'
+    connectionPrefSelect.style.fontSize = '14px'
+    connectionPrefSelect.style.boxSizing = 'border-box';
+    ['auto', 'ble', 'openapi'].forEach((val) => {
+      const opt = document.createElement('option')
+      opt.value = val
+      opt.text = val.charAt(0).toUpperCase() + val.slice(1)
+      opt.selected = (device.connectionPreference || 'auto') === val
+      connectionPrefSelect.appendChild(opt)
+    })
+
+    // --- Room ---
+    const roomLabel = document.createElement('label')
+    roomLabel.textContent = 'Room'
+    roomLabel.style.display = 'block'
+    roomLabel.style.marginBottom = '6px'
+    roomLabel.style.fontWeight = '500'
+    roomLabel.style.fontSize = '12px'
+    roomLabel.style.color = '#6b7280'
+
+    const roomInput = document.createElement('input')
+    roomInput.type = 'text'
+    roomInput.value = device.room || ''
+    roomInput.placeholder = 'Optional room/location metadata'
+    roomInput.style.width = '100%'
+    roomInput.style.marginBottom = '12px'
+    roomInput.style.padding = '8px 10px'
+    roomInput.style.borderRadius = '6px'
+    roomInput.style.fontSize = '14px'
+    roomInput.style.boxSizing = 'border-box'
+
+    // --- BLE MAC Address ---
     const macLabel = document.createElement('label')
     macLabel.textContent = 'BLE MAC Address (optional)'
     macLabel.style.display = 'block'
@@ -110,7 +163,7 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     macInput.style.fontSize = '14px'
     macInput.style.boxSizing = 'border-box'
 
-    // BLE Encryption Key
+    // --- Encryption Key ---
     const encryptionKeyLabel = document.createElement('label')
     encryptionKeyLabel.textContent = 'BLE Encryption Key (optional)'
     encryptionKeyLabel.style.display = 'block'
@@ -130,7 +183,7 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     encryptionKeyInput.style.fontSize = '14px'
     encryptionKeyInput.style.boxSizing = 'border-box'
 
-    // BLE Key ID
+    // --- Key ID ---
     const keyIdLabel = document.createElement('label')
     keyIdLabel.textContent = 'BLE Key ID (optional)'
     keyIdLabel.style.display = 'block'
@@ -171,7 +224,15 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     importBtn.style.padding = '8px 20px'
     importBtn.style.fontSize = '13px'
 
-    const cleanup = (result: { configDeviceName: string, configDeviceType: string, address?: string, encryptionKey?: string, keyId?: string } | null) => {
+    const cleanup = (result: {
+      configDeviceName: string
+      configDeviceType: string
+      address?: string
+      connectionPreference?: string
+      room?: string
+      encryptionKey?: string
+      keyId?: string
+    } | null) => {
       div.remove()
       resolve(result)
     }
@@ -181,6 +242,8 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       configDeviceName: nameInput.value || device.name || device.id,
       configDeviceType: typeSelect.value || device.type,
       address: macInput.value || undefined,
+      connectionPreference: connectionPrefSelect.value || undefined,
+      room: roomInput.value || undefined,
       encryptionKey: encryptionKeyInput.value || undefined,
       keyId: keyIdInput.value || undefined,
     })
@@ -197,6 +260,10 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     contentDiv.appendChild(nameInput)
     contentDiv.appendChild(typeLabel)
     contentDiv.appendChild(typeSelect)
+    contentDiv.appendChild(connectionPrefLabel)
+    contentDiv.appendChild(connectionPrefSelect)
+    contentDiv.appendChild(roomLabel)
+    contentDiv.appendChild(roomInput)
     contentDiv.appendChild(macLabel)
     contentDiv.appendChild(macInput)
     contentDiv.appendChild(encryptionKeyLabel)
@@ -250,58 +317,6 @@ export async function editDevice(device: any): Promise<void> {
     typeSelect.appendChild(optgroup)
   })
 
-  // --- Matter Type Advanced Field (only for window covering types) ---
-  const windowCoveringTypes = ['Roller Shade', 'Curtain', 'Curtain3', 'Blind Tilt']
-  const showMatterType = windowCoveringTypes.includes(device.configDeviceType || device.deviceType || device.type || '')
-  const matterTypeLabel = document.createElement('label')
-  matterTypeLabel.textContent = 'Matter Window Covering Type (Advanced)'
-  matterTypeLabel.style.display = showMatterType ? 'block' : 'none'
-  matterTypeLabel.style.marginBottom = '6px'
-  matterTypeLabel.style.fontWeight = '500'
-  matterTypeLabel.style.fontSize = '12px'
-  matterTypeLabel.style.color = '#6b7280'
-  matterTypeLabel.style.marginTop = '2px'
-  const matterTypes = [
-    { value: '', label: 'Auto-detect (recommended)' },
-    { value: 0, label: 'Roller Shade (0)' },
-    { value: 1, label: 'Roman Shade (1)' },
-    { value: 2, label: 'Balloon Shade (2)' },
-    { value: 3, label: 'Woven Wood (3)' },
-    { value: 4, label: 'Drapery (4)' },
-    { value: 5, label: 'Awning (5)' },
-    { value: 6, label: 'Shutter (6)' },
-    { value: 7, label: 'Tilt Blind (7)' },
-    { value: 8, label: 'Blind Tilt (8)' },
-    { value: 9, label: 'Projector Screen (9)' },
-    { value: 15, label: 'Other (15)' },
-  ]
-  const matterTypeSelect = document.createElement('select')
-  matterTypeSelect.style.width = '100%'
-  matterTypeSelect.style.marginBottom = '12px'
-  matterTypeSelect.style.padding = '8px 10px'
-  matterTypeSelect.style.borderRadius = '6px'
-  matterTypeSelect.style.fontSize = '14px'
-  matterTypeSelect.style.boxSizing = 'border-box'
-  matterTypes.forEach((opt) => {
-    const option = document.createElement('option')
-    option.value = String(opt.value)
-    option.textContent = opt.label
-    if (device.matterType != null && String(opt.value) === String(device.matterType)) {
-      option.selected = true
-    }
-    matterTypeSelect.appendChild(option)
-  })
-  function updateMatterTypeVisibility() {
-    if (windowCoveringTypes.includes(typeSelect.value)) {
-      matterTypeLabel.style.display = 'block'
-      matterTypeSelect.style.display = 'block'
-    } else {
-      matterTypeLabel.style.display = 'none'
-      matterTypeSelect.style.display = 'none'
-    }
-  }
-  typeSelect.addEventListener('change', updateMatterTypeVisibility)
-  updateMatterTypeVisibility()
   // Create modal dialog for editing
   const div = document.createElement('div')
   div.style.position = 'fixed'
@@ -402,6 +417,90 @@ export async function editDevice(device: any): Promise<void> {
     typeSelect.appendChild(optgroup)
   })
 
+  // --- Connection Preference ---
+  const connectionPrefLabel = document.createElement('label')
+  connectionPrefLabel.textContent = 'Connection Preference'
+  connectionPrefLabel.style.display = 'block'
+  connectionPrefLabel.style.marginBottom = '6px'
+  connectionPrefLabel.style.fontWeight = '500'
+  connectionPrefLabel.style.fontSize = '12px'
+  connectionPrefLabel.style.color = '#6b7280'
+
+  const connectionPrefSelect = document.createElement('select')
+  connectionPrefSelect.style.width = '100%'
+  connectionPrefSelect.style.marginBottom = '12px'
+  connectionPrefSelect.style.padding = '8px 10px'
+  connectionPrefSelect.style.borderRadius = '6px'
+  connectionPrefSelect.style.fontSize = '14px'
+  connectionPrefSelect.style.boxSizing = 'border-box'
+  ;['auto', 'ble', 'openapi'].forEach((val) => {
+    const opt = document.createElement('option')
+    opt.value = val
+    opt.text = val.charAt(0).toUpperCase() + val.slice(1)
+    opt.selected = (device.connectionPreference || 'auto') === val
+    connectionPrefSelect.appendChild(opt)
+  })
+
+  // --- Room ---
+  const roomLabel = document.createElement('label')
+  roomLabel.textContent = 'Room'
+  roomLabel.style.display = 'block'
+  roomLabel.style.marginBottom = '6px'
+  roomLabel.style.fontWeight = '500'
+  roomLabel.style.fontSize = '12px'
+  roomLabel.style.color = '#6b7280'
+
+  const roomInput = document.createElement('input')
+  roomInput.type = 'text'
+  roomInput.value = device.room || ''
+  roomInput.placeholder = 'Optional room/location metadata'
+  roomInput.style.width = '100%'
+  roomInput.style.marginBottom = '12px'
+  roomInput.style.padding = '8px 10px'
+  roomInput.style.borderRadius = '6px'
+  roomInput.style.fontSize = '14px'
+  roomInput.style.boxSizing = 'border-box'
+
+  // --- Encryption Key ---
+  const encryptionKeyLabel = document.createElement('label')
+  encryptionKeyLabel.textContent = 'BLE Encryption Key (optional)'
+  encryptionKeyLabel.style.display = 'block'
+  encryptionKeyLabel.style.marginBottom = '6px'
+  encryptionKeyLabel.style.fontWeight = '500'
+  encryptionKeyLabel.style.fontSize = '12px'
+  encryptionKeyLabel.style.color = '#6b7280'
+
+  const encryptionKeyInput = document.createElement('input')
+  encryptionKeyInput.type = 'password'
+  encryptionKeyInput.value = device.encryptionKey || ''
+  encryptionKeyInput.placeholder = 'Paste device BLE encryption key'
+  encryptionKeyInput.style.width = '100%'
+  encryptionKeyInput.style.marginBottom = '12px'
+  encryptionKeyInput.style.padding = '8px 10px'
+  encryptionKeyInput.style.borderRadius = '6px'
+  encryptionKeyInput.style.fontSize = '14px'
+  encryptionKeyInput.style.boxSizing = 'border-box'
+
+  // --- Key ID ---
+  const keyIdLabel = document.createElement('label')
+  keyIdLabel.textContent = 'BLE Key ID (optional)'
+  keyIdLabel.style.display = 'block'
+  keyIdLabel.style.marginBottom = '6px'
+  keyIdLabel.style.fontWeight = '500'
+  keyIdLabel.style.fontSize = '12px'
+  keyIdLabel.style.color = '#6b7280'
+
+  const keyIdInput = document.createElement('input')
+  keyIdInput.type = 'text'
+  keyIdInput.value = device.keyId || ''
+  keyIdInput.placeholder = 'e.g. ff'
+  keyIdInput.style.width = '100%'
+  keyIdInput.style.marginBottom = '12px'
+  keyIdInput.style.padding = '8px 10px'
+  keyIdInput.style.borderRadius = '6px'
+  keyIdInput.style.fontSize = '14px'
+  keyIdInput.style.boxSizing = 'border-box'
+
   const errorMessage = document.createElement('div')
   errorMessage.style.color = 'var(--switchbot-red, #ef4444)'
   errorMessage.style.marginBottom = '12px'
@@ -442,10 +541,32 @@ export async function editDevice(device: any): Promise<void> {
         deviceId: device.id,
         configDeviceName: nameInput.value || undefined,
         configDeviceType: typeSelect.value,
-        matterType: windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== '' ? Number(matterTypeSelect.value) : undefined,
+        connectionPreference: connectionPrefSelect.value,
+        room: roomInput.value || undefined,
+        encryptionKey: encryptionKeyInput.value || undefined,
+        keyId: keyIdInput.value || undefined,
+      }
+
+      // Only include defined properties in the options object
+      const options: any = {}
+      if (params.connectionPreference !== undefined) {
+        options.connectionPreference = params.connectionPreference
+      }
+      if (params.room !== undefined) {
+        options.room = params.room
+      }
+      if (params.encryptionKey !== undefined) {
+        options.encryptionKey = params.encryptionKey
+      }
+      if (params.keyId !== undefined) {
+        options.keyId = params.keyId
       }
 
-      await updateDevice(params.deviceId, params.configDeviceName, params.configDeviceType, { matterType: params.matterType })
+      await updateDevice(
+        params.deviceId,
+        params.configDeviceName,
+        params.configDeviceType,
+      )
       await syncParentPluginConfigFromDisk()
 
       // Refresh device list
@@ -469,8 +590,14 @@ export async function editDevice(device: any): Promise<void> {
   contentDiv.appendChild(apiTypeInput)
   contentDiv.appendChild(typeLabel)
   contentDiv.appendChild(typeSelect)
-  contentDiv.appendChild(matterTypeLabel)
-  contentDiv.appendChild(matterTypeSelect)
+  contentDiv.appendChild(connectionPrefLabel)
+  contentDiv.appendChild(connectionPrefSelect)
+  contentDiv.appendChild(roomLabel)
+  contentDiv.appendChild(roomInput)
+  contentDiv.appendChild(encryptionKeyLabel)
+  contentDiv.appendChild(encryptionKeyInput)
+  contentDiv.appendChild(keyIdLabel)
+  contentDiv.appendChild(keyIdInput)
   contentDiv.appendChild(errorMessage)
   contentDiv.appendChild(buttons)