Merge branch 'main' into revert/pr-1850

Author: greens

Jenkinsfile

@@ -28,13 +28,14 @@ pipeline {
   agent {
     docker {
       image 'python:3.10'
-      label 'production'
+      label  "${params.NODE_LABEL ?: 'production'}"
       args '--entrypoint= -u 0:0'
     }
   }
   environment {
     BRANCH = getEnvName()
     CHANGED_DRIVERS = getChangedDrivers()
+    ENVIRONMENT = "${env.NODE_LABEL.toUpperCase()}"
   }
   stages {
     stage('requirements') {
@@ -51,22 +52,13 @@ pipeline {
       }
     }
     stage('update') {
-      matrix {
-        axes {
-          axis {
-            name 'ENVIRONMENT'
-            values 'DEV', 'STAGING', 'ACCEPTANCE', 'PRODUCTION'
-          }
-        }
-        stages {
-          stage('environment_update') {
-            steps {
-              sh 'python3 tools/deploy.py'
-            }
+      stages {
+        stage('environment_update') {
+          steps {
+            sh 'python3 tools/deploy.py'
           }
         }
       }
     }
   }
 }
-

drivers/Aqara/aqara-cube/src/init.lua

@@ -125,7 +125,8 @@ local aqara_cube_t1_pro_handler = {
   lifecycle_handlers = {
     init = device_init,
     added = device_added
-  }
+  },
+  health_check = false,
 }
 
 local aqara_cube_t1_pro_driver = ZigbeeDriver("aqara_cube_t1_pro", aqara_cube_t1_pro_handler)

drivers/Aqara/aqara-feeder/src/init.lua

@@ -184,6 +184,7 @@ local aqara_pet_feeder_handler = {
     infoChanged = device_info_changed,
     doConfigure = device_configure
   },
+  health_check = false,
   can_handle = function(opts, driver, device, ...)
     return device:get_model() == "aqara.feeder.acn001"
   end

drivers/Aqara/aqara-lock/fingerprints.yml

@@ -4,3 +4,13 @@ zigbeeManufacturer:
     manufacturer: Lumi
     model: aqara.lock.akr011
     deviceProfileName: aqara-lock-battery
+  - id: "lumi/aqara.lock.akr001"
+    deviceLabel: "Aqara Doorlock L100"
+    manufacturer: lumi
+    model: aqara.lock.akr001
+    deviceProfileName: aqara-lock-battery
+  - id: "Lumi/aqara.lock.akr001"
+    deviceLabel: "Aqara Doorlock L100"
+    manufacturer: Lumi
+    model: aqara.lock.akr001
+    deviceProfileName: aqara-lock-battery

drivers/Aqara/aqara-lock/profiles/aqara-lock-battery.yml

@@ -6,6 +6,8 @@ components:
     version: 1
   - id: battery
     version: 1
+  - id: batteryLevel
+    version: 1
   - id: lockAlarm
     version: 1
   - id: remoteControlStatus

drivers/Aqara/aqara-lock/src/init.lua

@@ -25,6 +25,10 @@ local SUPPORTED_ALARM_VALUES = { "damaged", "forcedOpeningAttempt", "unableToLoc
 local SERIAL_NUM_TX = "serial_num_tx"
 local SERIAL_NUM_RX = "serial_num_rx"
 local SEQ_NUM = "seq_num"
+local THRESHOLD_BATTERY = {
+  ["aqara.lock.akr011"] = { low = 47, dryout = 28 },  -- K100
+  ["aqara.lock.akr001"] = { low = 47, dryout = 31 }   -- L100
+}
 
 local function my_secret_data_handler(driver, device, secret_info)
   if secret_info.secret_kind ~= "aqara" then return end
@@ -75,12 +79,19 @@ local function device_init(self, device)
   device:emit_event(capabilities.lock.supportedUnlockDirections({ "fromInside", "fromOutside" },
     { visibility = { displayed = false } }))
   device:emit_event(capabilities.battery.type("AA"))
-  device:emit_event(capabilities.battery.quantity(8))
+  device:emit_event(capabilities.batteryLevel.type("AA"))
+  local battery_quantity = 8
+  if device:get_model() == "aqara.lock.akr001" then
+    battery_quantity = 6
+  end
+  device:emit_event(capabilities.battery.quantity(battery_quantity))
+  device:emit_event(capabilities.batteryLevel.quantity(battery_quantity))
 end
 
 local function device_added(self, device)
   remoteControlShow(device)
   device:emit_event(Battery.battery(100))
+  device:emit_event(capabilities.batteryLevel.battery("normal"))
   device:emit_event(LockAlarm.alarm.clear({ visibility = { displayed = false } }))
   device:emit_event(antiLockStatus.antiLockStatus("unknown", { visibility = { displayed = false } }))
   device:emit_event(Lock.lock.locked())
@@ -154,8 +165,18 @@ local function event_door_handler(driver, device, evt_name, evt_value)
   end
 end
 
+local function calc_battery_level(model, level)
+  local batteryLevel = "normal"
+  if level < THRESHOLD_BATTERY[model].dryout then
+    batteryLevel = "critical"
+  elseif level < THRESHOLD_BATTERY[model].low then
+    batteryLevel = "warning"
+  end
+  return batteryLevel
+end
 local function event_battery_handler(driver, device, evt_name, evt_value)
   device:emit_event(Battery.battery(evt_value))
+  device:emit_event(capabilities.batteryLevel.battery(calc_battery_level(device:get_model(), evt_value)))
 end
 
 local function event_abnormal_status_handler(driver, device, evt_name, evt_value)
@@ -321,7 +342,8 @@ local aqara_locks_handler = {
   },
   secret_data_handlers = {
     [security.SECRET_KIND_AQARA] = my_secret_data_handler
-  }
+  },
+  health_check = false,
 }
 
 local aqara_locks_driver = ZigbeeDriver("aqara_locks_k100", aqara_locks_handler)

drivers/Aqara/aqara-lock/src/test/test_aqara_lock.lua

@@ -13,6 +13,7 @@ test.add_package_capability("lockCredentialInfo.yaml")
 local lockAlarm = capabilities["lockAlarm"]
 test.add_package_capability("lockAlarm.yaml")
 local Battery = capabilities.battery
+local BatteryLevel = capabilities.batteryLevel
 local Lock = capabilities.lock
 
 local PRI_CLU = 0xFCC0
@@ -45,7 +46,9 @@ local function test_init()
   test.socket.capability:__expect_send(mock_device:generate_test_message("main",
     Lock.supportedUnlockDirections({"fromInside", "fromOutside"}, { visibility = { displayed = false } })))
   test.socket.capability:__expect_send(mock_device:generate_test_message("main", Battery.type("AA")))
+  test.socket.capability:__expect_send(mock_device:generate_test_message("main", BatteryLevel.type("AA")))
   test.socket.capability:__expect_send(mock_device:generate_test_message("main", Battery.quantity(8)))
+  test.socket.capability:__expect_send(mock_device:generate_test_message("main", BatteryLevel.quantity(8)))
   test.mock_device.add_test_device(mock_device)
 end
 test.set_test_init_function(test_init)
@@ -59,6 +62,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
       remoteControlStatus.remoteControlEnabled('false', { visibility = { displayed = false } })))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", Battery.battery(100)))
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main", BatteryLevel.battery("normal")))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
       lockAlarm.alarm.clear({ visibility = { displayed = false } })))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
@@ -76,6 +80,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
       remoteControlStatus.remoteControlEnabled('true', { visibility = { displayed = false } })))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", Battery.battery(100)))
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main", BatteryLevel.battery("normal")))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
       lockAlarm.alarm.clear({ visibility = { displayed = false } })))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",

drivers/Aqara/aqara-presence-sensor/src/discovery.lua

@@ -1,10 +1,11 @@
 local log = require "log"
-local discovery = {}
 local fields = require "fields"
 local discovery_mdns = require "discovery_mdns"
 local socket = require "cosock.socket"
 
-local processing_devices = {}
+local discovery = {
+  last_try_time = {}
+}
 
 function discovery.set_device_field(driver, device)
   local device_cache_value = driver.datastore.discovery_cache[device.device_network_id]
@@ -22,8 +23,7 @@ function discovery.set_device_field(driver, device)
   driver.datastore.discovery_cache[device.device_network_id] = nil
 end
 
-local function update_device_discovery_cache(driver, dni, ip)
-  local device_info = driver.discovery_helper.get_device_info(driver, dni, ip)
+local function update_device_discovery_cache(driver, dni, ip, device_info)
   if driver.datastore.discovery_cache[dni] == nil then
     driver.datastore.discovery_cache[dni] = {}
   end
@@ -33,9 +33,14 @@ end
 
 local function try_add_device(driver, device_dni, device_ip)
   log.trace(string.format("try_add_device : dni= %s, ip= %s", device_dni, device_ip))
+  local device_info = driver.discovery_helper.get_device_info(driver, device_dni, device_ip)
 
-  update_device_discovery_cache(driver, device_dni, device_ip)
-  local create_device_msg = driver.discovery_helper.get_device_create_msg(driver, device_dni, device_ip)
+  update_device_discovery_cache(driver, device_dni, device_ip, device_info)
+  local create_device_msg = driver.discovery_helper.get_device_create_msg(driver, device_dni, device_ip, device_info)
+  if not create_device_msg then
+    log.error_with({ hub_logs = true }, string.format("Failed to get device info. dni= %s, ip= %s", device_dni, device_ip))
+    return "device info not found"
+  end
 
   local credential = driver.discovery_helper.get_credential(driver, device_dni, device_ip)
 
@@ -52,15 +57,20 @@ local function try_add_device(driver, device_dni, device_ip)
   end
 
   log.info_with({ hub_logs = true }, string.format("try_create_device. dni= %s, ip= %s", device_dni, device_ip))
-  processing_devices[device_dni] = true
-  driver:try_create_device(create_device_msg)
+
+  local success, ret = pcall(driver.try_create_device, driver, create_device_msg)
+  if success then
+    discovery.last_try_time[device_dni] = os.time()
+  else
+    log.error_with({ hub_logs = true }, string.format("Failed to try_create_device. dni= %s, %s", device_dni, ret))
+  end
   return nil
 end
 
 function discovery.device_added(driver, device)
   log.info_with({ hub_logs = true }, string.format("device_added. dni= %s", device.device_network_id))
   discovery.set_device_field(driver, device)
-  processing_devices[device.device_network_id] = nil
+  discovery.last_try_time[device.device_network_id] = nil
   driver.lifecycle_handlers.init(driver, device)
 end
 
@@ -93,14 +103,27 @@ local function discovery_device(driver)
 
   for dni, ip in pairs(unknown_discovered_devices) do
     log.trace(string.format("unknown dni= %s, ip= %s", dni, ip))
-    if not processing_devices[dni] then
-      try_add_device(driver, dni, ip)
+    local is_already_added = false
+    for _, device in pairs(driver:get_devices()) do
+      if device.device_network_id == dni then
+        is_already_added = true
+        break
+      end
+    end
+    if not is_already_added then
+      local time_since_last_try = os.time() - (discovery.last_try_time[dni] or 0)
+      if (not discovery.last_try_time[dni]) or (time_since_last_try > 10) then
+        try_add_device(driver, dni, ip)
+      else
+        log.trace(string.format("skip adding device because it was tried recently. dni= %s, ip= %s, since %s sec", dni, ip, time_since_last_try))
+      end
     end
   end
 end
 
 function discovery.do_network_discovery(driver, _, should_continue)
   log.info_with({ hub_logs = true }, string.format("discovery start for Aqara FP2"))
+  discovery.last_try_time = {}
   while should_continue() do
     discovery_device(driver)
     socket.sleep(1)

drivers/Aqara/aqara-presence-sensor/src/fields.lua

@@ -10,7 +10,8 @@ local fields = {
   EVENT_SOURCE = "eventsource",
   MONITORING_TIMER = "monitoring_timer",
   CREDENTIAL = "credential",
-  _INIT = "init"
+  _INIT = "init",
+  LAST_DISCONNECTED_TIME = "last_disconnected_time"
 }
 
 return fields

drivers/Aqara/aqara-presence-sensor/src/fp2/discovery_helper.lua

@@ -25,12 +25,14 @@ function discovery_helper.get_service_type_and_domain()
   return SERVICE_TYPE, DOMAIN
 end
 
-function discovery_helper.get_device_create_msg(driver, device_dni, device_ip)
-  local device_info = fp2_api.get_info(device_ip, fp2_api.labeled_socket_builder(device_dni))
-
+function discovery_helper.get_device_create_msg(driver, device_dni, device_ip, device_info)
   if not device_info then
-    log.warn("failed to create device create msg. device_info is nil.")
-    return nil
+    device_info = fp2_api.get_info(device_ip, fp2_api.labeled_socket_builder(device_dni))
+
+    if not device_info then
+      log.warn("failed to create device create msg. device_info is nil.")
+      return nil
+    end
   end
 
   local device_label = device_info.label or "Aqara-FP2"