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

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

@@ -0,0 +1,191 @@
+import type { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils'
+
+import { RequestError } from '@homebridge/plugin-ui-utils'
+
+import { getCredential, getSwitchBotPlatformConfig } from '../utils/config-parser.js'
+import { uiLog } from '../utils/logger.js'
+
+/**
+ * Register discovery endpoint
+ * Discovers SwitchBot devices via BLE and OpenAPI
+ */
+export function registerDiscoveryEndpoint(server: HomebridgePluginUiServer) {
+  server.onRequest('/discover', async () => {
+    try {
+      const { platform } = await getSwitchBotPlatformConfig(server)
+
+      uiLog.debug(`GET /discover - Platform config keys: ${Object.keys(platform).join(', ')}`)
+
+      const token = getCredential(platform, 'openApiToken') || platform.token
+      const secret = getCredential(platform, 'openApiSecret') || platform.secret
+
+      const hasOpenAPICredentials = !!token
+
+      if (!hasOpenAPICredentials) {
+        uiLog.warn('GET /discover - No OpenAPI credentials found, will attempt BLE-only discovery')
+      } else {
+        uiLog.info('GET /discover - Using OpenAPI credentials for discovery')
+      }
+
+      // Import and initialize node-switchbot
+      const { SwitchBot } = await import('node-switchbot')
+      const switchbot = new SwitchBot({
+        token: token || undefined,
+        secret: secret || undefined,
+        enableBLE: true,
+        enableFallback: true,
+        enableRetry: true,
+      })
+
+      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 (!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')
+
+            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')
+        }
+      } 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) {
+        uiLog.info('GET /discover - Fetching devices from OpenAPI...')
+        try {
+          const apiClient = switchbot.getAPIClient()
+          if (!apiClient) {
+            throw new Error('API client not available - token/secret may be missing')
+          }
+          const apiData = await apiClient.getDevices()
+          uiLog.debug(`GET /discover - OpenAPI response: ${JSON.stringify(apiData)}`)
+
+          // Parse physical devices - apiData is DeviceListResponse with deviceList and infraredRemoteList
+          const devices = apiData.deviceList || []
+          const irDevices = apiData.infraredRemoteList || []
+
+          uiLog.info(`GET /discover - Found ${devices.length} OpenAPI physical devices and ${irDevices.length} IR devices`)
+
+          // Process physical devices from OpenAPI
+          for (const d of devices) {
+            const id = d.deviceId
+            if (!id) {
+              continue
+            }
+
+            const existing = deviceMap.get(id)
+            if (existing) {
+              // Device found via both BLE and OpenAPI
+              existing.connectionType = 'Both'
+              existing.name = d.deviceName || existing.name
+              existing.type = d.deviceType || existing.type
+              // Note: APIDevice doesn't have a model property
+              existing.enabled = d.enableCloudService !== false
+              existing.hubDeviceId = d.hubDeviceId
+            } else {
+              // Device only found via OpenAPI
+              deviceMap.set(id, {
+                id,
+                name: d.deviceName || id,
+                type: d.deviceType || 'unknown',
+                enabled: d.enableCloudService !== false,
+                hubDeviceId: d.hubDeviceId,
+                connectionType: 'OpenAPI',
+              })
+            }
+          }
+
+          // Process IR devices (OpenAPI only)
+          for (const d of irDevices) {
+            const id = d.deviceId
+            if (!id) {
+              continue
+            }
+
+            deviceMap.set(id, {
+              id,
+              name: d.deviceName || id,
+              type: d.remoteType || 'unknown',
+              enabled: true,
+              hubDeviceId: d.hubDeviceId,
+              connectionType: 'OpenAPI',
+              isIR: true,
+            })
+          }
+        } catch (apiErr) {
+          uiLog.error(`GET /discover - OpenAPI discovery failed: ${apiErr instanceof Error ? apiErr.message : String(apiErr)}`)
+          // If we have BLE devices, we can still return those
+          if (deviceMap.size === 0) {
+            throw apiErr
+          }
+        }
+      } else {
+        uiLog.info('GET /discover - Skipping OpenAPI discovery (no credentials configured)')
+      }
+
+      const normalizedBleDevices = [...deviceMap.values()].filter(d => d.connectionType === 'BLE' || d.connectionType === 'Both')
+      const firstNormalizedBleId = normalizedBleDevices[0]?.id || 'none'
+      uiLog.info(`GET /discover - Normalized BLE devices: ${normalizedBleDevices.length} (firstId: ${firstNormalizedBleId})`)
+
+      // Check if we found any devices
+      if (deviceMap.size === 0) {
+        const errorMsg = hasOpenAPICredentials
+          ? 'No devices found via BLE or OpenAPI. Make sure devices are powered on and in range.'
+          : 'No devices found via BLE. OpenAPI credentials not configured. Please save your credentials in settings to discover cloud-connected devices, or ensure BLE devices are powered on and in range.'
+        uiLog.error(`GET /discover - ${errorMsg}`)
+        throw new Error(errorMsg)
+      }
+
+      // Convert map to array
+      const allDiscovered = [...deviceMap.values()]
+
+      const bleCount = allDiscovered.filter(d => d.connectionType === 'BLE').length
+      const apiCount = allDiscovered.filter(d => d.connectionType === 'OpenAPI').length
+      const bothCount = allDiscovered.filter(d => d.connectionType === 'Both').length
+
+      uiLog.info(`GET /discover - Total: ${allDiscovered.length} devices (BLE: ${bleCount}, OpenAPI: ${apiCount}, Both: ${bothCount})`)
+      return { success: true, data: allDiscovered }
+    } catch (e) {
+      uiLog.error(`Error in /discover: ${e instanceof Error ? e.message : String(e)}`)
+      throw new RequestError(`Failed to discover devices: ${e instanceof Error ? e.message : String(e)}`, e)
+    }
+  })
+}

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

@@ -0,0 +1,254 @@
+:root {
+  color-scheme: light dark;
+  --switchbot-red: #ef4444;
+  --switchbot-red-hover: #dc2626;
+  --switchbot-red-light: #fee2e2;
+}
+
+@media (prefers-color-scheme: light) {
+  body {
+    background: #f5f5f5;
+    color: #1a1a1a;
+  }
+  input {
+    background: #fff;
+    border-color: #ddd;
+    color: #1a1a1a;
+  }
+  input:focus {
+    border-color: #6366f1;
+  }
+  .card {
+    background: #fff;
+    border: 1px solid #ddd;
+  }
+  code {
+    background: #f0f0f0;
+    color: #1a1a1a;
+  }
+  h2 {
+    border-bottom-color: #ddd;
+  }
+  .status {
+    color: #666;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  body {
+    background: #1a1a1a;
+    color: #fff;
+  }
+  input {
+    background: #2a2a2a;
+    border-color: #444;
+    color: #fff;
+  }
+  .card {
+    background: #2a2a2a;
+  }
+  code {
+    background: #333;
+    color: #fff;
+  }
+  h2 {
+    border-bottom-color: #444;
+  }
+  .status {
+    color: #888;
+  }
+  .device-item {
+    background: #333;
+    border: 1px solid #444;
+  }
+}
+
+@media (prefers-color-scheme: light) {
+  .device-item {
+    background: #f9f9f9;
+    border: 1px solid #e0e0e0;
+  }
+}
+
+body {
+  font-family:
+    system-ui,
+    -apple-system,
+    Arial;
+  padding: 16px;
+}
+
+h1 {
+  font-size: 24px;
+  margin-top: 0;
+}
+
+h2 {
+  font-size: 16px;
+  margin-top: 24px;
+  margin-bottom: 12px;
+  border-bottom: 1px solid;
+  padding-bottom: 8px;
+}
+
+ul {
+  padding-left: 0;
+  list-style: none;
+}
+
+li {
+  margin: 8px 0;
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+button {
+  padding: 10px 20px;
+  background: var(--switchbot-red);
+  color: #fff;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+  font-weight: 500;
+  font-size: 14px;
+  transition: all 0.2s ease;
+}
+
+button:hover {
+  background: var(--switchbot-red-hover);
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(239, 68, 68, 0.3);
+}
+
+button:active {
+  transform: translateY(0);
+  box-shadow: 0 2px 6px rgba(239, 68, 68, 0.2);
+}
+
+button.secondary {
+  background: #6b7280;
+  color: #fff;
+}
+
+button.secondary:hover {
+  background: #4b5563;
+  box-shadow: 0 4px 12px rgba(107, 114, 128, 0.3);
+}
+
+button.success {
+  background: #10b981;
+}
+
+button.success:hover {
+  background: #059669;
+  box-shadow: 0 4px 12px rgba(16, 185, 129, 0.3);
+}
+
+code {
+  padding: 4px 6px;
+  border-radius: 4px;
+  font-family: monospace;
+}
+
+.form-group {
+  margin-bottom: 16px;
+}
+
+label {
+  display: block;
+  margin-bottom: 6px;
+  font-weight: 500;
+  font-size: 12px;
+  color: #6b7280;
+}
+
+input {
+  width: 100%;
+  max-width: 400px;
+  padding: 8px 10px;
+  border: 1px solid #d1d5db;
+  border-radius: 6px;
+  font-family: system-ui, -apple-system, monospace;
+  font-size: 14px;
+  transition: all 0.2s ease;
+}
+
+input:focus {
+  outline: none;
+  border-color: var(--switchbot-red, #ef4444);
+  box-shadow: 0 0 0 3px rgba(239, 68, 68, 0.1);
+}
+
+input:disabled,
+input[readonly] {
+  background-color: #f9fafb;
+  cursor: not-allowed;
+}
+
+select {
+  padding: 8px 10px;
+  border: 1px solid #d1d5db;
+  border-radius: 6px;
+  font-family: system-ui, -apple-system, Arial;
+  font-size: 14px;
+  transition: all 0.2s ease;
+  cursor: pointer;
+}
+
+select:focus {
+  outline: none;
+  border-color: var(--switchbot-red, #ef4444);
+  box-shadow: 0 0 0 3px rgba(239, 68, 68, 0.1);
+}
+
+.status {
+  font-size: 14px;
+  margin-top: 4px;
+}
+
+.status.ok {
+  color: #10b981;
+}
+
+.error {
+  color: #ef4444;
+}
+
+.success-msg {
+  color: #10b981;
+  margin-top: 8px;
+}
+
+.card {
+  padding: 16px;
+  border-radius: 8px;
+  margin-bottom: 16px;
+}
+
+.device-item {
+  padding: 10px 12px;
+  border-radius: 6px;
+  margin-bottom: 6px;
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  justify-content: space-between;
+  transition: all 0.2s ease;
+}
+
+.device-item:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.card {
+  padding: 16px;
+  border-radius: 8px;
+  margin-bottom: 16px;
+  transition: box-shadow 0.2s ease;
+}
+
+.card:hover {
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+}