@switchbot/homebridge-switchbot 5.0.0-beta.133 → 5.0.0-beta.135

package/src/platform.ts

@@ -97,12 +97,46 @@ export const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
   }, // Switch in HAP, RobotVacuumCleaner in Matter
   curtain: {
     windowCovering: {
-      type: 5, // GenericWindowCovering - supports lift feature (covers curtain3, rollershade variants via normalization)
+      currentPositionLiftPercent100ths: 0,
+      targetPositionLiftPercent100ths: 0,
+      operationalStatus: {
+        global: 0,
+        lift: 0,
+        tilt: 0,
+      },
+      endProductType: 0,
+      configStatus: {
+        operational: true,
+        onlineReserved: true,
+        liftMovementReversed: false,
+        liftPositionAware: true,
+        tiltPositionAware: false,
+        liftEncoderControlled: true,
+        tiltEncoderControlled: false,
+      },
     },
   }, // WindowCovering → WindowCovering (includes curtain3, rollershade variants via normalization)
   blindtilt: {
     windowCovering: {
-      type: 8, // TiltBlindLiftAndTilt - supports tilt feature
+      currentPositionLiftPercent100ths: 0,
+      targetPositionLiftPercent100ths: 0,
+      currentPositionTiltPercent100ths: 0,
+      targetPositionTiltPercent100ths: 0,
+      operationalStatus: {
+        global: 0,
+        lift: 0,
+        tilt: 0,
+      },
+      endProductType: 8,
+      configStatus: {
+        operational: true,
+        onlineReserved: true,
+        liftMovementReversed: false,
+        liftPositionAware: true,
+        tiltPositionAware: true,
+        liftEncoderControlled: true,
+        tiltEncoderControlled: true,
+      },
     },
   }, // WindowCovering with tilt → WindowCovering
   fan: {
@@ -1030,7 +1064,7 @@ export class SwitchBotHAPPlatform {
 
   constructor(log: Logger, config: PlatformConfig, api?: API) {
     this.log = log
-    this.config = (config as any) ?? {}
+    this.config = { ...(config as any), logger: log }
     this.api = api
     this.accessories = new Map()
     this.log.info('SwitchBot HAP platform initialized')
@@ -1044,15 +1078,6 @@ export class SwitchBotHAPPlatform {
       this.log.debug('Failed to create shared SwitchBot client', e)
     }
 
-    // Create/shared SwitchBot client and attach to config so child devices reuse it.
-    try {
-      const client = new SwitchBotClient(this.config)
-      void client.init()
-      ;(this.config as any)._client = client
-    } catch (e) {
-      this.log.debug('Failed to create shared SwitchBot client', e)
-    }
-
     // Wait for Homebridge to finish launching to create/register accessories
     if (this.api && typeof (this.api as any).on === 'function') {
       (this.api as any).on('didFinishLaunching', async () => {
@@ -1133,23 +1158,7 @@ export class SwitchBotHAPPlatform {
       }
 
       const type: string = normalizeTypeForMatter(d.type)
-      const windowCoveringTypes = ['curtain', 'curtain3', 'rollershade', 'roller shade', 'blindtilt', 'blind tilt']
-      // Patch: If a config override for matterType is present, update DEVICE_MATTER_CLUSTERS for this device
-      if (windowCoveringTypes.includes(type.toLowerCase()) && typeof raw.matterType === 'number') {
-        if (DEVICE_MATTER_CLUSTERS[type] && DEVICE_MATTER_CLUSTERS[type].windowCovering) {
-          DEVICE_MATTER_CLUSTERS[type].windowCovering.type = raw.matterType
-          this.log.info(`[Matter/Debug] Overriding DEVICE_MATTER_CLUSTERS.${type}.windowCovering.type to`, raw.matterType)
-        }
-      }
       const deviceOpts: any = { id: d.id, type, name: d.name, encryptionKey: d.encryptionKey, keyId: d.keyId }
-      if (windowCoveringTypes.includes(type.toLowerCase())) {
-        if (typeof raw.matterType === 'number') {
-          deviceOpts.matterType = raw.matterType
-          this.log.info(`[Matter/Debug] Passing matterType override for device ${d.name ?? d.id}: matterType=${raw.matterType}`)
-        } else {
-          this.log.info(`[Matter/Debug] No matterType override for device ${d.name ?? d.id}`)
-        }
-      }
       this.log.debug(`[Matter/Debug] Device options for ${d.name ?? d.id}:`, JSON.stringify(deviceOpts, null, 2))
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
@@ -1353,7 +1362,7 @@ export class SwitchBotMatterPlatform {
 
   constructor(log: Logger, config: PlatformConfig, api?: API) {
     this.log = log
-    this.config = (config as any) ?? {}
+    this.config = { ...(config as any), logger: log }
     this.api = api
     this.accessories = new Map()
     this.log.info('SwitchBot Matter platform initialized')

package/src/switchbotClient.ts

@@ -1,12 +1,13 @@
 import type { SwitchBotPluginConfig } from './settings.js'
-import { SwitchbotOperationError, SwitchbotAuthenticationError, CharacteristicMissingError } from './errors.js'
+
+import { CharacteristicMissingError, SwitchbotAuthenticationError, SwitchbotOperationError } from './errors.js'
 
 export interface ISwitchBotClient {
-  init(): Promise<void>
-  getDevice(id: string): Promise<any>
-  getDevices(): Promise<any[]>
-  setDeviceState(id: string, body: any): Promise<any>
-  destroy(): Promise<void>
+  init: () => Promise<void>
+  getDevice: (id: string) => Promise<any>
+  getDevices: () => Promise<any[]>
+  setDeviceState: (id: string, body: any) => Promise<any>
+  destroy: () => Promise<void>
 }
 
 /**
@@ -21,15 +22,24 @@ export class SwitchBotClient implements ISwitchBotClient {
   private requestTimeout = 5000
   private maxRetries = 2
   private writeDebounceMs = 100
-  private logger: any
-  private pendingWrites: Map<string, { timer: any; body: any; resolvers: Array<{ resolve: (v:any)=>void; reject: (e:any)=>void }>; }> = new Map()
+  private logger: import('homebridge').Logger
+  private pendingWrites: Map<string, { timer: any, body: any, resolvers: Array<{ resolve: (v: any) => void, reject: (e: any) => void }> }> = new Map()
 
   constructor(cfg: SwitchBotPluginConfig) {
     this.cfg = cfg
-    this.logger = (cfg as any)?.logger ?? console
-    if (typeof (cfg as any)?.requestTimeout === 'number') this.requestTimeout = (cfg as any).requestTimeout
-    if (typeof (cfg as any)?.maxRetries === 'number') this.maxRetries = (cfg as any).maxRetries
-    if (typeof (cfg as any)?.writeDebounceMs === 'number') this.writeDebounceMs = (cfg as any).writeDebounceMs
+    this.logger = (cfg as any)?.logger as import('homebridge').Logger
+    if (!this.logger) {
+      throw new Error('SwitchBotClient requires a logger (Homebridge logger) in config')
+    }
+    if (typeof (cfg as any)?.requestTimeout === 'number') {
+      this.requestTimeout = (cfg as any).requestTimeout
+    }
+    if (typeof (cfg as any)?.maxRetries === 'number') {
+      this.maxRetries = (cfg as any).maxRetries
+    }
+    if (typeof (cfg as any)?.writeDebounceMs === 'number') {
+      this.writeDebounceMs = (cfg as any).writeDebounceMs
+    }
   }
 
   async init(): Promise<void> {
@@ -40,12 +50,12 @@ export class SwitchBotClient implements ISwitchBotClient {
         token: this.cfg.openApiToken,
         secret: this.cfg.openApiSecret,
         // Enable all built-in resilience features from node-switchbot v4
-        enableFallback: true,        // Auto-fallback from BLE to API
-        enableRetry: true,            // Retry with exponential backoff
-        enableCircuitBreaker: true,   // Circuit breaker per connection type
-        enableMetrics: true,          // Connection tracking and statistics
-        enableBLE: true,              // Enable BLE scanning by default
-        scanDuration: 5000,           // BLE scan duration in milliseconds
+        enableFallback: true, // Auto-fallback from BLE to API
+        enableRetry: true, // Retry with exponential backoff
+        enableCircuitBreaker: true, // Circuit breaker per connection type
+        enableMetrics: true, // Connection tracking and statistics
+        enableBLE: true, // Enable BLE scanning by default
+        scanDuration: 5000, // BLE scan duration in milliseconds
         ...(typeof (this.cfg as any)?.nodeClientConfig === 'object' && (this.cfg as any).nodeClientConfig),
       })
       this.logger?.info?.('SwitchBot client initialized with native resilience features')
@@ -65,7 +75,7 @@ export class SwitchBotClient implements ISwitchBotClient {
       const controller = new AbortController()
       const timer = setTimeout(() => controller.abort(), to)
       try {
-        const fetchOpts = Object.assign({}, opts)
+        const fetchOpts = { ...opts }
         try {
           Object.defineProperty(fetchOpts, 'signal', { value: controller.signal, enumerable: false, configurable: true })
         } catch (_e) {
@@ -73,7 +83,9 @@ export class SwitchBotClient implements ISwitchBotClient {
         }
         const resp = await fetch(url, fetchOpts)
         clearTimeout(timer)
-        if (resp.ok) return resp
+        if (resp.ok) {
+          return resp
+        }
         // server error / rate limit: retry
         if (resp.status >= 500 || resp.status === 429) {
           throw new Error(`retriable response: ${resp.status}`)
@@ -81,10 +93,12 @@ export class SwitchBotClient implements ISwitchBotClient {
         return resp
       } catch (err: any) {
         clearTimeout(timer)
-        if (attempt > max) throw err
+        if (attempt > max) {
+          throw err
+        }
         // exponential backoff
-        const backoff = Math.min(100 * Math.pow(2, attempt - 1), 2000)
-        await new Promise((r) => setTimeout(r, backoff))
+        const backoff = Math.min(100 * 2 ** (attempt - 1), 2000)
+        await new Promise(r => setTimeout(r, backoff))
       }
     }
   }
@@ -151,10 +165,12 @@ export class SwitchBotClient implements ISwitchBotClient {
         return
       }
 
-      const resolvers: Array<{ resolve: (v:any)=>void; reject: (e:any)=>void }> = [{ resolve, reject }]
+      const resolvers: Array<{ resolve: (v: any) => void, reject: (e: any) => void }> = [{ resolve, reject }]
       const timer = setTimeout(async () => {
         const entry = this.pendingWrites.get(id)
-        if (!entry) return
+        if (!entry) {
+          return
+        }
         this.pendingWrites.delete(id)
         try {
           const out = await this._doSetDeviceState(id, entry.body)
@@ -224,7 +240,7 @@ export class SwitchBotClient implements ISwitchBotClient {
       const opts = {
         method: 'POST',
         headers: {
-          Authorization: this.cfg.openApiToken,
+          'Authorization': this.cfg.openApiToken,
           'Content-Type': 'application/json',
         },
         body: JSON.stringify(body),
@@ -248,4 +264,3 @@ export class SwitchBotClient implements ISwitchBotClient {
     this.client = null
   }
 }
-

package/test/accessory-restore.spec.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
+
 import { SwitchBotHAPPlatform, SwitchBotMatterPlatform } from '../src/platform'
 
 const log = { info: () => {}, warn: () => {}, error: () => {}, debug: () => {} }
@@ -8,7 +9,7 @@ describe('accessory restore', () => {
     const registered: any[] = []
     const hap = { uuid: { generate: (s: string) => `uuid-${s}` }, Service: {}, Characteristic: {} }
 
-    function PlatformAccessory(name: string, uuid: string) {
+    function PlatformAccessory(this: any, name: string, uuid: string) {
       this.displayName = name
       this.UUID = uuid
       this.context = {}
@@ -20,10 +21,10 @@ describe('accessory restore', () => {
       hap,
       platformAccessory: PlatformAccessory as any,
       registerPlatformAccessories: (_p: string, _n: string, accs: any[]) => registered.push(...accs),
-      on: (_ev: string, cb: Function) => {},
+      on: () => {},
     }
 
-    const platform = new SwitchBotHAPPlatform(log as any, { devices: [{ id: 'dev1', type: 'light', name: 'NewName' }] }, api)
+    const platform = new SwitchBotHAPPlatform(log as any, { platform: 'SwitchBot', devices: [{ id: 'dev1', type: 'light', name: 'NewName' }] }, api)
 
     // Simulate restored accessory with different uuid but correct deviceId in context
     const restored = new (api.platformAccessory)('OldName', 'old-uuid')
@@ -36,7 +37,7 @@ describe('accessory restore', () => {
     // No new registration for this device because restored accessory was reused
     expect(registered.length).toBe(0)
     // The restored accessory should remain in the platform's accessory map
-    const keys = Array.from((platform as any).accessories.keys())
+    const keys = [...(platform as any).accessories.keys()]
     expect(keys).toContain('old-uuid')
     const acc = (platform as any).accessories.get('old-uuid')
     expect(acc.context.deviceId).toBe('dev1')
@@ -49,10 +50,10 @@ describe('accessory restore', () => {
       matter,
       isMatterAvailable: () => true,
       isMatterEnabled: () => true,
-      on: (_ev: string, cb: Function) => {},
+      on: () => {},
     }
 
-    const platform = new SwitchBotMatterPlatform(log as any, { devices: [{ id: 'm1', type: 'light', name: 'M1' }] }, api)
+    const platform = new SwitchBotMatterPlatform(log as any, { platform: 'SwitchBot', devices: [{ id: 'm1', type: 'light', name: 'M1' }] }, api)
 
     // Simulate restored Matter accessory with a different uuid but matching deviceId
     const restored = { uuid: 'restored-uuid', displayName: 'OldM', context: { deviceId: 'm1', type: 'light' } }
@@ -65,7 +66,7 @@ describe('accessory restore', () => {
     await (platform as any).registerMatterAccessories()
 
     // The restored accessory should still be present and associated with deviceId
-    const keys = Array.from((platform as any).accessories.keys())
+    const keys = [...(platform as any).accessories.keys()]
     expect(keys).toContain(restored.uuid)
     const acc = (platform as any).accessories.get(restored.uuid)
     expect(acc.context.deviceId).toBe('m1')

package/test/device-mapping.spec.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
+
 import { createDevice } from '../src/deviceFactory'
 
 const DEVICE_TYPES = [
@@ -18,7 +19,7 @@ const DEVICE_TYPES = [
 describe('device mapping', () => {
   it('maps known device types to device descriptors (HAP)', async () => {
     for (const t of DEVICE_TYPES) {
-      const created = await createDevice({ id: `dev-${t}`, type: t, name: `Name-${t}` }, {}, false)
+      const created = await createDevice({ id: `dev-${t}`, type: t, name: `Name-${t}` }, { log: console, logger: console }, false)
       expect(created).toHaveProperty('instance')
       expect(created).toHaveProperty('createAccessory')
       const acc = created.createAccessory?.(undefined)
@@ -31,7 +32,7 @@ describe('device mapping', () => {
   })
 
   it('returns matter protocol when requested', async () => {
-    const created = await createDevice({ id: 'm1', type: 'light', name: 'M1' }, { preferMatter: true, enableMatter: true }, true)
+    const created = await createDevice({ id: 'm1', type: 'light', name: 'M1' }, { preferMatter: true, enableMatter: true, log: console, logger: console }, true)
     expect(created.protocol).toBe('matter')
   })
 })

package/test/deviceFactory.spec.ts

@@ -1,9 +1,10 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
+
 import { createDevice } from '../src/deviceFactory'
 
 describe('deviceFactory', () => {
   it('creates HAP device descriptor for light', async () => {
-    const created = await createDevice({ id: 'dev1', type: 'light', name: 'L1' }, {}, false)
+    const created = await createDevice({ id: 'dev1', type: 'light', name: 'L1' }, { log: console, logger: console }, false)
     expect(created).toHaveProperty('instance')
     expect(created).toHaveProperty('createAccessory')
     expect(created.protocol).toBe('hap')
@@ -12,7 +13,7 @@ describe('deviceFactory', () => {
   })
 
   it('creates Matter descriptor when useMatter=true', async () => {
-    const created = await createDevice({ id: 'dev2', type: 'light', name: 'L2' }, { preferMatter: true, enableMatter: true }, true)
+    const created = await createDevice({ id: 'dev2', type: 'light', name: 'L2' }, { preferMatter: true, enableMatter: true, log: console, logger: console }, true)
     expect(created.protocol).toBe('matter')
   })
 })

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' })