@switchbot/homebridge-switchbot 5.0.0-beta.1 → 5.0.0-beta.3

package/src/devices-matter/OnOffLightAccessory.ts

@@ -16,17 +16,29 @@ import { BaseMatterAccessory } from './BaseMatterAccessory.js'
  * It extends BaseMatterAccessory to inherit common functionality.
  */
 export class OnOffLightAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'LIGHT-001'
-    const displayName = 'On/Off Light'
-    const manufacturer = 'Homebridge Matter'
-    const model = 'HB-MATTER-LIGHT-ON-OFF'
-    const firmwareRevision = '2.0.0'
-    const hardwareRevision = '1.0.0'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'LIGHT-001'
+    const displayName = opts?.displayName ?? 'On/Off Light'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-LIGHT-ON-OFF'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? { onOff: { onOff: true } }
+    const handlers = opts?.handlers ?? {
+      onOff: {
+        on: async () => {
+          log.debug(`${displayName} on handler invoked (default no-op).`)
+        },
+        off: async () => {
+          log.debug(`${displayName} off handler invoked (default no-op).`)
+        },
+      },
+    }
 
     // Call parent constructor with device configuration
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
       displayName,
       deviceType: api.matter.deviceTypes.OnOffLight,
       serialNumber,
@@ -34,21 +46,9 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
       model,
       firmwareRevision,
       hardwareRevision,
-
-      // Initial cluster states
-      clusters: {
-        onOff: {
-          onOff: true, // initial state: light is on
-        },
-      },
-
-      // Command handlers
-      handlers: {
-        onOff: {
-          on: async () => this.handleOnCommand(),
-          off: async () => this.handleOffCommand(),
-        },
-      },
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/OnOffOutletAccessory.ts

@@ -7,45 +7,39 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class OnOffOutletAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'OUTLET-001'
-    super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'On/Off Outlet',
-      deviceType: api.matter.deviceTypes.OnOffOutlet,
-      serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-OUTLET-ON-OFF',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        onOff: {
-          onOff: false,
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'OUTLET-001'
+    const displayName = opts?.displayName ?? 'On/Off Outlet'
+    const clusters = opts?.clusters ?? { onOff: { onOff: false } }
+    const handlers = opts?.handlers ?? {
+      onOff: {
+        on: async () => {
+          // default no-op; platform may inject handlers via opts.handlers
+          log.debug(`${displayName} on handler invoked (default no-op).`)
         },
-      },
-
-      handlers: {
-        onOff: {
-          on: async () => this.handleOn(),
-          off: async () => this.handleOff(),
+        off: async () => {
+          log.debug(`${displayName} off handler invoked (default no-op).`)
         },
       },
+    }
+
+    super(api, log, {
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
+      deviceType: api.matter.deviceTypes.OnOffOutlet,
+      serialNumber,
+      manufacturer: opts?.manufacturer ?? 'Homebridge Matter',
+      model: opts?.model ?? 'HB-MATTER-OUTLET-ON-OFF',
+      firmwareRevision: opts?.firmwareRevision ?? '2.0.0',
+      hardwareRevision: opts?.hardwareRevision ?? '1.0.0',
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')
   }
 
-  private async handleOn(): Promise<void> {
-    this.logInfo('turning on.')
-    // TODO: await myOutletAPI.turnOn()
-  }
-
-  private async handleOff(): Promise<void> {
-    this.logInfo('turning off.')
-    // TODO: await myOutletAPI.turnOff()
-  }
-
   public updateOnOffState(isOn: boolean): void {
     this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn })
   }

package/src/devices-matter/OnOffSwitchAccessory.ts

@@ -7,30 +7,29 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class OnOffSwitchAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SWITCH-001'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SWITCH-001'
+    const displayName = opts?.displayName ?? 'On/Off Switch'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-SWITCH-ON-OFF'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? { onOff: { onOff: false } }
+    const handlers = opts?.handlers ?? { onOff: { on: async () => this.handleOn(), off: async () => this.handleOff() } }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'On/Off Switch',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.OnOffSwitch,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SWITCH-ON-OFF',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        onOff: {
-          onOff: false,
-        },
-      },
-
-      handlers: {
-        onOff: {
-          on: async () => this.handleOn(),
-          off: async () => this.handleOff(),
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/RoboticVacuumAccessory.ts

@@ -30,165 +30,88 @@ import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 export class RoboticVacuumAccessory extends BaseMatterAccessory {
   private activeTimers: NodeJS.Timeout[] = []
 
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'VACUUM-001'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'VACUUM-001'
+    const clusters = opts?.clusters ?? {
+      powerSource: {
+        status: 0,
+        order: 0,
+        description: 'Battery',
+        batPercentRemaining: 100,
+        batChargeLevel: 2,
+        batReplaceability: 1,
+      },
+      rvcRunMode: {
+        supportedModes: [
+          { label: 'Idle', mode: 0, modeTags: [{ value: 16384 }] },
+          { label: 'Cleaning', mode: 1, modeTags: [{ value: 16385 }] },
+          { label: 'Mapping', mode: 2, modeTags: [{ value: 16386 }] },
+        ],
+        currentMode: 0,
+      },
+      rvcCleanMode: {
+        supportedModes: [
+          { label: 'Vacuum', mode: 0, modeTags: [{ value: 16385 }] },
+          { label: 'Mop', mode: 1, modeTags: [{ value: 16386 }] },
+          { label: 'Vacuum & Mop', mode: 2, modeTags: [{ value: 16385 }, { value: 16386 }] },
+          { label: 'Deep Clean', mode: 3, modeTags: [{ value: 16384 }] },
+          { label: 'Deep Vacuum', mode: 4, modeTags: [{ value: 16384 }, { value: 16385 }] },
+          { label: 'Deep Mop', mode: 5, modeTags: [{ value: 16384 }, { value: 16386 }] },
+          { label: 'Quick Clean', mode: 6, modeTags: [{ value: 1 }, { value: 16385 }] },
+          { label: 'Max Clean', mode: 7, modeTags: [{ value: 7 }, { value: 16385 }] },
+          { label: 'Min Clean', mode: 8, modeTags: [{ value: 6 }, { value: 16385 }] },
+          { label: 'Quiet Vacuum', mode: 9, modeTags: [{ value: 2 }, { value: 16385 }] },
+          { label: 'Quiet Mop', mode: 10, modeTags: [{ value: 2 }, { value: 16386 }] },
+          { label: 'Night Mode', mode: 11, modeTags: [{ value: 8 }, { value: 16385 }] },
+          { label: 'Eco Vacuum', mode: 12, modeTags: [{ value: 4 }, { value: 16385 }] },
+          { label: 'Eco Mop', mode: 13, modeTags: [{ value: 4 }, { value: 16386 }] },
+          { label: 'Auto', mode: 14, modeTags: [{ value: 0 }, { value: 16385 }] },
+        ],
+        currentMode: 0,
+      },
+      rvcOperationalState: {
+        operationalStateList: [
+          { operationalStateId: 0 },
+          { operationalStateId: 1 },
+          { operationalStateId: 2 },
+          { operationalStateId: 3 },
+          { operationalStateId: 64 },
+          { operationalStateId: 65 },
+          { operationalStateId: 66 },
+        ],
+        operationalState: 66,
+      },
+      serviceArea: {
+        supportedMaps: [],
+        supportedAreas: [
+          { areaId: 0, mapId: null, areaInfo: { locationInfo: { locationName: 'Living Room', floorNumber: 0, areaType: 7 }, landmarkInfo: null } },
+          { areaId: 1, mapId: null, areaInfo: { locationInfo: { locationName: 'Kitchen', floorNumber: 0, areaType: 10 }, landmarkInfo: null } },
+          { areaId: 2, mapId: null, areaInfo: { locationInfo: { locationName: 'Bedroom', floorNumber: 0, areaType: 2 }, landmarkInfo: null } },
+          { areaId: 3, mapId: null, areaInfo: { locationInfo: { locationName: 'Bathroom', floorNumber: 0, areaType: 6 }, landmarkInfo: null } },
+        ],
+        selectedAreas: [0, 1, 2, 3],
+      },
+    }
+
+    const handlers = opts?.handlers ?? {
+      rvcRunMode: { changeToMode: async (request: MatterRequests.ChangeToMode) => this.handleChangeRunMode(request) },
+      rvcCleanMode: { changeToMode: async (request: MatterRequests.ChangeToMode) => this.handleChangeCleanMode(request) },
+      rvcOperationalState: { pause: async () => this.handlePause(), stop: async () => this.handleStop(), start: async () => this.handleStart(), resume: async () => this.handleResume(), goHome: async () => this.handleGoHome() },
+      serviceArea: { selectAreas: async (request: MatterRequests.SelectAreas) => this.handleSelectAreas(request), skipArea: async (request: MatterRequests.SkipArea) => this.handleSkipArea(request) },
+    }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Robot Vacuum',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName: opts?.displayName ?? 'Robot Vacuum',
       deviceType: api.matter.deviceTypes.RoboticVacuumCleaner,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-VACUUM-ROBOTIC',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        // Power Source: Battery status and percentage
-        powerSource: {
-          status: 0, // 0 = Active
-          order: 0, // Primary power source
-          description: 'Battery',
-          batPercentRemaining: 100, // 0-200, where 200 = 100% (0.5% increments)
-          batChargeLevel: 2, // 0 = Ok, 1 = Warning, 2 = Critical
-          batReplaceability: 1, // 0 = Unspecified, 1 = Not replaceable, 2 = User replaceable, 3 = Factory replaceable
-        },
-
-        // Run Mode: Controls what the vacuum is doing (Idle, Cleaning, Mapping)
-        rvcRunMode: {
-          supportedModes: [
-            { label: 'Idle', mode: 0, modeTags: [{ value: 16384 }] }, // RvcRunMode.ModeTag.Idle
-            { label: 'Cleaning', mode: 1, modeTags: [{ value: 16385 }] }, // RvcRunMode.ModeTag.Cleaning
-            { label: 'Mapping', mode: 2, modeTags: [{ value: 16386 }] }, // RvcRunMode.ModeTag.Mapping
-          ],
-          currentMode: 0,
-        },
-
-        // Clean Mode: Controls HOW the vacuum cleans
-        // You can combine semantic tags (0-9) with functional tags (16384-16386)
-        // Available semantic tags: Auto, Quick, Quiet, LowNoise, LowEnergy, Vacation, Min, Max, Night, Day
-        // Available functional tags: DeepClean, Vacuum, Mop
-        rvcCleanMode: {
-          supportedModes: [
-            // Basic functional modes
-            { label: 'Vacuum', mode: 0, modeTags: [{ value: 16385 }] }, // Vacuum
-            { label: 'Mop', mode: 1, modeTags: [{ value: 16386 }] }, // Mop
-            { label: 'Vacuum & Mop', mode: 2, modeTags: [{ value: 16385 }, { value: 16386 }] }, // Both
-
-            // Deep clean modes
-            { label: 'Deep Clean', mode: 3, modeTags: [{ value: 16384 }] }, // DeepClean
-            { label: 'Deep Vacuum', mode: 4, modeTags: [{ value: 16384 }, { value: 16385 }] }, // DeepClean + Vacuum
-            { label: 'Deep Mop', mode: 5, modeTags: [{ value: 16384 }, { value: 16386 }] }, // DeepClean + Mop
-
-            // Intensity modes
-            { label: 'Quick Clean', mode: 6, modeTags: [{ value: 1 }, { value: 16385 }] }, // Quick + Vacuum
-            { label: 'Max Clean', mode: 7, modeTags: [{ value: 7 }, { value: 16385 }] }, // Max + Vacuum
-            { label: 'Min Clean', mode: 8, modeTags: [{ value: 6 }, { value: 16385 }] }, // Min + Vacuum
-
-            // Quiet modes
-            { label: 'Quiet Vacuum', mode: 9, modeTags: [{ value: 2 }, { value: 16385 }] }, // Quiet + Vacuum
-            { label: 'Quiet Mop', mode: 10, modeTags: [{ value: 2 }, { value: 16386 }] }, // Quiet + Mop
-            { label: 'Night Mode', mode: 11, modeTags: [{ value: 8 }, { value: 16385 }] }, // Night + Vacuum
-
-            // Energy efficient
-            { label: 'Eco Vacuum', mode: 12, modeTags: [{ value: 4 }, { value: 16385 }] }, // LowEnergy + Vacuum
-            { label: 'Eco Mop', mode: 13, modeTags: [{ value: 4 }, { value: 16386 }] }, // LowEnergy + Mop
-
-            // Auto mode
-            { label: 'Auto', mode: 14, modeTags: [{ value: 0 }, { value: 16385 }] }, // Auto + Vacuum
-          ],
-          currentMode: 0, // start with basic Vacuum
-        },
-
-        // Operational State: Current state (Stopped, Running, Paused, Error, etc.)
-        rvcOperationalState: {
-          operationalStateList: [
-            { operationalStateId: 0 }, // stopped (standard label from Matter spec)
-            { operationalStateId: 1 }, // running
-            { operationalStateId: 2 }, // paused
-            { operationalStateId: 3 }, // error
-            { operationalStateId: 64 }, // seeking charger
-            { operationalStateId: 65 }, // charging
-            { operationalStateId: 66 }, // docked
-          ],
-          operationalState: 66, // start docked
-        },
-
-        // Service Area: Room/zone selection for targeted cleaning
-        serviceArea: {
-          supportedMaps: [], // empty array - we don't use map features
-          supportedAreas: [
-            {
-              areaId: 0,
-              mapId: null, // required: must be null when supportedMaps is empty
-              areaInfo: {
-                locationInfo: {
-                  locationName: 'Living Room',
-                  floorNumber: 0,
-                  areaType: 7, // AreaNamespaceTag.LivingRoom
-                },
-                landmarkInfo: null,
-              },
-            },
-            {
-              areaId: 1,
-              mapId: null,
-              areaInfo: {
-                locationInfo: {
-                  locationName: 'Kitchen',
-                  floorNumber: 0,
-                  areaType: 10, // AreaNamespaceTag.Kitchen
-                },
-                landmarkInfo: null,
-              },
-            },
-            {
-              areaId: 2,
-              mapId: null,
-              areaInfo: {
-                locationInfo: {
-                  locationName: 'Bedroom',
-                  floorNumber: 0,
-                  areaType: 2, // AreaNamespaceTag.Bedroom
-                },
-                landmarkInfo: null,
-              },
-            },
-            {
-              areaId: 3,
-              mapId: null,
-              areaInfo: {
-                locationInfo: {
-                  locationName: 'Bathroom',
-                  floorNumber: 0,
-                  areaType: 6, // AreaNamespaceTag.Bathroom
-                },
-                landmarkInfo: null,
-              },
-            },
-          ],
-          selectedAreas: [0, 1, 2, 3], // all areas selected by default
-        },
-      },
-
-      handlers: {
-        rvcRunMode: {
-          changeToMode: async (request: MatterRequests.ChangeToMode) => this.handleChangeRunMode(request),
-        },
-        rvcCleanMode: {
-          changeToMode: async (request: MatterRequests.ChangeToMode) => this.handleChangeCleanMode(request),
-        },
-        rvcOperationalState: {
-          pause: async () => this.handlePause(),
-          stop: async () => this.handleStop(),
-          start: async () => this.handleStart(),
-          resume: async () => this.handleResume(),
-          goHome: async () => this.handleGoHome(),
-        },
-        serviceArea: {
-          selectAreas: async (request: MatterRequests.SelectAreas) => this.handleSelectAreas(request),
-          skipArea: async (request: MatterRequests.SkipArea) => this.handleSkipArea(request),
-        },
-      },
+      manufacturer: opts?.manufacturer ?? 'Homebridge Matter',
+      model: opts?.model ?? 'HB-MATTER-VACUUM-ROBOTIC',
+      firmwareRevision: opts?.firmwareRevision ?? '2.0.0',
+      hardwareRevision: opts?.hardwareRevision ?? '1.0.0',
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized and ready.')

package/src/devices-matter/TemperatureSensorAccessory.ts

@@ -7,25 +7,29 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class TemperatureSensorAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SENSOR-004'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SENSOR-004'
+    const displayName = opts?.displayName ?? 'Temperature Sensor'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-SENSOR-TEMPERATURE'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? {
+      temperatureMeasurement: { measuredValue: 2100, minMeasuredValue: -5000, maxMeasuredValue: 10000 },
+    }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Temperature Sensor',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.TemperatureSensor,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SENSOR-TEMPERATURE',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        temperatureMeasurement: {
-          measuredValue: 2100, // 21.00°C (in hundredths)
-          minMeasuredValue: -5000,
-          maxMeasuredValue: 10000,
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/ThermostatAccessory.ts

@@ -7,44 +7,49 @@ import type { API, Logger, MatterRequests } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class ThermostatAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'THERMOSTAT-001'
-    super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Thermostat',
-      deviceType: api.matter.deviceTypes.Thermostat,
-      serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-THERMOSTAT',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'THERMOSTAT-001'
+    const displayName = opts?.displayName ?? 'Thermostat'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-THERMOSTAT'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
 
-      clusters: {
-        thermostat: {
-          localTemperature: 2100, // 21.00°C
-          occupiedHeatingSetpoint: 2000,
-          occupiedCoolingSetpoint: 2400,
-          minHeatSetpointLimit: 700,
-          maxHeatSetpointLimit: 3000,
-          minCoolSetpointLimit: 1600,
-          maxCoolSetpointLimit: 3200,
-          controlSequenceOfOperation: 4, // cooling and heating
-          systemMode: 0, // off
-        },
+    const clusters = opts?.clusters ?? {
+      thermostat: {
+        localTemperature: 2100,
+        occupiedHeatingSetpoint: 2000,
+        occupiedCoolingSetpoint: 2400,
+        minHeatSetpointLimit: 700,
+        maxHeatSetpointLimit: 3000,
+        minCoolSetpointLimit: 1600,
+        maxCoolSetpointLimit: 3200,
+        controlSequenceOfOperation: 4,
+        systemMode: 0,
       },
+    }
 
-      handlers: {
-        thermostat: {
-          setpointRaiseLower: async (request: MatterRequests.SetpointRaiseLower) =>
-            this.handleSetpointRaiseLower(request),
-          systemModeChange: async (request: { systemMode: number, oldSystemMode: number }) =>
-            this.handleSystemModeChange(request),
-          occupiedHeatingSetpointChange: async (request: { occupiedHeatingSetpoint: number, oldOccupiedHeatingSetpoint: number }) =>
-            this.handleOccupiedHeatingSetpointChange(request),
-          occupiedCoolingSetpointChange: async (request: { occupiedCoolingSetpoint: number, oldOccupiedCoolingSetpoint: number }) =>
-            this.handleOccupiedCoolingSetpointChange(request),
-        },
+    const handlers = opts?.handlers ?? {
+      thermostat: {
+        setpointRaiseLower: async (request: MatterRequests.SetpointRaiseLower) => this.handleSetpointRaiseLower(request),
+        systemModeChange: async (request: { systemMode: number, oldSystemMode: number }) => this.handleSystemModeChange(request),
+        occupiedHeatingSetpointChange: async (request: { occupiedHeatingSetpoint: number, oldOccupiedHeatingSetpoint: number }) => this.handleOccupiedHeatingSetpointChange(request),
+        occupiedCoolingSetpointChange: async (request: { occupiedCoolingSetpoint: number, oldOccupiedCoolingSetpoint: number }) => this.handleOccupiedCoolingSetpointChange(request),
       },
+    }
+
+    super(api, log, {
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
+      deviceType: api.matter.deviceTypes.Thermostat,
+      serialNumber,
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/VenetianBlindAccessory.ts

@@ -8,54 +8,51 @@ import type { API, Logger, MatterRequests } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class VenetianBlindAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'BLIND-002'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'BLIND-002'
+
+    const clusters = opts?.clusters ?? {
+      windowCovering: {
+        targetPositionLiftPercent100ths: 5000,
+        currentPositionLiftPercent100ths: 5000,
+        targetPositionTiltPercent100ths: 5000,
+        currentPositionTiltPercent100ths: 5000,
+        operationalStatus: { global: 0, lift: 0, tilt: 0 },
+        endProductType: 8,
+        configStatus: {
+          operational: true,
+          onlineReserved: true,
+          liftMovementReversed: false,
+          liftPositionAware: true,
+          tiltPositionAware: true,
+          liftEncoderControlled: true,
+          tiltEncoderControlled: true,
+        },
+      },
+    }
+
+    const handlers = opts?.handlers ?? {
+      windowCovering: {
+        goToLiftPercentage: async (request: MatterRequests.GoToLiftPercentage) => this.handleGoToLift(request),
+        goToTiltPercentage: async (request: MatterRequests.GoToTiltPercentage) => this.handleGoToTilt(request),
+        upOrOpen: async () => this.handleUpOrOpen(),
+        downOrClose: async () => this.handleDownOrClose(),
+        stopMotion: async () => this.handleStop(),
+      },
+    }
 
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Venetian Blind (Tilt)',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName: opts?.displayName ?? 'Venetian Blind (Tilt)',
       deviceType: api.matter.deviceTypes.WindowCovering,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-BLIND-VENETIAN',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        windowCovering: {
-          targetPositionLiftPercent100ths: 5000,
-          currentPositionLiftPercent100ths: 5000,
-          targetPositionTiltPercent100ths: 5000,
-          currentPositionTiltPercent100ths: 5000,
-          operationalStatus: {
-            global: 0,
-            lift: 0,
-            tilt: 0,
-          },
-          endProductType: 8,
-          configStatus: {
-            operational: true,
-            onlineReserved: true,
-            liftMovementReversed: false,
-            liftPositionAware: true,
-            tiltPositionAware: true,
-            liftEncoderControlled: true,
-            tiltEncoderControlled: true,
-          },
-        },
-      },
-
-      handlers: {
-        windowCovering: {
-          goToLiftPercentage: async (request: MatterRequests.GoToLiftPercentage) =>
-            this.handleGoToLift(request),
-          goToTiltPercentage: async (request: MatterRequests.GoToTiltPercentage) =>
-            this.handleGoToTilt(request),
-          upOrOpen: async () => this.handleUpOrOpen(),
-          downOrClose: async () => this.handleDownOrClose(),
-          stopMotion: async () => this.handleStop(),
-        },
-      },
+      manufacturer: opts?.manufacturer ?? 'Homebridge Matter',
+      model: opts?.model ?? 'HB-MATTER-BLIND-VENETIAN',
+      firmwareRevision: opts?.firmwareRevision ?? '2.0.0',
+      hardwareRevision: opts?.hardwareRevision ?? '1.0.0',
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')