@switchbot/homebridge-switchbot 5.0.0-beta.108 → 5.0.0-beta.109

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

@@ -0,0 +1,189 @@
+// API wrapper functions for communicating with the Homebridge UI server
+import './types.js'
+import { uiLog } from './logger.js'
+
+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
+    }
+
+    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> {
+  try {
+    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
+  } catch (e) {
+    throw e
+  }
+}
+
+export async function fetchDevices(): Promise<any[]> {
+  try {
+    const resp = await homebridge.request('/devices', {})
+    if (!resp || resp.success === false) { throw new Error(resp?.data?.message || 'request failed') }
+    return resp.data || []
+  } catch (e) {
+    uiLog.error('Error fetching devices:', e)
+    return []
+  }
+}
+
+export async function discoverDevices(): Promise<any[]> {
+  try {
+    const resp = await homebridge.request('/discover', {})
+    uiLog.info('Discover response:', resp)
+
+    if (!resp || resp.success === false) {
+      throw new Error(resp?.data?.message || 'Discovery failed')
+    }
+
+    return resp.data || []
+  } catch (e) {
+    throw e
+  }
+}
+
+export async function addDevice(deviceId: string, name: string, type: string): Promise<any> {
+  try {
+    uiLog.info('Adding device to config:', { deviceId, name, type })
+    const resp = await homebridge.request('/add-device', { deviceId, name, type })
+    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
+  } catch (e) {
+    throw e
+  }
+}
+
+export async function addDevicesInBulk(
+  devices: Array<{ deviceId: string, name: string, type: string }>,
+): Promise<any> {
+  try {
+    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
+  } catch (e) {
+    throw e
+  }
+}
+
+export async function updateDevice(
+  deviceId: string,
+  configDeviceName?: string,
+  configDeviceType?: string,
+): Promise<any> {
+  try {
+    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
+  } catch (e) {
+    throw e
+  }
+}
+
+export async function deleteDevice(deviceId: string): Promise<any> {
+  try {
+    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
+  } catch (e) {
+    throw e
+  }
+}

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

@@ -0,0 +1,21 @@
+import { loadCredentialStatus, saveCredentials } from './credentials.js'
+import { loadConfiguredDevices } from './devices.js'
+// Wire up global event handlers
+import { discoverDevices } 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()
+  const list = await loadConfiguredDevices()
+}
+
+// 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,113 @@
+import { deleteDevice as apiDeleteDevice, 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()
+  }
+}

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

@@ -0,0 +1,78 @@
+import { addDevice, fetchDevices, syncParentPluginConfigFromDisk } from './api.js'
+import { uiLog } from './logger.js'
+import { hideBusyUi, showBusyUi } from './modal.js'
+import { renderDeviceList } from './render.js'
+import { toastError, toastInfo, toastSuccess, toastWarning } from './toast.js'
+
+export async function addDeviceToConfig(device: any, options: { refresh?: boolean, showStatus?: boolean } = {}): Promise<{ added: boolean }> {
+  const { refresh = true, showStatus = true } = options
+
+  try {
+    showBusyUi()
+    uiLog.info('Adding device to config:', device)
+    const resp = await addDevice(device.id, device.name, device.type)
+    uiLog.info('Add device response:', resp)
+
+    if (!resp || resp.success === false) {
+      throw new Error(resp?.data?.message || 'Failed to add device')
+    }
+
+    const alreadyExists = !!resp?.alreadyExists
+    const message
+      = resp?.message
+        || (alreadyExists
+          ? `Device "${device.name}" already in config`
+          : `Device "${device.name}" added successfully!`)
+
+    if (alreadyExists) {
+      toastInfo(message)
+    } else {
+      toastSuccess(message)
+    }
+
+    if (showStatus) {
+      const status = document.getElementById('discoverStatus')
+      if (status) {
+        status.textContent = (alreadyExists ? '• ' : '✓ ') + message
+        status.classList.remove('error')
+        status.classList.add('success-msg')
+
+        // Sync parent Homebridge form cache and auto-save to prevent cache overwrite
+        if (!alreadyExists) {
+          const synced = await syncParentPluginConfigFromDisk(true)
+          status.textContent += synced
+            ? ' - Config saved automatically.'
+            : ' - Warning: config may not persist until you close/reopen settings.'
+
+          if (synced) {
+            toastSuccess('Configuration synced and saved automatically')
+          } else {
+            toastWarning('Configuration sync failed; close and reopen settings before Save')
+          }
+        }
+      }
+    }
+
+    if (refresh) {
+      await loadConfiguredDevices()
+    }
+
+    return { added: !alreadyExists }
+  } catch (e) {
+    uiLog.error('Add device error:', e)
+    const status = document.getElementById('discoverStatus')
+    if (status) {
+      status.textContent = `✗ Error: ${e instanceof Error ? e.message : 'Failed to add device'}`
+      status.classList.add('error')
+    }
+    toastError(e instanceof Error ? e.message : 'Failed to add device')
+    return { added: false }
+  } finally {
+    hideBusyUi()
+  }
+}
+
+export async function loadConfiguredDevices(): Promise<void> {
+  const list = await fetchDevices()
+  renderDeviceList(list)
+}

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

@@ -0,0 +1,123 @@
+import {
+  addDevicesInBulk,
+  discoverDevices as apiDiscoverDevices,
+  fetchDevices,
+  syncParentPluginConfigFromDisk,
+} from './api.js'
+import { loadConfiguredDevices } from './devices.js'
+import { uiLog } from './logger.js'
+import { hideBusyUi, showBusyUi } from './modal.js'
+import { renderDiscoveredDevices } from './render.js'
+import { toastError, toastInfo, toastSuccess, toastWarning } from './toast.js'
+
+export async function discoverDevices(): Promise<void> {
+  const btn = document.getElementById('discoverBtn') as HTMLButtonElement
+  const status = document.getElementById('discoverStatus')
+  const list = document.getElementById('discoveredList')
+  const autoAddAll = (document.getElementById('autoAddAllCheckbox') as HTMLInputElement)?.checked
+
+  if (!btn || !status || !list) { return }
+
+  try {
+    showBusyUi()
+    btn.disabled = true
+    btn.textContent = '🔍 Discovering...'
+    status.textContent = 'Searching SwitchBot account...'
+    status.classList.remove('error')
+
+    const devicesRaw = await apiDiscoverDevices()
+    uiLog.info('Discover response:', devicesRaw)
+
+    // Deduplicate by device ID
+    const devices = devicesRaw.filter((d, index, arr) => !!d?.id && arr.findIndex(x => x?.id === d.id) === index)
+
+    if (!devices.length) {
+      status.textContent = 'No devices found in your SwitchBot account'
+      toastInfo('No devices found in your SwitchBot account')
+      list.style.display = 'none'
+      return
+    }
+
+    // If auto-add is enabled, add all devices immediately using bulk endpoint
+    if (autoAddAll) {
+      status.textContent = `Auto-adding ${devices.length} device(s)...`
+
+      try {
+        const bulkResult = await addDevicesInBulk(
+          devices.map(d => ({
+            deviceId: d.id,
+            name: d.name,
+            type: d.type,
+          })),
+        )
+        uiLog.info('Bulk add response:', bulkResult)
+
+        if (!bulkResult || bulkResult.success === false) {
+          throw new Error(bulkResult?.data?.message || 'Bulk add failed')
+        }
+
+        const addedCount
+          = bulkResult?.addedCount
+            ?? bulkResult?.data?.addedCount
+            ?? 0
+        const skippedCount
+          = bulkResult?.skippedCount
+            ?? bulkResult?.data?.skippedCount
+            ?? 0
+        status.textContent = `✓ Added ${addedCount} device(s)${skippedCount > 0 ? ` (${skippedCount} skipped)` : ''}`
+        if (addedCount > 0) {
+          toastSuccess(`Added ${addedCount} device(s)${skippedCount > 0 ? ` (${skippedCount} skipped)` : ''}`)
+        } else if (skippedCount > 0) {
+          toastWarning(`No new devices were added (${skippedCount} skipped)`)
+        }
+        status.classList.remove('error')
+        list.style.display = 'none'
+
+        // Sync parent Homebridge form cache and auto-save to prevent cache overwrite
+        // Run sync when discovery returned devices (even if backend response shape changes)
+        if (devices.length > 0) {
+          const synced = await syncParentPluginConfigFromDisk(true)
+          status.textContent += synced
+            ? ' - Config saved automatically.'
+            : ' - Warning: config may not persist until you close/reopen settings.'
+
+          if (synced) {
+            toastSuccess('Configuration synced and saved automatically')
+          } else {
+            toastWarning('Configuration sync failed; close and reopen settings before Save')
+          }
+        }
+      } catch (e) {
+        uiLog.error('Bulk add error:', e)
+        status.textContent = `✗ Error: ${e instanceof Error ? e.message : 'Failed to add devices'}`
+        status.classList.add('error')
+        toastError(e instanceof Error ? e.message : 'Failed to add devices')
+      }
+
+      // Refresh the configured devices list
+      await loadConfiguredDevices()
+      return
+    }
+
+    status.textContent = `Found ${devices.length} device(s)`
+    const ul = await renderDiscoveredDevices(devices)
+    document.getElementById('discoveredDevices')?.replaceWith(ul)
+    ul.id = 'discoveredDevices'
+    list.style.display = 'block'
+  } catch (e) {
+    uiLog.error('Discovery error:', e)
+    status.textContent = `Error: ${e instanceof Error ? e.message : 'Discovery failed'}`
+    status.classList.add('error')
+    toastError(e instanceof Error ? e.message : 'Discovery failed')
+    list.style.display = 'none'
+  } finally {
+    hideBusyUi()
+    btn.disabled = false
+    btn.textContent = '🔍 Discover Devices'
+  }
+}
+
+export async function addDeviceToConfig(device: any): Promise<void> {
+  const { addDeviceToConfig: addDevice } = await import('./devices.js')
+  await addDevice(device)
+}

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

@@ -0,0 +1,11 @@
+export const uiLog = {
+  info: (message: string, ...parameters: any[]): void => {
+    console.warn('[SwitchBot UI]', message, ...parameters)
+  },
+  warn: (message: string, ...parameters: any[]): void => {
+    console.warn('[SwitchBot UI]', message, ...parameters)
+  },
+  error: (message: string, ...parameters: any[]): void => {
+    console.error('[SwitchBot UI]', message, ...parameters)
+  },
+}

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

@@ -0,0 +1,28 @@
+import './types.js'
+import { uiLog } from './logger.js'
+
+function callUiMethod(name: keyof HomebridgePluginUiAPI): void {
+  try {
+    const value = homebridge?.[name]
+    if (typeof value === 'function') {
+      const fn = value as () => void
+      fn()
+    }
+  } catch (e) {
+    uiLog.warn(`Homebridge UI method ${String(name)} failed:`, e)
+  }
+}
+
+export function showBusyUi(): void {
+  callUiMethod('disableSaveButton')
+  callUiMethod('showSpinner')
+}
+
+export function hideBusyUi(): void {
+  callUiMethod('hideSpinner')
+  callUiMethod('enableSaveButton')
+}
+
+export function closeSettingsModal(): void {
+  callUiMethod('closeSettings')
+}