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

package/test/utils.spec.ts

@@ -2,11 +2,15 @@ import { describe, it, expect } from 'vitest'
 import { createPlatformProxy } from '../src/utils'
 
 describe('createPlatformProxy', () => {
-  it('returns Matter platform when preferMatter and enabled', () => {
+  it('returns Matter platform when preferMatter, enabled, and Matter API is available', () => {
     class HAP {}
     class Matter {}
     const ProxyCtor: any = createPlatformProxy(HAP, Matter)
-    const impl = new (ProxyCtor as any)(console, { preferMatter: true, enableMatter: true }, undefined)
+    const api = {
+      isMatterAvailable: () => true,
+      isMatterEnabled: () => true,
+    }
+    const impl = new (ProxyCtor as any)(console, { preferMatter: true, enableMatter: true }, api)
     expect(impl).toBeInstanceOf(Matter)
   })
 
@@ -17,4 +21,16 @@ describe('createPlatformProxy', () => {
     const impl = new (ProxyCtor as any)(console, { preferMatter: false, enableMatter: true }, undefined)
     expect(impl).toBeInstanceOf(HAP)
   })
+
+  it('returns HAP platform when Matter API is unavailable', () => {
+    class HAP {}
+    class Matter {}
+    const ProxyCtor: any = createPlatformProxy(HAP, Matter)
+    const api = {
+      isMatterAvailable: () => false,
+      isMatterEnabled: () => false,
+    }
+    const impl = new (ProxyCtor as any)(console, { preferMatter: true, enableMatter: true }, api)
+    expect(impl).toBeInstanceOf(HAP)
+  })
 })

package/todo/COMPLETED.md

@@ -23,6 +23,17 @@ This file tracks all completed features and improvements for the SwitchBot Homeb
 
 ## Bug Fixes
 
+### Matter Window Covering Conformance ✅ COMPLETED
+
+- [x] **Fix Matter window covering Drapery enum validation error**
+  - [x] **Issue:** Matter accessory registration failed for Curtain devices
+  - [x] **Error:** `Conformance "LF & !TL": Matter does not allow enum value Drapery (ID 4) here`
+  - [x] **Related Runtime Failure:** `[Matter/Server] Failed to register Matter accessory ... [endpoint-behaviors] Behaviors have errors` with rollback from Matter transaction initialization
+  - [x] **Root Cause:** `windowCovering.type` used `Drapery` for lift-only curtain mappings
+  - [x] **Fix:** Updated curtain Matter default to a compliant lift-only covering enum and added regression coverage
+
+  **Status:** Curtain-type Matter accessories now register without the Drapery conformance failure.
+
 ### Invalid Device Type Validation ✅ COMPLETED
 
 - [x] **Fix invalid device type in config schema validation**
@@ -137,10 +148,52 @@ This file tracks all completed features and improvements for the SwitchBot Homeb
 - Real-time search box
 - All preferences saved and restored on next discovery
 
+### One-Click Device Import ✅ COMPLETED
+
+- [x] Added "Add to Config" button for each discovered device
+- [x] Added auto-populated import modal with discovered name/type defaults
+- [x] Added BLE MAC pre-fill in import flow and persistence to config on single add
+- [x] Added confirmation toast/status messaging on successful import
+
+**Implementation:**
+- Updated discovery row action in `render.ts` to use explicit "Add to Config" CTA
+- Added `importDiscoveredDevice()` modal in `modals.ts` for prefilled import settings
+- Extended single-add client payload in `api.ts` to include optional `address`, `model`, and `rssi`
+- Extended `/add-device` endpoint in `devices.ts` to persist discovered metadata (MAC/model/RSSI)
+
+**Status:** One-click import now supports prefilled configuration and BLE MAC carry-through for direct connection setup.
+
+### Duplicate Detection ✅ COMPLETED
+
+- [x] Check if discovered device ID already exists in config
+- [x] Show badge: "✓ Already Added" (green) or "➕ New Device" (blue)
+- [x] Disable/hide "Add" button for already-added devices
+- [x] Add "View in Config" link for existing devices
+
+**Implementation:**
+- Discovery view now fetches configured device IDs and tags discovered rows as existing/new
+- Existing devices show `Already Added` state with disabled add action
+- Existing devices include a `View in Config` action that scrolls and highlights the configured entry
+
+**Status:** Duplicate devices are clearly identified at discovery time, preventing accidental re-adds and improving navigation to existing config entries.
+
 ---
 
 ## Bug Fixes & Technical Debt
 
+### Fix Discovery Not Showing Devices ✅ COMPLETED
+
+- [x] **Issue:** No devices appear in discovery results after clicking "Discover Devices"
+- [x] **Root Cause:** Discovery UI cleared the `#discoveredList` div (including the `<ul id="discoveredDevices">` element), but then tried to replace a non-existent element when rendering discovered devices
+- [x] **Effect:** `document.getElementById('discoveredDevices')?.replaceWith(ul)` silently failed due to optional chaining, leaving the list empty
+
+**Implementation:**
+- Modified `discoverDevices()` in `discovery.ts` to create a new `<ul id="discoveredDevices">` container if it doesn't exist after clearing controls
+- Updated `updateDiscoveryView()` to check if the element exists before using `replaceWith()`, with fallback to append if element is missing
+- Added proper element lifecycle management for discovery list rendering
+
+**Status:** Discovery now properly displays all discovered devices. Devices appear correctly with filters, sorting, and duplicate detection badges.
+
 ### Fix lint & lint:fix scripts ✅ COMPLETED
 
 - [x] Update ESLint configuration to include `src/homebridge-ui/**/*.ts` files

package/todo/TODO.md

@@ -4,19 +4,7 @@
 
 ### Bug Fixes (Priority: Critical)
 
-#### Matter Window Covering Conformance Issue
-
-- [ ] **Fix Matter window covering Drapery enum validation error**
-  - [ ] **Issue:** Matter accessory registration fails for Curtain devices
-  - [ ] **Error:** `Conformance "LF & !TL": Matter does not allow enum value Drapery (ID 4) here`
-  - [ ] **Root Cause:** windowCovering.state.type is set to "Drapery" but Matter spec requires "LF & !TL" conformance (Lift Fail without Tilt)
-  - [ ] **Solution:** Need to validate/correct window covering type mappings for Matter compatibility
-  - [ ] **Affected Devices:** Curtain-type devices (e.g., "Master Bathroom Left Curtain")
-  - [ ] **Steps to Fix:**
-    - [ ] Check Matter window covering specification for valid type combinations
-    - [ ] Update device type mapping to use compliant enum values
-    - [ ] Validate conformance rules for Lift/Tilt combinations
-    - [ ] Test with Curtain, Curtain3, and Roller Shade devices
+- No active critical bug fixes right now.
 
 ---
 
@@ -24,21 +12,7 @@
 
 ### Quick Wins (Priority: High)
 
-#### 1. One-Click Device Import
-
-- [ ] Add "Add to Config" button next to each discovered device
-- [ ] Implement auto-populate device configuration modal with discovered values
-- [ ] Pre-fill MAC address for BLE devices to enable direct connection
-- [ ] Add confirmation toast message on successful import
-
-#### 2. Duplicate Detection
-
-- [ ] Check if discovered device ID already exists in config
-- [ ] Show badge: "✓ Already Added" (green) or "➕ New Device" (blue)
-- [ ] Disable/hide "Add" button for already-added devices
-- [ ] Add "View in Config" link for existing devices
-
-#### 3. Better Loading States
+#### 1. Better Loading States
 
 - [ ] Show progress indicator: "Scanning BLE... (5s)" → "Fetching OpenAPI..." → "Complete"
 - [ ] Add progress bar or spinner for each discovery phase
@@ -48,7 +22,7 @@
 
 ### Medium Effort (Priority: Medium)
 
-#### 4. Device Grouping
+#### 2. Device Grouping
 
 - [ ] Implement grouping by Hub (show which devices are on which hub)
 - [ ] Implement grouping by Connection Type
@@ -56,14 +30,14 @@
 - [ ] Show device count per group
 - [ ] Remember expanded/collapsed state
 
-#### 5. Connection Recommendations
+#### 3. Connection Recommendations
 
 - [ ] Add badge: "⚡ Recommended: BLE" for devices with strong signal (> -70 dBm)
 - [ ] Add badge: "☁️ Recommended: API" for hub-dependent devices
 - [ ] Show tooltip explaining why recommendation is made
 - [ ] Consider device type (some work better with BLE vs API)
 
-#### 6. Configurable BLE Scan
+#### 4. Configurable BLE Scan
 
 - [ ] Add settings panel with scan duration options (3s/5s/10s/15s)
 - [ ] Add option to disable BLE scanning if no Bluetooth adapter
@@ -71,7 +45,7 @@
 - [ ] Remember user preferences in localStorage
 - [ ] Show system Bluetooth availability status
 
-#### 7. Discovery History/Cache
+#### 5. Discovery History/Cache
 
 - [ ] Cache last discovery results for 5 minutes
 - [ ] Show "Last scanned: X minutes ago" with timestamp
@@ -79,7 +53,7 @@
 - [ ] Show cached results immediately on page load
 - [ ] Auto-refresh option with configurable interval
 
-#### 8. Detailed Device Info Panel
+#### 6. Detailed Device Info Panel
 
 - [ ] Add click-to-expand device details panel
 - [ ] Show extended information:
@@ -93,14 +67,14 @@
 
 ### Advanced Features (Priority: Low)
 
-#### 9. Real-Time BLE Scanning
+#### 7. Real-Time BLE Scanning
 
 - [ ] Show devices as they're discovered (streaming results)
 - [ ] Add animated "pulsing" indicator for active BLE scan
 - [ ] Update RSSI values in real-time during scan
 - [ ] Show "X devices found..." counter during scan
 
-#### 10. Connection Testing
+#### 8. Connection Testing
 
 - [ ] Add "Test Connection" button per device
 - [ ] Attempt to connect and read basic device status
@@ -108,7 +82,7 @@
 - [ ] Display connection latency
 - [ ] Show which connection method succeeded (BLE/API)
 
-#### 11. Batch Import
+#### 9. Batch Import
 
 - [ ] Add checkboxes to select multiple devices
 - [ ] Add "Add Selected to Config" button
@@ -116,7 +90,7 @@
 - [ ] Show progress for batch operations
 - [ ] Allow batch enable/disable of devices
 
-#### 12. Device Health Dashboard
+#### 10. Device Health Dashboard
 
 - [ ] Show battery warnings (< 20%) with yellow/red indicators
 - [ ] Show firmware update available indicators
@@ -124,7 +98,7 @@
 - [ ] Add "Needs Attention" section at top
 - [ ] Implement battery level trending (if historical data available)
 
-#### 13. Export/Import Discovery
+#### 11. Export/Import Discovery
 
 - [ ] Add "Export Results" button (JSON format)
 - [ ] Add "Import Results" for comparison or troubleshooting
@@ -172,10 +146,7 @@
 
 ### Must Do (Next Release)
 
-1. Fix Matter window covering conformance issue (CRITICAL)
-2. One-Click Device Import
-3. Duplicate Detection
-4. Better Loading States
+1. Better Loading States
 
 ### Should Do (Soon)