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

package/src/{device → devices-hap}/curtain.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicChange, CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, curtain3ServiceData, curtain3WebhookContext, curtainServiceData, curtainStatus, curtainWebhookContext, device, SwitchBotBLE, SwitchbotDevice, WoCurtain } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { curtainConfig, devicesConfig } from '../settings.js'
 
 import { hostname } from 'node:os'
@@ -77,7 +77,7 @@ export class Curtain extends deviceBase {
   doCurtainUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {
@@ -378,9 +378,11 @@ export class Curtain extends deviceBase {
     this.debugLog('BLEparseStatus')
     this.debugLog(`(position, battery) = BLE:(${this.serviceData.position}, ${this.serviceData.battery}), current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`)
     // CurrentPosition
-    if ('position' in this.serviceData) {
-      this.WindowCovering.CurrentPosition = 100 - this.serviceData.position
+    if ('position' in this.serviceData && this.serviceData.position !== undefined && this.serviceData.position !== null && !Number.isNaN(Number(this.serviceData.position))) {
+      this.WindowCovering.CurrentPosition = 100 - Number(this.serviceData.position)
       await this.getCurrentPostion()
+    } else {
+      this.warnLog(`Invalid position data from BLE: ${this.serviceData.position}`)
     }
     // CurrentAmbientLightLevel
     if (!(this.device as curtainConfig).hide_lightsensor && this.LightSensor?.Service && 'lightLevel' in this.serviceData) {
@@ -489,10 +491,10 @@ export class Curtain extends deviceBase {
         // Start to monitor advertisement packets
         const serviceData = await this.monitorAdvertisementPackets(switchBotBLE) as curtainServiceData | curtain3ServiceData
         // Update HomeKit
-        if ((serviceData.model === SwitchBotBLEModel.Curtain || SwitchBotBLEModel.Curtain3)
-          && (serviceData.modelName === SwitchBotBLEModelName.Curtain || SwitchBotBLEModelName.Curtain3)) {
+        if ((serviceData.model === SwitchBotBLEModel.Curtain || serviceData.model === SwitchBotBLEModel.Curtain3)
+          && (serviceData.modelName === SwitchBotBLEModelName.Curtain || serviceData.modelName === SwitchBotBLEModelName.Curtain3)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -559,7 +561,7 @@ export class Curtain extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: curtainServiceData | curtain3ServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -619,7 +621,11 @@ export class Curtain extends deviceBase {
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  return await deviceList[0].runToPos(100 - Number(this.WindowCovering.TargetPosition), adjustedMode)
+                  if (deviceList && Array.isArray(deviceList) && deviceList.length > 0) {
+                    return await deviceList[0].runToPos(100 - Number(this.WindowCovering.TargetPosition), adjustedMode)
+                  } else {
+                    throw new Error('No device found')
+                  }
                 },
               })
             })
@@ -777,6 +783,17 @@ export class Curtain extends deviceBase {
 
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.setMinMax()
+
+    // Validate position values to prevent NaN
+    if (Number.isNaN(Number(this.WindowCovering.CurrentPosition))) {
+      this.warnLog(`CurrentPosition is NaN, keeping previous value`)
+      this.WindowCovering.CurrentPosition = this.accessory.context.CurrentPosition ?? 100
+    }
+    if (Number.isNaN(Number(this.WindowCovering.TargetPosition))) {
+      this.warnLog(`TargetPosition is NaN, keeping previous value`)
+      this.WindowCovering.TargetPosition = this.accessory.context.TargetPosition ?? 100
+    }
+
     // CurrentPosition
     await this.updateCharacteristic(this.WindowCovering.Service, this.hap.Characteristic.CurrentPosition, this.WindowCovering.CurrentPosition, 'CurrentPosition')
     // PositionState
@@ -799,17 +816,22 @@ export class Curtain extends deviceBase {
   }
 
   async BLEPushConnection() {
+    this.warnLog('BLE connection failed for push operation')
     if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
       this.warnLog('Using OpenAPI Connection to Push Changes')
       await this.openAPIpushChanges()
+    } else {
+      this.errorLog('No fallback available for BLE push failure. Consider using BLE/OpenAPI connection type.')
     }
   }
 
   async BLERefreshConnection(switchbot: SwitchBotBLE): Promise<void> {
-    this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
+    this.warnLog(`BLE connection failed for refresh operation, node-switchbot: ${switchbot}`)
     if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
       this.warnLog('Using OpenAPI Connection to Refresh Status')
       await this.openAPIRefreshStatus()
+    } else {
+      this.errorLog('No fallback available for BLE refresh failure. Consider using BLE/OpenAPI connection type.')
     }
   }
 

package/src/{device → devices-hap}/device.ts

@@ -7,7 +7,7 @@ import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service
 import type { MqttClient } from 'mqtt'
 import type { ad, bodyChange, device, deviceStatus, deviceStatusRequest, pushResponse, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { blindTiltConfig, botConfig, ceilingLightConfig, colorBulbConfig, contactConfig, curtainConfig, devicesConfig, hubConfig, humidifierConfig, indoorOutdoorSensorConfig, lockConfig, meterConfig, motionConfig, plugConfig, relaySwitch1Config, relaySwitch1PMConfig, stripLightConfig, SwitchBotPlatformConfig, waterDetectorConfig } from '../settings.js'
 
 import { hostname } from 'node:os'
@@ -53,7 +53,7 @@ export abstract class deviceBase {
   protected mqttClient: MqttClient | null = null
 
   constructor(
-    protected readonly platform: SwitchBotPlatform,
+    protected readonly platform: SwitchBotHAPPlatform,
     protected accessory: PlatformAccessory,
     protected device: device & devicesConfig,
   ) {
@@ -318,7 +318,7 @@ export abstract class deviceBase {
     try {
       await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac })
     } 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
     let serviceData = { model: this.device.bleModel, modelName: this.device.bleModelName } as ad['serviceData']
@@ -337,7 +337,7 @@ export abstract class deviceBase {
     try {
       await switchbot.stopScan()
     } catch (e: any) {
-      this.errorLog(`Failed to stop BLE scanning. Error:${e.message ?? e}`)
+      this.errorLog(`Failed to stop BLE scanning. Error: ${e.message ?? e}`)
     }
     return serviceData
   }
@@ -350,7 +350,7 @@ export abstract class deviceBase {
         try {
           await switchbot.startScan({ model: this.device.bleModel })
         } 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
         switchbot.onadvertisement = (ad: ad) => {
@@ -361,7 +361,7 @@ export abstract class deviceBase {
         try {
           switchbot.stopScan()
         } catch (e: any) {
-          this.errorLog(`Failed to stop BLE scanning. Error:${e.message ?? e}`)
+          this.errorLog(`Failed to stop BLE scanning. Error: ${e.message ?? e}`)
         }
       })()
     }
@@ -446,6 +446,12 @@ export abstract class deviceBase {
         bleModelName: SwitchBotBLEModelName.Hub2,
         bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Hub2,
       },
+      'Hub 3': {
+        model: SwitchBotModel.Hub3,
+        bleModel: SwitchBotBLEModel.Hub3,
+        bleModelName: SwitchBotBLEModelName.Hub3,
+        bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Hub3,
+      },
       'Bot': {
         model: SwitchBotModel.Bot,
         bleModel: SwitchBotBLEModel.Bot,

package/src/{device → devices-hap}/fan.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { batteryCirculatorFanServiceData, batteryCirculatorFanStatus, batteryCirculatorFanWebhookContext, bodyChange, device, SwitchBotBLE, SwitchbotDevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig } from '../settings.js'
 
 /*
@@ -57,7 +57,7 @@ export class Fan extends deviceBase {
   doFanUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/hub.ts

@@ -3,9 +3,9 @@
  * hub.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
-import type { device, hub2ServiceData, hub2Status, hub2WebhookContext, SwitchBotBLE } from 'node-switchbot'
+import type { device, hub2ServiceData, hub2Status, hub2WebhookContext, hub3ServiceData, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, hubConfig } from '../settings.js'
 
 import { Units } from 'homebridge'
@@ -46,14 +46,14 @@ export class Hub extends deviceBase {
   webhookContext!: hub2WebhookContext
 
   // BLE
-  serviceData!: hub2ServiceData
+  serviceData!: hub2ServiceData | hub3ServiceData
 
   // Updates
   hubUpdateInProgress!: boolean
   doHubUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {
@@ -292,9 +292,10 @@ export class Hub extends deviceBase {
       // Start to monitor advertisement packets
       (async () => {
         // Start to monitor advertisement packets
-        const serviceData = await this.monitorAdvertisementPackets(switchBotBLE) as hub2ServiceData
+        const serviceData = await this.monitorAdvertisementPackets(switchBotBLE) as hub2ServiceData | hub3ServiceData
         // Update HomeKit
-        if (serviceData.model === SwitchBotBLEModel.Hub2 && serviceData.modelName === SwitchBotBLEModelName.Hub2) {
+        if ((serviceData.model === SwitchBotBLEModel.Hub2 && serviceData.modelName === SwitchBotBLEModelName.Hub2)
+          || (serviceData.model === SwitchBotBLEModel.Hub3 && serviceData.modelName === SwitchBotBLEModelName.Hub3)) {
           this.serviceData = serviceData
           if (serviceData !== undefined || serviceData !== null) {
             await this.BLEparseStatus()

package/src/{device → devices-hap}/humidifier.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, device, humidifier2ServiceData, humidifier2Status, humidifier2WebhookContext, humidifierServiceData, humidifierStatus, humidifierWebhookContext, SwitchBotBLE, SwitchbotDevice, WoHumi } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, humidifierConfig } from '../settings.js'
 
 /*
@@ -56,7 +56,7 @@ export class Humidifier extends deviceBase {
   doHumidifierUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/iosensor.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { device, outdoorMeterServiceData, outdoorMeterStatus, outdoorMeterWebhookContext, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, indoorOutdoorSensorConfig } from '../settings.js'
 
 import { Units } from 'homebridge'
@@ -59,7 +59,7 @@ export class IOSensor extends deviceBase {
   doIOSensorUpdate: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/lightstrip.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, Controller, ControllerConstructor, ControllerServiceMap, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, device, stripLightServiceData, stripLightStatus, stripLightWebhookContext, SwitchBotBLE, SwitchbotDevice, WoStrip } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, stripLightConfig } from '../settings.js'
 
 /*
@@ -54,7 +54,7 @@ export class StripLight extends deviceBase {
   doStripLightUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/lock.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, device, lockProServiceData, lockProStatus, lockProWebhookContext, lockServiceData, lockStatus, lockWebhookContext, SwitchBotBLE, SwitchbotDevice, WoSmartLock } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, lockConfig } from '../settings.js'
 
 /*
@@ -60,7 +60,7 @@ export class Lock extends deviceBase {
   doLockUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/meter.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { device, meterServiceData, meterStatus, meterWebhookContext, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, meterConfig } from '../settings.js'
 
 import { Units } from 'homebridge'
@@ -54,7 +54,7 @@ export class Meter extends deviceBase {
   doMeterUpdate: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/meterplus.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { device, meterPlusServiceData, meterPlusStatus, meterPlusWebhookContext, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, meterConfig } from '../settings.js'
 
 import { Units } from 'homebridge'
@@ -59,7 +59,7 @@ export class MeterPlus extends deviceBase {
   doMeterUpdate: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/meterpro.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { device, meterProCO2ServiceData, meterProCO2Status, meterProCO2WebhookContext, meterProServiceData, meterProStatus, meterProWebhookContext, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, meterProConfig } from '../settings.js'
 
 import { Units } from 'homebridge'
@@ -66,7 +66,7 @@ export class MeterPro extends deviceBase {
   doMeterUpdate: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {
@@ -237,7 +237,6 @@ export class MeterPro extends deviceBase {
         ? this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_ABNORMAL
         : this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL
       this.debugLog(`CarbonDioxideDetected: ${this.CarbonDioxideSensor.CarbonDioxideDetected}`)
-      this.warnLog('Carbon Dioxide Sensor is not supported yet.')
     }
     // Battery Info
     if ('battery' in this.serviceData) {
@@ -277,7 +276,6 @@ export class MeterPro extends deviceBase {
         ? this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_ABNORMAL
         : this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL
       this.debugLog(`CarbonDioxideDetected: ${this.CarbonDioxideSensor.CarbonDioxideDetected}`)
-      this.warnLog('Carbon Dioxide Sensor is not supported yet.')
     }
 
     // Battery Info
@@ -338,7 +336,6 @@ export class MeterPro extends deviceBase {
         ? this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_ABNORMAL
         : this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL
       this.debugLog(`CarbonDioxideDetected: ${this.CarbonDioxideSensor.CarbonDioxideDetected}`)
-      this.warnLog('Carbon Dioxide Sensor is not supported yet.')
     }
   }
 
@@ -469,6 +466,14 @@ export class MeterPro extends deviceBase {
     if (!(this.device as meterProConfig).hide_temperature && this.TemperatureSensor?.Service) {
       await this.updateCharacteristic(this.TemperatureSensor.Service, this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor.CurrentTemperature, 'CurrentTemperature')
     }
+    // CarbonDioxideDetected
+    if (!(this.device as meterProConfig).hide_co2 && this.CarbonDioxideSensor?.Service && this.device.deviceType === 'MeterPro(CO2)') {
+      await this.updateCharacteristic(this.CarbonDioxideSensor.Service, this.hap.Characteristic.CarbonDioxideDetected, this.CarbonDioxideSensor.CarbonDioxideDetected, 'CarbonDioxideDetected')
+    }
+    // CarbonDioxideLevel
+    if (!(this.device as meterProConfig).hide_co2 && this.CarbonDioxideSensor?.Service && this.device.deviceType === 'MeterPro(CO2)') {
+      await this.updateCharacteristic(this.CarbonDioxideSensor.Service, this.hap.Characteristic.CarbonDioxideLevel, this.CarbonDioxideSensor.CarbonDioxideLevel, 'CarbonDioxideLevel')
+    }
     // BatteryLevel
     await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel, 'BatteryLevel')
     // StatusLowBattery
@@ -491,6 +496,10 @@ export class MeterPro extends deviceBase {
       if (!(this.device as meterProConfig).hide_temperature && this.TemperatureSensor?.Service) {
         this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, 30)
       }
+      if (!(this.device as meterProConfig).hide_co2 && this.CarbonDioxideSensor?.Service && this.device.deviceType === 'MeterPro(CO2)') {
+        this.CarbonDioxideSensor.Service.updateCharacteristic(this.hap.Characteristic.CarbonDioxideDetected, this.hap.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL)
+        this.CarbonDioxideSensor.Service.updateCharacteristic(this.hap.Characteristic.CarbonDioxideLevel, 0)
+      }
       this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, 100)
       this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL)
     }
@@ -503,6 +512,10 @@ export class MeterPro extends deviceBase {
     if (!(this.device as meterProConfig).hide_temperature && this.TemperatureSensor?.Service) {
       this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e)
     }
+    if (!(this.device as meterProConfig).hide_co2 && this.CarbonDioxideSensor?.Service && this.device.deviceType === 'MeterPro(CO2)') {
+      this.CarbonDioxideSensor.Service.updateCharacteristic(this.hap.Characteristic.CarbonDioxideDetected, e)
+      this.CarbonDioxideSensor.Service.updateCharacteristic(this.hap.Characteristic.CarbonDioxideLevel, e)
+    }
     this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e)
     this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e)
   }

package/src/{device → devices-hap}/motion.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { device, motionSensorServiceData, motionSensorStatus, motionSensorWebhookContext, SwitchBotBLE } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, motionConfig } from '../settings.js'
 
 /*
@@ -58,7 +58,7 @@ export class Motion extends deviceBase {
   doMotionUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/plug.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, device, plugMiniJPServiceData, plugMiniJPWebhookContext, plugMiniStatus, plugMiniUSServiceData, plugMiniUSWebhookContext, plugStatus, plugWebhookContext, SwitchBotBLE, SwitchbotDevice, WoPlugMiniUS } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig } from '../settings.js'
 
 /*
@@ -40,7 +40,7 @@ export class Plug extends deviceBase {
   doPlugUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/relayswitch.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, device, relaySwitch1Context, relaySwitch1PMContext, relaySwitch1PMServiceData, relaySwitch1PMStatus, relaySwitch1ServiceData, relaySwitch1Status, SwitchBotBLE, SwitchbotDevice, WoRelaySwitch1, WoRelaySwitch1PM } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, relaySwitch1Config, relaySwitch1PMConfig } from '../settings.js'
 
 /*
@@ -107,7 +107,7 @@ export class RelaySwitch extends deviceBase {
    * @constructor
    */
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/robotvacuumcleaner.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { bodyChange, device, floorCleaningRobotS10Status, floorCleaningRobotS10WebhookContext, robotVacuumCleanerS1PlusStatus, robotVacuumCleanerS1PlusWebhookContext, robotVacuumCleanerS1Status, robotVacuumCleanerS1WebhookContext, robotVacuumCleanerServiceData, SwitchBotBLE, SwitchbotDevice } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig } from '../settings.js'
 
 /*
@@ -49,7 +49,7 @@ export class RobotVacuumCleaner extends deviceBase {
   doRobotVacuumCleanerUpdate!: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/{device → devices-hap}/waterdetector.ts

@@ -5,7 +5,7 @@
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 import type { device, SwitchBotBLE, waterLeakDetectorServiceData, waterLeakDetectorStatus, waterLeakDetectorWebhookContext } from 'node-switchbot'
 
-import type { SwitchBotPlatform } from '../platform.js'
+import type { SwitchBotHAPPlatform } from '../platform-hap.js'
 import type { devicesConfig, waterDetectorConfig } from '../settings.js'
 
 /*
@@ -54,7 +54,7 @@ export class WaterDetector extends deviceBase {
   doWaterDetectorUpdate: Subject<void>
 
   constructor(
-    readonly platform: SwitchBotPlatform,
+    readonly platform: SwitchBotHAPPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {

package/src/devices-matter/BaseMatterAccessory.ts

@@ -0,0 +1,131 @@
+/**
+ * Base Matter Accessory Class
+ *
+ * This base class implements the MatterAccessory interface and provides
+ * common functionality that all Matter devices can use.
+ *
+ * Individual device types should extend this class and call super() with
+ * the required configuration.
+ */
+
+import type { API, EndpointType, Logger, MatterAccessory } from 'homebridge'
+
+export interface BaseMatterAccessoryConfig {
+  uuid: string
+  displayName: string
+  deviceType: EndpointType
+  serialNumber: string
+  manufacturer: string
+  model: string
+  firmwareRevision: string
+  hardwareRevision: string
+  context?: Record<string, unknown>
+  clusters?: MatterAccessory['clusters']
+  handlers?: MatterAccessory['handlers']
+  parts?: MatterAccessory['parts']
+}
+
+/**
+ * Base class for all Matter accessories
+ * Implements the MatterAccessory interface and provides common methods
+ */
+export abstract class BaseMatterAccessory implements MatterAccessory {
+  // Required MatterAccessory properties
+  public readonly uuid: string
+  public readonly displayName: string
+  public readonly deviceType: EndpointType
+  public readonly serialNumber: string
+  public readonly manufacturer: string
+  public readonly model: string
+  public readonly firmwareRevision: string
+  public readonly hardwareRevision: string
+  public readonly context: Record<string, unknown>
+  public readonly clusters?: MatterAccessory['clusters']
+  public readonly handlers?: MatterAccessory['handlers']
+  public readonly parts?: MatterAccessory['parts']
+
+  // Protected properties available to child classes
+  protected readonly api: API
+  protected readonly log: Logger
+
+  constructor(
+    api: API,
+    log: Logger,
+    config: BaseMatterAccessoryConfig,
+  ) {
+    this.api = api
+    this.log = log
+
+    // Set all required properties
+    this.uuid = config.uuid
+    this.displayName = config.displayName
+    this.deviceType = config.deviceType
+    this.serialNumber = config.serialNumber
+    this.manufacturer = config.manufacturer
+    this.model = config.model
+    this.firmwareRevision = config.firmwareRevision
+    this.hardwareRevision = config.hardwareRevision
+    this.clusters = config.clusters
+    this.handlers = config.handlers
+    this.parts = config.parts
+
+    // Set context with all metadata
+    this.context = {
+      serialNumber: this.serialNumber,
+      manufacturer: this.manufacturer,
+      model: this.model,
+      firmwareRevision: this.firmwareRevision,
+      hardwareRevision: this.hardwareRevision,
+      ...config.context,
+    }
+  }
+
+  /**
+   * Update the accessory state
+   * Helper method to update cluster attributes
+   */
+  protected async updateState(cluster: string, attributes: Record<string, unknown>): Promise<void> {
+    await this.api.matter.updateAccessoryState(this.uuid, cluster, attributes)
+    this.log.debug(`[${this.displayName}] Updated ${cluster} state:`, attributes)
+  }
+
+  /**
+   * Log helper methods
+   */
+  protected logInfo(message: string, ...args: unknown[]): void {
+    this.log.info(`[${this.displayName}] ${message}`, ...args)
+  }
+
+  protected logError(message: string, ...args: unknown[]): void {
+    this.log.error(`[${this.displayName}] ${message}`, ...args)
+  }
+
+  protected logDebug(message: string, ...args: unknown[]): void {
+    this.log.debug(`[${this.displayName}] ${message}`, ...args)
+  }
+
+  protected logWarn(message: string, ...args: unknown[]): void {
+    this.log.warn(`[${this.displayName}] ${message}`, ...args)
+  }
+
+  /**
+   * Convert this class instance to a plain MatterAccessory object
+   * This is what gets registered with Homebridge
+   */
+  public toAccessory(): MatterAccessory {
+    return {
+      uuid: this.uuid,
+      displayName: this.displayName,
+      deviceType: this.deviceType,
+      serialNumber: this.serialNumber,
+      manufacturer: this.manufacturer,
+      model: this.model,
+      firmwareRevision: this.firmwareRevision,
+      hardwareRevision: this.hardwareRevision,
+      context: this.context,
+      clusters: this.clusters,
+      handlers: this.handlers,
+      parts: this.parts,
+    }
+  }
+}