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

package/src/homebridge-ui/public/js/render.ts

@@ -1,4 +1,9 @@
-import type { DEVICE_TYPES } from './constants.js'
+// Move regexes to module scope to avoid re-compilation on every call
+// import type { DEVICE_TYPES } from './constants.js' // Removed unused import
+
+const SPACES_REGEX = /\s/g
+const CAMELCASE_REGEX = /([A-Z])/g
+const FIRST_CHAR_REGEX = /^./
 
 /**
  * Get RSSI signal quality level and color based on dBm value
@@ -129,7 +134,9 @@ export function renderBadge(text: string, style: string): HTMLElement {
 }
 
 export function renderConnectionBadge(connectionType: string): HTMLElement | null {
-  if (!connectionType) { return null }
+  if (!connectionType) {
+    return null
+  }
 
   const badge = renderBadge(connectionType, '')
 
@@ -265,17 +272,27 @@ export function renderDeviceDetailsPanel(device: any): HTMLElement {
   let batteryHistory: Array<{ value: number, ts: number }> = []
   try {
     const raw = localStorage.getItem(batteryHistoryKey)
-    if (raw) batteryHistory = JSON.parse(raw)
-  } catch {}
+    if (raw) {
+      batteryHistory = JSON.parse(raw)
+    }
+  } catch (e) {
+    // Optionally log or handle error
+  }
   const now = Date.now()
   if (typeof device?.battery === 'number') {
     // Only add if different from last or >1h since last
-    const last = batteryHistory[batteryHistory.length - 1]
+    const last = batteryHistory.at(-1)
     if (!last || last.value !== device.battery || now - last.ts > 60 * 60 * 1000) {
       batteryHistory.push({ value: device.battery, ts: now })
       // Keep only last 30 entries (about a month if daily)
-      if (batteryHistory.length > 30) batteryHistory = batteryHistory.slice(-30)
-      try { localStorage.setItem(batteryHistoryKey, JSON.stringify(batteryHistory)) } catch {}
+      if (batteryHistory.length > 30) {
+        batteryHistory = batteryHistory.slice(-30)
+      }
+      try {
+        localStorage.setItem(batteryHistoryKey, JSON.stringify(batteryHistory))
+      } catch (e) {
+        // Optionally log or handle error
+      }
     }
   }
 
@@ -291,8 +308,6 @@ export function renderDeviceDetailsPanel(device: any): HTMLElement {
     { label: 'Last Seen', value: formatLastSeen(device?.lastSeen || device?.lastseen || device?.updatedAt) },
   ]
 
-
-
   for (const row of rows) {
     const line = document.createElement('div')
     line.style.display = 'flex'
@@ -366,7 +381,9 @@ export function renderDeviceDetailsPanel(device: any): HTMLElement {
       chart.style.height = '28px'
       chart.style.display = 'flex'
       // SVG sparkline
-      const w = 120, h = 24, pad = 2
+      const w = 120
+      const h = 24
+      const pad = 2
       const min = Math.min(...batteryHistory.map(b => b.value), 100)
       const max = Math.max(...batteryHistory.map(b => b.value), 0)
       const range = max - min || 1
@@ -424,11 +441,26 @@ export function renderDeviceDetailsPanel(device: any): HTMLElement {
 
   // --- Expose advanced/extra features dynamically ---
   const featureKeys = [
-    'airQuality', 'pm25', 'pm10', 'voc', 'co2', 'humidity', 'temperature',
-    'preset', 'mode', 'presetMode', 'direction', 'calibration', 'multiCommand',
-    'extendedInfo', 'segmentedControl', 'features', 'capabilities', 'state',
+    'airQuality',
+    'pm25',
+    'pm10',
+    'voc',
+    'co2',
+    'humidity',
+    'temperature',
+    'preset',
+    'mode',
+    'presetMode',
+    'direction',
+    'calibration',
+    'multiCommand',
+    'extendedInfo',
+    'segmentedControl',
+    'features',
+    'capabilities',
+    'state',
   ]
-  const shown = new Set(rows.map(r => r.label.toLowerCase().replace(/\s/g, '')))
+  const shown = new Set(rows.map(r => r.label.toLowerCase().replace(SPACES_REGEX, '')))
   for (const key of featureKeys) {
     if (device && device[key] !== undefined && !shown.has(key.toLowerCase())) {
       const line = document.createElement('div')
@@ -441,7 +473,7 @@ export function renderDeviceDetailsPanel(device: any): HTMLElement {
       const label = document.createElement('span')
       label.style.fontWeight = '600'
       label.style.minWidth = '110px'
-      label.textContent = key.replace(/([A-Z])/g, ' $1').replace(/^./, s => s.toUpperCase()) + ':'
+      label.textContent = `${key.replace(CAMELCASE_REGEX, ' $1').replace(FIRST_CHAR_REGEX, s => s.toUpperCase())}:`
 
       const value = document.createElement('span')
       value.style.fontFamily = 'monospace'
@@ -533,37 +565,38 @@ export async function renderDiscoveredDevices(
 
     nameContainer.appendChild(selectCheckbox)
 
-
     nameContainer.appendChild(name)
 
     // Show firmware update available indicator if present
     if (d.firmwareUpdateAvailable) {
-      const fwBadge = document.createElement('span');
-      fwBadge.textContent = 'Update Available';
-      fwBadge.style.cssText = 'background: #fb923c; color: #111; padding: 1px 7px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;';
-      fwBadge.title = 'A firmware update is available for this device.';
-      nameContainer.appendChild(fwBadge);
+      const fwBadge = document.createElement('span')
+      fwBadge.textContent = 'Update Available'
+      fwBadge.style.cssText = 'background: #fb923c; color: #111; padding: 1px 7px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;'
+      fwBadge.title = 'A firmware update is available for this device.'
+      nameContainer.appendChild(fwBadge)
     }
 
     // Show offline/unreachable indicator if device is offline
-    let offline = false;
-    let lastSeen = d.lastSeen || d.lastseen || d.updatedAt;
+    let offline = false
+    const lastSeen = d.lastSeen || d.lastseen || d.updatedAt
     if (typeof d.offline === 'boolean') {
-      offline = d.offline;
+      offline = d.offline
     } else if (lastSeen) {
       try {
-        const last = new Date(lastSeen).getTime();
-        if (!isNaN(last) && Date.now() - last > 1000 * 60 * 60) { // 1 hour
-          offline = true;
+        const last = new Date(lastSeen).getTime()
+        if (!Number.isNaN(last)) {
+          if (Date.now() - last > 1000 * 60 * 60) { // 1 hour
+            offline = true
+          }
         }
       } catch {}
     }
     if (offline) {
-      const offlineBadge = document.createElement('span');
-      offlineBadge.textContent = 'Offline';
-      offlineBadge.style.cssText = 'background: #dc2626; color: white; padding: 1px 7px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;';
-      offlineBadge.title = 'Device is offline or unreachable.';
-      nameContainer.appendChild(offlineBadge);
+      const offlineBadge = document.createElement('span')
+      offlineBadge.textContent = 'Offline'
+      offlineBadge.style.cssText = 'background: #dc2626; color: white; padding: 1px 7px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;'
+      offlineBadge.title = 'Device is offline or unreachable.'
+      nameContainer.appendChild(offlineBadge)
     }
 
     const expandedDetails = document.createElement('div')
@@ -596,7 +629,9 @@ export async function renderDiscoveredDevices(
     // Add connection type badge
     if (d.connectionType) {
       const badge = renderConnectionBadge(d.connectionType)
-      if (badge) { nameContainer.appendChild(badge) }
+      if (badge) {
+        nameContainer.appendChild(badge)
+      }
     }
 
     // Add IR badge if it's an IR device
@@ -612,14 +647,14 @@ export async function renderDiscoveredDevices(
 
     // Add battery warning indicator if battery < 20%
     if (typeof d.battery === 'number' && d.battery < 20) {
-      const batteryWarn = document.createElement('span');
-      batteryWarn.textContent = `⚠️ ${d.battery}%`;
-      batteryWarn.style.cssText =
-        d.battery < 10
+      const batteryWarn = document.createElement('span')
+      batteryWarn.textContent = `⚠️ ${d.battery}%`
+      batteryWarn.style.cssText
+        = d.battery < 10
           ? 'background: #dc2626; color: white; padding: 1px 6px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;'
-          : 'background: #fbbf24; color: #111; padding: 1px 6px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;';
-      batteryWarn.title = d.battery < 10 ? 'Battery critically low' : 'Battery low';
-      nameContainer.appendChild(batteryWarn);
+          : 'background: #fbbf24; color: #111; padding: 1px 6px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 6px;'
+      batteryWarn.title = d.battery < 10 ? 'Battery critically low' : 'Battery low'
+      nameContainer.appendChild(batteryWarn)
     }
 
     const details = document.createElement('div')
@@ -632,8 +667,12 @@ export async function renderDiscoveredDevices(
     details.style.wordBreak = 'break-word'
 
     let detailsText = `ID: ${d.id} | Type: ${d.type} | Model: ${d.model || 'N/A'}`
-    if (d.hubDeviceId) { detailsText += ` | Hub: ${d.hubDeviceId}` }
-    if (d.address) { detailsText += ` | MAC: ${d.address}` }
+    if (d.hubDeviceId) {
+      detailsText += ` | Hub: ${d.hubDeviceId}`
+    }
+    if (d.address) {
+      detailsText += ` | MAC: ${d.address}`
+    }
     details.textContent = detailsText
 
     info.appendChild(nameContainer)
@@ -727,7 +766,7 @@ export function filterDevices(
 
   // Filter by connection type
   if (connectionType !== 'all') {
-    filtered = filtered.filter(d => {
+    filtered = filtered.filter((d) => {
       if (connectionType === 'ir') {
         return d.isIR === true
       }
@@ -747,7 +786,7 @@ export function filterDevices(
   // Filter by search query
   if (searchQuery.trim()) {
     const query = searchQuery.toLowerCase()
-    filtered = filtered.filter(d => {
+    filtered = filtered.filter((d) => {
       const name = (d.name || '').toLowerCase()
       const id = (d.id || '').toLowerCase()
       const type = (d.type || '').toLowerCase()
@@ -792,11 +831,11 @@ export function sortDevices(
     case 'connection': {
       // Sort by connection type: Both > BLE > OpenAPI > Others
       const connectionOrder: Record<string, number> = {
-        'Both': 0,
-        'BLE': 1,
-        'OpenAPI': 2,
-        'API': 2,
-        'Unknown': 3,
+        Both: 0,
+        BLE: 1,
+        OpenAPI: 2,
+        API: 2,
+        Unknown: 3,
       }
       sorted.sort((a, b) => {
         const aOrder = connectionOrder[a.connectionType || 'Unknown'] ?? 3
@@ -844,6 +883,9 @@ export function getDiscoveryPreferences(): {
 /**
  * Save filter/sort preferences to localStorage
  * @param preferences Preferences object to save
+ * @param preferences.connectionType Connection type filter
+ * @param preferences.sortBy Sort criterion
+ * @param preferences.searchQuery Search query string
  */
 export function setDiscoveryPreferences(preferences: {
   connectionType: 'all' | 'ble' | 'api' | 'both' | 'ir'
@@ -862,7 +904,9 @@ export function renderDeviceList(list: any[]): void {
   const status = document.getElementById('status')
   const removeAllContainer = document.getElementById('removeAllContainer')
 
-  if (!ul || !status) { return }
+  if (!ul || !status) {
+    return
+  }
 
   if (!list.length) {
     status.textContent = 'No devices found in config.'
@@ -1000,7 +1044,12 @@ export function renderDeviceList(list: any[]): void {
           copyBtn.classList.remove('success')
         }, 1200)
       } catch (e) {
-        alert('Failed to copy')
+        copyBtn.textContent = 'Failed'
+        copyBtn.classList.add('error')
+        setTimeout(() => {
+          copyBtn.textContent = 'Copy ID'
+          copyBtn.classList.remove('error')
+        }, 1200)
       }
     })
 
@@ -1023,4 +1072,6 @@ export function renderDeviceList(list: any[]): void {
     li.appendChild(buttons)
     ul.appendChild(li)
   }
+
+  // No return value needed for void function
 }

package/src/homebridge-ui/utils/logger.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-const PREFIX = '[SwitchBot UI]'
+const PREFIX = '[SwitchBot UI/Server]'
 
 export const uiLog = {
   info: (message: string, ...parameters: any[]) => {

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')
@@ -1416,7 +1425,7 @@ export class SwitchBotMatterPlatform {
       const matterEnabled = matterAvailable || !!this.config.enableMatter
       const useMatter = matterEnabled && matterSupported
       try {
-        const created = await createDevice({ id: d.id, type, name: d.name }, this.config, useMatter)
+        const created = await createDevice({ id: d.id, type, name: d.name, log: this.log }, this.config, useMatter)
         this.devices.push(created)
         if (useMatter) {
           this.log.info(`Prepared Matter accessory for ${d.id} (${type})${matterAvailable ? ' (auto-detected)' : ' (manually enabled)'}`)
@@ -1516,7 +1525,7 @@ export class SwitchBotMatterPlatform {
       }
 
       try {
-        const created = await createDevice({ id: d.id, type, name: d.name }, this.config, true)
+        const created = await createDevice({ id: d.id, type, name: d.name, log: this.log }, this.config, true)
         const createdDesc = await created.createAccessory(this.api)
         const uuid = matterApi.uuid.generate(`${d.id}`)
         // Try to find existing restored accessory by deviceId

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