@switchbot/homebridge-switchbot 5.0.0-beta.110 → 5.0.0-beta.112

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

@@ -154,8 +154,34 @@ export function renderIRBadge(): HTMLElement {
   )
 }
 
-export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLElement> {
+function normalizeId(value: any): string {
+  return String(value ?? '').trim().toLowerCase()
+}
+
+function scrollToConfiguredDevice(deviceId: string): void {
+  const normalizedId = normalizeId(deviceId)
+  const target = document.querySelector(`[data-device-id="${normalizedId}"]`) as HTMLElement | null
+  if (!target) {
+    return
+  }
+
+  target.scrollIntoView({ behavior: 'smooth', block: 'center' })
+  const originalOutline = target.style.outline
+  const originalBackground = target.style.background
+  target.style.outline = '2px solid var(--switchbot-red, #ef4444)'
+  target.style.background = 'rgba(239, 68, 68, 0.08)'
+  setTimeout(() => {
+    target.style.outline = originalOutline
+    target.style.background = originalBackground
+  }, 1800)
+}
+
+export async function renderDiscoveredDevices(
+  devices: any[],
+  options: { configuredIds?: Set<string> } = {},
+): Promise<HTMLElement> {
   const ul = document.createElement('ul')
+  ul.className = 'device-grid'
   ul.style.maxHeight = '400px'
   ul.style.overflowY = 'auto'
   ul.style.marginTop = '12px'
@@ -163,35 +189,50 @@ export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLEleme
   ul.style.listStyle = 'none'
 
   const { addDeviceToConfig } = await import('./discovery.js')
+  const { loadConfiguredDevices } = await import('./devices.js')
+  const configuredIds = options.configuredIds ?? new Set<string>()
 
   for (const d of devices) {
+    const deviceId = normalizeId(d.id)
+    const alreadyAdded = configuredIds.has(deviceId)
+
     const li = document.createElement('li')
     li.className = 'device-item'
     li.style.display = 'flex'
-    li.style.alignItems = 'center'
-    li.style.justifyContent = 'space-between'
-    li.style.padding = '10px 12px'
-    li.style.marginBottom = '6px'
-    li.style.borderRadius = '6px'
+    li.style.flexDirection = 'column'
+    li.style.alignItems = 'stretch'
+    li.style.justifyContent = 'flex-start'
+    li.style.padding = '5px 8px'
+    li.style.marginBottom = '0'
+    li.style.borderRadius = '5px'
     li.style.transition = 'all 0.2s ease'
 
     const info = document.createElement('div')
-    info.style.flex = '1'
+    info.style.flex = '1 1 auto'
+    info.style.width = '100%'
+    info.style.minWidth = '0'
 
     const nameContainer = document.createElement('div')
     nameContainer.style.display = 'flex'
     nameContainer.style.alignItems = 'center'
-    nameContainer.style.marginBottom = '4px'
+    nameContainer.style.marginBottom = '0'
     nameContainer.style.flexWrap = 'wrap'
-    nameContainer.style.gap = '6px'
+    nameContainer.style.gap = '4px'
 
     const name = document.createElement('div')
     name.style.fontWeight = '500'
-    name.style.fontSize = '14px'
+    name.style.fontSize = '13px'
     name.textContent = d.name || d.id
 
     nameContainer.appendChild(name)
 
+    const duplicateBadge = document.createElement('span')
+    duplicateBadge.textContent = alreadyAdded ? '✓ Already Added' : '➕ New Device'
+    duplicateBadge.style.cssText = alreadyAdded
+      ? 'background: #16a34a; color: white; padding: 1px 5px; border-radius: 3px; font-size: 9px; font-weight: 600;'
+      : 'background: #2563eb; color: white; padding: 1px 5px; border-radius: 3px; font-size: 9px; font-weight: 600;'
+    nameContainer.appendChild(duplicateBadge)
+
     // Add connection type badge
     if (d.connectionType) {
       const badge = renderConnectionBadge(d.connectionType)
@@ -210,10 +251,13 @@ export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLEleme
     }
 
     const details = document.createElement('div')
-    details.style.fontSize = '11px'
+    details.style.fontSize = '10px'
     details.style.opacity = '0.7'
-    details.style.marginTop = '4px'
+    details.style.marginTop = '0'
     details.style.fontFamily = 'monospace'
+    details.style.whiteSpace = 'normal'
+    details.style.overflowWrap = 'anywhere'
+    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}` }
@@ -224,18 +268,68 @@ export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLEleme
     info.appendChild(details)
 
     const addBtn = document.createElement('button')
-    addBtn.textContent = '+ Add'
-    addBtn.style.marginLeft = '8px'
-    addBtn.style.padding = '6px 14px'
-    addBtn.style.fontSize = '12px'
+    addBtn.textContent = alreadyAdded ? 'Already Added' : 'Add to Config'
+    addBtn.style.marginLeft = '0'
+    addBtn.style.marginTop = '2px'
+    addBtn.style.padding = '4px 9px'
+    addBtn.style.fontSize = '11px'
     addBtn.style.whiteSpace = 'nowrap'
     addBtn.style.flexShrink = '0'
+    addBtn.disabled = alreadyAdded
+    if (alreadyAdded) {
+      addBtn.style.opacity = '0.65'
+      addBtn.style.cursor = 'not-allowed'
+      addBtn.style.background = '#6b7280'
+    }
     addBtn.onclick = async () => {
+      if (alreadyAdded) {
+        return
+      }
       await addDeviceToConfig(d)
     }
 
+    if (alreadyAdded) {
+      const viewBtn = document.createElement('button')
+      viewBtn.textContent = 'View in Config'
+      viewBtn.className = 'secondary'
+      viewBtn.style.marginLeft = '0'
+      viewBtn.style.padding = '4px 9px'
+      viewBtn.style.fontSize = '11px'
+      viewBtn.onclick = async () => {
+        await loadConfiguredDevices()
+        scrollToConfiguredDevice(d.id)
+      }
+      li.appendChild(info)
+      const actions = document.createElement('div')
+      actions.className = 'device-actions'
+      actions.style.display = 'flex'
+      actions.style.alignItems = 'center'
+      actions.style.flexWrap = 'wrap'
+      actions.style.justifyContent = 'flex-start'
+      actions.style.marginLeft = '0'
+      actions.style.width = '100%'
+      actions.style.marginTop = '2px'
+      actions.style.gap = '5px'
+      actions.appendChild(viewBtn)
+      actions.appendChild(addBtn)
+      li.appendChild(actions)
+      ul.appendChild(li)
+      continue
+    }
+
+    const actions = document.createElement('div')
+    actions.className = 'device-actions'
+    actions.style.display = 'flex'
+    actions.style.flexWrap = 'wrap'
+    actions.style.justifyContent = 'flex-start'
+    actions.style.marginLeft = '0'
+    actions.style.width = '100%'
+    actions.style.marginTop = '2px'
+    actions.style.gap = '5px'
+    actions.appendChild(addBtn)
+
     li.appendChild(info)
-    li.appendChild(addBtn)
+    li.appendChild(actions)
     ul.appendChild(li)
   }
 
@@ -406,6 +500,7 @@ export function renderDeviceList(list: any[]): void {
   }
 
   status.textContent = `Found ${list.length} device(s)`
+  ul.classList.add('device-grid')
   ul.innerHTML = ''
 
   // Show remove all button when devices exist
@@ -416,25 +511,37 @@ export function renderDeviceList(list: any[]): void {
   for (const d of list) {
     const li = document.createElement('li')
     li.className = 'device-item'
+    li.setAttribute('data-device-id', normalizeId(d.id))
+    li.style.display = 'flex'
+    li.style.flexDirection = 'column'
+    li.style.alignItems = 'stretch'
+    li.style.marginBottom = '0'
 
     const info = document.createElement('div')
-    info.style.flex = '1'
+    info.style.flex = '1 1 auto'
+    info.style.width = '100%'
+    info.style.minWidth = '0'
 
     const nameContainer = document.createElement('div')
     nameContainer.style.display = 'flex'
-    nameContainer.style.alignItems = 'center'
-    nameContainer.style.flexWrap = 'wrap'
-    nameContainer.style.gap = '6px'
+    nameContainer.style.flexDirection = 'column'
+    nameContainer.style.alignItems = 'flex-start'
+    nameContainer.style.gap = '0'
 
     const name = document.createElement('div')
     name.style.fontWeight = '500'
+    name.style.fontSize = '13px'
     name.textContent = d.name || d.id
 
     const code = document.createElement('code')
     code.textContent = d.id
-    code.style.fontSize = '12px'
+    code.style.fontSize = '10px'
     code.style.opacity = '0.75'
-    code.style.marginLeft = '8px'
+    code.style.marginLeft = '0'
+    code.style.whiteSpace = 'normal'
+    code.style.overflowWrap = 'anywhere'
+    code.style.wordBreak = 'break-word'
+    code.style.maxWidth = '100%'
 
     nameContainer.appendChild(name)
     nameContainer.appendChild(code)
@@ -447,8 +554,8 @@ export function renderDeviceList(list: any[]): void {
 
     const meta = document.createElement('div')
     meta.style.opacity = '0.75'
-    meta.style.marginTop = '4px'
-    meta.style.fontSize = '12px'
+    meta.style.marginTop = '0'
+    meta.style.fontSize = '11px'
 
     const typeText = d.type ? `type: ${d.type}` : ''
     const connText = d.connectionPreference ? `conn: ${d.connectionPreference}` : ''
@@ -459,13 +566,19 @@ export function renderDeviceList(list: any[]): void {
     info.appendChild(meta)
 
     const buttons = document.createElement('div')
+    buttons.className = 'device-actions'
     buttons.style.display = 'flex'
-    buttons.style.gap = '8px'
+    buttons.style.flexWrap = 'wrap'
+    buttons.style.justifyContent = 'flex-start'
+    buttons.style.marginLeft = '0'
+    buttons.style.width = '100%'
+    buttons.style.marginTop = '2px'
+    buttons.style.gap = '5px'
 
     const editBtn = document.createElement('button')
     editBtn.textContent = '✏️ Edit'
-    editBtn.style.padding = '6px 12px'
-    editBtn.style.fontSize = '12px'
+    editBtn.style.padding = '4px 9px'
+    editBtn.style.fontSize = '11px'
     editBtn.onclick = async () => {
       const { editDevice } = await import('./modals.js')
       await editDevice(d)
@@ -473,8 +586,8 @@ export function renderDeviceList(list: any[]): void {
 
     const copyBtn = document.createElement('button')
     copyBtn.textContent = 'Copy ID'
-    copyBtn.style.padding = '6px 12px'
-    copyBtn.style.fontSize = '12px'
+    copyBtn.style.padding = '4px 9px'
+    copyBtn.style.fontSize = '11px'
     copyBtn.addEventListener('click', async () => {
       try {
         await navigator.clipboard.writeText(d.id)
@@ -491,8 +604,8 @@ export function renderDeviceList(list: any[]): void {
 
     const deleteBtn = document.createElement('button')
     deleteBtn.textContent = '🗑️ Delete'
-    deleteBtn.style.padding = '6px 12px'
-    deleteBtn.style.fontSize = '12px'
+    deleteBtn.style.padding = '4px 9px'
+    deleteBtn.style.fontSize = '11px'
     deleteBtn.style.background = '#ef4444'
     deleteBtn.onclick = async () => {
       const { deleteDeviceFromConfig } = await import('./devices-delete.js')

package/src/platform.ts

@@ -97,7 +97,9 @@ const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
   }, // Switch in HAP, RobotVacuumCleaner in Matter
   curtain: {
     windowCovering: {
-      type: 4, // Drapery - safe default for LF conformance
+      // Use a lift-only/non-tilt covering type to satisfy Matter conformance rules.
+      // Drapery (4) can fail validation in some stacks when TL (tilt) is not present.
+      type: 0, // Rollershade
     },
   }, // WindowCovering → WindowCovering (includes curtain3, rollershade variants via normalization)
   blindtilt: {
@@ -130,12 +132,7 @@ const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
       minLevel: 0,
       maxLevel: 254,
     },
-    colorControl: {
-      currentHue: 0,
-      currentSaturation: 0,
-      colorTemperatureMireds: 400,
-      colorMode: 0,
-    },
+    colorControl: {},
   }, // Lightbulb with color → OnOff + LevelControl + ColorControl
   lock: {
     doorLock: {
@@ -226,6 +223,76 @@ const DEVICE_MATTER_DEVICE_TYPE_KEYS: Record<string, string> = {
   waterdetector: 'LeakSensor',
 }
 
+function normalizeTypeForMatter(typeValue: string | undefined | null): string {
+  const raw = String(typeValue || '').trim().toLowerCase()
+  if (!raw) {
+    return 'unknown'
+  }
+
+  // Vacuum variants
+  if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes(raw)) {
+    return 'vacuum'
+  }
+
+  // Window covering variants
+  if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes(raw)) {
+    return 'curtain'
+  }
+
+  // Plug variants
+  if (['plug mini (jp)', 'plug mini (us)', 'plug mini (eu)'].includes(raw)) {
+    return 'plug'
+  }
+
+  // Meter variants
+  if (['meterplus', 'meter plus', 'meter plus (jp)', 'meterpro', 'meter pro', 'meterpro(co2)', 'meter pro (co2)'].includes(raw)) {
+    return 'meter'
+  }
+
+  // Relay switch variants
+  if (['relay switch 1', 'relay switch 1pm'].includes(raw)) {
+    return 'relay'
+  }
+
+  // Water detector variants
+  if (['water detector', 'waterdetector'].includes(raw)) {
+    return 'waterdetector'
+  }
+
+  // Fan variants
+  if (['smart fan', 'circulator fan', 'battery circulator fan', 'standing circulator fan'].includes(raw)) {
+    return 'fan'
+  }
+
+  // Light variants
+  if (['strip light', 'strip light 3', 'rgbic neon rope light', 'rgbic neon wire rope light', 'rgbicww floor lamp', 'rgbicww strip light'].includes(raw)) {
+    return 'lightstrip'
+  }
+  if (['color bulb', 'ceiling light', 'ceiling light pro', 'candle warmer lamp', 'floor lamp'].includes(raw)) {
+    return 'light'
+  }
+
+  // Sensor variants
+  if (raw === 'motion sensor') {
+    return 'motion'
+  }
+  if (['contact sensor', 'presence sensor'].includes(raw)) {
+    return 'contact'
+  }
+
+  // Lock variants
+  if (['smart lock', 'smart lock pro', 'smart lock ultra', 'lock lite', 'keypad', 'keypad touch', 'keypad vision', 'keypad vision pro', 'lock vision pro'].includes(raw)) {
+    return 'lock'
+  }
+
+  // Climate variant
+  if (raw === 'humidifier2') {
+    return 'humidifier'
+  }
+
+  return raw
+}
+
 // Factory function to create Matter handlers with Homebridge logger integration
 function createMatterHandlers(log: Logger, deviceId: string, type: string, client: any): any {
   const lowerType = type.toLowerCase()
@@ -1030,40 +1097,7 @@ export class SwitchBotHAPPlatform {
         _raw: raw,
       }
 
-      let type: string = d.type
-      // Normalize device type variants for consistent Matter cluster lookup
-      // Vacuum variants
-      if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes((type || '').toLowerCase())) {
-        type = 'vacuum'
-      }
-      // Window covering variants
-      if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes((type || '').toLowerCase())) {
-        type = 'curtain'
-      }
-      // Plug variants
-      if (['plug mini (jp)', 'plug mini (us)'].includes((type || '').toLowerCase())) {
-        type = 'plug'
-      }
-      // Meter variants
-      if (['meterplus', 'meter plus (jp)', 'meterpro', 'meterpro(co2)'].includes((type || '').toLowerCase())) {
-        type = 'meter'
-      }
-      // Relay switch variants
-      if (['relay switch 1', 'relay switch 1pm'].includes((type || '').toLowerCase())) {
-        type = 'relay'
-      }
-      // Water detector variants
-      if (['water detector'].includes((type || '').toLowerCase())) {
-        type = 'waterdetector'
-      }
-      // Fan variants
-      if (['smart fan'].includes((type || '').toLowerCase())) {
-        type = 'fan'
-      }
-      // Light variants
-      if (['strip light'].includes((type || '').toLowerCase())) {
-        type = 'lightstrip'
-      }
+      const type: string = normalizeTypeForMatter(d.type)
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       // Auto-detect Matter from Homebridge API, allow manual override via config
@@ -1307,40 +1341,7 @@ export class SwitchBotMatterPlatform {
         _raw: raw,
       }
 
-      let type: string = d.type
-      // Normalize device type variants for consistent Matter cluster lookup
-      // Vacuum variants
-      if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes((type || '').toLowerCase())) {
-        type = 'vacuum'
-      }
-      // Window covering variants
-      if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes((type || '').toLowerCase())) {
-        type = 'curtain'
-      }
-      // Plug variants
-      if (['plug mini (jp)', 'plug mini (us)'].includes((type || '').toLowerCase())) {
-        type = 'plug'
-      }
-      // Meter variants
-      if (['meterplus', 'meter plus (jp)', 'meterpro', 'meterpro(co2)'].includes((type || '').toLowerCase())) {
-        type = 'meter'
-      }
-      // Relay switch variants
-      if (['relay switch 1', 'relay switch 1pm'].includes((type || '').toLowerCase())) {
-        type = 'relay'
-      }
-      // Water detector variants
-      if (['water detector'].includes((type || '').toLowerCase())) {
-        type = 'waterdetector'
-      }
-      // Fan variants
-      if (['smart fan'].includes((type || '').toLowerCase())) {
-        type = 'fan'
-      }
-      // Light variants
-      if (['strip light'].includes((type || '').toLowerCase())) {
-        type = 'lightstrip'
-      }
+      const type: string = normalizeTypeForMatter(d.type)
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       // Auto-detect Matter from Homebridge API, allow manual override via config
@@ -1439,40 +1440,7 @@ export class SwitchBotMatterPlatform {
         continue
       }
 
-      let type: string = d.type
-      // Normalize device type variants for consistent Matter cluster lookup
-      // Vacuum variants
-      if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes((type || '').toLowerCase())) {
-        type = 'vacuum'
-      }
-      // Window covering variants
-      if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes((type || '').toLowerCase())) {
-        type = 'curtain'
-      }
-      // Plug variants
-      if (['plug mini (jp)', 'plug mini (us)'].includes((type || '').toLowerCase())) {
-        type = 'plug'
-      }
-      // Meter variants
-      if (['meterplus', 'meter plus (jp)', 'meterpro', 'meterpro(co2)'].includes((type || '').toLowerCase())) {
-        type = 'meter'
-      }
-      // Relay switch variants
-      if (['relay switch 1', 'relay switch 1pm'].includes((type || '').toLowerCase())) {
-        type = 'relay'
-      }
-      // Water detector variants
-      if (['water detector'].includes((type || '').toLowerCase())) {
-        type = 'waterdetector'
-      }
-      // Fan variants
-      if (['smart fan'].includes((type || '').toLowerCase())) {
-        type = 'fan'
-      }
-      // Light variants
-      if (['strip light'].includes((type || '').toLowerCase())) {
-        type = 'lightstrip'
-      }
+      const type: string = normalizeTypeForMatter(d.type)
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       const useMatter = matterEnabled && matterSupported

package/src/utils.ts

@@ -36,8 +36,9 @@ export function createPlatformProxy(HAPPlatform: any, MatterPlatform: any): any
       const cfg = normalizeConfig(config)
       const preferMatter = cfg.preferMatter ?? true
       const enableMatter = cfg.enableMatter ?? true
+      const matterAvailable = !!(api?.isMatterAvailable?.() && api?.isMatterEnabled?.())
 
-      if (enableMatter && preferMatter && MatterPlatform) {
+      if (enableMatter && preferMatter && MatterPlatform && matterAvailable) {
         this.impl = new MatterPlatform(log, cfg, api)
         return this.impl
       }

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

@@ -1,21 +1,21 @@
-import { describe, test } from 'vitest'
-import { promisify } from 'util'
-import { execFile } from 'child_process'
-import path from 'path'
+import { execFile } from 'node:child_process'
+import path from 'node:path'
+import { promisify } from 'node:util'
+import { describe, it } from 'vitest'
 
 const execFileP = promisify(execFile)
 
-describe('E2E scripts (manual-run harness)', () => {
+describe('e2e scripts (manual-run harness)', () => {
   if (!process.env.RUN_E2E) {
-    test.skip('E2E disabled - set RUN_E2E=true to enable', () => {})
+    it.skip('e2e disabled - set RUN_E2E=true to enable', () => {})
     return
   }
 
-  test('run configured E2E scripts sequentially', async () => {
+  it('should run configured e2e scripts sequentially', async () => {
     const repoRoot = path.resolve(__dirname, '../../')
     const scriptsDir = path.join(repoRoot, 'scripts', 'e2e')
 
-    const scriptsToRun: { envVar: string; script: string }[] = [
+    const scriptsToRun: { envVar: string, script: string }[] = [
       { envVar: 'LIGHT_ACCESSORY_ID', script: 'light-e2e.sh' },
       { envVar: 'FAN_ACCESSORY_ID', script: 'fan-e2e.sh' },
       { envVar: 'CURTAIN_ACCESSORY_ID', script: 'curtain-e2e.sh' },
@@ -32,7 +32,7 @@ describe('E2E scripts (manual-run harness)', () => {
 
       const scriptPath = path.join(scriptsDir, s.script)
       // Forward environment so scripts can read HB_URL / HB_TOKEN / <ACCESSORY_ID>
-      const env = Object.assign({}, process.env)
+      const env = { ...process.env }
 
       try {
         // eslint-disable-next-line no-console
@@ -40,7 +40,9 @@ describe('E2E scripts (manual-run harness)', () => {
         const { stdout, stderr } = await execFileP('bash', [scriptPath], { env })
         // eslint-disable-next-line no-console
         console.log(stdout)
-        if (stderr) console.error(stderr)
+        if (stderr) {
+          console.error(stderr)
+        }
       } catch (e: any) {
         // bubble up as test failure
         throw new Error(`Script ${s.script} failed: ${e.message}`)

package/test/helpers/matter-harness.ts

@@ -47,7 +47,7 @@ export function makeFakeApiWithoutMatter() {
     isMatterEnabled: () => false,
     hap: makeFakeHap(),
     platformAccessory: PlatformAccessory,
-    registerPlatformAccessories: (_p: string, _n: string, accs: any[]) => {},
-    on: (_ev: string, cb: Function) => {},
+    registerPlatformAccessories: () => {},
+    on: () => {},
   }
 }

package/test/matter-childbridge.spec.ts

@@ -31,7 +31,11 @@ describe('platform integration (Matter)', () => {
 
     // Create proxy that would choose the fake matter platform when preferred
     const Proxy = createPlatformProxy(function HAP() {}, FakeMatterPlatform)
-    const platform = new (Proxy as any)(console, { preferMatter: true, enableMatter: true }, {})
+    const matterApi = {
+      isMatterAvailable: () => true,
+      isMatterEnabled: () => true,
+    }
+    const platform = new (Proxy as any)(console, { preferMatter: true, enableMatter: true }, matterApi)
 
     // Make a small device descriptor to load
     const device = { id: 'dev-m-1', type: 'light', name: 'MatterLight' }

package/test/matter-integration.spec.ts

@@ -6,6 +6,47 @@ import SwitchBotHAPPlatform, { SwitchBotMatterPlatform } from '../src/platform'
 // Expanded Matter integration harness tests
 
 describe('Matter integration harness', () => {
+  it('normalizes Color Bulb and Motion Sensor to Matter-supported categories', async () => {
+    const matterApi = makeFakeMatterApi()
+    const api = makeFakeApiWithMatter(matterApi)
+
+    const platform = new SwitchBotMatterPlatform(console as any, {
+      devices: [
+        { id: 'cb-1', type: 'Color Bulb', name: 'Color Bulb 1' },
+        { id: 'ms-1', type: 'Motion Sensor', name: 'Motion Sensor 1' },
+      ],
+      enableMatter: true,
+      preferMatter: true,
+    } as any, api as any)
+
+    await (platform as any).registerMatterAccessories()
+
+    const regs = matterApi.getRegistered()
+    expect(regs.length).toBeGreaterThanOrEqual(2)
+    const ids = regs.map((r: any) => r?.context?.deviceId)
+    expect(ids).toContain('cb-1')
+    expect(ids).toContain('ms-1')
+  })
+
+  it('uses conformant window covering type for curtain Matter registration', async () => {
+    const matterApi = makeFakeMatterApi()
+    const api = makeFakeApiWithMatter(matterApi)
+
+    const platform = new SwitchBotMatterPlatform(console as any, {
+      devices: [{ id: 'curtain-1', type: 'curtain', name: 'Curtain 1' }],
+      enableMatter: true,
+      preferMatter: true,
+    } 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(0)
+    expect(wcType).not.toBe(4)
+  })
+
   it('registers Matter accessories when Matter API available', async () => {
     // Instantiate the real Matter platform directly to test its registration path
     const matterApi = makeFakeMatterApi()