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

package/src/devices-matter/ColorTemperatureLightAccessory.ts

@@ -7,50 +7,44 @@ import type { API, Logger, MatterRequests } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class ColorTemperatureLightAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'LIGHT-003'
-    super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Colour Temperature Light',
-      deviceType: api.matter.deviceTypes.ColorTemperatureLight,
-      serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-LIGHT-COLOUR-TEMP',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'LIGHT-003'
+    const displayName = opts?.displayName ?? 'Colour Temperature Light'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-LIGHT-COLOUR-TEMP'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
 
-      clusters: {
-        onOff: {
-          onOff: false,
-        },
-        levelControl: {
-          currentLevel: 127,
-          minLevel: 1,
-          maxLevel: 254,
-        },
-        colorControl: {
-          colorMode: api.matter.types.ColorControl.ColorMode.ColorTemperatureMireds,
-          colorTemperatureMireds: 250,
-          colorTempPhysicalMinMireds: 147,
-          colorTempPhysicalMaxMireds: 454,
-          coupleColorTempToLevelMinMireds: 147,
-        },
+    const clusters = opts?.clusters ?? {
+      onOff: { onOff: false },
+      levelControl: { currentLevel: 127, minLevel: 1, maxLevel: 254 },
+      colorControl: {
+        colorMode: api.matter.types.ColorControl.ColorMode.ColorTemperatureMireds,
+        colorTemperatureMireds: 250,
+        colorTempPhysicalMinMireds: 147,
+        colorTempPhysicalMaxMireds: 454,
+        coupleColorTempToLevelMinMireds: 147,
       },
+    }
 
-      handlers: {
-        onOff: {
-          on: async () => this.handleOn(),
-          off: async () => this.handleOff(),
-        },
-        levelControl: {
-          moveToLevelWithOnOff: async (request: MatterRequests.MoveToLevel) =>
-            this.handleSetLevel(request),
-        },
-        colorControl: {
-          moveToColorTemperatureLogic: async (request: MatterRequests.MoveToColorTemperature) =>
-            this.handleSetColorTemperature(request),
-        },
-      },
+    const handlers = opts?.handlers ?? {
+      onOff: { on: async () => this.handleOn(), off: async () => this.handleOff() },
+      levelControl: { moveToLevelWithOnOff: async (request: MatterRequests.MoveToLevel) => this.handleSetLevel(request) },
+      colorControl: { moveToColorTemperatureLogic: async (request: MatterRequests.MoveToColorTemperature) => this.handleSetColorTemperature(request) },
+    }
+
+    super(api, log, {
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
+      deviceType: api.matter.deviceTypes.ColorTemperatureLight,
+      serialNumber,
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/ContactSensorAccessory.ts

@@ -7,23 +7,27 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class ContactSensorAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SENSOR-001'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SENSOR-001'
+    const displayName = opts?.displayName ?? 'Contact Sensor'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-SENSOR-CONTACT'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? { booleanState: { stateValue: true } }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Contact Sensor',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.ContactSensor,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SENSOR-CONTACT',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        booleanState: {
-          stateValue: true, // matter: true = closed/normal, false = open/triggered
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/DimmableLightAccessory.ts

@@ -22,16 +22,31 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
   // Track current state
   private currentLevel: number = 127 // 50% brightness
 
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'LIGHT-002'
-    const displayName = 'Dimmable Light'
-    const manufacturer = 'Homebridge Matter'
-    const model = 'HB-MATTER-LIGHT-DIMMABLE'
-    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-002'
+    const displayName = opts?.displayName ?? 'Dimmable Light'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-LIGHT-DIMMABLE'
+    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 },
+    }
+
+    const handlers = opts?.handlers ?? {
+      onOff: {
+        on: async () => this.handleOn(),
+        off: async () => this.handleOff(),
+      },
+      levelControl: {
+        moveToLevelWithOnOff: async (request: MatterRequests.MoveToLevel) => this.handleSetLevel(request),
+      },
+    }
 
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
       displayName,
       deviceType: api.matter.deviceTypes.DimmableLight,
       serialNumber,
@@ -39,28 +54,9 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
       model,
       firmwareRevision,
       hardwareRevision,
-
-      clusters: {
-        onOff: {
-          onOff: false,
-        },
-        levelControl: {
-          currentLevel: 127, // 50% brightness (range 1-254)
-          minLevel: 1,
-          maxLevel: 254,
-        },
-      },
-
-      handlers: {
-        onOff: {
-          on: async () => this.handleOn(),
-          off: async () => this.handleOff(),
-        },
-        levelControl: {
-          moveToLevelWithOnOff: async (request: MatterRequests.MoveToLevel) =>
-            this.handleSetLevel(request),
-        },
-      },
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/DoorLockAccessory.ts

@@ -7,33 +7,37 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class DoorLockAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'LOCK-001'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'LOCK-001'
+    const displayName = opts?.displayName ?? 'Door Lock'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-LOCK-DOOR'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? {
+      doorLock: {
+        lockState: api.matter.types.DoorLock.LockState.Unlocked,
+        lockType: api.matter.types.DoorLock.LockType.DeadBolt,
+        actuatorEnabled: true,
+        operatingMode: api.matter.types.DoorLock.OperatingMode.Normal,
+      },
+    }
+
+    const handlers = opts?.handlers ?? { doorLock: { lockDoor: async () => this.handleLock(), unlockDoor: async () => this.handleUnlock() } }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Door Lock',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.DoorLock,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-LOCK-DOOR',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        doorLock: {
-          lockState: api.matter.types.DoorLock.LockState.Unlocked,
-          lockType: api.matter.types.DoorLock.LockType.DeadBolt,
-          actuatorEnabled: true,
-          operatingMode: api.matter.types.DoorLock.OperatingMode.Normal,
-        },
-      },
-
-      handlers: {
-        doorLock: {
-          lockDoor: async () => this.handleLock(),
-          unlockDoor: async () => this.handleUnlock(),
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/ExtendedColorLightAccessory.ts

@@ -8,56 +8,52 @@ import type { API, Logger, MatterRequests } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class ExtendedColorLightAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'LIGHT-005'
-    super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Extended Colour Light (HS+CCT)',
-      deviceType: api.matter.deviceTypes.ExtendedColorLight,
-      serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-LIGHT-EXTENDED-COLOUR',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      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,
-          colorTemperatureMireds: 250,
-          colorTempPhysicalMinMireds: 147,
-          colorTempPhysicalMaxMireds: 454,
-          coupleColorTempToLevelMinMireds: 147,
-        },
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'LIGHT-005'
+    const displayName = opts?.displayName ?? 'Extended Colour Light (HS+CCT)'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-LIGHT-EXTENDED-COLOUR'
+    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,
+        colorTemperatureMireds: 250,
+        colorTempPhysicalMinMireds: 147,
+        colorTempPhysicalMaxMireds: 454,
+        coupleColorTempToLevelMinMireds: 147,
       },
+    }
 
-      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),
-          moveToColorTemperatureLogic: async (request: MatterRequests.MoveToColorTemperature) =>
-            this.handleSetColorTemperature(request),
-        },
+    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),
+        moveToColorTemperatureLogic: async (request: MatterRequests.MoveToColorTemperature) => this.handleSetColorTemperature(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.')

package/src/devices-matter/FanAccessory.ts

@@ -7,35 +7,43 @@ import type { API, Logger, MatterRequests } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class FanAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'FAN-001'
-    super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Fan',
-      deviceType: api.matter.deviceTypes.Fan,
-      serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-FAN',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'FAN-001'
+    const displayName = opts?.displayName ?? 'Fan'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-FAN'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
 
-      clusters: {
-        fanControl: {
-          fanMode: api.matter.types.FanControl.FanMode.Off,
-          fanModeSequence: api.matter.types.FanControl.FanModeSequence.OffLowMedHigh,
-          percentSetting: 0,
-          percentCurrent: 0,
-        },
+    const clusters = opts?.clusters ?? {
+      fanControl: {
+        fanMode: api.matter.types.FanControl.FanMode.Off,
+        fanModeSequence: api.matter.types.FanControl.FanModeSequence.OffLowMedHigh,
+        percentSetting: 0,
+        percentCurrent: 0,
       },
+    }
 
-      handlers: {
-        fanControl: {
-          step: async (request: MatterRequests.FanStep) => this.handleStep(request),
-          fanModeChange: async (request: { fanMode: number, oldFanMode: number }) => this.handleFanModeChange(request),
-          percentSettingChange: async (request: { percentSetting: number | null, oldPercentSetting: number | null }) =>
-            this.handlePercentSettingChange(request),
-        },
+    const handlers = opts?.handlers ?? {
+      fanControl: {
+        step: async (request: MatterRequests.FanStep) => this.handleStep(request),
+        fanModeChange: async (request: { fanMode: number, oldFanMode: number }) => this.handleFanModeChange(request),
+        percentSettingChange: async (request: { percentSetting: number | null, oldPercentSetting: number | null }) => this.handlePercentSettingChange(request),
       },
+    }
+
+    super(api, log, {
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
+      deviceType: api.matter.deviceTypes.Fan,
+      serialNumber,
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/HumiditySensorAccessory.ts

@@ -7,25 +7,27 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class HumiditySensorAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SENSOR-005'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SENSOR-005'
+    const displayName = opts?.displayName ?? 'Humidity Sensor'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-SENSOR-HUMIDITY'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? { relativeHumidityMeasurement: { measuredValue: 5500, minMeasuredValue: 0, maxMeasuredValue: 10000 } }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Humidity Sensor',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.HumiditySensor,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SENSOR-HUMIDITY',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        relativeHumidityMeasurement: {
-          measuredValue: 5500, // 55% (in hundredths of a percent)
-          minMeasuredValue: 0,
-          maxMeasuredValue: 10000,
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/LeakSensorAccessory.ts

@@ -7,23 +7,27 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class LeakSensorAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SENSOR-007'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SENSOR-007'
+    const displayName = opts?.displayName ?? 'Leak Sensor'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-SENSOR-LEAK'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? { booleanState: { stateValue: false } }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Leak Sensor',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.LeakSensor,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SENSOR-LEAK',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        booleanState: {
-          stateValue: false, // false = dry, true = leak
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/LightSensorAccessory.ts

@@ -7,25 +7,27 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class LightSensorAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SENSOR-002'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SENSOR-002'
+    const displayName = opts?.displayName ?? 'Light Sensor'
+    const manufacturer = opts?.manufacturer ?? 'Homebridge Matter'
+    const model = opts?.model ?? 'HB-MATTER-SENSOR-LIGHT'
+    const firmwareRevision = opts?.firmwareRevision ?? '2.0.0'
+    const hardwareRevision = opts?.hardwareRevision ?? '1.0.0'
+
+    const clusters = opts?.clusters ?? { illuminanceMeasurement: { measuredValue: 5000, minMeasuredValue: 1, maxMeasuredValue: 65534 } }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Light Sensor',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName,
       deviceType: api.matter.deviceTypes.LightSensor,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SENSOR-LIGHT',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        illuminanceMeasurement: {
-          measuredValue: 5000,
-          minMeasuredValue: 1,
-          maxMeasuredValue: 65534,
-        },
-      },
+      manufacturer,
+      model,
+      firmwareRevision,
+      hardwareRevision,
+      clusters,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/devices-matter/OccupancySensorAccessory.ts

@@ -7,37 +7,33 @@ import type { API, Logger } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class OccupancySensorAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'SENSOR-003'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'SENSOR-003'
     // Note: Matter.js API calls this "MotionSensor" but it's actually an Occupancy Sensor
     const OccupancySensingServer = api.matter.deviceTypes.MotionSensor.requirements.OccupancySensingServer
     const OccupancySensorWithPIR = api.matter.deviceTypes.MotionSensor.with(
       OccupancySensingServer.with('PassiveInfrared'),
     )
 
+    const clusters = opts?.clusters ?? {
+      occupancySensing: {
+        occupancy: { occupied: false },
+        occupancySensorType: 0,
+        occupancySensorTypeBitmap: { pir: true, ultrasonic: false, physicalContact: false },
+      },
+    }
+
     super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Occupancy Sensor',
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName: opts?.displayName ?? 'Occupancy Sensor',
       deviceType: OccupancySensorWithPIR,
       serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-SENSOR-OCCUPANCY',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        occupancySensing: {
-          occupancy: {
-            occupied: false,
-          },
-          occupancySensorType: 0,
-          occupancySensorTypeBitmap: {
-            pir: true,
-            ultrasonic: false,
-            physicalContact: false,
-          },
-        },
-      },
+      manufacturer: opts?.manufacturer ?? 'Homebridge Matter',
+      model: opts?.model ?? 'HB-MATTER-SENSOR-OCCUPANCY',
+      firmwareRevision: opts?.firmwareRevision ?? '2.0.0',
+      hardwareRevision: opts?.hardwareRevision ?? '1.0.0',
+      clusters,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')