@switchbot/homebridge-switchbot 5.0.0-beta.127 → 5.0.0-beta.129

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

@@ -57,6 +57,7 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     nameInput.style.fontSize = '14px'
     nameInput.style.boxSizing = 'border-box'
 
+    // --- Device Type Select ---
     const typeLabel = document.createElement('label')
     typeLabel.textContent = 'Config Device Type'
     typeLabel.style.display = 'block'
@@ -79,7 +80,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     Object.keys(DEVICE_TYPES).forEach((categoryName) => {
       const optgroup = document.createElement('optgroup')
       optgroup.label = categoryName
-
       DEVICE_TYPES[categoryName as keyof typeof DEVICE_TYPES].forEach((deviceType) => {
         const opt = document.createElement('option')
         opt.value = deviceType
@@ -88,10 +88,69 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
         opt.selected = deviceType.toLowerCase() === detectedType
         optgroup.appendChild(opt)
       })
-
       typeSelect.appendChild(optgroup)
     })
 
+    // --- Matter Type Advanced Field (only for window covering types) ---
+
+    // Matter Type advanced field (only for window covering types)
+    const windowCoveringTypes = ['Roller Shade', 'Curtain', 'Curtain3', 'Blind Tilt']
+
+    const matterTypeLabel = document.createElement('label')
+    matterTypeLabel.textContent = 'Matter Window Covering Type (Advanced)'
+    matterTypeLabel.style.display = 'block'
+    matterTypeLabel.style.marginBottom = '6px'
+    matterTypeLabel.style.fontWeight = '500'
+    matterTypeLabel.style.fontSize = '12px'
+    matterTypeLabel.style.color = '#6b7280'
+    matterTypeLabel.style.marginTop = '2px'
+
+    // Table 8.2 from Matter spec (partial, most common types)
+    const matterTypes = [
+      { value: '', label: 'Auto-detect (recommended)' },
+      { value: 0, label: 'Roller Shade (0)' },
+      { value: 1, label: 'Roman Shade (1)' },
+      { value: 2, label: 'Balloon Shade (2)' },
+      { value: 3, label: 'Woven Wood (3)' },
+      { value: 4, label: 'Drapery (4)' },
+      { value: 5, label: 'Awning (5)' },
+      { value: 6, label: 'Shutter (6)' },
+      { value: 7, label: 'Tilt Blind (7)' },
+      { value: 8, label: 'Blind Tilt (8)' },
+      { value: 9, label: 'Projector Screen (9)' },
+      { value: 15, label: 'Other (15)' },
+    ]
+
+    const matterTypeSelect = document.createElement('select')
+    matterTypeSelect.style.width = '100%'
+    matterTypeSelect.style.marginBottom = '12px'
+    matterTypeSelect.style.padding = '8px 10px'
+    matterTypeSelect.style.borderRadius = '6px'
+    matterTypeSelect.style.fontSize = '14px'
+    matterTypeSelect.style.boxSizing = 'border-box'
+    matterTypes.forEach((opt) => {
+      const option = document.createElement('option')
+      option.value = String(opt.value)
+      option.textContent = opt.label
+      if (device.matterType != null && String(opt.value) === String(device.matterType)) {
+        option.selected = true
+      }
+      matterTypeSelect.appendChild(option)
+    })
+
+    // Show/hide Matter Type field based on type
+    function updateMatterTypeVisibility() {
+      if (windowCoveringTypes.includes(typeSelect.value)) {
+        matterTypeLabel.style.display = 'block'
+        matterTypeSelect.style.display = 'block'
+      } else {
+        matterTypeLabel.style.display = 'none'
+        matterTypeSelect.style.display = 'none'
+      }
+    }
+    typeSelect.addEventListener('change', updateMatterTypeVisibility)
+    updateMatterTypeVisibility()
+
     const macLabel = document.createElement('label')
     macLabel.textContent = 'BLE MAC Address (optional)'
     macLabel.style.display = 'block'
@@ -111,7 +170,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     macInput.style.fontSize = '14px'
     macInput.style.boxSizing = 'border-box'
 
-
     // BLE Encryption Key
     const encryptionKeyLabel = document.createElement('label')
     encryptionKeyLabel.textContent = 'BLE Encryption Key (optional)'
@@ -173,7 +231,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     importBtn.style.padding = '8px 20px'
     importBtn.style.fontSize = '13px'
 
-
     const cleanup = (result: { configDeviceName: string, configDeviceType: string, address?: string, encryptionKey?: string, keyId?: string } | null) => {
       div.remove()
       resolve(result)
@@ -186,6 +243,7 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       address: macInput.value || undefined,
       encryptionKey: encryptionKeyInput.value || undefined,
       keyId: keyIdInput.value || undefined,
+      ...(windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== '' ? { matterType: Number(matterTypeSelect.value) } : {}),
     })
 
     div.addEventListener('click', (event) => {
@@ -194,13 +252,14 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       }
     })
 
-
     buttons.appendChild(cancelBtn)
     buttons.appendChild(importBtn)
     contentDiv.appendChild(nameLabel)
     contentDiv.appendChild(nameInput)
     contentDiv.appendChild(typeLabel)
     contentDiv.appendChild(typeSelect)
+    contentDiv.appendChild(matterTypeLabel)
+    contentDiv.appendChild(matterTypeSelect)
     contentDiv.appendChild(macLabel)
     contentDiv.appendChild(macInput)
     contentDiv.appendChild(encryptionKeyLabel)
@@ -218,6 +277,94 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
 }
 
 export async function editDevice(device: any): Promise<void> {
+  // --- Device Type Select ---
+  const typeLabel = document.createElement('label')
+  typeLabel.textContent = 'Config Device Type'
+  typeLabel.style.display = 'block'
+  typeLabel.style.marginBottom = '6px'
+  typeLabel.style.fontWeight = '500'
+  typeLabel.style.fontSize = '12px'
+  typeLabel.style.color = '#6b7280'
+
+  const typeSelect = document.createElement('select')
+  typeSelect.style.width = '100%'
+  typeSelect.style.padding = '8px 10px'
+  typeSelect.style.marginBottom = '12px'
+  typeSelect.style.borderRadius = '6px'
+  typeSelect.style.fontSize = '14px'
+  typeSelect.style.background = getComputedStyle(document.body).backgroundColor
+  typeSelect.style.color = getComputedStyle(document.body).color
+  typeSelect.style.border = '1px solid #ccc'
+  typeSelect.style.boxSizing = 'border-box'
+
+  // Add option groups with all API device types
+  Object.keys(DEVICE_TYPES).forEach((categoryName) => {
+    const optgroup = document.createElement('optgroup')
+    optgroup.label = categoryName
+    DEVICE_TYPES[categoryName as keyof typeof DEVICE_TYPES].forEach((deviceType) => {
+      const opt = document.createElement('option')
+      opt.value = deviceType
+      opt.text = deviceType
+      // Select current configDeviceType if set, otherwise match API deviceType
+      const currentType = device.configDeviceType || device.deviceType || device.type || ''
+      opt.selected = currentType === deviceType
+      optgroup.appendChild(opt)
+    })
+    typeSelect.appendChild(optgroup)
+  })
+
+  // --- Matter Type Advanced Field (only for window covering types) ---
+  const windowCoveringTypes = ['Roller Shade', 'Curtain', 'Curtain3', 'Blind Tilt']
+  const showMatterType = windowCoveringTypes.includes(device.configDeviceType || device.deviceType || device.type || '')
+  const matterTypeLabel = document.createElement('label')
+  matterTypeLabel.textContent = 'Matter Window Covering Type (Advanced)'
+  matterTypeLabel.style.display = showMatterType ? 'block' : 'none'
+  matterTypeLabel.style.marginBottom = '6px'
+  matterTypeLabel.style.fontWeight = '500'
+  matterTypeLabel.style.fontSize = '12px'
+  matterTypeLabel.style.color = '#6b7280'
+  matterTypeLabel.style.marginTop = '2px'
+  const matterTypes = [
+    { value: '', label: 'Auto-detect (recommended)' },
+    { value: 0, label: 'Roller Shade (0)' },
+    { value: 1, label: 'Roman Shade (1)' },
+    { value: 2, label: 'Balloon Shade (2)' },
+    { value: 3, label: 'Woven Wood (3)' },
+    { value: 4, label: 'Drapery (4)' },
+    { value: 5, label: 'Awning (5)' },
+    { value: 6, label: 'Shutter (6)' },
+    { value: 7, label: 'Tilt Blind (7)' },
+    { value: 8, label: 'Blind Tilt (8)' },
+    { value: 9, label: 'Projector Screen (9)' },
+    { value: 15, label: 'Other (15)' },
+  ]
+  const matterTypeSelect = document.createElement('select')
+  matterTypeSelect.style.width = '100%'
+  matterTypeSelect.style.marginBottom = '12px'
+  matterTypeSelect.style.padding = '8px 10px'
+  matterTypeSelect.style.borderRadius = '6px'
+  matterTypeSelect.style.fontSize = '14px'
+  matterTypeSelect.style.boxSizing = 'border-box'
+  matterTypes.forEach((opt) => {
+    const option = document.createElement('option')
+    option.value = String(opt.value)
+    option.textContent = opt.label
+    if (device.matterType != null && String(opt.value) === String(device.matterType)) {
+      option.selected = true
+    }
+    matterTypeSelect.appendChild(option)
+  })
+  function updateMatterTypeVisibility() {
+    if (windowCoveringTypes.includes(typeSelect.value)) {
+      matterTypeLabel.style.display = 'block'
+      matterTypeSelect.style.display = 'block'
+    } else {
+      matterTypeLabel.style.display = 'none'
+      matterTypeSelect.style.display = 'none'
+    }
+  }
+  typeSelect.addEventListener('change', updateMatterTypeVisibility)
+  updateMatterTypeVisibility()
   // Create modal dialog for editing
   const div = document.createElement('div')
   div.style.position = 'fixed'
@@ -298,26 +445,6 @@ export async function editDevice(device: any): Promise<void> {
   apiTypeInput.style.backgroundColor = '#f9fafb'
 
   // Editable config device type dropdown
-  const typeLabel = document.createElement('label')
-  typeLabel.textContent = 'Config Device Type (Override)'
-  typeLabel.style.display = 'block'
-  typeLabel.style.marginBottom = '6px'
-  typeLabel.style.fontWeight = '500'
-  typeLabel.style.fontSize = '12px'
-  typeLabel.style.color = '#6b7280'
-
-  const typeSelect = document.createElement('select')
-  typeSelect.style.width = '100%'
-  typeSelect.style.padding = '8px 10px'
-  typeSelect.style.marginBottom = '12px'
-  typeSelect.style.borderRadius = '6px'
-  typeSelect.style.fontSize = '14px'
-  typeSelect.style.background = getComputedStyle(nameInput).background
-  typeSelect.style.color = getComputedStyle(nameInput).color
-  typeSelect.style.border = getComputedStyle(nameInput).border
-  typeSelect.style.boxSizing = 'border-box'
-  typeSelect.style.cursor = 'pointer'
-  typeSelect.style.transition = 'border-color 0.2s ease'
 
   // Add option groups with all API device types
   Object.keys(DEVICE_TYPES).forEach((categoryName) => {
@@ -378,9 +505,10 @@ export async function editDevice(device: any): Promise<void> {
         deviceId: device.id,
         configDeviceName: nameInput.value || undefined,
         configDeviceType: typeSelect.value,
+        matterType: windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== '' ? Number(matterTypeSelect.value) : undefined,
       }
 
-      await updateDevice(params.deviceId, params.configDeviceName, params.configDeviceType)
+      await updateDevice(params.deviceId, params.configDeviceName, params.configDeviceType, { matterType: params.matterType })
       await syncParentPluginConfigFromDisk()
 
       // Refresh device list
@@ -404,6 +532,8 @@ export async function editDevice(device: any): Promise<void> {
   contentDiv.appendChild(apiTypeInput)
   contentDiv.appendChild(typeLabel)
   contentDiv.appendChild(typeSelect)
+  contentDiv.appendChild(matterTypeLabel)
+  contentDiv.appendChild(matterTypeSelect)
   contentDiv.appendChild(errorMessage)
   contentDiv.appendChild(buttons)
 

package/src/platform.ts

@@ -1141,10 +1141,8 @@ export class SwitchBotHAPPlatform {
         // Prefer Matter: try registering to the Matter child bridge first.
         let matterRegistered = false
         if (useMatter) {
-          // Only attempt Matter registration if api.matter is truly available
           const matterApi = (this.api as any)?.matter
           if (this.api?.isMatterAvailable?.() && this.api?.isMatterEnabled?.() && matterApi && typeof matterApi.registerPlatformAccessories === 'function') {
-            this.log.info(`Attempting Matter registration for ${d.id} (${type})`)
             try {
               const createdDesc = await created.createAccessory(this.api)
               const uuid = matterApi.uuid.generate(`${d.id}`)
@@ -1165,7 +1163,6 @@ export class SwitchBotHAPPlatform {
                 handlers: createdDesc.handlers || createMatterHandlers(this.log, d.id, type, (this.config as any)?._client) || undefined,
                 context: { deviceId: d.id, type, _created: true },
               }
-              // Log the full accessory descriptor before registration
               this.log.info(`[MatterDebug] Accessory descriptor for ${d.id}:`, JSON.stringify({
                 UUID: accessory.UUID,
                 displayName: accessory.displayName,
@@ -1179,7 +1176,6 @@ export class SwitchBotHAPPlatform {
               this.log.info(`[MatterDebug] Registered Matter accessory ${d.id} (${type}) with uuid=${uuid}`)
             } catch (e: any) {
               this.log.error(`[MatterDebug] Failed to register Matter accessory for ${d.id} (${type}):`, e && (e.stack || e.message || e))
-              // If this is a conformance error, attempt to remove the cached accessory so it can be re-registered cleanly
               if (e && (e.message?.includes('Conformance') || e.message?.includes('enum value Rollershade') || e.message?.includes('Behaviors have errors'))) {
                 try {
                   const uuid = matterApi.uuid.generate(`${d.id}`)