@switchbot/homebridge-switchbot 5.0.0-beta.12 → 5.0.0-beta.121

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

@@ -0,0 +1,272 @@
+import { isValidDeviceType, normalizeDeviceType } from '../../../device-types.js'
+import './types.js'
+import { uiLog } from './logger.js'
+
+/**
+ * Validate and auto-correct device types in the config array before saving.
+ * Returns an array of errors for devices that cannot be fixed.
+ */
+export function validateAndFixDeviceTypes(devices: Array<{ deviceId: string, configDeviceName: string, configDeviceType: string }>) {
+  const errors: Array<{ deviceId: string, name: string, type: string }> = []
+  for (const d of devices) {
+    if (!isValidDeviceType(d.configDeviceType)) {
+      const fixed = normalizeDeviceType(d.configDeviceType)
+      if (fixed) {
+        d.configDeviceType = fixed
+      } else {
+        errors.push({
+          deviceId: d.deviceId,
+          name: d.configDeviceName,
+          type: d.configDeviceType,
+        })
+      }
+    }
+  }
+  return errors
+}
+
+// API wrapper functions for communicating with the Homebridge UI server
+
+function isSwitchBotPlatformConfig(block: any): boolean {
+  const platformName = String(block?.platform || block?.name || '').toLowerCase()
+  return (
+    platformName === 'switchbot'
+    || platformName === '@switchbot/homebridge-switchbot'
+    || platformName.includes('switchbot')
+  )
+}
+
+export async function syncParentPluginConfigFromDisk(autoSave = false): Promise<boolean> {
+  try {
+    if (
+      typeof homebridge.getPluginConfig !== 'function'
+      || typeof homebridge.updatePluginConfig !== 'function'
+    ) {
+      uiLog.warn('Parent config sync API not available')
+      return false
+    }
+
+    const diskResp = await homebridge.request('/platform-config', {})
+    if (!diskResp || diskResp.success === false || !diskResp.data) {
+      uiLog.warn('Failed to fetch fresh platform config from disk')
+      return false
+    }
+
+    const pluginConfigBlocks = await homebridge.getPluginConfig()
+    if (!Array.isArray(pluginConfigBlocks) || !pluginConfigBlocks.length) {
+      uiLog.warn('No plugin config blocks returned from Homebridge')
+      return false
+    }
+
+    const index = pluginConfigBlocks.findIndex(block => isSwitchBotPlatformConfig(block))
+    if (index < 0) {
+      uiLog.warn('SwitchBot platform block not found in Homebridge plugin config')
+      return false
+    }
+
+    // Validate and fix device types before saving
+    const errors = validateAndFixDeviceTypes(diskResp.data.devices || [])
+    if (errors.length > 0) {
+      homebridge.toast?.error?.(`Invalid device types found: ${errors.map(e => `${e.name} (${e.type})`).join(', ')}`)
+      return false
+    }
+    pluginConfigBlocks[index] = diskResp.data
+    await homebridge.updatePluginConfig(pluginConfigBlocks)
+
+    // Auto-save to disk if requested - prevents parent UI from overwriting with stale cache
+    if (autoSave && typeof homebridge.savePluginConfig === 'function') {
+      uiLog.info('Auto-saving config to disk...')
+      await homebridge.savePluginConfig()
+      uiLog.info('Config saved successfully')
+    }
+
+    return true
+  } catch (e) {
+    uiLog.warn('Failed to sync parent plugin config cache:', e)
+    return false
+  }
+}
+
+export async function fetchCredentialStatus(): Promise<any> {
+  try {
+    const resp = await homebridge.request('/credentials', {})
+    uiLog.info('Load credentials response:', resp)
+
+    if (!resp || resp.success === false) {
+      uiLog.error('Failed to load credentials:', resp)
+      return null
+    }
+
+    return resp.data || {}
+  } catch (e) {
+    uiLog.error('Error loading credentials:', e)
+    return null
+  }
+}
+
+export async function saveCredentials(token: string, secret: string): Promise<any> {
+  uiLog.info('Saving credentials...')
+  const resp = await homebridge.request('/credentials', { token, secret })
+  uiLog.info('Save response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.message || 'Save failed')
+  }
+  return resp.data || resp
+}
+
+export async function fetchDevices(): Promise<any[]> {
+  try {
+    const resp = await homebridge.request('/devices', {})
+    if (!resp || resp.success === false) {
+      // Prefer backend error message if available
+      const backendMsg = resp?.data?.message || resp?.message
+      throw new Error(backendMsg || 'request failed')
+    }
+    return resp.data || []
+  } catch (e) {
+    // Show the real error to the user
+    const msg = e instanceof Error ? e.message : String(e)
+    uiLog.error('Error fetching devices:', msg)
+    // Optionally, show a toast or UI error here if needed
+    return []
+  }
+}
+
+export interface DiscoverRequestOptions {
+  bleEnabled?: boolean
+  bleScanDurationSeconds?: number
+  bleTimeoutSeconds?: number
+}
+
+export async function discoverDevices(
+  mode: 'all' | 'ble' | 'openapi' = 'all',
+  options?: DiscoverRequestOptions,
+): Promise<any[]> {
+  const resp = await homebridge.request('/discover', { mode, ...options })
+  uiLog.info('Discover response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Discovery failed')
+  }
+  return resp.data || []
+}
+
+export async function fetchBluetoothStatus(): Promise<{ available: boolean, message: string }> {
+  try {
+    const resp = await homebridge.request('/ble-status', {})
+    if (!resp || resp.success === false) {
+      return { available: false, message: 'Bluetooth status unavailable' }
+    }
+    return resp.data || { available: false, message: 'Bluetooth status unavailable' }
+  } catch (_e) {
+    return { available: false, message: 'Bluetooth status unavailable' }
+  }
+}
+
+export async function testDeviceConnection(payload: {
+  deviceId: string
+  connectionType?: string
+  address?: string
+}): Promise<{
+  success: boolean
+  deviceId: string
+  method: string
+  latencyMs: number
+  message: string
+  state?: Record<string, any>
+}> {
+  const resp = await homebridge.request('/test-connection', payload)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Connection test failed')
+  }
+
+  return resp.data || {
+    success: false,
+    deviceId: payload.deviceId,
+    method: 'Auto',
+    latencyMs: 0,
+    message: 'Connection test failed',
+  }
+}
+
+export async function addDevice(
+  deviceId: string,
+  name: string,
+  type: string,
+  options?: { address?: string, model?: string, rssi?: number, encryptionKey?: string, keyId?: string },
+): Promise<any> {
+  const payload: any = { deviceId, name, type }
+  if (options?.address) {
+    payload.address = options.address
+  }
+  if (options?.model) {
+    payload.model = options.model
+  }
+  if (options?.rssi !== undefined && options?.rssi !== null && options?.rssi !== 0) {
+    payload.rssi = options.rssi
+  }
+  if (options?.encryptionKey) {
+    payload.encryptionKey = options.encryptionKey
+  }
+  if (options?.keyId) {
+    payload.keyId = options.keyId
+  }
+  uiLog.info('Adding device to config:', payload)
+  const resp = await homebridge.request('/add-device', payload)
+  uiLog.info('Add device response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Failed to add device')
+  }
+  return resp.data || resp
+}
+
+export async function addDevicesInBulk(
+  devices: Array<{ deviceId: string, name: string, type: string, rssi?: number, address?: string, model?: string }>,
+): Promise<any> {
+  const resp = await homebridge.request('/add-devices', { devices })
+  uiLog.info('Bulk add response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Bulk add failed')
+  }
+  return resp.data || resp
+}
+
+export async function updateDevice(
+  deviceId: string,
+  configDeviceName?: string,
+  configDeviceType?: string,
+): Promise<any> {
+  const params: any = { deviceId }
+  if (configDeviceName) {
+    params.configDeviceName = configDeviceName
+  }
+  if (configDeviceType) {
+    params.configDeviceType = configDeviceType
+  }
+  uiLog.info('[Update Device] Sending update request with params:', params)
+  const resp = await homebridge.request('/update-device', params)
+  uiLog.info('[Update Device] Update response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Failed to update device')
+  }
+  return resp.data || resp
+}
+
+export async function deleteDevice(deviceId: string): Promise<any> {
+  uiLog.info('Sending delete request for deviceId:', deviceId)
+  const resp = await homebridge.request('/delete-device', { deviceId })
+  uiLog.info('Delete response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Failed to delete device')
+  }
+  return resp.data || resp
+}
+
+export async function deleteAllDevices(): Promise<any> {
+  uiLog.info('Sending delete all devices request')
+  const resp = await homebridge.request('/delete-all-devices', {})
+  uiLog.info('Delete all response:', resp)
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || 'Failed to delete all devices')
+  }
+  return resp.data || resp
+}

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

@@ -0,0 +1,23 @@
+import { loadCredentialStatus, saveCredentials } from './credentials.js'
+import { loadConfiguredDevices, initRemoveAllButton } from './devices.js'
+// Wire up global event handlers
+import { discoverDevices, initializeDiscoverySettings } from './discovery.js';
+
+(window as any).loadCredentialStatus = loadCredentialStatus
+;(window as any).saveCredentials = saveCredentials
+;(window as any).discoverDevices = discoverDevices
+
+// Initialize on page load
+async function init(): Promise<void> {
+  await loadCredentialStatus()
+  await initializeDiscoverySettings()
+  const list = await loadConfiguredDevices()
+  await initRemoveAllButton()
+}
+
+// Run initialization when DOM is ready
+if (document.readyState === 'loading') {
+  document.addEventListener('DOMContentLoaded', init)
+} else {
+  init()
+}

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

@@ -0,0 +1 @@
+export { DEVICE_TYPES } from '../../../device-types.js'

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

@@ -0,0 +1,100 @@
+import { fetchCredentialStatus as apiFetchCredentialStatus, saveCredentials as apiSaveCredentials, syncParentPluginConfigFromDisk } from './api.js'
+import { uiLog } from './logger.js'
+import { hideBusyUi, showBusyUi } from './modal.js'
+import { toastError, toastSuccess, toastWarning } from './toast.js'
+
+export async function loadCredentialStatus(): Promise<void> {
+  try {
+    const creds = await apiFetchCredentialStatus()
+
+    if (!creds) {
+      uiLog.error('Failed to load credentials')
+      return
+    }
+
+    const tokenStatus = document.getElementById('tokenStatus')
+    const secretStatus = document.getElementById('secretStatus')
+
+    if (!tokenStatus || !secretStatus) { return }
+
+    if (creds.hasToken) {
+      tokenStatus.textContent = `✓ Configured (${creds.tokenLength} characters)`
+      tokenStatus.classList.add('ok')
+    } else {
+      tokenStatus.textContent = 'Not configured'
+      tokenStatus.classList.remove('ok')
+    }
+
+    if (creds.hasSecret) {
+      secretStatus.textContent = `✓ Configured (${creds.secretLength} characters)`
+      secretStatus.classList.add('ok')
+    } else {
+      secretStatus.textContent = 'Not configured'
+      secretStatus.classList.remove('ok')
+    }
+  } catch (e) {
+    uiLog.error('Error loading credentials:', e)
+  }
+}
+
+export async function saveCredentials(): Promise<void> {
+  const token = (document.getElementById('token') as HTMLInputElement)?.value
+  const secret = (document.getElementById('secret') as HTMLInputElement)?.value
+  const saveStatus = document.getElementById('saveStatus')
+  const saveBtn = document.getElementById('saveBtn') as HTMLButtonElement
+
+  if (!saveStatus || !saveBtn) { return }
+
+  if (!token || !secret) {
+    saveStatus.textContent = 'Please enter both token and secret'
+    saveStatus.classList.add('error')
+    toastWarning('Please enter both token and secret')
+    return
+  }
+
+  try {
+    showBusyUi()
+    saveBtn.disabled = true
+    saveBtn.textContent = 'Saving...'
+    uiLog.info('Saving credentials...')
+
+    const result = await apiSaveCredentials(token, secret)
+    uiLog.info('Save response:', result)
+
+    const message = result?.message || 'Credentials saved successfully'
+    saveStatus.textContent = `✓ ${message}`
+    saveStatus.classList.remove('error')
+    saveStatus.classList.add('success-msg')
+    toastSuccess(message)
+
+    const synced = await syncParentPluginConfigFromDisk(true)
+    if (synced) {
+      saveStatus.textContent += ' - Config saved automatically.'
+      toastSuccess('Configuration synced and saved automatically')
+    } else {
+      toastWarning('Credentials saved, but configuration sync failed')
+    }
+
+    // Clear inputs after successful save
+    ;(document.getElementById('token') as HTMLInputElement).value = ''
+    ;(document.getElementById('secret') as HTMLInputElement).value = ''
+
+    // Reload status to verify save
+    setTimeout(() => loadCredentialStatus(), 500)
+
+    // Clear status message
+    setTimeout(() => {
+      saveStatus.textContent = ''
+      saveStatus.classList.remove('success-msg')
+    }, 3000)
+  } catch (e) {
+    uiLog.error('Save error:', e)
+    saveStatus.textContent = `Error: ${e instanceof Error ? e.message : 'Failed to save'}`
+    saveStatus.classList.add('error')
+    toastError(e instanceof Error ? e.message : 'Failed to save credentials')
+  } finally {
+    hideBusyUi()
+    saveBtn.disabled = false
+    saveBtn.textContent = 'Save Credentials'
+  }
+}

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

@@ -0,0 +1,236 @@
+import { deleteDevice as apiDeleteDevice, deleteAllDevices as apiDeleteAllDevices, syncParentPluginConfigFromDisk, fetchDevices } from './api.js'
+import { uiLog } from './logger.js'
+import { hideBusyUi, showBusyUi } from './modal.js'
+import { renderDeviceList } from './render.js'
+import { toastError, toastSuccess, toastWarning } from './toast.js'
+
+async function confirmDeleteDialog(deviceNameOrId: string): Promise<boolean> {
+  return new Promise((resolve) => {
+    const overlay = document.createElement('div')
+    overlay.style.position = 'fixed'
+    overlay.style.top = '0'
+    overlay.style.left = '0'
+    overlay.style.width = '100%'
+    overlay.style.height = '100%'
+    overlay.style.background = 'rgba(0,0,0,0.6)'
+    overlay.style.display = 'flex'
+    overlay.style.alignItems = 'center'
+    overlay.style.justifyContent = 'center'
+    overlay.style.zIndex = '10000'
+
+    const modal = document.createElement('div')
+    modal.style.background = getComputedStyle(document.body).backgroundColor
+    modal.style.color = getComputedStyle(document.body).color
+    modal.style.padding = '20px'
+    modal.style.borderRadius = '10px'
+    modal.style.minWidth = '340px'
+    modal.style.maxWidth = '90vw'
+    modal.style.boxShadow = '0 12px 40px rgba(0,0,0,0.35)'
+
+    const title = document.createElement('h3')
+    title.textContent = 'Delete Device'
+    title.style.margin = '0 0 10px 0'
+
+    const message = document.createElement('p')
+    message.textContent = `Remove "${deviceNameOrId}" from configuration?`
+    message.style.margin = '0 0 16px 0'
+
+    const actions = document.createElement('div')
+    actions.style.display = 'flex'
+    actions.style.justifyContent = 'flex-end'
+    actions.style.gap = '8px'
+
+    const cancelBtn = document.createElement('button')
+    cancelBtn.textContent = 'Cancel'
+    cancelBtn.style.background = '#6b7280'
+
+    const deleteBtn = document.createElement('button')
+    deleteBtn.textContent = 'Delete'
+    deleteBtn.style.background = '#ef4444'
+
+    const cleanup = (result: boolean) => {
+      overlay.remove()
+      resolve(result)
+    }
+
+    cancelBtn.onclick = () => cleanup(false)
+    deleteBtn.onclick = () => cleanup(true)
+    overlay.addEventListener('click', (event) => {
+      if (event.target === overlay) {
+        cleanup(false)
+      }
+    })
+
+    actions.appendChild(cancelBtn)
+    actions.appendChild(deleteBtn)
+    modal.appendChild(title)
+    modal.appendChild(message)
+    modal.appendChild(actions)
+    overlay.appendChild(modal)
+    document.body.appendChild(overlay)
+  })
+}
+
+export async function deleteDeviceFromConfig(deviceId: string, deviceName: string): Promise<void> {
+  uiLog.info('Delete button clicked for device:', deviceId, deviceName)
+
+  const confirmed = await confirmDeleteDialog(deviceName || deviceId)
+  if (!confirmed) {
+    uiLog.info('Delete cancelled by user')
+    return
+  }
+
+  try {
+    showBusyUi()
+    uiLog.info('Sending delete request for deviceId:', deviceId)
+    const resp = await apiDeleteDevice(deviceId)
+    uiLog.info('Delete response:', resp)
+
+    if (!resp || resp.success === false) {
+      throw new Error(resp?.data?.message || 'Failed to delete device')
+    }
+
+    uiLog.info('Syncing parent config from disk...')
+    const synced = await syncParentPluginConfigFromDisk(true)
+    if (!synced) {
+      toastWarning('Device deleted, but configuration sync failed')
+    }
+
+    uiLog.info('Refreshing device list...')
+    // Refresh device list
+    const list = await fetchDevices()
+    uiLog.info('Rendering devices:', list.length)
+    renderDeviceList(list)
+
+    uiLog.info('✓ Device deleted successfully')
+    toastSuccess(`Device "${deviceName || deviceId}" deleted successfully`)
+  } catch (e) {
+    uiLog.error('Delete error:', e)
+    toastError(e instanceof Error ? e.message : 'Failed to delete device')
+  } finally {
+    hideBusyUi()
+  }
+}
+
+async function confirmDeleteAllDialog(deviceCount: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const overlay = document.createElement('div')
+    overlay.style.position = 'fixed'
+    overlay.style.top = '0'
+    overlay.style.left = '0'
+    overlay.style.width = '100%'
+    overlay.style.height = '100%'
+    overlay.style.background = 'rgba(0,0,0,0.7)'
+    overlay.style.display = 'flex'
+    overlay.style.alignItems = 'center'
+    overlay.style.justifyContent = 'center'
+    overlay.style.zIndex = '10000'
+
+    const modal = document.createElement('div')
+    modal.style.background = getComputedStyle(document.body).backgroundColor
+    modal.style.color = getComputedStyle(document.body).color
+    modal.style.padding = '20px'
+    modal.style.borderRadius = '10px'
+    modal.style.minWidth = '380px'
+    modal.style.maxWidth = '90vw'
+    modal.style.boxShadow = '0 12px 40px rgba(0,0,0,0.35)'
+    modal.style.borderTop = '3px solid #ef4444'
+
+    const title = document.createElement('h3')
+    title.textContent = '⚠️ Remove All Devices'
+    title.style.margin = '0 0 12px 0'
+    title.style.color = '#ef4444'
+
+    const message = document.createElement('p')
+    message.innerHTML = `Are you sure you want to remove <strong>all ${deviceCount} device(s)</strong> from your configuration?<br><br>This action cannot be undone.`
+    message.style.margin = '0 0 18px 0'
+    message.style.lineHeight = '1.5'
+
+    const actions = document.createElement('div')
+    actions.style.display = 'flex'
+    actions.style.justifyContent = 'flex-end'
+    actions.style.gap = '10px'
+
+    const cancelBtn = document.createElement('button')
+    cancelBtn.textContent = 'Cancel'
+    cancelBtn.style.background = '#6b7280'
+    cancelBtn.style.padding = '8px 16px'
+    cancelBtn.style.fontSize = '13px'
+    cancelBtn.className = 'secondary'
+
+    const deleteBtn = document.createElement('button')
+    deleteBtn.textContent = 'Remove All'
+    deleteBtn.style.background = '#ef4444'
+    deleteBtn.style.padding = '8px 20px'
+    deleteBtn.style.fontSize = '13px'
+
+    const cleanup = (result: boolean) => {
+      overlay.remove()
+      resolve(result)
+    }
+
+    cancelBtn.onclick = () => cleanup(false)
+    deleteBtn.onclick = () => cleanup(true)
+    overlay.addEventListener('click', (event) => {
+      if (event.target === overlay) {
+        cleanup(false)
+      }
+    })
+
+    actions.appendChild(cancelBtn)
+    actions.appendChild(deleteBtn)
+    modal.appendChild(title)
+    modal.appendChild(message)
+    modal.appendChild(actions)
+    overlay.appendChild(modal)
+    document.body.appendChild(overlay)
+  })
+}
+
+export async function deleteAllDevicesFromConfig(): Promise<void> {
+  uiLog.info('Remove All Devices button clicked')
+
+  try {
+    // Get current device count
+    const list = await fetchDevices()
+    if (!list || list.length === 0) {
+      toastWarning('No devices to remove')
+      return
+    }
+
+    const confirmed = await confirmDeleteAllDialog(list.length)
+    if (!confirmed) {
+      uiLog.info('Remove all cancelled by user')
+      return
+    }
+
+    showBusyUi()
+    uiLog.info('Sending delete all devices request')
+    const resp = await apiDeleteAllDevices()
+    uiLog.info('Delete all response:', resp)
+
+    if (!resp || resp.success === false) {
+      throw new Error(resp?.data?.message || 'Failed to delete all devices')
+    }
+
+    uiLog.info('Syncing parent config from disk...')
+    const synced = await syncParentPluginConfigFromDisk(true)
+    if (!synced) {
+      toastWarning('Devices deleted, but configuration sync failed')
+    }
+
+    uiLog.info('Refreshing device list...')
+    const updatedList = await fetchDevices()
+    uiLog.info('Rendering devices:', updatedList.length)
+    renderDeviceList(updatedList)
+
+    const deletedCount = resp?.deletedCount || list.length
+    uiLog.info(`✓ Removed ${deletedCount} device(s) successfully`)
+    toastSuccess(`Removed ${deletedCount} device(s) successfully`)
+  } catch (e) {
+    uiLog.error('Delete all error:', e)
+    toastError(e instanceof Error ? e.message : 'Failed to delete all devices')
+  } finally {
+    hideBusyUi()
+  }
+}