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

package/src/devices/genericDevice.ts

@@ -433,166 +433,31 @@ export class CurtainDevice extends GenericDevice {
 
   // Matter-specific descriptor for Curtain (Shade cluster) with conformance type
   async createMatterAccessory(api: any): Promise<any> {
-    // Determine device type and features
-    const typeKey = (this.opts.type || '').toLowerCase()
-    // Dynamic detection: check config/state for lift/tilt support
-    const hasConfigLift = !!this.opts.lift || typeof this.opts.lift === 'number'
-    const hasConfigTilt = !!this.opts.tilt || typeof this.opts.tilt === 'number'
-    let hasLiftAttrs = false
-    let hasTiltAttrs = false
-    if (typeof this.getState === 'function') {
-      let state: any
-      try {
-        state = await this.getState()
-      } catch (e) {
-        state = undefined
-      }
-      if (state) {
-        hasLiftAttrs = typeof state.position === 'number'
-        hasTiltAttrs = typeof state.tilt === 'number'
-      }
-    }
-    // For SwitchBot Curtain, always set supportsLift = true
-    let supportsLift = hasConfigLift || hasLiftAttrs
-    if (typeKey.includes('curtain')) {
-      supportsLift = true
-    } else if (!supportsLift && (typeKey.includes('rollershade') || typeKey.includes('blindtilt'))) {
-      supportsLift = true
-    }
-    const supportsTilt = hasConfigTilt || hasTiltAttrs || typeKey.includes('blindtilt') || typeKey.includes('blind tilt')
-
-    // Debug: Log feature detection variables
-    this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} feature detection: typeKey='${typeKey}', hasConfigLift=${hasConfigLift}, hasLiftAttrs=${hasLiftAttrs}, hasConfigTilt=${hasConfigTilt}, hasTiltAttrs=${hasTiltAttrs}, supportsLift=${supportsLift}, supportsTilt=${supportsTilt}`)
-
-    // If neither lift nor tilt is supported, do not register as Matter window covering
-    if (!supportsLift && !supportsTilt) {
-      this.log.warn(`[Matter] Skipping Matter registration for window covering device '${this.opts.name ?? this.opts.id}' (id: ${this.opts.id}): no lift or tilt support detected.`)
-      return undefined
-    }
-
-    // Allow user to override Matter type via config (opts.matterType)
-    if (typeof this.opts.matterType === 'number') {
-      const matterType = this.opts.matterType
-      this.log.info(`[Matter/Config] Using user-specified Matter type for ${this.opts.name ?? this.opts.id}: matterType=${matterType}`)
-      // Build attributes for Matter WindowCovering
-      const attributes: Record<string, any> = {
-        type: {
-          read: async () => {
-            this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} returning config-overridden type attribute value:`, matterType)
-            return matterType
-          },
-          write: undefined,
-        },
-        currentPosition: { read: async () => { const s = await this.getState(); return typeof s.position === 'number' ? s.position : 0 }, write: undefined },
-        targetPosition: { read: async () => { const s = await this.getState(); return typeof s.position === 'number' ? s.position : 0 }, write: async (v: any) => this.setState({ position: Number(v) }) },
-      }
-      if (supportsTilt) {
-        attributes.currentTilt = { read: async () => { const s = await this.getState(); return typeof s.tilt === 'number' ? s.tilt : 0 }, write: undefined }
-        attributes.targetTilt = { read: async () => { const s = await this.getState(); return typeof s.tilt === 'number' ? s.tilt : 0 }, write: async (v: any) => this.setState({ tilt: Number(v) }) }
-      }
-      try {
-        this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} attributes:`, JSON.stringify(attributes, null, 2))
-      } catch (e) {
-        this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} attributes: [unserializable]`)
-      }
-      const windowCoveringCluster = {
-        type: 'WindowCovering', // for test compatibility
-        matterType, // actual Matter type number
-        clusterId: MATTER_CLUSTER_IDS.WindowCovering,
-        attributes,
-      }
-      const clustersArr: any = [windowCoveringCluster]
-      // Always set clusters.windowCovering to the WindowCovering cluster by clusterId
-      const foundWC = clustersArr.find((c: any) => c && c.clusterId === MATTER_CLUSTER_IDS.WindowCovering)
-      clustersArr.windowCovering = foundWC || null
-      return {
-        id: this.opts.id,
-        name: this.opts.name ?? this.opts.type,
-        protocol: 'matter',
-        clusters: clustersArr,
-      }
-    }
-
-    // Only try allowed types for each feature set (per Matter spec Table 8.2)
-    // - supportsLift && !supportsTilt: RollerShade (0), NOT Drapery (4)
-    // - !supportsLift && supportsTilt: BlindTilt (8)
-    // - supportsLift && supportsTilt: RollerShade (0) (or Blind, but 0 is safe)
-    // - supportsLift && supportsTilt && typeKey.includes('drapery'): allow Drapery (4)
-    // - !supportsLift && !supportsTilt: skip
-    interface MatterCombo {
-      matterType: number
-      supportsLift: boolean
-      supportsTilt: boolean
+    // Always use the platform-provided Matter type (e.g., 5 for roller shade)
+    const matterType = 5
+    const attributes: Record<string, any> = {
+      type: {
+        read: async () => matterType,
+        write: undefined,
+      },
+      currentPosition: { read: async () => { const s = await this.getState(); return typeof s.position === 'number' ? s.position : 0 }, write: undefined },
+      targetPosition: { read: async () => { const s = await this.getState(); return typeof s.position === 'number' ? s.position : 0 }, write: async (v: any) => this.setState({ position: Number(v) }) },
     }
-    const combos: MatterCombo[] = []
-    if (supportsLift && supportsTilt) {
-      // Both supported: allow RollerShade (0), optionally Drapery (4) if typeKey includes 'drapery'
-      combos.push({ matterType: 0, supportsLift: true, supportsTilt: true })
-      if (typeKey.includes('drapery')) {
-        combos.push({ matterType: 4, supportsLift: true, supportsTilt: true })
-      }
-    } else if (supportsLift && !supportsTilt) {
-      // Only lift: for SwitchBot Curtain, use Drapery (4) for conformance
-      if (typeKey.includes('curtain')) {
-        combos.push({ matterType: 4, supportsLift: true, supportsTilt: false })
-      } else {
-        combos.push({ matterType: 0, supportsLift: true, supportsTilt: false })
-      }
-    } else if (!supportsLift && supportsTilt) {
-      // Only tilt: allow BlindTilt (8)
-      combos.push({ matterType: 8, supportsLift: false, supportsTilt: true })
+    const windowCoveringCluster = {
+      type: 'WindowCovering',
+      matterType,
+      clusterId: MATTER_CLUSTER_IDS.WindowCovering,
+      attributes,
     }
-    let lastError
-    for (const combo of combos) {
-      try {
-        this.log.info(`[Matter/Retry] Trying combo for ${this.opts.name ?? this.opts.id}: matterType=${combo.matterType}, supportsLift=${combo.supportsLift}, supportsTilt=${combo.supportsTilt}`)
-        this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} trying combo: matterType=${combo.matterType}, supportsLift=${combo.supportsLift}, supportsTilt=${combo.supportsTilt}`)
-        // Build attributes for Matter WindowCovering (string keys only)
-        const attributes: Record<string, any> = {
-          type: {
-            read: async () => {
-              this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} returning type attribute value:`, combo.matterType)
-              return combo.matterType
-            },
-            write: undefined,
-          },
-          currentPosition: { read: async () => { const s = await this.getState(); return typeof s.position === 'number' ? s.position : 0 }, write: undefined },
-          targetPosition: { read: async () => { const s = await this.getState(); return typeof s.position === 'number' ? s.position : 0 }, write: async (v: any) => this.setState({ position: Number(v) }) },
-        }
-        if (combo.supportsTilt) {
-          attributes.currentTilt = { read: async () => { const s = await this.getState(); return typeof s.tilt === 'number' ? s.tilt : 0 }, write: undefined }
-          attributes.targetTilt = { read: async () => { const s = await this.getState(); return typeof s.tilt === 'number' ? s.tilt : 0 }, write: async (v: any) => this.setState({ tilt: Number(v) }) }
-        }
-        // Log the final attributes object
-        try {
-          this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} attributes:`, JSON.stringify(attributes, null, 2))
-        } catch (e) {
-          this.log.debug(`[Matter/Debug] ${this.opts.name ?? this.opts.id} attributes: [unserializable]`)
-        }
-        // Try to register with this combo
-        const windowCoveringCluster = {
-          type: 'WindowCovering', // for test compatibility
-          matterType: combo.matterType, // actual Matter type number
-          clusterId: MATTER_CLUSTER_IDS.WindowCovering,
-          attributes,
-        }
-        const clustersArr: any = [windowCoveringCluster]
-        // Always set clusters.windowCovering to the WindowCovering cluster by clusterId
-        const foundWC = clustersArr.find((c: any) => c && c.clusterId === MATTER_CLUSTER_IDS.WindowCovering)
-        clustersArr.windowCovering = foundWC || null
-        return {
-          id: this.opts.id,
-          name: this.opts.name ?? this.opts.type,
-          protocol: 'matter',
-          clusters: clustersArr,
-        }
-      } catch (err) {
-        lastError = err
-        this.log.warn(`[Matter/Retry] Failed combo matterType=${combo.matterType}, supportsLift=${combo.supportsLift}, supportsTilt=${combo.supportsTilt}: ${err}`)
-      }
+    const clustersArr: any = [windowCoveringCluster]
+    const foundWC = clustersArr.find((c: any) => c && c.clusterId === MATTER_CLUSTER_IDS.WindowCovering)
+    clustersArr.windowCovering = foundWC || null
+    return {
+      id: this.opts.id,
+      name: this.opts.name ?? this.opts.type,
+      protocol: 'matter',
+      clusters: clustersArr,
     }
-    // If all combos fail, throw last error
-    throw lastError || new Error('All Matter window covering type combos failed')
   }
 }
 

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

@@ -91,66 +91,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       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'
@@ -243,7 +183,6 @@ 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) => {
@@ -258,8 +197,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     contentDiv.appendChild(nameInput)
     contentDiv.appendChild(typeLabel)
     contentDiv.appendChild(typeSelect)
-    contentDiv.appendChild(matterTypeLabel)
-    contentDiv.appendChild(matterTypeSelect)
     contentDiv.appendChild(macLabel)
     contentDiv.appendChild(macInput)
     contentDiv.appendChild(encryptionKeyLabel)

package/src/platform.ts

@@ -96,9 +96,9 @@ export const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
     },
   }, // Switch in HAP, RobotVacuumCleaner in Matter
   curtain: {
-    /* windowCovering: {
-      type: 0, // Generic - supports basic open/close/position features, but no tilt (curtain3/rollershade variants use this with normalization)
-    }, */
+    windowCovering: {
+      type: 5, // GenericWindowCovering - supports lift feature (covers curtain3, rollershade variants via normalization)
+    },
   }, // WindowCovering → WindowCovering (includes curtain3, rollershade variants via normalization)
   blindtilt: {
     windowCovering: {