@switchbot/homebridge-switchbot 5.0.0-beta.134 → 5.0.0-beta.136

package/test/e2e/run-e2e.spec.ts

@@ -22,29 +22,25 @@ describe('e2e scripts (manual-run harness)', () => {
       { envVar: 'LOCK_ACCESSORY_ID', script: 'lock-e2e.sh' },
     ]
 
+    const logger = console
     for (const s of scriptsToRun) {
       if (!process.env[s.envVar]) {
-        // skip script if no accessory id configured
-        // eslint-disable-next-line no-console
-        console.log(`Skipping ${s.script} because ${s.envVar} not set`)
+        logger.info(`Skipping ${s.script} because ${s.envVar} not set`)
         continue
       }
 
       const scriptPath = path.join(scriptsDir, s.script)
-      // Forward environment so scripts can read HB_URL / HB_TOKEN / <ACCESSORY_ID>
       const env = { ...process.env }
 
       try {
-        // eslint-disable-next-line no-console
-        console.log(`Running ${s.script}...`)
+        logger.info(`Running ${s.script}...`)
         const { stdout, stderr } = await execFileP('bash', [scriptPath], { env })
-        // eslint-disable-next-line no-console
-        console.log(stdout)
+        logger.info(stdout)
         if (stderr) {
-          console.error(stderr)
+          logger.error(stderr)
         }
       } catch (e: any) {
-        // bubble up as test failure
+        logger.error(`Script ${s.script} failed: ${e.message}`)
         throw new Error(`Script ${s.script} failed: ${e.message}`)
       }
     }

package/test/fan-swing.spec.ts

@@ -1,19 +1,20 @@
-import { describe, it, expect, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
+
 import { FanDevice } from '../src/devices/genericDevice'
 
-describe('Fan swing commands', () => {
+describe('fan swing commands', () => {
   it('sends setSwing on boolean swing', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new FanDevice({ id: 'fan1', type: 'fan', name: 'F' }, { _client: mockClient } as any)
+    const d = new FanDevice({ id: 'fan1', type: 'fan', name: 'F' }, { _client: mockClient, log: console } as any)
     await d.init()
-    const res = await d.setState({ swing: true })
+    await d.setState({ swing: true })
     expect(mockClient.setDeviceState).toHaveBeenCalled()
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'setSwing', parameter: 'on', commandType: 'command' })
   })
 
   it('sends setSwing with angle', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new FanDevice({ id: 'fan2', type: 'fan', name: 'F2' }, { _client: mockClient } as any)
+    const d = new FanDevice({ id: 'fan2', type: 'fan', name: 'F2' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ swingAngle: 45 })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'setSwing', parameter: '45', commandType: 'command' })
@@ -21,7 +22,7 @@ describe('Fan swing commands', () => {
 
   it('sends setSwing with mode', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new FanDevice({ id: 'fan3', type: 'fan', name: 'F3' }, { _client: mockClient } as any)
+    const d = new FanDevice({ id: 'fan3', type: 'fan', name: 'F3' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ swingMode: 'vertical' })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'setSwing', parameter: 'vertical', commandType: 'command' })

package/test/helpers/matter-harness.ts

@@ -30,16 +30,27 @@ export function makeFakeApiWithMatter(matterApi?: any) {
 
 export function makeFakeApiWithoutMatter() {
   // Provide a minimal platformAccessory constructor and registerPlatformAccessories
-  function PlatformAccessory(name: string, uuid: string) {
+  interface IPlatformAccessory {
+    displayName: string
+    UUID: string
+    services: any[]
+    context: Record<string, any>
+    getService: (type: any) => any
+    addService: (type: any) => any
+  }
+  function PlatformAccessory(this: IPlatformAccessory, name: string, uuid: string) {
     this.displayName = name
     this.UUID = uuid
     this.services = []
-    this.getService = (type: any) => this.services.find((s: any) => s.type === type)
-    this.addService = (type: any) => {
-      const s: any = { type, characteristics: {} }
-      this.services.push(s)
-      return s
-    }
+    this.context = {}
+  }
+  PlatformAccessory.prototype.getService = function (this: IPlatformAccessory, type: any) {
+    return this.services.find((s: any) => s.type === type)
+  }
+  PlatformAccessory.prototype.addService = function (this: IPlatformAccessory, type: any) {
+    const s: any = { type, characteristics: {} }
+    this.services.push(s)
+    return s
   }
 
   return {

package/test/lock-users.spec.ts

@@ -4,7 +4,7 @@ import { LockDevice } from '../src/devices/genericDevice'
 describe('Lock user management', () => {
   it('sets lock pin via pin field', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new LockDevice({ id: 'lock1', type: 'lock', name: 'L1' }, { _client: mockClient } as any)
+    const d = new LockDevice({ id: 'lock1', type: 'lock', name: 'L1' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ pin: '1234' })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'setLockPin', parameter: '1234', commandType: 'command' })
@@ -12,7 +12,7 @@ describe('Lock user management', () => {
 
   it('adds a user code with addUser action', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new LockDevice({ id: 'lock2', type: 'lock', name: 'L2' }, { _client: mockClient } as any)
+    const d = new LockDevice({ id: 'lock2', type: 'lock', name: 'L2' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ action: 'addUser', user: 'user1', pin: '9999' })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'addUserCode', parameter: 'user1:9999', commandType: 'command' })
@@ -20,7 +20,7 @@ describe('Lock user management', () => {
 
   it('removes a user code with removeUser action', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new LockDevice({ id: 'lock3', type: 'lock', name: 'L3' }, { _client: mockClient } as any)
+    const d = new LockDevice({ id: 'lock3', type: 'lock', name: 'L3' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ action: 'removeUser', user: 'user1' })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'removeUserCode', parameter: 'user1', commandType: 'command' })
@@ -28,7 +28,7 @@ describe('Lock user management', () => {
 
   it('lists users with listUsers action', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new LockDevice({ id: 'lock4', type: 'lock', name: 'L4' }, { _client: mockClient } as any)
+    const d = new LockDevice({ id: 'lock4', type: 'lock', name: 'L4' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ action: 'listUsers' })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'listUsers', parameter: 'default', commandType: 'command' })
@@ -36,7 +36,7 @@ describe('Lock user management', () => {
 
   it('unlocks with pin using unlockWithPin action', async () => {
     const mockClient = { setDeviceState: vi.fn(async (id: string, body: any) => ({ id, body })) }
-    const d = new LockDevice({ id: 'lock5', type: 'lock', name: 'L5' }, { _client: mockClient } as any)
+    const d = new LockDevice({ id: 'lock5', type: 'lock', name: 'L5' }, { _client: mockClient, log: console } as any)
     await d.init()
     await d.setState({ action: 'unlockWithPin', pin: '5555' })
     expect((mockClient.setDeviceState as any).mock.calls[0][1]).toEqual({ command: 'unlockWithPin', parameter: '5555', commandType: 'command' })

package/test/matter-childbridge.spec.ts

@@ -1,5 +1,5 @@
-import { describe, it, expect, beforeEach } from 'vitest'
-import SwitchBotPlatform from '../src/platform'
+import { describe, expect, it } from 'vitest'
+
 import { createPlatformProxy } from '../src/utils'
 
 // This is a lightweight integration-style unit test that verifies the
@@ -14,23 +14,26 @@ describe('platform integration (Matter)', () => {
       constructor(public log: any, public cfg: any, public api: any) {}
       async registerMatterAccessories(accessories: any[]) {
         this.registered.push(...accessories)
-        return
       }
+
       // simulate configureAccessory hook for restored matter accessories
-      configureMatterAccessory(accessory: any) {
+      configureMatterAccessory() {
         // no-op
       }
+
       // lightweight loadDevices implementation that uses an injected discover hook if present
       async loadDevices() {
         const devices = (this.cfg?.devices) || (this as any)._discoverDevices ? await (this as any)._discoverDevices() : []
         // Simulate preparing descriptors and immediately registering them
         const serialized = devices.map((d: any) => ({ id: d.id ?? d.deviceId ?? d, protocol: 'matter', name: d.name }))
-        if (serialized.length > 0) await this.registerMatterAccessories(serialized)
+        if (serialized.length > 0) {
+          await this.registerMatterAccessories(serialized)
+        }
       }
     }
 
     // Create proxy that would choose the fake matter platform when preferred
-    const Proxy = createPlatformProxy(function HAP() {}, FakeMatterPlatform)
+    const Proxy = createPlatformProxy(() => {}, FakeMatterPlatform)
     const matterApi = {
       isMatterAvailable: () => true,
       isMatterEnabled: () => true,
@@ -53,7 +56,7 @@ describe('platform integration (Matter)', () => {
       expect(registered).toHaveProperty('protocol', 'matter')
       expect(registered).toHaveProperty('id', device.id)
     } else {
-      throw new Error('platform.loadDevices not implemented')
+      throw new TypeError('platform.loadDevices not implemented')
     }
   })
 })

package/test/matter-descriptors.spec.ts

@@ -13,7 +13,7 @@ describe('matter descriptors and translations (per-device)', () => {
       calls.push({ id, body })
       return { ok: true }
     } }
-    const d = new FanDevice({ id: 'f1', type: 'fan' } as any, { _client: fakeClient } as any)
+    const d = new FanDevice({ id: 'f1', type: 'fan' } as any, { _client: fakeClient, log: console } as any)
 
     // Oscillate
     await d.setState({ oscillate: true })
@@ -36,7 +36,7 @@ describe('matter descriptors and translations (per-device)', () => {
       calls.push(body)
       return { ok: true }
     } }
-    const d = new LightDevice({ id: 'l1', type: 'light' } as any, { _client: fakeClient } as any)
+    const d = new LightDevice({ id: 'l1', type: 'light' } as any, { _client: fakeClient, log: console } as any)
 
     // color temperature (mired)
     await d.setState({ colorTemperature: 300 })
@@ -59,18 +59,18 @@ describe('matter descriptors and translations (per-device)', () => {
       calls.push(body)
       return { ok: true }
     } }
-    const d = new CurtainDevice({ id: 'c1', type: 'curtain' } as any, { _client: fakeClient } as any)
+    const d = new CurtainDevice({ id: 'c1', type: 'curtain' } as any, { _client: fakeClient, log: console } as any)
 
     // Setting position via HAP-style setState
     await d.setState({ position: 25 })
     expect(calls.pop()?.command).toBe('setPosition')
 
-    // Matter descriptor write: call targetPosition write handler
+    // Matter descriptor write: call targetPositionLiftPercent100ths write handler
     const matter = await d.createMatterAccessory({})
     const cluster = matter.clusters.find((c: any) => c.type === 'WindowCovering')
-    // targetPosition attribute exists and has a write function
-    expect(cluster.attributes.targetPosition.write).toBeTypeOf('function')
-    await cluster.attributes.targetPosition.write(80)
+    // targetPositionLiftPercent100ths attribute exists and has a write function
+    expect(cluster.attributes.targetPositionLiftPercent100ths.write).toBeTypeOf('function')
+    await cluster.attributes.targetPositionLiftPercent100ths.write(8000)
     expect(calls.pop()?.command).toBe('setPosition')
   })
 
@@ -80,7 +80,7 @@ describe('matter descriptors and translations (per-device)', () => {
       calls.push(body)
       return { ok: true }
     } }
-    const d = new LockDevice({ id: 'lock1', type: 'lock' } as any, { _client: fakeClient } as any)
+    const d = new LockDevice({ id: 'lock1', type: 'lock' } as any, { _client: fakeClient, log: console } as any)
 
     // addUser via setState
     await d.setState({ action: 'addUser', user: 'u1', pin: '1234' })

package/test/matter-device-state.spec.ts

@@ -1,20 +1,24 @@
-import { describe, it, expect } from 'vitest'
-import { LightDevice, FanDevice, CurtainDevice, LockDevice, HumidifierMatterDevice } from '../src/devices/genericDevice'
+import { describe, expect, it } from 'vitest'
+
+import { CurtainDevice, FanDevice, HumidifierMatterDevice, LightDevice, LockDevice } from '../src/devices/genericDevice'
 import { makeFakeApiWithMatter } from './helpers/matter-harness'
 
 const api = makeFakeApiWithMatter()
 
-describe('Matter device state translations', () => {
-  it('Light: reads and writes map to setState/getState', async () => {
-    const device = new LightDevice({ id: 'l-1', type: 'light', name: 'L1' }, {})
+describe('matter device state translations', () => {
+  it('light: reads and writes map to setState/getState', async () => {
+    const device = new LightDevice({ id: 'l-1', type: 'light', name: 'L1' }, { log: console })
     let lastSet: any = null
     device.getState = async () => ({ on: true, brightness: 75, hue: 120, saturation: 50, colorTemperature: 350 })
-    device.setState = async (c: any) => { lastSet = c; return { success: true } }
+    device.setState = async (c: any) => {
+      lastSet = c
+      return { success: true }
+    }
 
     const desc = await device.createMatterAccessory(api)
     const levelCluster = desc.clusters.find((c: any) => c.clusterId === 0x0008 || c.type === 'LevelControl')
     expect(levelCluster).toBeDefined()
-    const levelAttr = levelCluster.attributes.currentLevel || levelCluster.attributes["0x0000"] || Object.values(levelCluster.attributes)[0]
+    const levelAttr = levelCluster.attributes.currentLevel || levelCluster.attributes['0x0000'] || Object.values(levelCluster.attributes)[0]
     const read = await levelAttr.read()
     expect(read).toBe(75)
 
@@ -23,11 +27,14 @@ describe('Matter device state translations', () => {
     expect(lastSet).toMatchObject({ brightness: 30 })
   })
 
-  it('Fan: reads speed and writes speed/oscillation', async () => {
-    const device = new FanDevice({ id: 'f-1', type: 'fan', name: 'F1' }, {})
-    let last: any = null
+  it('fan: reads speed and writes speed/oscillation', async () => {
+    const device = new FanDevice({ id: 'f-1', type: 'fan', name: 'F1' }, { log: console })
+    let lastFan: any = null
     device.getState = async () => ({ on: false, speed: 45, oscillating: true, swingMode: 'auto' })
-    device.setState = async (c: any) => { last = c; return { success: true } }
+    device.setState = async (c: any) => {
+      lastFan = c
+      return { success: true }
+    }
 
     const desc = await device.createMatterAccessory(api)
     const fanCluster = desc.clusters.find((c: any) => c.clusterId === 0x0202 || c.type === 'FanControl')
@@ -37,65 +44,74 @@ describe('Matter device state translations', () => {
     expect(speed).toBe(45)
 
     await speedAttr.write(80)
-    expect(last).toMatchObject({ speed: 80 })
+    expect(lastFan).toMatchObject({ speed: 80 })
 
     // oscillation write
     const osc = fanCluster.attributes.oscillation
     await osc.write(true)
-    expect(last).toMatchObject({ oscillate: true })
+    expect(lastFan).toMatchObject({ oscillate: true })
   })
 
-  it('Curtain: reads and writes position', async () => {
-    const device = new CurtainDevice({ id: 'c-1', type: 'curtain', name: 'C1' }, {})
-    let last: any = null
+  it('curtain: reads and writes position', async () => {
+    const device = new CurtainDevice({ id: 'c-1', type: 'curtain', name: 'C1' }, { log: console })
+    let lastCurtain: any = null
     device.getState = async () => ({ position: 42 })
-    device.setState = async (c: any) => { last = c; return { success: true } }
+    device.setState = async (c: any) => {
+      lastCurtain = c
+      return { success: true }
+    }
 
     const desc = await device.createMatterAccessory(api)
-    const shade = desc.clusters.find((c: any) => c.clusterId === 0x0102 || c.type === 'Shade')
+    const shade = desc.clusters.find((c: any) => c.clusterId === 0x0102 || c.type === 'WindowCovering')
     expect(shade).toBeDefined()
-    const current = shade.attributes.currentPosition || shade.attributes["0x0000"]
+    const current = shade.attributes.currentPositionLiftPercent100ths
     const v = await current.read()
-    expect(v).toBe(42)
+    expect(Math.round(v / 100)).toBe(42)
 
-    const target = shade.attributes.targetPosition || shade.attributes["0x0001"]
-    await target.write(10)
-    expect(last).toMatchObject({ position: 10 })
+    const target = shade.attributes.targetPositionLiftPercent100ths
+    await target.write(4200)
+    expect(lastCurtain).toMatchObject({ position: 42 })
   })
 
-  it('Lock: reads and writes locked state', async () => {
-    const device = new LockDevice({ id: 'k-1', type: 'lock', name: 'K1' }, {})
-    let last: any = null
+  it('lock: reads and writes locked state', async () => {
+    const device = new LockDevice({ id: 'k-1', type: 'lock', name: 'K1' }, { log: console })
+    let lastLock: any = null
     device.getState = async () => ({ locked: true })
-    device.setState = async (c: any) => { last = c; return { success: true } }
+    device.setState = async (c: any) => {
+      lastLock = c
+      return { success: true }
+    }
 
     const desc = await device.createMatterAccessory(api)
     const lock = desc.clusters.find((c: any) => c.clusterId === 0x0101 || c.type === 'DoorLock')
     expect(lock).toBeDefined()
-    const lockAttr = lock.attributes.lockState || lock.attributes["0x0000"]
+    const lockAttr = lock.attributes.lockState || lock.attributes['0x0000']
     const v = await lockAttr.read()
     expect(v).toBe(true)
 
     await lockAttr.write(false)
-    expect(last).toMatchObject({ locked: false })
+    expect(lastLock).toMatchObject({ locked: false })
   })
 
-  it('Humidifier: reads humidity and toggles on/off', async () => {
-    const device = new HumidifierMatterDevice({ id: 'h-1', type: 'humidifier', name: 'H1' }, {})
-    let last: any = null
+  it('humidifier: reads humidity and toggles on/off', async () => {
+    const device = new HumidifierMatterDevice({ id: 'h-1', type: 'humidifier', name: 'H1' }, { log: console })
+    let lastHum: any = null
     device.getState = async () => ({ humidity: 55, on: false })
-    device.setState = async (c: any) => { last = c; return { success: true } }
+    device.setState = async (c: any) => {
+      lastHum = c
+      return { success: true }
+    }
 
     const desc = await device.createMatterAccessory(api)
     const rh = desc.clusters.find((c: any) => c.clusterId === 0x0405 || c.type === 'RelativeHumiditySensor')
     expect(rh).toBeDefined()
-    const humAttr = rh.attributes.currentRelativeHumidity || rh.attributes["0x0000"]
+    const humAttr = rh.attributes.currentRelativeHumidity || rh.attributes['0x0000']
     const hv = await humAttr.read()
     expect(hv).toBe(55)
 
     const onCluster = desc.clusters.find((c: any) => c.clusterId === 0x0006 || c.type === 'OnOff')
-    const onAttr = onCluster.attributes.onOff || onCluster.attributes["0x0000"]
+    const onAttr = onCluster.attributes.onOff || onCluster.attributes['0x0000']
     await onAttr.write(true)
-    expect(last).toMatchObject({ on: true })
+    expect(lastHum).toMatchObject({ on: true })
   })
 })

package/test/matter-integration.spec.ts

@@ -6,6 +6,37 @@ import { makeFakeApiWithMatter, makeFakeApiWithoutMatter, makeFakeMatterApi } fr
 // Expanded Matter integration harness tests
 
 describe('matter integration harness', () => {
+  it('registers blind tilt Matter accessory with correct window covering tilt attributes', async () => {
+    const matterApi = makeFakeMatterApi()
+    const api = makeFakeApiWithMatter(matterApi)
+
+    const platform = new SwitchBotMatterPlatform(console as any, {
+      devices: [{ id: 'blindtilt-1', type: 'blindtilt', name: 'Blind Tilt 1' }],
+      enableMatter: true,
+      preferMatter: true,
+      log: console,
+    } as any, api as any)
+
+    await (platform as any).registerMatterAccessories()
+
+    const regs = matterApi.getRegistered()
+    expect(regs.length).toBeGreaterThanOrEqual(1)
+    const clusters = regs[0]?.clusters
+    // Debug: log the actual clusters structure
+    // eslint-disable-next-line no-console
+    console.log('DEBUG clusters (blindtilt):', JSON.stringify(clusters, null, 2))
+    // Support both array and object cluster representations
+    let wc = clusters?.windowCovering
+    if (!wc && Array.isArray(clusters)) {
+      wc = clusters.find((c: any) => c?.type === 'WindowCovering' || c?.clusterId === 0x0102)
+    }
+    expect(wc).toBeDefined()
+    expect(wc).toHaveProperty('currentPositionTiltPercent100ths')
+    expect(wc).toHaveProperty('targetPositionTiltPercent100ths')
+    expect(wc).toHaveProperty('operationalStatus')
+    expect(wc).toHaveProperty('endProductType')
+    expect(wc).toHaveProperty('configStatus')
+  })
   it('normalizes Color Bulb and Motion Sensor to Matter-supported categories', async () => {
     const matterApi = makeFakeMatterApi()
     const api = makeFakeApiWithMatter(matterApi)
@@ -17,6 +48,7 @@ describe('matter integration harness', () => {
       ],
       enableMatter: true,
       preferMatter: true,
+      log: console,
     } as any, api as any)
 
     await (platform as any).registerMatterAccessories()
@@ -28,7 +60,7 @@ describe('matter integration harness', () => {
     expect(ids).toContain('ms-1')
   })
 
-  it('uses conformant window covering type for curtain Matter registration', async () => {
+  it('registers curtain Matter accessory with correct window covering attributes', async () => {
     const matterApi = makeFakeMatterApi()
     const api = makeFakeApiWithMatter(matterApi)
 
@@ -36,14 +68,28 @@ describe('matter integration harness', () => {
       devices: [{ id: 'curtain-1', type: 'curtain', name: 'Curtain 1' }],
       enableMatter: true,
       preferMatter: true,
+      log: console,
     } as any, api as any)
 
     await (platform as any).registerMatterAccessories()
 
     const regs = matterApi.getRegistered()
     expect(regs.length).toBeGreaterThanOrEqual(1)
-    // const wcType = regs[0]?.clusters?.windowCovering?.type
-    // expect(wcType).toBe(4) // 4 = Curtain (conformant for SwitchBot Curtain)
+    const clusters = regs[0]?.clusters
+    // Debug: log the actual clusters structure
+    // eslint-disable-next-line no-console
+    console.log('DEBUG clusters (curtain):', JSON.stringify(clusters, null, 2))
+    // Support both array and object cluster representations
+    let wc = clusters?.windowCovering
+    if (!wc && Array.isArray(clusters)) {
+      wc = clusters.find((c: any) => c?.type === 'WindowCovering' || c?.clusterId === 0x0102)
+    }
+    expect(wc).toBeDefined()
+    expect(wc).toHaveProperty('currentPositionLiftPercent100ths')
+    expect(wc).toHaveProperty('targetPositionLiftPercent100ths')
+    expect(wc).toHaveProperty('operationalStatus')
+    expect(wc).toHaveProperty('endProductType')
+    expect(wc).toHaveProperty('configStatus')
   })
 
   it('registers RGBIC Neon Wire Rope Light as lightstrip with conformant ColorControl defaults', async () => {
@@ -54,6 +100,7 @@ describe('matter integration harness', () => {
       devices: [{ id: 'neon-1', type: 'RGBIC Neon Wire Rope Light', name: 'Family Room Neon Wire Rope Light' }],
       enableMatter: true,
       preferMatter: true,
+      log: console,
     } as any, api as any)
 
     await (platform as any).registerMatterAccessories()
@@ -72,7 +119,7 @@ describe('matter integration harness', () => {
     const matterApi = makeFakeMatterApi()
     const api = makeFakeApiWithMatter(matterApi)
 
-    const platform = new SwitchBotMatterPlatform(console as any, { devices: [{ id: 'm-1', type: 'light', name: 'L1' }], enableMatter: true, preferMatter: true } as any, api as any)
+    const platform = new SwitchBotMatterPlatform(console as any, { devices: [{ id: 'm-1', type: 'light', name: 'L1' }], enableMatter: true, preferMatter: true, log: console } as any, api as any)
 
     // Call register path directly
     if (typeof (platform as any).registerMatterAccessories === 'function') {
@@ -91,7 +138,7 @@ describe('matter integration harness', () => {
   it('falls back to HAP when Matter API unavailable', async () => {
     // Directly instantiate the HAP platform to exercise HAP fallback
     const api = makeFakeApiWithoutMatter()
-    const platform = new SwitchBotHAPPlatform(console as any, { devices: [{ id: 'h-1', type: 'light', name: 'H1' }], enableMatter: true, preferMatter: true } as any, api as any)
+    const platform = new SwitchBotHAPPlatform(console as any, { devices: [{ id: 'h-1', type: 'light', name: 'H1' }], enableMatter: true, preferMatter: true, log: console } as any, api as any)
 
     // call loadDevices for HAP flow
     if (typeof (platform as any).loadDevices === 'function') {
@@ -109,7 +156,7 @@ describe('matter integration harness', () => {
     const matterApi = makeFakeMatterApi()
     const api = makeFakeApiWithMatter(matterApi)
 
-    const platform = new SwitchBotMatterPlatform(console as any, { devices: [{ id: 'r-1', type: 'light', name: 'R1' }], enableMatter: true, preferMatter: true } as any, api as any)
+    const platform = new SwitchBotMatterPlatform(console as any, { devices: [{ id: 'r-1', type: 'light', name: 'R1' }], enableMatter: true, preferMatter: true, log: console } as any, api as any)
 
     // Simulate a restored accessory present before registration
     const restored = { uuid: matterApi.uuid.generate('r-1'), displayName: 'Restored R1', context: { deviceId: 'r-1' } }

package/test/platform.integration.spec.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
+
 import { SwitchBotHAPPlatform } from '../src/platform'
 
 // Minimal mock logger
@@ -21,7 +22,7 @@ describe('platform integration (HAP)', () => {
     }
 
     // Simple platformAccessory constructor
-    function PlatformAccessory(name: string, uuid: string) {
+    function PlatformAccessory(this: any, name: string, uuid: string) {
       this.displayName = name
       this.UUID = uuid
       this.services = []
@@ -37,10 +38,11 @@ describe('platform integration (HAP)', () => {
       hap,
       platformAccessory: PlatformAccessory as any,
       registerPlatformAccessories: (_p: string, _n: string, accs: any[]) => registered.push(...accs),
-      on: (_ev: string, cb: Function) => { /* do not auto-run */ },
+      on: () => { /* do not auto-run */ },
     }
 
-    const config: any = { devices: [{ id: 'dev1', type: 'light', name: 'L1' }] }
+    // Inject logger into config
+    const config: any = { devices: [{ id: 'dev1', type: 'light', name: 'L1' }], log }
 
     const platform = new SwitchBotHAPPlatform(log as any, config, api)
 
@@ -49,7 +51,7 @@ describe('platform integration (HAP)', () => {
 
     // Expect accessory created and registered
     expect(registered.length).toBeGreaterThanOrEqual(1)
-    const keys = Array.from((platform as any).accessories.keys())
+    const keys = [...(platform as any).accessories.keys()]
     expect(keys.some((k: string) => k.includes('dev1'))).toBeTruthy()
   })
 })