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

package/src/homebridge-ui/utils/config-parser.ts

@@ -0,0 +1,108 @@
+import type { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils'
+
+import fs from 'node:fs/promises'
+
+import { uiLog } from './logger.js'
+
+// Module-scope regex pattern to avoid recompilation
+export const SWITCHBOT_PLATFORM_REGEX = /switchbot/i
+
+/**
+ * Get reference to the devices array in platform config
+ */
+export function getDevicesRef(platform: any): any[] {
+  if (!platform || typeof platform !== 'object') {
+    return []
+  }
+
+  if (Array.isArray(platform.devices)) {
+    return platform.devices
+  }
+
+  platform.devices = []
+  return platform.devices
+}
+
+/**
+ * Get all device arrays from platform config
+ */
+export function getDeviceArrays(platform: any): any[][] {
+  const rootDevices = getDevicesRef(platform)
+  return [rootDevices]
+}
+
+/**
+ * Get all unique devices from platform config
+ */
+export function getAllDevices(platform: any): any[] {
+  const all = getDevicesRef(platform)
+  const seen = new Set<string>()
+
+  return all.filter((d: any) => {
+    const id = String(d?.deviceId ?? d?.id ?? '').trim().toLowerCase()
+    if (!id || seen.has(id)) {
+      return false
+    }
+    seen.add(id)
+    return true
+  })
+}
+
+/**
+ * Get credential from platform config
+ */
+export function getCredential(platform: any, key: 'openApiToken' | 'openApiSecret'): string | undefined {
+  return platform?.[key]
+}
+
+/**
+ * Set credential in platform config
+ */
+export function setCredential(platform: any, key: 'openApiToken' | 'openApiSecret', value: string): void {
+  if (!platform || typeof platform !== 'object') {
+    return
+  }
+
+  platform[key] = value
+}
+
+/**
+ * Find and parse the SwitchBot platform config from Homebridge config file
+ */
+export async function getSwitchBotPlatformConfig(server: HomebridgePluginUiServer) {
+  const cfgPath = server.homebridgeConfigPath
+  if (!cfgPath) {
+    throw new Error('HOMEBRIDGE_CONFIG_PATH not set')
+  }
+
+  const raw = await fs.readFile(cfgPath, 'utf-8')
+  const cfg = JSON.parse(raw)
+
+  const platforms = Array.isArray(cfg.platforms) ? cfg.platforms : []
+
+  const candidates = platforms.filter((p: any) => {
+    const platformName = p.platform || p.name || ''
+    return !!platformName && (SWITCHBOT_PLATFORM_REGEX.test(String(platformName)) || String(platformName).toLowerCase() === '@switchbot/homebridge-switchbot')
+  })
+
+  uiLog.info(`Found ${candidates.length} SwitchBot candidate(s)`)
+
+  const platform = candidates.find((p: any) => {
+    const name = String(p.platform || '').toLowerCase()
+    return name === 'switchbot' || name.includes('switchbot')
+  })
+
+  if (!platform) {
+    throw new Error('SwitchBot platform not found in config. Please add the plugin configuration first.')
+  }
+
+  uiLog.info(`Using SwitchBot platform: ${platform.name || platform.platform || 'SwitchBot'}`)
+  return { platform, cfg, cfgPath }
+}
+
+/**
+ * Save the Homebridge config file
+ */
+export async function saveConfig(cfgPath: string, cfg: any): Promise<void> {
+  await fs.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf-8')
+}

package/src/homebridge-ui/utils/logger.ts

@@ -0,0 +1,17 @@
+/* eslint-disable no-console */
+const PREFIX = '[SwitchBot UI]'
+
+export const uiLog = {
+  info: (message: string, ...parameters: any[]) => {
+    console.log(PREFIX, message, ...parameters)
+  },
+  warn: (message: string, ...parameters: any[]) => {
+    console.warn(PREFIX, message, ...parameters)
+  },
+  error: (message: string, ...parameters: any[]) => {
+    console.error(PREFIX, message, ...parameters)
+  },
+  debug: (message: string, ...parameters: any[]) => {
+    console.debug(PREFIX, message, ...parameters)
+  },
+}

package/src/platform.ts

@@ -96,10 +96,14 @@ const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
     },
   }, // Switch in HAP, RobotVacuumCleaner in Matter
   curtain: {
-    windowCovering: {},
+    windowCovering: {
+      type: 4, // Drapery - safe default for LF conformance
+    },
   }, // WindowCovering → WindowCovering (includes curtain3, rollershade variants via normalization)
   blindtilt: {
-    windowCovering: {},
+    windowCovering: {
+      type: 8, // TiltBlindLiftAndTilt - supports tilt feature
+    },
   }, // WindowCovering with tilt → WindowCovering
   fan: {
     onOff: { onOff: false },

package/src/switchbotClient.ts

@@ -43,6 +43,8 @@ export class SwitchBotClient implements ISwitchBotClient {
         enableRetry: true,            // Retry with exponential backoff
         enableCircuitBreaker: true,   // Circuit breaker per connection type
         enableMetrics: true,          // Connection tracking and statistics
+        enableBLE: true,              // Enable BLE scanning by default
+        scanDuration: 5000,           // BLE scan duration in milliseconds
         ...(typeof (this.cfg as any)?.nodeClientConfig === 'object' && (this.cfg as any).nodeClientConfig),
       })
       this.logger?.info?.('SwitchBot client initialized with native resilience features')