v3.1.3

Author: donavanbecker

config.schema.json

@@ -20,6 +20,15 @@
             "type": "boolean",
             "title": "Exclude Pico remotes that are associated with devices directly or in the Lutron app"
           },
+          "clickSpeed": {
+            "type": "string",
+            "title": "Double- and long-press speed",
+            "oneOf": [
+              { "title": "Fast", "enum": ["fast"] },
+              { "title": "Medium (default)", "enum": ["medium"] },
+              { "title": "Slow", "enum": ["slow"] }
+            ]
+          },
           "excludedDeviceTypes": {
             "type": "array",
             "title": "Exclude specific device types (HAP + Matter)",
@@ -46,15 +55,6 @@
             "uniqueItems": true,
             "default": []
           },
-          "clickSpeed": {
-            "type": "string",
-            "title": "Double- and long-press speed",
-            "oneOf": [
-              { "title": "Fast", "enum": ["fast"] },
-              { "title": "Medium (default)", "enum": ["medium"] },
-              { "title": "Slow", "enum": ["slow"] }
-            ]
-          },
           "logLevel": {
             "type": "string",
             "title": "Log Verbosity",
@@ -69,11 +69,11 @@
           "buttonPressLogging": {
             "type": "string",
             "title": "Button Press Logging",
-            "description": "How verbose to be about button-press events specifically. 'Debug' is the default and means presses are quiet in normal logs (visible only with global Homebridge debug). Use 'Info' if you want to see presses while wiring up automations without enabling global debug. Use 'Silent' to drop them entirely.",
-            "default": "debug",
+            "description": "How verbose to be about button-press events specifically. 'Info' is the default so presses are visible in normal logs. Use 'Debug' to show presses only with global Homebridge debug enabled. Use 'Silent' to drop them entirely.",
+            "default": "info",
             "oneOf": [
-              { "title": "Debug — visible only with global debug (default)", "enum": ["debug"] },
-              { "title": "Info — visible in normal logs", "enum": ["info"] },
+              { "title": "Info — visible in normal logs (default)", "enum": ["info"] },
+              { "title": "Debug — visible only with global debug", "enum": ["debug"] },
               { "title": "Silent — never logged", "enum": ["silent"] }
             ]
           }
@@ -86,12 +86,6 @@
         "description": "When enabled, the plugin will use the Homebridge Matter API to register accessories if it is available.",
         "default": true
       },
-      "preferMatter": {
-        "type": "boolean",
-        "title": "Prefer Matter over HAP",
-        "description": "When both Matter and HAP are available, prefer the Matter API for accessory registration.",
-        "default": true
-      },
       "secrets": {
         "type": "array",
         "items": {
@@ -128,6 +122,18 @@
       ]
 
     },
+    {
+      "type": "div",
+      "displayFlex": true,
+      "items": [
+        {
+          "key": "enableMatter",
+          "notitle": false,
+          "type": "boolean",
+          "flex": "1 1 300px"
+        }
+      ]
+    },
     {
       "key": "options.excludedDeviceTypes",
       "type": "checkboxes",
@@ -168,24 +174,6 @@
         }
       ]
     },
-    {
-      "type": "div",
-      "displayFlex": true,
-      "items": [
-        {
-          "key": "enableMatter",
-          "notitle": false,
-          "type": "boolean",
-          "flex": "1 1 150px"
-        },
-        {
-          "key": "preferMatter",
-          "notitle": false,
-          "type": "boolean",
-          "flex": "1 1 150px"
-        }
-      ]
-    },
     {
       "key": "secrets",
       "type": "array",

package-lock.json

@@ -2,7 +2,7 @@
   "name": "@homebridge-plugins/homebridge-lutron-caseta-leap",
   "displayName": "Lutron Caseta LEAP",
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Support for the Lutron Caseta Smart Bridge 2",
   "license": "Apache-2.0",
   "repository": {

package.json

@@ -82,10 +82,10 @@ export class ButtonTracker {
     clickSpeedDouble = 'default',
     clickSpeedLong = 'default',
     isUpDownButton = false,
-    // Default 'debug' matches the platform's optionsFromConfig default —
+    // Default 'info' matches the platform's optionsFromConfig default —
     // safe even if a caller (e.g. a future device type or a test) forgets
     // to thread the option through.
-    private buttonPressLogging: ButtonPressLogLevel = 'debug',
+    private buttonPressLogging: ButtonPressLogLevel = 'info',
   ) {
     log.debug(`btrk ${this.href} created speed ${clickSpeedDouble} dbl ${clickSpeedLong} long`)
 

src/ButtonState.ts

@@ -29,9 +29,9 @@ export type LogLevelOption = 'normal' | 'quiet' | 'errors-only'
  *
  *   'info'   — visible at info level (legacy behavior; useful when wiring
  *              up automations and you want to see presses without enabling
- *              global Homebridge debug).
- *   'debug'  — visible at debug level only (new default). Quiet in normal
- *              logs; flip Homebridge's global debug to see presses.
+ *              global Homebridge debug). Default.
+ *   'debug'  — visible at debug level only. Quiet in normal logs; flip
+ *              Homebridge's global debug to see presses.
  *   'silent' — never log presses at any level.
  */
 export type ButtonPressLogLevel = 'info' | 'debug' | 'silent'

src/Logger.ts

@@ -179,11 +179,11 @@ export class LutronCasetaLeap
         // Defaults reflect the post-reclassification "sane quiet by default"
         // posture. logLevel 'normal' means the wrapper is a passthrough; the
         // quietness comes from the call sites being correctly classified.
-        // buttonPressLogging 'debug' means presses are not visible in normal
-        // logs (a behavior change from earlier versions); use 'info' to
-        // restore the old chatty behavior, or 'silent' to drop them entirely.
+        // buttonPressLogging 'info' keeps press events visible in normal logs.
+        // Users can set 'debug' to only show presses with global Homebridge
+        // debug enabled, or 'silent' to drop them entirely.
         logLevel: 'normal',
-        buttonPressLogging: 'debug',
+        buttonPressLogging: 'info',
       },
       config.options,
       { excludedDeviceTypes },

src/Platform.HAP.ts

@@ -5,5 +5,4 @@ export const PLATFORM_NAME = 'LutronCasetaLeap'
 
 export interface LutronCasetaLeapPluginConfig extends PlatformConfig {
   enableMatter?: boolean
-  preferMatter?: boolean
 }

src/settings.ts

@@ -11,23 +11,19 @@ import { createPlatformProxy, normalizeConfig } from './utils.js'
 describe('normalizeConfig', () => {
   it('returns defaults when called with undefined', () => {
     const cfg = normalizeConfig(undefined)
-    expect(cfg.preferMatter).toBe(true)
     expect(cfg.enableMatter).toBe(true)
   })
 
   it('applies defaults for fields absent in raw config', () => {
     const cfg = normalizeConfig({ platform: 'LutronCasetaLeap' } as PlatformConfig)
-    expect(cfg.preferMatter).toBe(true)
     expect(cfg.enableMatter).toBe(true)
   })
 
   it('respects explicit false values over defaults', () => {
     const cfg = normalizeConfig({
       platform: 'LutronCasetaLeap',
-      preferMatter: false,
       enableMatter: false,
     } as PlatformConfig)
-    expect(cfg.preferMatter).toBe(false)
     expect(cfg.enableMatter).toBe(false)
   })
 
@@ -91,15 +87,6 @@ describe('createPlatformProxy – platform selection', () => {
     expect(Matter).not.toHaveBeenCalled()
   })
 
-  it('uses HAP when preferMatter is false even if Matter is available', () => {
-    const HAP = vi.fn()
-    const Matter = vi.fn()
-    const Proxy = createPlatformProxy(HAP, Matter)
-    new Proxy({}, { ...baseConfig, preferMatter: false }, makeApi(true, true))
-    expect(HAP).toHaveBeenCalledOnce()
-    expect(Matter).not.toHaveBeenCalled()
-  })
-
   it('uses HAP when api has no isMatterAvailable method', () => {
     const HAP = vi.fn()
     const Matter = vi.fn()

src/utils.test.ts

@@ -8,7 +8,6 @@ import type { LutronCasetaLeapPluginConfig } from './settings.js'
  */
 export function normalizeConfig(raw?: PlatformConfig): LutronCasetaLeapPluginConfig {
   const defaults: Partial<LutronCasetaLeapPluginConfig> = {
-    preferMatter: true,
     enableMatter: true,
   }
   if (!raw) {
@@ -24,8 +23,8 @@ export function normalizeConfig(raw?: PlatformConfig): LutronCasetaLeapPluginCon
  * required by the `DynamicPlatformPlugin` interface to the chosen
  * implementation so that cached accessories are always tracked correctly.
  *
- * @param HAPPlatform  The standard HAP platform class constructor.
- * @param MatterPlatform  The Matter platform class constructor.
+ * @param HAPPlatform The standard HAP platform class constructor.
+ * @param MatterPlatform The Matter platform class constructor.
  * @returns A proxy class that delegates to the correct platform implementation.
  */
 export function createPlatformProxy(HAPPlatform: any, MatterPlatform: any): any {
@@ -35,14 +34,12 @@ export function createPlatformProxy(HAPPlatform: any, MatterPlatform: any): any
 
     constructor(log: any, config: PlatformConfig, api: any) {
       const cfg = normalizeConfig(config)
-      const preferMatter = cfg.preferMatter as boolean
       const enableMatter = cfg.enableMatter as boolean
       const matterAvailable = !!(api?.isMatterAvailable?.() && api?.isMatterEnabled?.())
 
-      if (enableMatter && preferMatter && MatterPlatform && matterAvailable) {
+      if (enableMatter && MatterPlatform && matterAvailable) {
         this.impl = new MatterPlatform(log, cfg, api)
-      }
-      else {
+      } else {
         // Fallback to HAP
         this.impl = new HAPPlatform(log, cfg, api)
       }