@switchbot/homebridge-switchbot 5.0.0-beta.12 → 5.0.0-beta.121

package/src/devices-hap/waterdetector.ts

@@ -1,400 +0,0 @@
-/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * waterdetector.ts: @switchbot/homebridge-switchbot.
- */
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
-import type { device, SwitchBotBLE, waterLeakDetectorServiceData, waterLeakDetectorStatus, waterLeakDetectorWebhookContext } from 'node-switchbot'
-
-import type { SwitchBotHAPPlatform } from '../platform-hap.js'
-import type { devicesConfig, waterDetectorConfig } from '../settings.js'
-
-/*
-* For Testing Locally:
-* import { SwitchBotBLEModel, SwitchBotBLEModelName } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
-*/
-import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot'
-import { interval, skipWhile, Subject } from 'rxjs'
-
-import { formatDeviceIdAsMac } from '../utils.js'
-import { deviceBase } from './device.js'
-
-/**
- * Platform Accessory
- * An instance of this class is created for each accessory your platform registers
- * Each accessory may expose multiple services of different service types.
- */
-export class WaterDetector extends deviceBase {
-  // Services
-  private Battery: {
-    Name: CharacteristicValue
-    Service: Service
-    BatteryLevel: CharacteristicValue
-    StatusLowBattery: CharacteristicValue
-    ChargingState: CharacteristicValue
-  }
-
-  private LeakSensor?: {
-    Name: CharacteristicValue
-    Service: Service
-    StatusActive: CharacteristicValue
-    LeakDetected: CharacteristicValue
-  }
-
-  // OpenAPI
-  deviceStatus!: waterLeakDetectorStatus
-
-  // Webhook
-  webhookContext!: waterLeakDetectorWebhookContext
-
-  // BLE
-  serviceData!: waterLeakDetectorServiceData
-
-  // Updates
-  WaterDetectorUpdateInProgress!: boolean
-  doWaterDetectorUpdate: Subject<void>
-
-  constructor(
-    readonly platform: SwitchBotHAPPlatform,
-    accessory: PlatformAccessory,
-    device: device & devicesConfig,
-  ) {
-    super(platform, accessory, device)
-    // Set category
-    accessory.category = this.hap.Categories.SENSOR
-
-    // this is subject we use to track when we need to POST changes to the SwitchBot API
-    this.doWaterDetectorUpdate = new Subject()
-    this.WaterDetectorUpdateInProgress = false
-
-    // Initialize Battery Service
-    accessory.context.Battery = accessory.context.Battery ?? {}
-    this.Battery = {
-      Name: `${accessory.displayName} Battery`,
-      Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
-      BatteryLevel: accessory.context.BatteryLevel ?? 100,
-      StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
-      ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGEABLE,
-    }
-    accessory.context.Battery = this.Battery as object
-
-    // Initialize Battery Characteristic
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name).setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE).getCharacteristic(this.hap.Characteristic.BatteryLevel).onGet(() => {
-      return this.Battery.StatusLowBattery
-    })
-
-    this.Battery.Service.getCharacteristic(this.hap.Characteristic.StatusLowBattery).onGet(() => {
-      return this.Battery.StatusLowBattery
-    })
-
-    // Initialize Leak Sensor Service
-    if ((device as waterDetectorConfig).hide_leak) {
-      if (this.LeakSensor) {
-        this.debugLog('Removing Leak Sensor Service')
-        this.LeakSensor.Service = this.accessory.getService(this.hap.Service.LeakSensor) as Service
-        accessory.removeService(this.LeakSensor.Service)
-      } else {
-        this.debugLog('Leak Sensor Service Not Found')
-      }
-    } else {
-      accessory.context.LeakSensor = accessory.context.LeakSensor ?? {}
-      this.LeakSensor = {
-        Name: `${accessory.displayName} Leak Sensor`,
-        Service: accessory.getService(this.hap.Service.LeakSensor) ?? this.accessory.addService(this.hap.Service.LeakSensor) as Service,
-        StatusActive: accessory.context.StatusActive ?? false,
-        LeakDetected: accessory.context.LeakDetected ?? this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
-      }
-      accessory.context.LeakSensor = this.LeakSensor as object
-
-      // Initialize LeakSensor Characteristic
-      this.LeakSensor.Service.setCharacteristic(this.hap.Characteristic.Name, this.LeakSensor.Name).setCharacteristic(this.hap.Characteristic.StatusActive, true)
-    }
-
-    // Retrieve initial values and updateHomekit
-    try {
-      this.debugLog('Retrieve initial values and update Homekit')
-      this.refreshStatus()
-    } catch (e: any) {
-      this.errorLog(`failed to retrieve initial values and update Homekit, Error: ${e.message ?? e}`)
-    }
-
-    // regisiter webhook event handler if enabled
-    try {
-      this.debugLog('Registering Webhook Event Handler')
-      this.registerWebhook()
-    } catch (e: any) {
-      this.errorLog(`failed to registerWebhook, Error: ${e.message ?? e}`)
-    }
-
-    // regisiter platform BLE event handler if enabled
-    try {
-      this.debugLog('Registering Platform BLE Event Handler')
-      this.registerPlatformBLE()
-    } catch (e: any) {
-      this.errorLog(`failed to registerPlatformBLE, Error: ${e.message ?? e}`)
-    }
-
-    // Start an update interval
-    interval(this.deviceRefreshRate * 1000)
-      .pipe(skipWhile(() => this.WaterDetectorUpdateInProgress))
-      .subscribe(async () => {
-        this.debugLog(`update interval: ${this.deviceRefreshRate * 1000} seconds`)
-        await this.refreshStatus()
-      })
-  }
-
-  async BLEparseStatus(): Promise<void> {
-    this.debugLog('BLEparseStatus')
-    this.debugLog(`(leak, tampered, battery) = BLE: (${this.serviceData.leak}, ${this.serviceData.tampered}, ${this.serviceData.battery}), current:(${this.LeakSensor?.LeakDetected}, ${this.LeakSensor?.StatusActive}, ${this.Battery.BatteryLevel})`)
-
-    // LeakSensor
-    if (!(this.device as waterDetectorConfig).hide_leak && this.LeakSensor?.Service) {
-      // StatusActive
-      this.LeakSensor.StatusActive = this.serviceData.tampered
-      this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`)
-
-      // LeakDetected
-      this.LeakSensor.LeakDetected = (this.device as waterDetectorConfig).dry
-        ? !this.serviceData.leak ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-        : this.serviceData.leak ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-      this.LeakSensor.LeakDetected === this.hap.Characteristic.LeakDetected.LEAK_DETECTED ? this.warnLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, BLE`) : this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, BLE`)
-    }
-    // Battery Info
-    if ('battery' in this.serviceData) {
-      // BatteryLevel
-      this.Battery.BatteryLevel = this.serviceData.battery
-      this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`)
-      // StatusLowBattery
-      this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-        ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
-        : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
-      this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
-    }
-  }
-
-  async openAPIparseStatus(): Promise<void> {
-    this.debugLog('openAPIparseStatus')
-    this.debugLog(`(status, battery) = OpenAPI: (${this.deviceStatus.status}, ${this.deviceStatus.battery}), current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`)
-
-    // LeakSensor
-    if (!(this.device as waterDetectorConfig).hide_leak && this.LeakSensor?.Service) {
-      // StatusActive
-      this.LeakSensor.StatusActive = this.deviceStatus.battery !== 0
-      this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`)
-
-      // LeakDetected
-      this.LeakSensor.LeakDetected = (this.device as waterDetectorConfig).dry
-        ? this.deviceStatus.status === 0 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-        : this.deviceStatus.status === 1 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-      this.LeakSensor.LeakDetected === this.hap.Characteristic.LeakDetected.LEAK_DETECTED ? this.warnLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, OpenAPI`) : this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, OpenAPI`)
-    }
-
-    // BatteryLevel
-    this.Battery.BatteryLevel = this.deviceStatus.battery
-    this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`)
-
-    // StatusLowBattery
-    this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-      ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
-      : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
-    this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
-
-    // FirmwareVersion
-    if (this.deviceStatus.version) {
-      const version = this.deviceStatus.version.toString()
-      this.debugLog(`FirmwareVersion: ${version.replace(/^V|-.*$/g, '')}`)
-      const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0'
-      this.accessory
-        .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
-        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(deviceVersion)
-      this.accessory.context.version = deviceVersion
-      this.debugSuccessLog(`version: ${this.accessory.context.version}`)
-    }
-  }
-
-  async parseStatusWebhook(): Promise<void> {
-    this.debugLog('parseStatusWebhook')
-    this.debugLog(`(detectionState, battery) = Webhook: (${this.webhookContext.detectionState}, ${this.webhookContext.battery}), current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`)
-
-    // LeakSensor
-    if (!(this.device as waterDetectorConfig).hide_leak && this.LeakSensor?.Service) {
-      // StatusActive
-      this.LeakSensor.StatusActive = !!this.webhookContext.detectionState
-      this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`)
-
-      // LeakDetected
-      this.LeakSensor.LeakDetected = (this.device as waterDetectorConfig).dry
-        ? this.webhookContext.detectionState === 0 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-        : this.webhookContext.detectionState === 1 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-      this.LeakSensor.LeakDetected === this.hap.Characteristic.LeakDetected.LEAK_DETECTED ? this.warnLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, Webhook`) : this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, Webhook`)
-    }
-
-    // BatteryLevel
-    this.Battery.BatteryLevel = this.webhookContext.battery
-    this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`)
-
-    // StatusLowBattery
-    this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-      ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
-      : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
-    this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
-  }
-
-  /**
-   * Asks the SwitchBot API for the latest device information
-   */
-  async refreshStatus(): Promise<void> {
-    if (this.BLE) {
-      await this.BLERefreshStatus()
-    } else if (this.OpenAPI && this.platform.config.credentials?.token) {
-      await this.openAPIRefreshStatus()
-    } else {
-      await this.offlineOff()
-      this.debugWarnLog(`Connection Type: ${this.device.connectionType}, refreshStatus will not happen.`)
-    }
-  }
-
-  async BLERefreshStatus(): Promise<void> {
-    this.debugLog('BLERefreshStatus')
-    const switchBotBLE = await this.switchbotBLE()
-    if (switchBotBLE === undefined) {
-      await this.BLERefreshConnection(switchBotBLE)
-    } else {
-      // Start to monitor advertisement packets
-      (async () => {
-        // Start to monitor advertisement packets
-        const serviceData = await this.monitorAdvertisementPackets(switchBotBLE) as waterLeakDetectorServiceData
-        // Update HomeKit
-        if (serviceData.model === SwitchBotBLEModel.Leak && serviceData.modelName === SwitchBotBLEModelName.Leak) {
-          this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
-            await this.BLEparseStatus()
-            await this.updateHomeKitCharacteristics()
-          } else {
-            this.errorLog(`serviceData is either undefined or null, serviceData: ${JSON.stringify(serviceData)}`)
-            await this.BLERefreshConnection(switchBotBLE)
-          }
-        } else {
-          this.errorLog(`failed to get serviceData, serviceData: ${JSON.stringify(serviceData)}`)
-          await this.BLERefreshConnection(switchBotBLE)
-        }
-      })()
-    }
-  }
-
-  async registerPlatformBLE(): Promise<void> {
-    this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
-      this.debugLog('is listening to Platform BLE.')
-      try {
-        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
-        this.device.bleMac = formattedDeviceId
-        this.debugLog(`bleMac: ${this.device.bleMac}`)
-        this.platform.bleEventHandler[this.device.bleMac] = async (context: waterLeakDetectorServiceData) => {
-          try {
-            this.serviceData = context
-            if (context !== undefined || context !== null) {
-              this.debugLog(`received BLE: ${JSON.stringify(context)}`)
-              await this.BLEparseStatus()
-              await this.updateHomeKitCharacteristics()
-            } else {
-              this.errorLog(`context is either undefined or null, context: ${JSON.stringify(context)}`)
-              await this.BLERefreshConnection(context)
-            }
-          } catch (e: any) {
-            this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e.message ?? e}`)
-          }
-        }
-      } catch (error) {
-        this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
-      }
-    } else {
-      this.debugLog('is not listening to Platform BLE')
-    }
-  }
-
-  async openAPIRefreshStatus(): Promise<void> {
-    this.debugLog('openAPIRefreshStatus')
-    try {
-      const deviceStatus = await this.deviceRefreshStatus<waterLeakDetectorStatus>()
-      this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
-      if (await this.successfulStatusCodes(deviceStatus)) {
-        this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
-        this.deviceStatus = deviceStatus.body
-        await this.openAPIparseStatus()
-        await this.updateHomeKitCharacteristics()
-      } else {
-        this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
-      }
-    } catch (e: any) {
-      await this.apiError(e)
-      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
-    }
-  }
-
-  async registerWebhook() {
-    if (this.device.webhook) {
-      this.debugLog('is listening webhook.')
-      this.platform.webhookEventHandler[this.device.deviceId] = async (context: waterLeakDetectorWebhookContext) => {
-        try {
-          this.webhookContext = context
-          if (context !== undefined || context !== null) {
-            this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
-            await this.parseStatusWebhook()
-            await this.updateHomeKitCharacteristics()
-          } else {
-            this.errorLog(`context is either undefined or null, context: ${JSON.stringify(context)}`)
-          }
-        } catch (e: any) {
-          this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e.message ?? e}`)
-        }
-      }
-    } else {
-      this.debugLog('is not listening webhook.')
-    }
-  }
-
-  /**
-   * Updates the status for each of the HomeKit Characteristics
-   */
-  async updateHomeKitCharacteristics(): Promise<void> {
-    if (!(this.device as waterDetectorConfig).hide_leak && this.LeakSensor?.Service) {
-      // StatusActive
-      await this.updateCharacteristic(this.LeakSensor.Service, this.hap.Characteristic.StatusActive, this.LeakSensor.StatusActive, 'StatusActive')
-      // LeakDetected
-      await this.updateCharacteristic(this.LeakSensor.Service, this.hap.Characteristic.LeakDetected, this.LeakSensor.LeakDetected, 'LeakDetected')
-    }
-    // BatteryLevel
-    await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel, 'BatteryLevel')
-    // StatusLowBattery
-    await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery, 'StatusLowBattery')
-  }
-
-  async BLERefreshConnection(switchbot: SwitchBotBLE): Promise<void> {
-    this.errorLog(`wasn't able to establish BLE Connection, 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()
-    }
-  }
-
-  async offlineOff(): Promise<void> {
-    if (this.device.offline) {
-      if (!(this.device as waterDetectorConfig).hide_leak && this.LeakSensor?.Service) {
-        this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.StatusActive, false)
-        this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.LeakDetected, this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED)
-      }
-    }
-  }
-
-  async apiError(e: any): Promise<void> {
-    if (!(this.device as waterDetectorConfig).hide_leak && this.LeakSensor?.Service) {
-      this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.StatusActive, e)
-      this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.LeakDetected, e)
-    }
-    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e)
-    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e)
-  }
-}

package/src/devices-matter/BaseMatterAccessory.ts

@@ -1,131 +0,0 @@
-/**
- * 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,
-    }
-  }
-}

package/src/devices-matter/ColorLightAccessory.ts

@@ -1,110 +0,0 @@
-/**
- * Color Light Accessory Class (HS only)
- * Hue and Saturation color control
- */
-
-import type { API, Logger, MatterRequests } from 'homebridge'
-
-import { BaseMatterAccessory } from './BaseMatterAccessory.js'
-
-export class ColorLightAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
-    const serialNumber = opts?.serialNumber ?? 'LIGHT-004'
-    const displayName = opts?.displayName ?? 'Colour Light (HS)'
-    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
-    const model = opts?.model ?? 'HB-MATTER-LIGHT-COLOUR-HS'
-    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
-    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
-
-    const clusters = opts?.clusters ?? {
-      onOff: { onOff: false },
-      levelControl: { currentLevel: 127, minLevel: 1, maxLevel: 254 },
-      colorControl: {
-        colorMode: api.matter.types.ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
-        currentHue: 0,
-        currentSaturation: 254,
-        currentX: 41942,
-        currentY: 21626,
-      },
-    }
-
-    const handlers = opts?.handlers ?? {
-      onOff: { on: async () => this.handleOn(), off: async () => this.handleOff() },
-      levelControl: { moveToLevelWithOnOff: async (request: MatterRequests.MoveToLevel) => this.handleSetLevel(request) },
-      colorControl: {
-        moveToColorLogic: async (request: MatterRequests.MoveToColor) => this.handleSetColor(request),
-        moveToHueAndSaturationLogic: async (request: MatterRequests.MoveToHueAndSaturation) => this.handleSetHueSaturation(request),
-      },
-    }
-
-    super(api, log, {
-      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
-      displayName,
-      deviceType: api.matter.deviceTypes.ExtendedColorLight,
-      serialNumber,
-      manufacturer,
-      model,
-      firmwareRevision,
-      hardwareRevision,
-      clusters,
-      handlers,
-      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
-    })
-
-    this.logInfo('initialized.')
-  }
-
-  private async handleOn(): Promise<void> {
-    this.logInfo('turning on.')
-    // TODO: await myLightAPI.turnOn()
-  }
-
-  private async handleOff(): Promise<void> {
-    this.logInfo('turning off.')
-    // TODO: await myLightAPI.turnOff()
-  }
-
-  private async handleSetLevel(request: MatterRequests.MoveToLevel): Promise<void> {
-    this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`)
-    const { level } = request
-    const brightnessPercent = Math.round((level / 254) * 100)
-    this.logInfo(`setting brightness to ${brightnessPercent}%.`)
-    // TODO: await myLightAPI.setBrightness(brightnessPercent)
-  }
-
-  private async handleSetColor(request: MatterRequests.MoveToColor): Promise<void> {
-    this.logInfo(`MoveToColor request: ${JSON.stringify(request)}`)
-    const { colorX, colorY, transitionTime } = request
-    const xFloat = (colorX / 65535).toFixed(4)
-    const yFloat = (colorY / 65535).toFixed(4)
-    this.logInfo(`setting xy color to (${xFloat}, ${yFloat}) with transition ${transitionTime}.`)
-    // TODO: await myLightAPI.setXY(xFloat, yFloat, transitionTime)
-  }
-
-  private async handleSetHueSaturation(request: MatterRequests.MoveToHueAndSaturation): Promise<void> {
-    this.logInfo(`MoveToHueAndSaturation request: ${JSON.stringify(request)}`)
-    const { hue, saturation, transitionTime } = request
-    const hueDegrees = Math.round((hue / 254) * 360)
-    const saturationPercent = Math.round((saturation / 254) * 100)
-    this.logInfo(`setting color to ${hueDegrees}°, ${saturationPercent}% with transition ${transitionTime}.`)
-    // TODO: await myLightAPI.setColor(hueDegrees, saturationPercent, transitionTime)
-  }
-
-  public updateOnOffState(isOn: boolean): void {
-    this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn })
-  }
-
-  public updateBrightness(percent: number): void {
-    const matterLevel = Math.max(1, Math.round((percent / 100) * 254))
-    this.updateState(this.api.matter.clusterNames.LevelControl, { currentLevel: matterLevel })
-  }
-
-  public updateHueSaturation(hue: number, saturation: number): void {
-    const matterHue = Math.round((hue / 360) * 254)
-    const matterSat = Math.round((saturation / 100) * 254)
-    this.updateState(this.api.matter.clusterNames.ColorControl, {
-      currentHue: matterHue,
-      currentSaturation: matterSat,
-    })
-  }
-}