@switchbot/homebridge-switchbot 5.0.0-beta.98 → 5.0.0

package/src/deviceFactory.ts

@@ -1,35 +1,39 @@
-import type { SwitchBotPluginConfig, DeviceType } from './settings.js'
-import { SwitchBotClient } from './switchbotClient.js'
+import type { Logger } from 'homebridge'
+
+import type { DeviceType, SwitchBotPluginConfig } from './settings.js'
+
+import { DEVICE_TYPE_NORMALIZATION_MAP } from './device-types.js'
 import {
-  GenericDevice,
+  BlindTiltDevice,
   BotDevice,
+  ContactSensorDevice,
+  Curtain3Device,
   CurtainDevice,
   FanDevice,
+  GenericDevice,
+  Hub2Device,
+  HumidifierDevice,
   LightDevice,
   LightStripDevice,
-  MotionSensorDevice,
-  ContactSensorDevice,
-  VacuumDevice,
   LockDevice,
-  HumidifierDevice,
-  TemperatureSensorDevice,
-  RelaySwitchDevice,
-  RelaySwitch1PMDevice,
+  MeterDevice,
+  MotionSensorDevice,
   PlugDevice,
   PlugMiniDevice,
-  BlindTiltDevice,
-  Curtain3Device,
+  RelaySwitch1PMDevice,
+  RelaySwitchDevice,
   RollerShadeDevice,
-  Hub2Device,
-  MeterDevice,
-  WaterDetectorDevice,
   SmartFanDevice,
   StripLightDevice,
+  TemperatureSensorDevice,
+  VacuumDevice,
   WalletFinderDevice,
+  WaterDetectorDevice,
   WoSweeperDevice,
   WoSweeperMiniDevice,
   WoSweeperMiniProDevice,
 } from './devices/genericDevice.js'
+import { SwitchBotClient } from './switchbotClient.js'
 
 export interface DeviceOptions {
   id: string
@@ -39,52 +43,110 @@ export interface DeviceOptions {
 }
 
 const DEVICE_CLASS_MAP: Record<string, any> = {
-  bot: BotDevice,
-  curtain: CurtainDevice,
-  fan: FanDevice,
-  light: LightDevice,
-  lightstrip: LightStripDevice,
-  motion: MotionSensorDevice,
-  contact: ContactSensorDevice,
-  vacuum: VacuumDevice,
-  lock: LockDevice,
-  humidifier: HumidifierDevice,
-  temperature: TemperatureSensorDevice,
-  'relay switch 1': RelaySwitchDevice,
-  'relay switch 1pm': RelaySwitch1PMDevice,
-  plug: PlugDevice,
+  // Primary device type keys (lowercase, simplified)
+  'bot': BotDevice,
+  'curtain': CurtainDevice,
+  'curtain3': Curtain3Device,
+  'fan': FanDevice,
+  'light': LightDevice,
+  'lightstrip': LightStripDevice,
+  'motion': MotionSensorDevice,
+  'contact': ContactSensorDevice,
+  'vacuum': VacuumDevice,
+  // Canonical, normalized device type keys (lowercase, mapped to device classes)
+  'video doorbell': GenericDevice,
+  'smart radiator thermostat': GenericDevice,
+  'woiosensor': GenericDevice,
+  'garage door opener': GenericDevice,
+  'air purifier table pm2.5': GenericDevice,
+  'air purifier voc': GenericDevice,
+  'air purifier table voc': GenericDevice,
+  'meterplus': MeterDevice,
+  'meterpro': MeterDevice,
+  'meterpro(co2)': MeterDevice,
+  'walletfinder': WalletFinderDevice,
+  'plug': PlugDevice,
+  'plug mini (eu)': PlugMiniDevice,
   'plug mini (jp)': PlugMiniDevice,
   'plug mini (us)': PlugMiniDevice,
+  'relay switch 1pm': RelaySwitch1PMDevice,
+  'relay switch 2pm': RelaySwitch1PMDevice,
+  'k10+ pro': WoSweeperDevice,
+  'robot vacuum cleaner k10+ pro combo': WoSweeperDevice,
+  'robot vacuum cleaner k11+': WoSweeperDevice,
+  'robot vacuum cleaner k20 plus pro': WoSweeperDevice,
+  'ai hub': GenericDevice,
+  'hub': GenericDevice,
+  'hub 2': Hub2Device,
+  'hub 3': GenericDevice,
+  'hub mini': GenericDevice,
+  'hub plus': GenericDevice,
+  'indoor cam': GenericDevice,
+  'pan/tilt cam': GenericDevice,
+  'pan/tilt cam 2k': GenericDevice,
+  'pan/tilt cam plus 2k': GenericDevice,
+  'pan/tilt cam plus 3k': GenericDevice,
+  'humidifier': HumidifierDevice, // Includes evaporative humidifier mapping
+  'roller shade': RollerShadeDevice,
+  'strip light 3': StripLightDevice,
+  'circulator fan': FanDevice,
+  'smart lock pro': LockDevice,
+  'lock lite': LockDevice,
+  'keypad': LockDevice,
+  'lock vision pro': LockDevice,
+  'floor lamp': LightDevice,
+  'rgbicww floor lamp': LightStripDevice,
+  'rgbicww strip light': LightStripDevice,
+  'home climate panel': GenericDevice, // Climate panel family
+  'lock': LockDevice,
+  'humidifier2': HumidifierDevice,
+  'temperature': TemperatureSensorDevice,
+  'relay switch 1': RelaySwitchDevice,
   'blind tilt': BlindTiltDevice,
-  curtain3: Curtain3Device,
   'worollershade': RollerShadeDevice,
   'wo rollershade': RollerShadeDevice,
-  'roller shade': RollerShadeDevice,
   'rollershade': RollerShadeDevice,
-  'hub 2': Hub2Device,
-  meter: MeterDevice,
-  'meterplus': MeterDevice,
+  'meter': MeterDevice,
   'meter plus (jp)': MeterDevice,
-  'meterpro': MeterDevice,
-  'meterpro(co2)': MeterDevice,
   'water detector': WaterDetectorDevice,
   'smart fan': SmartFanDevice,
   'strip light': StripLightDevice,
-  'walletfinder': WalletFinderDevice,
   'wosweeper': WoSweeperDevice,
   'wosweepermini': WoSweeperMiniDevice,
   'wosweeperminipro': WoSweeperMiniProDevice,
   'k10+': WoSweeperDevice,
-  'k10+ pro': WoSweeperDevice,
   'k10+ pro (wosweeperminipro)': WoSweeperMiniProDevice,
+  'battery circulator fan': FanDevice,
+  'standing circulator fan': FanDevice,
+  'smart lock': LockDevice,
+  'smart lock ultra': LockDevice,
+  'keypad touch': LockDevice,
+  'keypad vision': LockDevice,
+  'keypad vision pro': LockDevice,
+  'color bulb': LightDevice,
+  'ceiling light': LightDevice,
+  'ceiling light pro': LightDevice,
+  'candle warmer lamp': LightDevice,
+  'rgbic neon rope light': LightStripDevice,
+  'rgbic neon wire rope light': LightStripDevice,
+  'robot vacuum cleaner s1': VacuumDevice,
+  'robot vacuum cleaner s1 plus': VacuumDevice,
+  'robot vacuum cleaner s10': VacuumDevice,
+  'robot vacuum cleaner s20': VacuumDevice,
 }
 
 function classForType(type: string) {
-  const key = (type || '').toLowerCase()
+  const rawKey = (type || '').toLowerCase()
+  const key = DEVICE_TYPE_NORMALIZATION_MAP[rawKey] ?? rawKey
   return DEVICE_CLASS_MAP[key] ?? GenericDevice
 }
 
-export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConfig, useMatter: boolean) {
+export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConfig, useMatter: boolean, log?: Logger) {
+  // Always pass the logger to both device opts and config
+  const logger = log || (cfg as any)?.logger || (cfg as any)?.log
+  if (opts && opts.name && logger && typeof logger.info === 'function') {
+    logger.info(`[Matter/Debug] createDevice: Passing opts for ${opts.name}:`, JSON.stringify(opts, null, 2))
+  }
   // Reuse existing client when provided via config to avoid creating
   // a new SwitchBotClient per device (which can be expensive).
   let client: any = (cfg as any)?._client ?? null
@@ -92,12 +154,26 @@ export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConf
     client = new SwitchBotClient(cfg)
     await client.init()
   }
-
   // Pass client via config so devices can access it
   const mergedCfg = { ...(cfg as any), _client: client }
-
+  // Always pass logger to mergedCfg
+  if (logger) {
+    mergedCfg.log = logger
+  }
+  // Pass encryptionKey and keyId to device opts if present
+  const deviceOpts = { ...opts }
+  if (opts.encryptionKey) {
+    deviceOpts.encryptionKey = opts.encryptionKey
+  }
+  if (opts.keyId) {
+    deviceOpts.keyId = opts.keyId
+  }
+  // Always pass logger to deviceOpts
+  if (logger) {
+    deviceOpts.log = logger
+  }
   const DeviceCtor = classForType(opts.type)
-  const device = new DeviceCtor(opts, mergedCfg)
+  const device = new DeviceCtor(deviceOpts, mergedCfg)
   await device.init()
 
   // Attach a simple getState delegator to the client where appropriate
@@ -106,7 +182,9 @@ export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConf
     try {
       // Prefer client-backed getDevice when available
       const dev = await client.getDevice(opts.id)
-      if (dev) return dev
+      if (dev) {
+        return dev
+      }
     } catch (e) {
       // ignore and fallback to device implementation
     }
@@ -116,7 +194,9 @@ export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConf
   // Provide accessory factory based on platform selection
   return {
     instance: device,
-    createAccessory: (api: any) => (useMatter ? device.createMatterAccessory(api) : device.createHAPAccessory(api)),
+    createAccessory: useMatter
+      ? async (api: any) => await device.createMatterAccessory(api)
+      : (api: any) => device.createHAPAccessory(api),
     protocol: useMatter ? 'matter' : 'hap',
   }
 }