@switchbot/homebridge-switchbot 5.0.0-beta.115 → 5.0.0-beta.117

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

@@ -1,7 +1,32 @@
-// API wrapper functions for communicating with the Homebridge UI server
+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 (
@@ -39,6 +64,12 @@ export async function syncParentPluginConfigFromDisk(autoSave = false): Promise<
       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)
 
@@ -74,33 +105,34 @@ export async function fetchCredentialStatus(): Promise<any> {
 }
 
 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
+  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) { throw new Error(resp?.data?.message || 'request failed') }
+    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) {
-    uiLog.error('Error fetching devices:', 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 type DiscoverRequestOptions = {
+export interface DiscoverRequestOptions {
   bleEnabled?: boolean
   bleScanDurationSeconds?: number
   bleTimeoutSeconds?: number
@@ -110,18 +142,12 @@ export async function discoverDevices(
   mode: 'all' | 'ble' | 'openapi' = 'all',
   options?: DiscoverRequestOptions,
 ): Promise<any[]> {
-  try {
-    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 || []
-  } catch (e) {
-    throw e
+  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 }> {
@@ -168,43 +194,40 @@ export async function addDevice(
   type: string,
   options?: { address?: string, model?: string, rssi?: number, encryptionKey?: string, keyId?: string },
 ): Promise<any> {
-  try {
-    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
-  } catch (e) {
-    throw e
+  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> {
-  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
+  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(
@@ -212,53 +235,38 @@ export async function updateDevice(
   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
+  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> {
-  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
+  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> {
-  try {
-    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
-  } catch (e) {
-    throw e
+  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
 }