Merge pull request #2518 from SmartThingsCommunity/chore/zwave-switch-ll-refactor

zwave-switch lazy loading of sub drivers refactor

Author: aleclorimer

drivers/SmartThings/zwave-switch/src/aeon-smart-strip/can_handle.lua

@@ -0,0 +1,24 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
+--- Determine whether the passed device is Aeon smart strip
+---
+--- @param driver Driver driver instance
+--- @param device Device device isntance
+--- @return boolean true if the device proper, else false
+local function can_handle_aeon_smart_strip(opts, driver, device, ...)
+  local fingerprints = {
+    {mfr = 0x0086, prod = 0x0003, model = 0x000B}, -- Aeon Smart Strip DSC11-ZWUS
+  }
+  for _, fingerprint in ipairs(fingerprints) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      local subdriver = require("aeon-smart-strip")
+      return true, subdriver
+    end
+  end
+  return false
+end
+
+
+return can_handle_aeon_smart_strip

drivers/SmartThings/zwave-switch/src/aeon-smart-strip/init.lua

@@ -1,16 +1,5 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass
@@ -24,29 +13,10 @@ local Meter = (require "st.zwave.CommandClass.Meter")({ version = 3 })
 --- @type st.zwave.CommandClass.SwitchBinary
 local SwitchBinary = (require "st.zwave.CommandClass.SwitchBinary")({ version = 2 })
 
-local AEON_SMART_STRIP_FINGERPRINTS = {
-  {mfr = 0x0086, prod = 0x0003, model = 0x000B}, -- Aeon Smart Strip DSC11-ZWUS
-}
-
 local ENERGY_UNIT_KWH = "kWh"
 local ENERGY_UNIT_KVAH = "kVAh"
 local POWER_UNIT_WATT = "W"
 
---- Determine whether the passed device is Aeon smart strip
----
---- @param driver Driver driver instance
---- @param device Device device isntance
---- @return boolean true if the device proper, else false
-local function can_handle_aeon_smart_strip(opts, driver, device, ...)
-  for _, fingerprint in ipairs(AEON_SMART_STRIP_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      local subdriver = require("aeon-smart-strip")
-      return true, subdriver
-    end
-  end
-  return false
-end
-
 local function binary_event_helper(self, device, cmd)
   local value = cmd.args.value and cmd.args.value or cmd.args.target_value
   local event = value == SwitchBinary.value.OFF_DISABLE and capabilities.switch.switch.off() or capabilities.switch.switch.on()
@@ -108,7 +78,7 @@ local aeon_smart_strip = {
       [Meter.REPORT] = meter_report_handler
     }
   },
-  can_handle = can_handle_aeon_smart_strip,
+  can_handle = require("aeon-smart-strip.can_handle"),
 }
 
 return aeon_smart_strip

drivers/SmartThings/zwave-switch/src/aeotec-heavy-duty/can_handle.lua

@@ -0,0 +1,18 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle(opts, driver, device, ...)
+  local fingerprints = {
+    { mfr = 0x0086, model = 0x004E }
+  }
+
+  for _, fingerprint in ipairs(fingerprints) do
+    if device:id_match(fingerprint.mfr, nil, fingerprint.model) then
+      local subdriver = require("aeotec-heavy-duty")
+      return true, subdriver
+    end
+  end
+  return false
+end
+
+return can_handle

drivers/SmartThings/zwave-switch/src/aeotec-heavy-duty/init.lua

@@ -1,18 +1,5 @@
--- Author: CommanderQ
---
--- Copyright 2021 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass.Meter
@@ -29,20 +16,6 @@ local LAST_REPORT_TIME = "LAST_REPORT_TIME"
 local POWER_UNIT_WATT = "W"
 local ENERGY_UNIT_KWH = "kWh"
 
-local FINGERPRINTS = {
-  { mfr = 0x0086, model = 0x004E }
-}
-
-local function can_handle(opts, driver, device, ...)
-  for _, fingerprint in ipairs(FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, nil, fingerprint.model) then
-      local subdriver = require("aeotec-heavy-duty")
-      return true, subdriver
-    end
-  end
-  return false
-end
-
 local function emit_power_consumption_report_event(device, value, channel)
   -- powerConsumptionReport report interval
   local current_time = os.time()
@@ -128,7 +101,7 @@ local driver_template = {
   lifecycle_handlers = {
     infoChanged = info_changed
   },
-  can_handle = can_handle
+  can_handle = require("aeotec-heavy-duty.can_handle")
 }
 
-return driver_template;
+return driver_template;

drivers/SmartThings/zwave-switch/src/aeotec-smart-switch/can_handle.lua

@@ -0,0 +1,21 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
+local function can_handle(opts, driver, device, ...)
+  local fingerprints = {
+    {mfr = 0x0086, prodId = 0x0060},
+    {mfr = 0x0371, prodId = 0x00AF}, -- Smart Switch 7 EU
+    {mfr = 0x0371, prodId = 0x0017}  -- Smart Switch 7 US
+  }
+
+  for _, fingerprint in ipairs(fingerprints) do
+    if device:id_match(fingerprint.mfr, nil, fingerprint.prodId) then
+      local subdriver = require("aeotec-smart-switch")
+      return true, subdriver
+    end
+  end
+  return false
+end
+
+return can_handle

drivers/SmartThings/zwave-switch/src/aeotec-smart-switch/init.lua

@@ -1,16 +1,5 @@
--- Copyright 2023 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
 
 local capabilities = require "st.capabilities"
 local Basic = (require "st.zwave.CommandClass.Basic")({ version=1 })
@@ -28,22 +17,6 @@ local LAST_REPORT_TIME = "LAST_REPORT_TIME"
 local POWER_UNIT_WATT = "W"
 local ENERGY_UNIT_KWH = "kWh"
 
-local FINGERPRINTS = {
-  {mfr = 0x0086, prodId = 0x0060},
-  {mfr = 0x0371, prodId = 0x00AF}, -- Smart Switch 7 EU
-  {mfr = 0x0371, prodId = 0x0017}  -- Smart Switch 7 US
-}
-
-local function can_handle(opts, driver, device, ...)
-  for _, fingerprint in ipairs(FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, nil, fingerprint.prodId) then
-      local subdriver = require("aeotec-smart-switch")
-      return true, subdriver
-    end
-  end
-  return false
-end
-
 local function emit_power_consumption_report_event(device, value, channel)
   -- powerConsumptionReport report interval
   local current_time = os.time()
@@ -144,7 +117,7 @@ local aeotec_smart_switch = {
       [Meter.REPORT] = meter_report_handler
     }
   },
-  can_handle = can_handle
+  can_handle = require("aeotec-smart-switch.can_handle")
 }
 
 return aeotec_smart_switch

drivers/SmartThings/zwave-switch/src/configurations.lua

@@ -1,16 +1,5 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
 
 local devices = {
   AEOTEC_METERING_SWITCH = {

drivers/SmartThings/zwave-switch/src/dawon-smart-plug/can_handle.lua

@@ -0,0 +1,24 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
+--- Determine whether the passed device is Dawon smart plug
+---
+--- @param driver Driver driver instance
+--- @param device Device device isntance
+--- @return boolean true if the device proper, else false
+local function can_handle_dawon_smart_plug(opts, driver, device, ...)
+  local fingerprints = {
+    {mfr = 0x018C, prod = 0x0042, model = 0x0005}, -- Dawon Smart Plug
+    {mfr = 0x018C, prod = 0x0042, model = 0x0008} -- Dawon Smart Multitab
+  }
+  for _, fingerprint in ipairs(fingerprints) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      local subdriver = require("dawon-smart-plug")
+      return true, subdriver
+    end
+  end
+  return false
+end
+
+return can_handle_dawon_smart_plug

drivers/SmartThings/zwave-switch/src/dawon-smart-plug/init.lua

@@ -1,42 +1,13 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass
 local cc = require "st.zwave.CommandClass"
 --- @type st.zwave.CommandClass.Notification
 local Notification = (require "st.zwave.CommandClass.Notification")({ version = 3 })
 
-local DAWON_SMART_PLUG_FINGERPRINTS = {
-  {mfr = 0x018C, prod = 0x0042, model = 0x0005}, -- Dawon Smart Plug
-  {mfr = 0x018C, prod = 0x0042, model = 0x0008} -- Dawon Smart Multitab
-}
 
---- Determine whether the passed device is Dawon smart plug
----
---- @param driver Driver driver instance
---- @param device Device device isntance
---- @return boolean true if the device proper, else false
-local function can_handle_dawon_smart_plug(opts, driver, device, ...)
-  for _, fingerprint in ipairs(DAWON_SMART_PLUG_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      local subdriver = require("dawon-smart-plug")
-      return true, subdriver
-    end
-  end
-  return false
-end
 
 --- Default handler for notification reports
 ---
@@ -60,7 +31,7 @@ local dawon_smart_plug = {
       [Notification.REPORT] = notification_report_handler
     }
   },
-  can_handle = can_handle_dawon_smart_plug
+  can_handle = require("dawon-smart-plug.can_handle")
 }
 
 return dawon_smart_plug

drivers/SmartThings/zwave-switch/src/dawon-wall-smart-switch/can_handle.lua

@@ -0,0 +1,21 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
+--- Determine whether the passed device is Dawon wall smart switch
+---
+--- @param driver Driver driver instance
+--- @param device Device device isntance
+--- @return boolean true if the device proper, else false
+local function can_handle_dawon_wall_smart_switch(opts, driver, device, ...)
+  local fingerprints = require("dawon-wall-smart-switch.fingerprints")
+  for _, fingerprint in ipairs(fingerprints) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      local subdriver = require("dawon-wall-smart-switch")
+      return true, subdriver
+    end
+  end
+  return false
+end
+
+return can_handle_dawon_wall_smart_switch