@switchbot/homebridge-switchbot 5.0.0-beta.111 → 5.0.0-beta.113

package/src/homebridge-ui/endpoints/devices.ts

@@ -3,6 +3,7 @@ import type { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils'
 import { RequestError } from '@homebridge/plugin-ui-utils'
 import fs from 'node:fs/promises'
 
+import { SwitchBotClient } from '../../switchbotClient.js'
 import { getAllDevices, getDeviceArrays, getSwitchBotPlatformConfig } from '../utils/config-parser.js'
 import { uiLog } from '../utils/logger.js'
 
@@ -10,12 +11,90 @@ import { uiLog } from '../utils/logger.js'
  * Register device CRUD endpoints
  */
 export function registerDeviceEndpoints(server: HomebridgePluginUiServer) {
+  /**
+   * POST /test-connection - Test connectivity and basic read for a device
+   */
+  server.onRequest('/test-connection', async (body: any) => {
+    let client: SwitchBotClient | null = null
+
+    try {
+      const deviceId = String(body?.deviceId || '').trim()
+      if (!deviceId) {
+        throw new Error('Device ID is required')
+      }
+
+      const { platform } = await getSwitchBotPlatformConfig(server)
+      const allDevices = getAllDevices(platform)
+      const normalizedDeviceId = deviceId.toLowerCase()
+      const configuredDevice = allDevices.find((d: any) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId)
+
+      const startedAt = Date.now()
+
+      client = new SwitchBotClient({
+        ...(platform as any),
+        logger: uiLog,
+      } as any)
+
+      await client.init()
+      const raw = await client.getDevice(deviceId)
+      const latencyMs = Date.now() - startedAt
+
+      const state = raw?.body ?? raw
+      const stateConnection = String(state?.connectionType || state?.source || body?.connectionType || '').toLowerCase()
+      const method = stateConnection.includes('ble')
+        ? 'BLE'
+        : stateConnection.includes('api')
+            ? 'OpenAPI'
+            : 'Auto'
+
+      return {
+        success: true,
+        data: {
+          success: true,
+          deviceId,
+          method,
+          latencyMs,
+          message: configuredDevice
+            ? `Connected to "${configuredDevice.configDeviceName || configuredDevice.deviceId || deviceId}"`
+            : 'Connected successfully',
+          state: {
+            online: state?.online,
+            power: state?.power,
+            battery: state?.battery,
+            version: state?.version,
+            deviceType: state?.deviceType,
+          },
+        },
+      }
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e)
+      uiLog.warn(`POST /test-connection failed: ${message}`)
+
+      return {
+        success: true,
+        data: {
+          success: false,
+          deviceId: String(body?.deviceId || ''),
+          method: 'Auto',
+          latencyMs: 0,
+          message,
+        },
+      }
+    } finally {
+      try {
+        await client?.destroy()
+      } catch (_e) {
+        // Ignore client shutdown errors
+      }
+    }
+  })
+
   /**
    * POST /add-device - Add a single device to config
    */
   server.onRequest('/add-device', async (body: any) => {
     try {
-      const { deviceId, name, type, address, model, rssi } = body
+      const { deviceId, name, type, address, model, rssi, encryptionKey, keyId } = body
 
       if (!deviceId) {
         throw new Error('Device ID is required')
@@ -55,6 +134,8 @@ export function registerDeviceEndpoints(server: HomebridgePluginUiServer) {
           if (address) { newDevice.address = address }
           if (model) { newDevice.model = model }
           if (rssi !== undefined && rssi !== null && rssi !== 0) { newDevice.rssi = rssi }
+          if (encryptionKey) { newDevice.encryptionKey = encryptionKey }
+          if (keyId) { newDevice.keyId = keyId }
           ref.push(newDevice)
           addCount++
         }

package/src/homebridge-ui/endpoints/discovery.ts

@@ -10,9 +10,37 @@ import { uiLog } from '../utils/logger.js'
  * Discovers SwitchBot devices via BLE and OpenAPI
  */
 export function registerDiscoveryEndpoint(server: HomebridgePluginUiServer) {
-  server.onRequest('/discover', async () => {
+  server.onRequest('/ble-status', async () => {
     try {
       const { platform } = await getSwitchBotPlatformConfig(server)
+      const token = getCredential(platform, 'openApiToken') || platform.token
+      const secret = getCredential(platform, 'openApiSecret') || platform.secret
+      const { SwitchBot } = await import('node-switchbot')
+      const switchbot = new SwitchBot({
+        token: token || undefined,
+        secret: secret || undefined,
+        enableBLE: true,
+        enableFallback: true,
+        enableRetry: true,
+      })
+
+      await switchbot.discover({ timeout: 1000 })
+      return { success: true, data: { available: true, message: 'adapter ready' } }
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e)
+      uiLog.warn(`GET /ble-status failed: ${message}`)
+      return { success: true, data: { available: false, message } }
+    }
+  })
+
+  server.onRequest('/discover', async (payload?: any) => {
+    try {
+      const { platform } = await getSwitchBotPlatformConfig(server)
+      const mode = String(payload?.mode || 'all').toLowerCase()
+      const runBle = mode === 'all' || mode === 'ble'
+      const runOpenApi = mode === 'all' || mode === 'openapi'
+      const bleScanDurationSeconds = Math.max(3, Math.min(15, Number(payload?.bleScanDurationSeconds || 5)))
+      const bleTimeoutSeconds = Math.max(3, Math.min(30, Number(payload?.bleTimeoutSeconds || 8)))
 
       uiLog.debug(`GET /discover - Platform config keys: ${Object.keys(platform).join(', ')}`)
 
@@ -40,55 +68,57 @@ export function registerDiscoveryEndpoint(server: HomebridgePluginUiServer) {
       const deviceMap = new Map<string, any>()
 
       // 1. Try BLE discovery first (with timeout)
-      uiLog.info('GET /discover - Starting BLE scan...')
-      try {
-        const bleTimeout = 8000 // 8 second timeout for BLE scan
-        const bleDiscoveryPromise = switchbot.discover({ timeout: 5000 }) // 5 second scan timeout
-        const bleDevices = await Promise.race([
-          bleDiscoveryPromise,
-          new Promise<any[]>(resolve => setTimeout(resolve, bleTimeout, [])),
-        ])
-
-        if (Array.isArray(bleDevices) && bleDevices.length > 0) {
-          uiLog.info(`GET /discover - Found ${bleDevices.length} BLE devices`)
-          for (const [index, d] of bleDevices.entries()) {
-            const info = typeof d?.getInfo === 'function' ? d.getInfo() : undefined
-            const id = d?.id
-              || (typeof d?.getId === 'function' ? d.getId() : undefined)
-              || info?.id
-
-            const mac = d?.mac
-              || (typeof d?.getMAC === 'function' ? d.getMAC() : undefined)
-              || info?.mac
+      if (runBle) {
+        uiLog.info('GET /discover - Starting BLE scan...')
+        try {
+          const bleTimeout = bleTimeoutSeconds * 1000
+          const bleDiscoveryPromise = switchbot.discover({ timeout: bleScanDurationSeconds * 1000 })
+          const bleDevices = await Promise.race([
+            bleDiscoveryPromise,
+            new Promise<any[]>(resolve => setTimeout(resolve, bleTimeout, [])),
+          ])
+
+          if (Array.isArray(bleDevices) && bleDevices.length > 0) {
+            uiLog.info(`GET /discover - Found ${bleDevices.length} BLE devices`)
+            for (const [index, d] of bleDevices.entries()) {
+              const info = typeof d?.getInfo === 'function' ? d.getInfo() : undefined
+              const id = d?.id
+                || (typeof d?.getId === 'function' ? d.getId() : undefined)
+                || info?.id
+
+              const mac = d?.mac
+                || (typeof d?.getMAC === 'function' ? d.getMAC() : undefined)
+                || info?.mac
+
+              if (!id) {
+                uiLog.warn(`GET /discover - BLE device at index ${index} has no id, skipping`)
+                continue
+              }
+
+              const connectionTypes = Array.isArray(info?.connectionTypes) ? info.connectionTypes : []
+              const isHybrid = connectionTypes.includes('api')
 
-            if (!id) {
-              uiLog.warn(`GET /discover - BLE device at index ${index} has no id, skipping`)
-              continue
+              deviceMap.set(id, {
+                id,
+                name: d?.name || (typeof d?.getName === 'function' ? d.getName() : undefined) || info?.name || d?.deviceName || id,
+                type: d?.deviceType || (typeof d?.getDeviceType === 'function' ? d.getDeviceType() : undefined) || info?.deviceType || d?.type || d?.model || 'unknown',
+                model: info?.model || d?.model || d?.deviceModel,
+                address: mac,
+                connectionType: isHybrid ? 'Both' : 'BLE',
+                rssi: info?.rssi || d?.rssi,
+              })
             }
-
-            const connectionTypes = Array.isArray(info?.connectionTypes) ? info.connectionTypes : []
-            const isHybrid = connectionTypes.includes('api')
-
-            deviceMap.set(id, {
-              id,
-              name: d?.name || (typeof d?.getName === 'function' ? d.getName() : undefined) || info?.name || d?.deviceName || id,
-              type: d?.deviceType || (typeof d?.getDeviceType === 'function' ? d.getDeviceType() : undefined) || info?.deviceType || d?.type || d?.model || 'unknown',
-              model: info?.model || d?.model || d?.deviceModel,
-              address: mac,
-              connectionType: isHybrid ? 'Both' : 'BLE',
-              rssi: info?.rssi || d?.rssi,
-            })
+          } else {
+            uiLog.info('GET /discover - No BLE devices found or scan timed out')
           }
-        } else {
-          uiLog.info('GET /discover - No BLE devices found or scan timed out')
+        } catch (bleErr) {
+          uiLog.warn(`GET /discover - BLE discovery failed: ${bleErr instanceof Error ? bleErr.message : String(bleErr)}`)
+          // Continue with OpenAPI even if BLE fails
         }
-      } catch (bleErr) {
-        uiLog.warn(`GET /discover - BLE discovery failed: ${bleErr instanceof Error ? bleErr.message : String(bleErr)}`)
-        // Continue with OpenAPI even if BLE fails
       }
 
       // 2. Get devices from OpenAPI (only if credentials are available)
-      if (hasOpenAPICredentials) {
+      if (runOpenApi && hasOpenAPICredentials) {
         uiLog.info('GET /discover - Fetching devices from OpenAPI...')
         try {
           const apiClient = switchbot.getAPIClient()
@@ -157,7 +187,7 @@ export function registerDiscoveryEndpoint(server: HomebridgePluginUiServer) {
             throw apiErr
           }
         }
-      } else {
+      } else if (runOpenApi) {
         uiLog.info('GET /discover - Skipping OpenAPI discovery (no credentials configured)')
       }
 
@@ -166,6 +196,10 @@ export function registerDiscoveryEndpoint(server: HomebridgePluginUiServer) {
       uiLog.info(`GET /discover - Normalized BLE devices: ${normalizedBleDevices.length} (firstId: ${firstNormalizedBleId})`)
 
       // Check if we found any devices
+      if (deviceMap.size === 0 && mode === 'openapi' && !hasOpenAPICredentials) {
+        return { success: true, data: [] }
+      }
+
       if (deviceMap.size === 0) {
         const errorMsg = hasOpenAPICredentials
           ? 'No devices found via BLE or OpenAPI. Make sure devices are powered on and in range.'

package/src/homebridge-ui/public/css/styles.css

@@ -75,12 +75,13 @@ body {
     system-ui,
     -apple-system,
     Arial;
-  padding: 16px;
+  padding: 10px;
 }
 
 h1 {
-  font-size: 24px;
+  font-size: 18px;
   margin-top: 0;
+  margin-bottom: 10px;
 }
 
 h2 {
@@ -152,25 +153,25 @@ code {
 }
 
 .form-group {
-  margin-bottom: 16px;
+  margin-bottom: 10px;
 }
 
 label {
   display: block;
-  margin-bottom: 6px;
+  margin-bottom: 4px;
   font-weight: 500;
-  font-size: 12px;
+  font-size: 11px;
   color: #6b7280;
 }
 
 input {
   width: 100%;
   max-width: 400px;
-  padding: 8px 10px;
+  padding: 6px 8px;
   border: 1px solid #d1d5db;
   border-radius: 6px;
   font-family: system-ui, -apple-system, monospace;
-  font-size: 14px;
+  font-size: 12px;
   transition: all 0.2s ease;
 }
 
@@ -203,8 +204,8 @@ select:focus {
 }
 
 .status {
-  font-size: 14px;
-  margin-top: 4px;
+  font-size: 11px;
+  margin-top: 3px;
 }
 
 .status.ok {
@@ -221,27 +222,207 @@ select:focus {
 }
 
 .card {
-  padding: 16px;
+  padding: 12px;
   border-radius: 8px;
-  margin-bottom: 16px;
+  margin-bottom: 10px;
 }
 
-.device-item {
-  padding: 10px 12px;
-  border-radius: 6px;
+.card.compact {
+  padding: 10px;
+  margin-bottom: 10px;
+}
+
+.card.compact h2 {
+  margin-top: 0;
+  margin-bottom: 6px;
+  font-size: 13px;
+  font-weight: 600;
+}
+
+.card.compact .form-group {
   margin-bottom: 6px;
+}
+
+.card.compact label {
+  font-size: 11px;
+  margin-bottom: 2px;
+  display: block;
+}
+
+.card.compact input {
+  padding: 5px 8px;
+  font-size: 12px;
+}
+
+.card.compact button {
+  padding: 6px 12px;
+  font-size: 12px;
+}
+
+.card.compact .status {
+  font-size: 11px;
+  margin-top: 4px;
+}
+
+.credentials-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.credentials-row .form-group {
+  flex: 1 1 100%;
+  min-width: 0;
+}
+
+@media (min-width: 700px) {
+  .credentials-row {
+    gap: 10px;
+    align-items: start;
+  }
+
+  .credentials-row .form-group {
+    flex: 1 1 calc(50% - 5px);
+  }
+}
+
+.device-item {
+  padding: 5px 8px;
+  border-radius: 5px;
+  margin-bottom: 0;
   display: flex;
-  gap: 10px;
+  gap: 8px;
   align-items: center;
   justify-content: space-between;
   transition: all 0.2s ease;
+  height: 100%;
+  min-width: 0;
 }
 
 .device-item:hover {
-  transform: translateY(-1px);
+  transform: translateY(-0.5px);
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 }
 
+.device-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}
+
+.discover-phase-progress {
+  margin-bottom: 8px;
+}
+
+.discovery-settings-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  align-items: center;
+}
+
+.discover-phase-track {
+  width: 100%;
+  height: 5px;
+  border-radius: 999px;
+  background: rgba(148, 163, 184, 0.35);
+  overflow: hidden;
+}
+
+.discover-phase-fill {
+  width: 0%;
+  height: 100%;
+  border-radius: 999px;
+  background: var(--switchbot-red, #ef4444);
+  transition: width 0.25s ease;
+}
+
+.discover-phase-label {
+  margin-top: 3px;
+  font-size: 10px;
+  opacity: 0.75;
+}
+
+.discovery-groups {
+  display: block;
+  max-height: 400px;
+  overflow-y: auto;
+  margin-top: 10px;
+}
+
+.discovery-group {
+  margin-top: 8px;
+}
+
+.discovery-group:first-child {
+  margin-top: 0;
+}
+
+.discovery-group-header {
+  margin: 0 0 4px;
+  font-size: 11px;
+  font-weight: 600;
+  opacity: 0.85;
+}
+
+.discovery-group-header-btn {
+  width: 100%;
+  text-align: left;
+  margin: 0 0 4px;
+  padding: 2px 0;
+  border: 0;
+  background: transparent;
+  color: inherit;
+  font-size: 11px;
+  font-weight: 600;
+  opacity: 0.9;
+  cursor: pointer;
+  border-radius: 0;
+  box-shadow: none;
+  transform: none;
+}
+
+.discovery-group-header-btn:hover,
+.discovery-group-header-btn:active {
+  background: transparent;
+  color: inherit;
+  box-shadow: none;
+  transform: none;
+}
+
+.discovery-group-empty {
+  font-size: 11px;
+  opacity: 0.75;
+  padding: 4px 0;
+}
+
+#devices.device-grid,
+#discoveredDevices.device-grid,
+ul.device-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(210px, 1fr));
+  gap: 6px;
+  padding-left: 0;
+  list-style: none;
+  margin: 0;
+}
+
+.device-item code {
+  display: inline-block;
+  max-width: 100%;
+  white-space: normal;
+  overflow-wrap: anywhere;
+  word-break: break-word;
+}
+
+@media (max-width: 900px) {
+  .device-actions {
+    width: 100%;
+    justify-content: flex-start !important;
+    margin-left: 0 !important;
+  }
+}
+
 .card {
   padding: 16px;
   border-radius: 8px;
@@ -252,3 +433,15 @@ select:focus {
 .card:hover {
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
 }
+@keyframes pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
+}
+
+.discovery-scanning-pulse {
+  animation: pulse 1.5s ease-in-out infinite;
+}