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

package/src/settings.ts

@@ -36,6 +36,16 @@ export interface options {
   irdevices?: irDevicesConfig[]
   irdeviceConfig?: { [remoteType: string]: irDevicesConfig }
   allowInvalidCharacters?: boolean
+  // When true, devices declared in config.options.devices that are not
+  // discovered via the SwitchBot OpenAPI will still be included (config-only
+  // devices). Default: false.
+  allowConfigOnlyDevices?: boolean
+  /**
+   * When true, previously-registered accessories for devices that are no
+   * longer discovered or configured will be kept on the bridge. Default: false.
+   * When false (default), stale accessories are removed automatically.
+   */
+  keepStaleAccessories?: boolean
   mqttURL?: string
   mqttOptions?: IClientOptions
   mqttPubOptions?: IClientOptions
@@ -51,6 +61,9 @@ export interface options {
   updateRate?: number
   pushRate?: number
   logging?: string
+  // Matter platform batch refresh options
+  matterBatchRefreshRate?: number
+  matterBatchConcurrency?: number
 };
 
 export type devicesConfig = botConfig | relaySwitch1Config | relaySwitch1PMConfig | meterConfig | meterProConfig | indoorOutdoorSensorConfig | humidifierConfig | curtainConfig | blindTiltConfig | contactConfig | motionConfig | waterDetectorConfig | plugConfig | colorBulbConfig | stripLightConfig | ceilingLightConfig | lockConfig | hubConfig

package/src/test/devices-matter/baseMatterAccessory.test.ts

@@ -0,0 +1,88 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { BaseMatterAccessory } from '../../devices-matter/BaseMatterAccessory.js'
+
+// Minimal concrete subclass for testing
+class TestAccessory extends BaseMatterAccessory {
+  constructor(api: any, log: any, opts?: any) {
+    super(api, log, {
+      uuid: opts?.uuid ?? api.matter.uuid.generate('test'),
+      displayName: opts?.displayName ?? 'Test',
+      deviceType: opts?.deviceType ?? ('OnOffLight' as any),
+      serialNumber: opts?.serialNumber ?? 'TEST-1',
+      manufacturer: opts?.manufacturer ?? 'TestCo',
+      model: opts?.model ?? 'T-1',
+      firmwareRevision: opts?.firmwareRevision ?? '1.0',
+      hardwareRevision: opts?.hardwareRevision ?? '1.0',
+      context: opts?.context ?? {},
+      clusters: opts?.clusters,
+      handlers: opts?.handlers,
+    })
+  }
+}
+
+describe('baseMatterAccessory helpers', () => {
+  it('sendOnCommand uses OpenAPI helper and updates state', async () => {
+    const update = vi.fn()
+    const sendOpenAPI = vi.fn(async () => ({ response: {}, statusCode: 200 }))
+    const api: any = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-1' }, updateAccessoryState: update } }
+    const log: any = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() }
+
+    const ctx = { deviceId: 'DEV-1', sendOpenAPI, connectionType: 'OpenAPI' }
+    const acc = new TestAccessory(api, log, { context: ctx })
+
+    await acc.sendOnCommand()
+
+    expect(sendOpenAPI).toHaveBeenCalledWith('turnOn', 'default')
+    expect(update).toHaveBeenCalledWith(acc.uuid, 'onOff', { onOff: true })
+  })
+
+  it('sendOnCommand uses BLE helper when connectionType is BLE', async () => {
+    const update = vi.fn()
+    const sendBLE = vi.fn(async () => true)
+    const api: any = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-2' }, updateAccessoryState: update } }
+    const log: any = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() }
+
+    const ctx = { deviceId: 'DEV-2', sendBLE, connectionType: 'BLE' }
+    const acc = new TestAccessory(api, log, { context: ctx })
+
+    await acc.sendOnCommand()
+
+    expect(sendBLE).toHaveBeenCalledWith('turnOn')
+    expect(update).toHaveBeenCalledWith(acc.uuid, 'onOff', { onOff: true })
+  })
+
+  it('sendSetBrightness sends percent and updates LevelControl', async () => {
+    const update = vi.fn()
+    const sendOpenAPI = vi.fn(async () => ({ response: {}, statusCode: 200 }))
+    const api: any = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-3' }, updateAccessoryState: update } }
+    const log: any = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() }
+
+    const ctx = { deviceId: 'DEV-3', sendOpenAPI, connectionType: 'OpenAPI' }
+    const acc = new TestAccessory(api, log, { context: ctx })
+
+    await acc.sendSetBrightness(50)
+
+    expect(sendOpenAPI).toHaveBeenCalledWith('setBrightness', '50')
+    const expectedLevel = Math.round((50 / 100) * 254)
+    expect(update).toHaveBeenCalledWith(acc.uuid, 'level', { currentLevel: expectedLevel })
+  })
+
+  it('sendSetColor sends RGB and updates ColorControl', async () => {
+    const update = vi.fn()
+    const sendOpenAPI = vi.fn(async () => ({ response: {}, statusCode: 200 }))
+    const api: any = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-4' }, updateAccessoryState: update } }
+    const log: any = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() }
+
+    const ctx = { deviceId: 'DEV-4', sendOpenAPI, connectionType: 'OpenAPI' }
+    const acc = new TestAccessory(api, log, { context: ctx })
+
+    await acc.sendSetColor(255, 128, 0)
+
+    expect(sendOpenAPI).toHaveBeenCalledWith('setColor', '255:128:0')
+    expect(update).toHaveBeenCalled()
+    // Ensure we updated ColorControl cluster with numeric attributes
+    const calledWith = (update.mock.calls[0] || update.mock.calls[1])
+    expect(calledWith[1] === 'color' || calledWith[1] === api.matter.clusterNames.ColorControl).toBeTruthy()
+  })
+})

package/src/test/helpers/platform-fixtures.ts

@@ -0,0 +1,33 @@
+import { vi } from 'vitest'
+
+// Shared test helpers for platform-matter tests
+export function makeApiStub(matterProps: Record<string, any> = {}) {
+  const handlers: Record<string, (...args: any[]) => any> = {}
+
+  const api: any = {
+    matter: {
+      uuid: { generate: (s: string) => `uuid-${s}` },
+      registerPlatformAccessories: matterProps.registerPlatformAccessories ?? vi.fn(),
+      unregisterPlatformAccessories: matterProps.unregisterPlatformAccessories ?? vi.fn(),
+      updateAccessoryState: matterProps.updateAccessoryState ?? vi.fn(),
+      clusterNames: matterProps.clusterNames ?? {},
+      deviceTypes: matterProps.deviceTypes ?? {},
+    },
+    isMatterAvailable: matterProps.isMatterAvailable ?? (() => true),
+    isMatterEnabled: matterProps.isMatterEnabled ?? (() => true),
+    on: (ev: string, fn: (...args: any[]) => any) => { handlers[ev] = fn },
+    _handlers: handlers,
+  }
+
+  return api
+}
+
+export function makeLogStub() {
+  return {
+    info: vi.fn(),
+    warn: vi.fn(),
+    debug: vi.fn(),
+    error: vi.fn(),
+    success: vi.fn(),
+  }
+}

package/src/test/platform-matter.additional.test.ts

@@ -0,0 +1,44 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../platform-matter.js'
+import { makeApiStub, makeLogStub } from './helpers/platform-fixtures.js'
+
+describe('additional platform-matter mapping tests', () => {
+  it('parses OpenAPI color strings and triggers an update', async () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState })
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    // Some OpenAPI statuses provide color as comma/colon separated or hex
+    await (platform as any).applyStatusToAccessory('uuid-col', { deviceId: 'DEV-COL' } as any, { color: '255:128:64' })
+    await (platform as any).applyStatusToAccessory('uuid-col', { deviceId: 'DEV-COL' } as any, { color: '255,128,64' })
+    await (platform as any).applyStatusToAccessory('uuid-col', { deviceId: 'DEV-COL' } as any, { color: '#FF8040' })
+
+    expect(updateAccessoryState).toHaveBeenCalled()
+  })
+
+  it('maps MeterPro CO2 values to Matter updates', async () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState })
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    await (platform as any).applyStatusToAccessory('uuid-co2', { deviceId: 'DEV-METERPRO' } as any, { co2: 420 })
+
+    expect(updateAccessoryState).toHaveBeenCalled()
+  })
+
+  it('handles curtain position synonyms (position / slidePosition)', async () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState })
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    // Provide status with position and slidePosition synonyms
+    await (platform as any).applyStatusToAccessory('uuid-cur', { deviceId: 'DEV-CUR', deviceType: 'Curtain' } as any, { position: 30 })
+    await (platform as any).applyStatusToAccessory('uuid-cur', { deviceId: 'DEV-CUR', deviceType: 'Curtain' } as any, { slidePosition: 70 })
+
+    expect(updateAccessoryState).toHaveBeenCalled()
+  })
+})

package/src/test/platform-matter.bleparse.test.ts

@@ -0,0 +1,47 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../platform-matter.js'
+import { makeApiStub, makeLogStub } from './helpers/platform-fixtures.js'
+
+describe('platform-matter BLE advertisement parser', () => {
+  it('parses extended serviceData fields correctly', () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState })
+
+    const log: any = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const dev: any = { deviceId: 'DEV-TEST' }
+    const sd = {
+      temp: 22.3,
+      humid: 45,
+      pm25: 12,
+      pm10: 34,
+      voc: 120,
+      co2: 420,
+      motion: 1,
+      open: 0,
+      leak: 0,
+      position: 30,
+      fanSpeed: 75,
+      battery: 88,
+      rgb: '255:128:64',
+    }
+
+    const parsed = (platform as any).parseAdvertisementForDevice(dev, sd)
+    expect(parsed).toBeTruthy()
+    expect(parsed.temperature).toBeCloseTo(22.3)
+    expect(parsed.humidity).toBe(45)
+    expect(parsed.pm25).toBe(12)
+    expect(parsed.pm10).toBe(34)
+    expect(parsed.voc).toBe(120)
+    expect(parsed.co2).toBe(420)
+    expect(parsed.motion).toBeTruthy()
+    expect(parsed.contact).toBeDefined()
+    expect(parsed.leak).toBeFalsy()
+    expect(parsed.position).toBe(30)
+    expect(parsed.fanSpeed).toBe(75)
+    expect(parsed.battery).toBe(88)
+    expect(parsed.color).toEqual({ r: 255, g: 128, b: 64 })
+  })
+})

package/src/test/platform-matter.cleanup.test.ts

@@ -0,0 +1,86 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../platform-matter.js'
+import { formatDeviceIdAsMac } from '../utils.js'
+import { makeApiStub, makeLogStub } from './helpers/platform-fixtures.js'
+
+describe('platform-matter lifecycle cleanup', () => {
+  it('clearDeviceResources removes timers, instances and BLE handler entries', async () => {
+    // Setup stubbed API and logs
+    const handlers: Record<string, (...args: any[]) => any> = {}
+    const api: any = makeApiStub({ registerPlatformAccessories: vi.fn(), unregisterPlatformAccessories: vi.fn(), clusterNames: { OnOff: 'OnOff' } })
+    api._handlers = handlers
+    // keep api.on as a single-statement arrow to satisfy lint
+    api.on = (ev: string, fn: (...args: any[]) => any) => (handlers[ev] = fn)
+
+    const log = makeLogStub()
+
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    // Insert a fake timer, accessory instance, and BLE handler
+    const deviceId = 'AA:BB:CC:11:22:33'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+
+    const timer = setInterval(() => {}, 100000)
+    ;(platform as any).refreshTimers.set(nid, timer)
+    ;(platform as any).accessoryInstances.set(nid, { dummy: true })
+    ;(platform as any).bleEventHandler[deviceId.toLowerCase()] = () => {}
+
+    // Ensure they exist prior
+    expect((platform as any).refreshTimers.get(nid)).toBeDefined()
+    expect((platform as any).accessoryInstances.get(nid)).toBeDefined()
+    expect((platform as any).bleEventHandler[deviceId.toLowerCase()]).toBeDefined()
+
+    // Call the private helper
+    ;(platform as any).clearDeviceResources(deviceId)
+
+    // Now they should be removed
+    expect((platform as any).refreshTimers.get(nid)).toBeUndefined()
+    expect((platform as any).accessoryInstances.get(nid)).toBeUndefined()
+    expect((platform as any).bleEventHandler[deviceId.toLowerCase()]).toBeUndefined()
+  })
+
+  it('shutdown handler clears all timers and handlers when invoked', async () => {
+    // Setup stubbed API and logs
+    const handlers: Record<string, (...args: any[]) => any> = {}
+    const api: any = makeApiStub({ registerPlatformAccessories: vi.fn(), unregisterPlatformAccessories: vi.fn(), clusterNames: { OnOff: 'OnOff' } })
+    api._handlers = handlers
+    // keep api.on as a single-statement arrow to satisfy lint
+    api.on = (ev: string, fn: (...args: any[]) => any) => (handlers[ev] = fn)
+
+    const log = makeLogStub()
+
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    // Add two timers to the platform (using normalized ids)
+    const ids = ['devA', 'devB']
+    for (const id of ids) {
+      const nid = (platform as any).normalizeDeviceId(id)
+      const t = setInterval(() => {}, 100000)
+      ;(platform as any).refreshTimers.set(nid, t)
+      ;(platform as any).accessoryInstances.set(nid, { dummy: true })
+      try {
+        const mac = formatDeviceIdAsMac(id).toLowerCase()
+        ;(platform as any).bleEventHandler[mac] = () => {}
+      } catch {
+        // ignore formatting errors in this test
+      }
+    }
+
+    // Invoke didFinishLaunching to ensure the platform registered its shutdown handler
+    await Promise.resolve(api._handlers.didFinishLaunching?.())
+
+    // Shutdown handler should now be registered on api._handlers.shutdown
+    expect(typeof api._handlers.shutdown).toBe('function')
+
+    // Call the shutdown handler
+    await Promise.resolve(api._handlers.shutdown())
+
+    // All refresh timers should be cleared
+    for (const id of ids) {
+      const nid = (platform as any).normalizeDeviceId(id)
+      expect((platform as any).refreshTimers.get(nid)).toBeUndefined()
+      expect((platform as any).accessoryInstances.get(nid)).toBeUndefined()
+    }
+  })
+})

package/src/test/platform-matter.keepstale.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../platform-matter.js'
+import { makeApiStub, makeLogStub } from './helpers/platform-fixtures.js'
+
+describe('keepStaleAccessories config flag behavior', () => {
+  it('keeps previously-registered accessories when options.keepStaleAccessories=true', async () => {
+    const unregister = vi.fn()
+    const register = vi.fn()
+    const api: any = makeApiStub({ unregisterPlatformAccessories: unregister, registerPlatformAccessories: register })
+
+    const log: any = makeLogStub()
+
+    // Create platform with keepStaleAccessories = true
+    const platform = new SwitchBotMatterPlatform(log as any, { options: { keepStaleAccessories: true } } as any, api)
+
+    // Seed discovered devices (one device)
+    ;(platform as any).discoveredDevices = [{ deviceId: 'DEV1', deviceType: 'Plug', deviceName: 'Device 1' }]
+
+    // Insert a stale accessory into matterAccessories
+    const staleUuid = api.matter.uuid.generate('stale-device')
+    const staleAcc: any = { uuid: staleUuid, displayName: 'Stale', context: { deviceId: 'STALE_DEVICE' } }
+    ;(platform as any).matterAccessories.set(staleUuid, staleAcc)
+
+    // Mock createAccessoryFromDevice to return a simple accessory for DEV1
+    vi.spyOn(platform as any, 'createAccessoryFromDevice').mockResolvedValue({ displayName: 'Device 1', uuid: 'uuid-DEV1', context: { deviceId: 'DEV1' } } as any)
+
+    // Run registration which includes stale-removal logic
+    await (platform as any).registerMatterAccessories()
+
+    // Expect unregister NOT called (we kept stale accessory)
+    expect(unregister).not.toHaveBeenCalled()
+
+    // Stale accessory should still be present in matterAccessories
+    expect((platform as any).matterAccessories.get(staleUuid)).toBeDefined()
+  })
+})

package/src/test/platform-matter.mapping.test.ts

@@ -0,0 +1,57 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../platform-matter.js'
+import { makeApiStub, makeLogStub } from './helpers/platform-fixtures.js'
+
+describe('platform-matter mapping helper', () => {
+  it('prefers accessory instance update methods for battery and falls back to api.matter.updateAccessoryState', async () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState, clusterNames: { OnOff: 'OnOff', LevelControl: 'LevelControl', ColorControl: 'ColorControl', PowerSource: 'powerSource' } })
+
+    const log: any = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    // Create a fake accessory instance with updateBatteryPercentage
+    const deviceId = 'DEV123'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+    const fakeInstance = { updateBatteryPercentage: vi.fn() }
+    ;(platform as any).accessoryInstances.set(nid, fakeInstance)
+
+    // Call the private helper with different battery field names
+    await (platform as any).applyStatusToAccessory('uuid-test', { deviceId } as any, { batteryPercentage: 55 })
+    expect(fakeInstance.updateBatteryPercentage).toHaveBeenCalled()
+
+    // Remove instance to force fallback
+    ;(platform as any).accessoryInstances.delete(nid)
+    await (platform as any).applyStatusToAccessory('uuid-test', { deviceId } as any, { battery: 30 })
+    expect(updateAccessoryState).toHaveBeenCalled()
+  })
+
+  it('handles temperature and humidity synonyms', async () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState })
+
+    const log: any = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'DEV-TEMP'
+    await (platform as any).applyStatusToAccessory('uuid-temp', { deviceId } as any, { temp: 21.5, humid: 48 })
+
+    // Expect updateAccessoryState to have been called for temperature and humidity
+    expect(updateAccessoryState).toHaveBeenCalled()
+  })
+
+  it('applies VOC and PM10 mappings when present', async () => {
+    const updateAccessoryState = vi.fn()
+    const api: any = makeApiStub({ updateAccessoryState })
+
+    const log: any = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'DEV-AQ'
+    await (platform as any).applyStatusToAccessory('uuid-aq', { deviceId } as any, { voc: 123, pm10: 56 })
+
+    // Expect updateAccessoryState (or safeUpdate fallback) to have been called for voc and pm10
+    expect(updateAccessoryState).toHaveBeenCalled()
+  })
+})

package/src/test/platform-matter.openapi-mapping.test.ts

@@ -0,0 +1,109 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../platform-matter.js'
+import { makeApiStub, makeLogStub } from './helpers/platform-fixtures.js'
+
+describe('platform-matter OpenAPI -> Matter mapping', () => {
+  it('maps light OpenAPI status (on/off, brightness, color, battery) to accessory instance helpers', async () => {
+    const api: any = makeApiStub()
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'LIGHT-1'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+
+    const instance = {
+      updateOnOffState: vi.fn(),
+      updateBrightness: vi.fn(),
+      updateHueSaturation: vi.fn(),
+      updateBatteryPercentage: vi.fn(),
+    }
+    ;(platform as any).accessoryInstances.set(nid, instance)
+
+    const status = { power: true, brightness: 80, color: '255:128:64', battery: 92 }
+    await (platform as any).applyStatusToAccessory('uuid-light', { deviceId } as any, status)
+
+    expect(instance.updateOnOffState).toHaveBeenCalled()
+    expect(instance.updateBrightness).toHaveBeenCalled()
+    expect(instance.updateHueSaturation).toHaveBeenCalled()
+    expect(instance.updateBatteryPercentage).toHaveBeenCalled()
+  })
+
+  it('maps MeterPro OpenAPI status (temp, humid, co2, pm25, voc) to accessory instance helpers', async () => {
+    const api: any = makeApiStub()
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'METERPRO-1'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+
+    const instance = {
+      updateTemperature: vi.fn(),
+      updateHumidity: vi.fn(),
+      updateCO2: vi.fn(),
+      updatePM25: vi.fn(),
+      updateVOC: vi.fn(),
+    }
+    ;(platform as any).accessoryInstances.set(nid, instance)
+
+    const status = { temp: 21.4, humid: 45, co2: 410, pm25: 12, voc: 85 }
+    await (platform as any).applyStatusToAccessory('uuid-meter', { deviceId } as any, status)
+
+    expect(instance.updateTemperature).toHaveBeenCalled()
+    expect(instance.updateHumidity).toHaveBeenCalled()
+    expect(instance.updateCO2).toHaveBeenCalled()
+    expect(instance.updatePM25).toHaveBeenCalled()
+    expect(instance.updateVOC).toHaveBeenCalled()
+  })
+
+  it('maps lock OpenAPI status to lock helper', async () => {
+    const api: any = makeApiStub()
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'LOCK-1'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+
+    const instance = { updateLockState: vi.fn() }
+    ;(platform as any).accessoryInstances.set(nid, instance)
+
+    const status = { lock: true }
+    await (platform as any).applyStatusToAccessory('uuid-lock', { deviceId } as any, status)
+
+    expect(instance.updateLockState).toHaveBeenCalled()
+  })
+
+  it('maps curtain position synonyms to lift position helper', async () => {
+    const api: any = makeApiStub()
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'CURTAIN-1'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+
+    const instance = { updateLiftPosition: vi.fn() }
+    ;(platform as any).accessoryInstances.set(nid, instance)
+
+    await (platform as any).applyStatusToAccessory('uuid-cur', { deviceId, deviceType: 'Curtain' } as any, { position: 25 })
+    await (platform as any).applyStatusToAccessory('uuid-cur', { deviceId, deviceType: 'Curtain' } as any, { slidePosition: 75 })
+
+    expect(instance.updateLiftPosition).toHaveBeenCalled()
+  })
+
+  it('maps robot vacuum run state / on to updateRunMode or updateOperationalState', async () => {
+    const api: any = makeApiStub()
+    const log = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
+
+    const deviceId = 'RVC-1'
+    const nid = (platform as any).normalizeDeviceId(deviceId)
+
+    const instance: any = { updateRunMode: vi.fn(), updateOperationalState: vi.fn() }
+    ;(platform as any).accessoryInstances.set(nid, instance)
+
+    await (platform as any).applyStatusToAccessory('uuid-rvc', { deviceId, deviceType: 'K10+' } as any, { runState: 'cleaning', power: true })
+
+    const calls = (instance.updateRunMode.mock?.calls?.length || 0) + (instance.updateOperationalState.mock?.calls?.length || 0)
+    expect(calls).toBeGreaterThan(0)
+  })
+})