@switchbot/homebridge-switchbot 4.3.2-beta.9 → 5.0.0-beta.1

package/src/irdevice/irdevice.ts

@@ -5,7 +5,7 @@
 import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, irdevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { irAirConfig, irDevicesConfig, irFanConfig, irLightConfig, irOtherConfig, SwitchBotPlatformConfig } from '../settings.js'
 
 export abstract class irdeviceBase {
@@ -26,7 +26,7 @@ export abstract class irdeviceBase {
   protected deviceDisablePushDetail?: boolean
 
   constructor(
-    protected readonly platform: SwitchBotPlatform,
+    protected readonly platform: SwitchBotHAPPlatform,
     protected accessory: PlatformAccessory,
     protected device: irdevice & irDevicesConfig,
   ) {

package/src/irdevice/light.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, irdevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { irDevicesConfig, irLightConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
@@ -38,7 +38,7 @@ export class Light extends irdeviceBase {
   }
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {

package/src/irdevice/other.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, irdevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { irDevicesConfig, irOtherConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
@@ -73,7 +73,7 @@ export class Others extends irdeviceBase {
   otherDeviceType?: string
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {

package/src/irdevice/tv.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, irdevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { irDevicesConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
@@ -38,7 +38,7 @@ export class TV extends irdeviceBase {
   // Characteristic Values
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {

package/src/irdevice/vacuumcleaner.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, irdevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { irDevicesConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
@@ -24,7 +24,7 @@ export class VacuumCleaner extends irdeviceBase {
   }
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {

package/src/irdevice/waterheater.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, irdevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { irDevicesConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
@@ -24,7 +24,7 @@ export class WaterHeater extends irdeviceBase {
   }
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {

package/src/{platform.ts → platform-hap.ts}

@@ -24,27 +24,27 @@ import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes'
 import { LogLevel, SwitchBotBLE, SwitchBotModel, SwitchBotOpenAPI } from 'node-switchbot'
 import { queueScheduler } from 'rxjs'
 
-import { AirPurifier } from './device/airpurifier.js'
-import { BlindTilt } from './device/blindtilt.js'
-import { Bot } from './device/bot.js'
-import { CeilingLight } from './device/ceilinglight.js'
-import { ColorBulb } from './device/colorbulb.js'
-import { Contact } from './device/contact.js'
-import { Curtain } from './device/curtain.js'
-import { Fan } from './device/fan.js'
-import { Hub } from './device/hub.js'
-import { Humidifier } from './device/humidifier.js'
-import { IOSensor } from './device/iosensor.js'
-import { StripLight } from './device/lightstrip.js'
-import { Lock } from './device/lock.js'
-import { Meter } from './device/meter.js'
-import { MeterPlus } from './device/meterplus.js'
-import { MeterPro } from './device/meterpro.js'
-import { Motion } from './device/motion.js'
-import { Plug } from './device/plug.js'
-import { RelaySwitch } from './device/relayswitch.js'
-import { RobotVacuumCleaner } from './device/robotvacuumcleaner.js'
-import { WaterDetector } from './device/waterdetector.js'
+import { AirPurifier } from './devices-hap/airpurifier.js'
+import { BlindTilt } from './devices-hap/blindtilt.js'
+import { Bot } from './devices-hap/bot.js'
+import { CeilingLight } from './devices-hap/ceilinglight.js'
+import { ColorBulb } from './devices-hap/colorbulb.js'
+import { Contact } from './devices-hap/contact.js'
+import { Curtain } from './devices-hap/curtain.js'
+import { Fan } from './devices-hap/fan.js'
+import { Hub } from './devices-hap/hub.js'
+import { Humidifier } from './devices-hap/humidifier.js'
+import { IOSensor } from './devices-hap/iosensor.js'
+import { StripLight } from './devices-hap/lightstrip.js'
+import { Lock } from './devices-hap/lock.js'
+import { Meter } from './devices-hap/meter.js'
+import { MeterPlus } from './devices-hap/meterplus.js'
+import { MeterPro } from './devices-hap/meterpro.js'
+import { Motion } from './devices-hap/motion.js'
+import { Plug } from './devices-hap/plug.js'
+import { RelaySwitch } from './devices-hap/relayswitch.js'
+import { RobotVacuumCleaner } from './devices-hap/robotvacuumcleaner.js'
+import { WaterDetector } from './devices-hap/waterdetector.js'
 import { AirConditioner } from './irdevice/airconditioner.js'
 import { AirPurifierIR } from './irdevice/airpurifier.js'
 import { Camera } from './irdevice/camera.js'
@@ -55,14 +55,14 @@ import { TV } from './irdevice/tv.js'
 import { VacuumCleaner } from './irdevice/vacuumcleaner.js'
 import { WaterHeater } from './irdevice/waterheater.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
-import { formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, safeStringify, sleep } from './utils.js'
+import { cleanDeviceConfig, formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, safeStringify, sleep } from './utils.js'
 
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
  * parse the user config and discover/register accessories with Homebridge.
  */
-export class SwitchBotPlatform implements DynamicPlatformPlugin {
+export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
   // Platform properties
   public accessories: PlatformAccessory[] = []
   public readonly api: API
@@ -119,6 +119,21 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       devices: config.devices as { deviceId: string }[],
     }
 
+    // Normalize deviceConfig to remove UI-inserted defaults (lots of false/empty values)
+    try {
+      if ((this.config as any).options) {
+        const cleaned = cleanDeviceConfig((this.config as any).options.deviceConfig)
+        if (cleaned) {
+          ;(this.config as any).options.deviceConfig = cleaned
+        } else {
+          // remove the empty deviceConfig so downstream checks treat it as absent
+          delete (this.config as any).options.deviceConfig
+        }
+      }
+    } catch (e) {
+      this.debugErrorLog(`Failed to clean deviceConfig: ${e}`)
+    }
+
     // Plugin Configuration
     this.getPlatformLogSettings()
     this.getPlatformRateSettings()
@@ -233,7 +248,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
               const context = JSON.parse(message.toString())
               this.webhookEventHandler[context.deviceMac]?.(context)
             } catch (e: any) {
-              this.errorLog(`Failed to handle webhook event. Error:${e.message ?? e}`)
+              this.errorLog(`Failed to handle webhook event. Error: ${e.message ?? e}`)
             }
           })
         }
@@ -260,14 +275,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           this.webhookEventHandler[body.context.deviceMac]?.(body.context)
         })
       } catch (e: any) {
-        this.errorLog(`Failed to setup webhook. Error:${e.message ?? e}`)
+        this.errorLog(`Failed to setup webhook. Error: ${e.message ?? e}`)
       }
 
       this.api.on('shutdown', async () => {
         try {
           this.switchBotAPI.deleteWebhook(url)
         } catch (e: any) {
-          this.errorLog(`Failed to delete webhook. Error:${e.message ?? e}`)
+          this.errorLog(`Failed to delete webhook. Error: ${e.message ?? e}`)
         }
       })
     }
@@ -318,14 +333,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           try {
             await this.switchBotBLE.startScan()
           } catch (e: any) {
-            this.errorLog(`Failed to start BLE scanning. Error:${e.message ?? e}`)
+            this.errorLog(`Failed to start BLE scanning. Error: ${e.message ?? e}`)
           }
           // Set an event handler to monitor advertisement packets
           this.switchBotBLE.onadvertisement = async (ad: any) => {
             try {
               this.bleEventHandler[ad.address]?.(ad.serviceData)
             } catch (e: any) {
-              this.errorLog(`Failed to handle BLE event. Error:${e.message ?? e}`)
+              this.errorLog(`Failed to handle BLE event. Error: ${e.message ?? e}`)
             }
           }
         })()
@@ -335,7 +350,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
             // this.switchBotBLE.stopScan()
             this.infoLog('Stopped BLE scanning to close listening.')
           } catch (e: any) {
-            this.errorLog(`Failed to stop Platform BLE scanning. Error:${e.message ?? e}`)
+            this.errorLog(`Failed to stop Platform BLE scanning. Error: ${e.message ?? e}`)
           }
         })
       }
@@ -370,10 +385,10 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         for (const deviceConfig of this.config.options.devices) {
           if (!deviceConfig.hide_device) {
             if (!deviceConfig.deviceId) {
-              throw new Error('The devices config section is missing the *Device ID* in the config. Please check your config.')
+              this.errorLog('The devices config section is missing the *Device ID* in the config. Please check your config.')
             }
             if (!deviceConfig.configDeviceType && (deviceConfig as devicesConfig).connectionType) {
-              throw new Error('The devices config section is missing the *Device Type* in the config. Please check your config.')
+              this.errorLog('The devices config section is missing the *Device Type* in the config. Please check your config.')
             }
           }
         }
@@ -583,6 +598,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       'Humidifier': this.createHumidifier.bind(this),
       'Humidifier2': this.createHumidifier.bind(this),
       'Hub 2': this.createHub2.bind(this),
+      'Hub 3': this.createHub2.bind(this),
       'Bot': this.createBot.bind(this),
       'Relay Switch 1': this.createRelaySwitch.bind(this),
       'Relay Switch 1PM': this.createRelaySwitch.bind(this),