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

package/src/deviceFactory.ts

@@ -139,16 +139,10 @@ function classForType(type: string) {
   return DEVICE_CLASS_MAP[key] ?? GenericDevice
 }
 
-export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConfig, useMatter: boolean) {
+export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConfig, useMatter: boolean, log?: { info: (...args: any[]) => void }) {
   // Debug: Log the options passed to the device constructor
-  if (opts && opts.name) {
-    if (typeof opts.matterType !== 'undefined') {
-      // eslint-disable-next-line no-console
-      console.info(`[Matter/Debug] createDevice: Passing opts for ${opts.name}:`, JSON.stringify(opts, null, 2))
-    } else {
-      // eslint-disable-next-line no-console
-      console.info(`[Matter/Debug] createDevice: Passing opts for ${opts.name} (no matterType):`, JSON.stringify(opts, null, 2))
-    }
+  if (opts && opts.name && log && typeof log.info === 'function') {
+    log.info(`[Matter/Debug] createDevice: Passing opts for ${opts.name}:`, JSON.stringify(opts, null, 2))
   }
   // Reuse existing client when provided via config to avoid creating
   // a new SwitchBotClient per device (which can be expensive).
@@ -169,15 +163,6 @@ export async function createDevice(opts: DeviceOptions, cfg: SwitchBotPluginConf
     deviceOpts.keyId = opts.keyId
   }
 
-  // Ensure matterType override is set for curtain devices
-  const typeKey = (opts.type || '').toLowerCase()
-  if ((typeKey === 'curtain' || typeKey === 'curtain3' || typeKey === 'rollershade' || typeKey === 'blindtilt') && cfg && cfg.devices) {
-    const configDevice = cfg.devices.find((d: any) => d.id === opts.id)
-    if (configDevice && typeof configDevice.matterType !== 'undefined') {
-      deviceOpts.matterType = configDevice.matterType
-    }
-  }
-
   const DeviceCtor = classForType(opts.type)
   const device = new DeviceCtor(deviceOpts, mergedCfg)
   await device.init()

package/src/devices/genericDevice.ts

@@ -7,9 +7,9 @@ import { Buffer } from 'node:buffer'
 import { MATTER_ATTRIBUTE_IDS, MATTER_CLUSTER_IDS } from '../utils.js'
 import { DeviceBase } from './deviceBase.js'
 
-function validateBLEResponseLength(buf: Buffer | Uint8Array | any[], expected: number, context = ''): boolean {
+function validateBLEResponseLength(buf: Buffer | Uint8Array | any[], expected: number, context = '', log: import('homebridge').Logger): boolean {
   if (!buf || typeof buf.length !== 'number' || buf.length !== expected) {
-    console.warn(`[BLE] Invalid response length${context ? ` for ${context}` : ''}: expected ${expected}, got ${buf?.length}`)
+    log.warn(`[BLE] Invalid response length${context ? ` for ${context}` : ''}: expected ${expected}, got ${buf?.length}`)
     return false
   }
   return true
@@ -22,12 +22,15 @@ const BLE_NOTIFICATION_HANDLERS = new Map<string, (payload: Buffer) => void>()
 const HEX_COLOR_REGEX = /^#?[0-9A-F]{6}$/i
 
 export class GenericDevice extends DeviceBase {
-  protected log: any
+  protected log: import('homebridge').Logger
 
   constructor(opts: any, cfg: SwitchBotPluginConfig) {
     super(opts, cfg)
-    // Prefer logger from opts, then cfg, fallback to console
-    this.log = opts?.log || cfg?.log || console
+    // Require logger from opts or cfg
+    this.log = opts?.log || cfg?.log
+    if (!this.log) {
+      throw new Error('Device requires a logger (Homebridge logger) in opts or cfg')
+    }
     // If BLE encryptionKey/keyId provided, set on node-switchbot device instance if possible
     if (opts.encryptionKey && this.client && typeof this.client.devices?.get === 'function') {
       try {
@@ -42,10 +45,7 @@ export class GenericDevice extends DeviceBase {
         // ignore if device not found or setKey not available
       }
     }
-    // Ensure log is always set
-    if (!this.log) {
-      this.log = console
-    }
+    // ...existing code...
     // Subscribe to BLE notifications if supported (node-switchbot v4+)
     this._subscribeBLENotifications()
   }
@@ -115,7 +115,7 @@ export class GenericDevice extends DeviceBase {
         // If this is a BLE buffer/array, validate length (common BLE status: 12 bytes, but may vary by device)
         if (raw && (raw instanceof Buffer || Array.isArray(raw) || raw instanceof Uint8Array)) {
           // Default to 12, override per device if needed
-          if (!validateBLEResponseLength(raw, 12, this.opts.type)) {
+          if (!validateBLEResponseLength(raw, 12, this.opts.type, this.log)) {
             return { id: this.opts.id, type: this.opts.type, error: 'invalid_ble_response_length', raw }
           }
         }
@@ -431,168 +431,81 @@ export class CurtainDevice extends GenericDevice {
     }
   }
 
-  // Matter-specific descriptor for Curtain (Shade cluster) with conformance type
+  // Matter-specific descriptor for Curtain (WindowCovering cluster) with new attributes
   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
+    // Get current state for dynamic attributes
+    const state = await this.getState()
+    // Compose attributes for Matter WindowCovering cluster
+    const attributes: Record<string, any> = {
+      currentPositionLiftPercent100ths: {
+        read: async () => {
+          const s = await this.getState()
+          return typeof s.position === 'number' ? Math.round(s.position * 100) : 0
+        },
+        write: undefined,
+      },
+      targetPositionLiftPercent100ths: {
+        read: async () => {
+          const s = await this.getState()
+          return typeof s.position === 'number' ? Math.round(s.position * 100) : 0
+        },
+        write: async (v: any) => this.setState({ position: Math.round(Number(v) / 100) }),
+      },
+      operationalStatus: {
+        read: async () => state.operationalStatus ?? { global: 0, lift: 0, tilt: 0 },
+        write: undefined,
+      },
+      endProductType: {
+        read: async () => state.endProductType ?? 0,
+        write: undefined,
+      },
+      configStatus: {
+        read: async () => state.configStatus ?? {
+          operational: true,
+          onlineReserved: true,
+          liftMovementReversed: false,
+          liftPositionAware: true,
+          tiltPositionAware: false,
+          liftEncoderControlled: true,
+          tiltEncoderControlled: false,
+        },
+        write: 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,
+    // If tilt is supported, add tilt attributes
+    if (typeof state.tilt === 'number') {
+      attributes.currentPositionTiltPercent100ths = {
+        read: async () => {
+          const s = await this.getState()
+          return typeof s.tilt === 'number' ? Math.round(s.tilt * 100) : 0
         },
-        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,
+        write: undefined,
       }
-      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,
+      attributes.targetPositionTiltPercent100ths = {
+        read: async () => {
+          const s = await this.getState()
+          return typeof s.tilt === 'number' ? Math.round(s.tilt * 100) : 0
+        },
+        write: async (v: any) => this.setState({ tilt: Math.round(Number(v) / 100) }),
       }
     }
-
-    // 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
-    }
-    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',
+      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}`)
-      }
+    // Provide both array and named property for clusters for compatibility with test expectations
+    const clustersArr: any[] = [windowCoveringCluster]
+    const clusters: any = [...clustersArr]
+    // Always set clusters.windowCovering to the WindowCovering cluster by clusterId
+    const foundWC = clustersArr.find((c: any) => c && c.clusterId === MATTER_CLUSTER_IDS.WindowCovering)
+    clusters.windowCovering = foundWC || null
+    return {
+      id: this.opts.id,
+      name: this.opts.name ?? this.opts.type,
+      protocol: 'matter',
+      clusters,
     }
-    // If all combos fail, throw last error
-    throw lastError || new Error('All Matter window covering type combos failed')
   }
 }
 

package/src/homebridge-ui/public/index.html

@@ -1,145 +1,128 @@
 <!doctype html>
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <title>SwitchBot Plugin UI</title>
-    <link rel="stylesheet" href="css/styles.css" />
-  </head>
-  <body>
-    <h1>🤖 SwitchBot Configuration</h1>
 
-    <div class="card compact">
-      <h2>API Credentials</h2>
-      <div class="credentials-row">
-        <div class="form-group">
-          <label for="token">Token:</label>
-          <input type="password" id="token" placeholder="Enter token" />
-          <div class="status" id="tokenStatus"></div>
-        </div>
-        <div class="form-group">
-          <label for="secret">Secret:</label>
-          <input type="password" id="secret" placeholder="Enter secret" />
-          <div class="status" id="secretStatus"></div>
-        </div>
-      </div>
-      <button id="saveBtn" onclick="saveCredentials()">Save</button>
-      <div id="saveStatus"></div>
-    </div>
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width,initial-scale=1" />
+  <title>SwitchBot Plugin UI</title>
+  <link rel="stylesheet" href="css/styles.css" />
+</head>
 
-    <div class="card compact">
-      <h2>Discover Devices</h2>
-      <div style="margin-bottom: 6px">
-        <label style="display: flex; align-items: center; gap: 4px; cursor: pointer; font-size: 11px">
-          <input type="checkbox" id="autoAddAllCheckbox" style="width: auto; margin: 0" />
-          <span>Auto-add all</span>
-          <span
-            title="When enabled, Discover immediately adds all found devices to your config. Existing devices are skipped automatically."
-            style="font-size: 11px; opacity: 0.7"
-          >ⓘ</span>
-        </label>
-        <div style="margin-top: 2px; margin-left: 22px; font-size: 10px; opacity: 0.75; line-height: 1.25">
-          Adds all discovered devices automatically; already configured devices are skipped.
-        </div>
-      </div>
-      <div class="discovery-settings-row" style="margin-bottom: 2px">
-        <label id="bleScanSetting" style="display: inline-flex; align-items: center; gap: 4px; font-size: 11px">
-          <span>Scan:</span>
-          <select id="bleScanDurationSelect" style="font-size: 11px; padding: 2px 6px">
-            <option value="3">3s</option>
-            <option value="5" selected>5s</option>
-            <option value="10">10s</option>
-            <option value="15">15s</option>
-          </select>
-        </label>
-        <label id="bleTimeoutSetting" style="display: inline-flex; align-items: center; gap: 4px; font-size: 11px">
-          <span>Timeout:</span>
-          <input
-            id="bleTimeoutInput"
-            type="number"
-            min="3"
-            max="30"
-            step="1"
-            value="8"
-            style="width: 56px; font-size: 11px; padding: 2px 4px"
-          />
-          <span>s</span>
-        </label>
-        <label style="display: flex; align-items: center; gap: 4px; cursor: pointer; font-size: 11px">
-          <input type="checkbox" id="disableBleScanCheckbox" style="width: auto; margin: 0" />
-          <span>Disable BLE scan</span>
-        </label>
+<body>
+  <h1>🤖 SwitchBot Configuration</h1>
+
+  <div class="card compact">
+    <h2>API Credentials</h2>
+    <div class="credentials-row">
+      <div class="form-group">
+        <label for="token">Token:</label>
+        <input type="password" id="token" placeholder="Enter token" />
+        <div class="status" id="tokenStatus"></div>
       </div>
-      <div id="bluetoothStatus" style="margin-bottom: 4px; font-size: 10px; opacity: 0.8">Bluetooth: checking...</div>
-      <div class="discovery-settings-row" style="margin-bottom: 8px">
-        <div id="lastScannedStatus" style="font-size: 10px; opacity: 0.8; flex: 1 1 auto">Last scanned: never</div>
-        <label style="font-size: 11px">
-          Auto-refresh:
-          <select id="autoRefreshIntervalSelect" style="margin-left: 4px; font-size: 11px; padding: 2px 6px">
-            <option value="0" selected>Off</option>
-            <option value="30">30s</option>
-            <option value="60">1m</option>
-            <option value="300">5m</option>
-          </select>
-        </label>
-        <button id="refreshDiscoverBtn" class="secondary" style="padding: 4px 9px; font-size: 11px">Refresh</button>
+      <div class="form-group">
+        <label for="secret">Secret:</label>
+        <input type="password" id="secret" placeholder="Enter secret" />
+        <div class="status" id="secretStatus"></div>
       </div>
-      <button id="discoverBtn" onclick="discoverDevices()" style="margin-bottom: 8px">
-        🔍 Discover
-      </button>
-      <button
-        id="cancelDiscoverBtn"
-        style="margin-left: 6px; margin-bottom: 8px; display: none; padding: 6px 10px; font-size: 11px"
-        class="secondary"
-      >
-        Cancel
-      </button>
-      <div id="discoverStatus" style="margin-bottom: 6px; font-size: 11px"></div>
-      <div id="discoverDevicesFound" style="margin-bottom: 6px; font-size: 11px; display: none"></div>
-      <div id="discoverPhaseProgress" class="discover-phase-progress" style="display: none">
-        <div class="discover-phase-track">
-          <div id="discoverPhaseFill" class="discover-phase-fill"></div>
-        </div>
-        <div id="discoverPhaseLabel" class="discover-phase-label"></div>
+    </div>
+    <button id="saveBtn" onclick="saveCredentials()">Save</button>
+    <div id="saveStatus"></div>
+  </div>
+
+  <div class="card compact">
+    <h2>Discover Devices</h2>
+    <div style="margin-bottom: 6px">
+      <label style="display: flex; align-items: center; gap: 4px; cursor: pointer; font-size: 11px">
+        <input type="checkbox" id="autoAddAllCheckbox" style="width: auto; margin: 0" />
+        <span>Auto-add all</span>
+        <span
+          title="When enabled, Discover immediately adds all found devices to your config. Existing devices are skipped automatically."
+          style="font-size: 11px; opacity: 0.7">ⓘ</span>
+      </label>
+      <div style="margin-top: 2px; margin-left: 22px; font-size: 10px; opacity: 0.75; line-height: 1.25">
+        Adds all discovered devices automatically; already configured devices are skipped.
       </div>
-      <div id="discoveredList" style="display: none">
-        <h3 style="margin-top: 0; font-size: 12px; margin-bottom: 6px; font-weight: 600">Available Devices</h3>
-        <ul
-          id="discoveredDevices"
-          style="max-height: 300px; overflow-y: auto"
-        ></ul>
+    </div>
+    <div class="discovery-settings-row" style="margin-bottom: 2px">
+      <label id="bleScanSetting" style="display: inline-flex; align-items: center; gap: 4px; font-size: 11px">
+        <span>Scan:</span>
+        <select id="bleScanDurationSelect" style="font-size: 11px; padding: 2px 6px">
+          <option value="3">3s</option>
+          <option value="5" selected>5s</option>
+          <option value="10">10s</option>
+          <option value="15">15s</option>
+        </select>
+      </label>
+      <label id="bleTimeoutSetting" style="display: inline-flex; align-items: center; gap: 4px; font-size: 11px">
+        <span>Timeout:</span>
+        <input id="bleTimeoutInput" type="number" min="3" max="30" step="1" value="8"
+          style="width: 56px; font-size: 11px; padding: 2px 4px" />
+        <span>s</span>
+      </label>
+      <label style="display: flex; align-items: center; gap: 4px; cursor: pointer; font-size: 11px">
+        <input type="checkbox" id="disableBleScanCheckbox" style="width: auto; margin: 0" />
+        <span>Disable BLE scan</span>
+      </label>
+    </div>
+    <div id="bluetoothStatus" style="margin-bottom: 4px; font-size: 10px; opacity: 0.8">Bluetooth: checking...</div>
+    <div class="discovery-settings-row" style="margin-bottom: 8px">
+      <div id="lastScannedStatus" style="font-size: 10px; opacity: 0.8; flex: 1 1 auto">Last scanned: never</div>
+      <label style="font-size: 11px">
+        Auto-refresh:
+        <select id="autoRefreshIntervalSelect" style="margin-left: 4px; font-size: 11px; padding: 2px 6px">
+          <option value="0" selected>Off</option>
+          <option value="30">30s</option>
+          <option value="60">1m</option>
+          <option value="300">5m</option>
+        </select>
+      </label>
+      <button id="refreshDiscoverBtn" class="secondary" style="padding: 4px 9px; font-size: 11px">Refresh</button>
+    </div>
+    <button id="discoverBtn" onclick="discoverDevices()" style="margin-bottom: 8px">
+      🔍 Discover
+    </button>
+    <button id="cancelDiscoverBtn"
+      style="margin-left: 6px; margin-bottom: 8px; display: none; padding: 6px 10px; font-size: 11px" class="secondary">
+      Cancel
+    </button>
+    <div id="discoverStatus" style="margin-bottom: 6px; font-size: 11px"></div>
+    <div id="discoverDevicesFound" style="margin-bottom: 6px; font-size: 11px; display: none"></div>
+    <div id="discoverPhaseProgress" class="discover-phase-progress" style="display: none">
+      <div class="discover-phase-track">
+        <div id="discoverPhaseFill" class="discover-phase-fill"></div>
       </div>
+      <div id="discoverPhaseLabel" class="discover-phase-label"></div>
+    </div>
+    <div id="discoveredList" style="display: none">
+      <h3 style="margin-top: 0; font-size: 12px; margin-bottom: 6px; font-weight: 600">Available Devices</h3>
+      <ul id="discoveredDevices" style="max-height: 300px; overflow-y: auto"></ul>
     </div>
+  </div>
 
-    <div class="card compact">
-      <h2>Configured Devices</h2>
-      <div id="status">Loading…</div>
-      <ul id="devices"></ul>
-      <!-- BLE encryption key fields will be rendered dynamically per device in the UI (see app.ts/devices.js) -->
-      <div
-        id="removeAllContainer"
-        style="
+  <div class="card compact">
+    <h2>Configured Devices</h2>
+    <div id="status">Loading…</div>
+    <ul id="devices"></ul>
+    <!-- BLE encryption key fields will be rendered dynamically per device in the UI (see app.ts/devices.js) -->
+    <div id="removeAllContainer" style="
           display: none;
           margin-top: 12px;
           padding-top: 10px;
           border-top: 1px solid rgba(0, 0, 0, 0.1);
-        "
-      >
-        <button
-          id="removeAllBtn"
-          style="
+        ">
+      <button id="removeAllBtn" style="
             background: #dc2626;
             width: 100%;
             padding: 7px 12px;
             font-size: 12px;
             font-weight: 500;
-          "
-        >
-          🗑️ Remove All Devices
-        </button>
-      </div>
+          ">
+        🗑️ Remove All Devices
+      </button>
     </div>
+  </div>
+
+  <script type="module" src="js/app.js"></script>
+</body>
 
-    <script type="module" src="js/app.js"></script>
-  </body>
-</html>
+</html>

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

@@ -192,7 +192,7 @@ export async function addDevice(
   deviceId: string,
   name: string,
   type: string,
-  options?: { address?: string, model?: string, rssi?: number, encryptionKey?: string, keyId?: string, matterType?: number },
+  options?: { address?: string, model?: string, rssi?: number, encryptionKey?: string, keyId?: string },
 ): Promise<any> {
   const payload: any = { deviceId, name, type }
   if (options?.address) {
@@ -210,9 +210,6 @@ export async function addDevice(
   if (options?.keyId) {
     payload.keyId = options.keyId
   }
-  if (options?.matterType !== undefined) {
-    payload.matterType = options.matterType
-  }
   uiLog.info('Adding device to config:', payload)
   const resp = await homebridge.request('/add-device', payload)
   uiLog.info('Add device response:', resp)
@@ -237,7 +234,6 @@ export async function updateDevice(
   deviceId: string,
   configDeviceName?: string,
   configDeviceType?: string,
-  options?: { matterType?: number },
 ): Promise<any> {
   const params: any = { deviceId }
   if (configDeviceName) {
@@ -246,9 +242,6 @@ export async function updateDevice(
   if (configDeviceType) {
     params.configDeviceType = configDeviceType
   }
-  if (options?.matterType !== undefined) {
-    params.matterType = options.matterType
-  }
   uiLog.info('[Update Device] Sending update request with params:', params)
   const resp = await homebridge.request('/update-device', params)
   uiLog.info('[Update Device] Update response:', resp)

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

@@ -1,17 +1,16 @@
 import { loadCredentialStatus, saveCredentials } from './credentials.js'
-import { loadConfiguredDevices, initRemoveAllButton } from './devices.js'
-// Wire up global event handlers
+import { initRemoveAllButton, loadConfiguredDevices } from './devices.js'
 import { discoverDevices, initializeDiscoverySettings } from './discovery.js';
 
-(window as any).loadCredentialStatus = loadCredentialStatus
-;(window as any).saveCredentials = saveCredentials
-;(window as any).discoverDevices = discoverDevices
+(window as any).loadCredentialStatus = loadCredentialStatus;
+(window as any).saveCredentials = saveCredentials;
+(window as any).discoverDevices = discoverDevices
 
 // Initialize on page load
 async function init(): Promise<void> {
   await loadCredentialStatus()
   await initializeDiscoverySettings()
-  const list = await loadConfiguredDevices()
+  await loadConfiguredDevices()
   await initRemoveAllButton()
 }