Merge branch 'main' into shina_button

Author: shinasys

drivers/SmartThings/philips-hue/src/handlers/attribute_emitters.lua

@@ -175,6 +175,11 @@ function AttributeEmitters.connectivity_update(child_device, zigbee_status)
     child_device.log.info_with({hub_logs=true}, "Device zigbee status event, marking device online")
     child_device:online()
     child_device:set_field(Fields.IS_ONLINE, true)
+    child_device.driver:inject_capability_command(child_device, {
+      capability = capabilities.refresh.ID,
+      command = capabilities.refresh.commands.refresh.NAME,
+      args = {}
+    })
   elseif zigbee_status.status == "connectivity_issue" then
     child_device.log.info_with({hub_logs=true}, "Device zigbee status event, marking device offline")
     child_device:set_field(Fields.IS_ONLINE, false)

drivers/SmartThings/sonos/src/api/cmd_handlers.lua

@@ -11,10 +11,10 @@ local CapCommandHandlers = {}
 
 local QUEUE_ACTION_PREF = "queueAction"
 
-local function _do_send(device, payload)
+local function _do_send(device, payload, use_coordinator)
   local conn = device:get_field(PlayerFields.CONNECTION)
   if conn and conn:is_running() then
-    conn:send_command(payload)
+    conn:send_command(payload, use_coordinator)
   else
     log.warn("No sonos connection for handling capability command")
   end
@@ -33,7 +33,7 @@ local function _do_send_to_group(driver, device, payload)
     payload[1].authorization = string.format("Bearer %s", maybe_token.accessToken)
   end
 
-  _do_send(device, payload)
+  _do_send(device, payload, true)
 end
 
 local function _do_send_to_self(driver, device, payload)
@@ -48,7 +48,7 @@ local function _do_send_to_self(driver, device, payload)
   if maybe_token then
     payload[1].authorization = string.format("Bearer %s", maybe_token.accessToken)
   end
-  _do_send(device, payload)
+  _do_send(device, payload, false)
 end
 
 function CapCommandHandlers.handle_play(driver, device, _cmd)

drivers/SmartThings/sonos/src/api/event_handlers.lua

@@ -9,7 +9,7 @@ CapEventHandlers.PlaybackStatus = {
   Buffering = "PLAYBACK_STATE_BUFFERING",
   Idle = "PLAYBACK_STATE_IDLE",
   Paused = "PLAYBACK_STATE_PAUSED",
-  Playing = "PLAYBACK_STATE_PLAYING"
+  Playing = "PLAYBACK_STATE_PLAYING",
 }
 
 function CapEventHandlers.handle_player_volume(device, new_volume, is_muted)
@@ -84,7 +84,12 @@ function CapEventHandlers.handle_playback_metadata_update(device, metadata_statu
     local is_linein = string.find(metadata_status_body.container.type, "linein", 1, true) ~= nil
     local is_station = string.find(metadata_status_body.container.type, "station", 1, true) ~= nil
     local is_show = string.find(metadata_status_body.container.type, "show", 1, true) ~= nil
-    local is_radio_tracklist = string.find(metadata_status_body.container.type, "trackList.program", 1, true) ~= nil
+    local is_radio_tracklist = string.find(
+      metadata_status_body.container.type,
+      "trackList.program",
+      1,
+      true
+    ) ~= nil
 
     if is_linein then
       audio_track_data.title = metadata_status_body.container.name
@@ -101,8 +106,7 @@ function CapEventHandlers.handle_playback_metadata_update(device, metadata_statu
   if metadata_status_body.track then
     track_info = metadata_status_body.track
   elseif metadata_status_body.currentItem and metadata_status_body.currentItem.track then
-    track_info = metadata_status_body
-        .currentItem.track
+    track_info = metadata_status_body.currentItem.track
   end
 
   if track_info ~= nil then

drivers/SmartThings/sonos/src/api/sonos_connection.lua

@@ -78,7 +78,11 @@ local _update_subscriptions_helper = function(
     local unique_key, bad_key_part = utils.sonos_unique_key(householdId, playerId)
     if not unique_key then
       local err_msg = string.format("Invalid Sonos Unique Key Part: %s", bad_key_part)
-      reply_tx:send(table.pack(nil, err_msg))
+      if reply_tx then
+        reply_tx:send(table.pack(nil, err_msg))
+      else
+        log.warn(string.format("Update Subscriptions Error: %s", err_msg))
+      end
       return
     end
     Router.send_message_to_player(unique_key, payload, reply_tx)
@@ -462,8 +466,11 @@ function SonosConnection.new(driver, device)
             local base_url = lb_utils.force_url_table(
               string.format("https://%s:%s", url_ip, SonosApi.DEFAULT_SONOS_PORT)
             )
+            local _, api_key = driver:check_auth(device)
+            local maybe_token = driver:get_oauth_token()
+            local headers = SonosApi.make_headers(api_key, maybe_token and maybe_token.accessToken)
             local favorites_response, err, _ =
-              SonosRestApi.get_favorites(base_url, header.householdId)
+              SonosRestApi.get_favorites(base_url, header.householdId, headers)
 
             if err or not favorites_response then
               log.error("Error querying for favorites: " .. err)
@@ -582,15 +589,21 @@ end
 
 --- Send a Sonos command object to the player for this connection
 --- @param cmd SonosCommand
-function SonosConnection:send_command(cmd)
+--- @param use_coordinator boolean
+function SonosConnection:send_command(cmd, use_coordinator)
   log.debug("Sending command over websocket channel for device " .. self.device.label)
-  local household_id, coordinator_id = self.driver.sonos:get_coordinator_for_device(self.device)
+  local household_id, target_id
+  if use_coordinator then
+    household_id, target_id = self.driver.sonos:get_coordinator_for_device(self.device)
+  else
+    household_id, target_id = self.driver.sonos:get_player_for_device(self.device)
+  end
   local json_payload, err = json.encode(cmd)
 
   if err or not json_payload then
     log.error("Json encoding error: " .. err)
   else
-    local unique_key, bad_key_part = utils.sonos_unique_key(household_id, coordinator_id)
+    local unique_key, bad_key_part = utils.sonos_unique_key(household_id, target_id)
     if not unique_key then
       self.device.log.error(string.format("Invalid Sonos Unique Key Part: %s", bad_key_part))
       return

drivers/SmartThings/sonos/src/api/sonos_ssdp_discovery.lua

@@ -99,7 +99,6 @@ local function make_persistent_task_impl(
           interval_timer:handled()
           ssdp_search_handle:multicast_m_search()
         elseif receiver == control_rx then
-          ---@type ControlMessage?,string?
           local recv, recv_err = receiver:receive()
           if not recv then
             log.warn(string.format("control channel receive error: %s", recv_err))

drivers/SmartThings/sonos/src/sonos_state.lua

@@ -183,8 +183,9 @@ end
 function SonosState:update_device_record_group_info(household, group, device)
   local player_id = device:get_field(PlayerFields.PLAYER_ID)
   local group_role
-  if player_id == group.coordinatorId then
-    if #household.groups[group.id].playerIds > 1 then
+  if (player_id and group and group.id and group.coordinatorId) and player_id == group.coordinatorId then
+    local player_ids_list = household.groups[group.id].playerIds or {}
+    if #player_ids_list > 1 then
       group_role = "primary"
     else
       group_role = "ungrouped"
@@ -248,7 +249,7 @@ end
 --- @param household_id HouseholdId
 --- @param device SonosDevice
 function SonosState:update_device_record_from_state(household_id, device)
-  local current_mapping = _STATE.device_record_map[device.id]
+  local current_mapping = _STATE.device_record_map[device.id] or {}
   local household = _STATE.households:get_or_init(household_id)
   self:update_device_record_group_info(household, current_mapping.group, device)
 end

drivers/SmartThings/zigbee-motion-sensor/fingerprints.yml

@@ -159,15 +159,15 @@ zigbeeManufacturer:
     model: VMS_ADUROLIGHT
     deviceProfileName: motion-battery
   - id: frientA/S/140
-    deviceLabel: frient Motion Sensor
+    deviceLabel: frient Motion Sensor Pro
     manufacturer: frient A/S
     model: MOSZB-140
-    deviceProfileName: motion-temp-battery
+    deviceProfileName: frient-motion-temp-illuminance-tamper-battery
   - id: frientA/S/141
     deviceLabel: frient Motion Sensor
     manufacturer: frient A/S
     model: MOSZB-141
-    deviceProfileName: motion-battery
+    deviceProfileName: frient-motion-battery
   - id: Compacta/ZBMS3-1
     deviceLabel: Smartenit Motion Sensor
     manufacturer: Compacta

drivers/SmartThings/zigbee-motion-sensor/profiles/frient-motion-battery.yml

@@ -0,0 +1,42 @@
+name: frient-motion-battery
+components:
+- id: main
+  capabilities:
+  - id: motionSensor
+    version: 1
+  - id: battery
+    version: 1
+  - id: firmwareUpdate
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: MotionSensor
+preferences:
+  - title: "Motion Turn-Off Delay (s)"
+    name: occupiedToUnoccupiedD
+    description: "Delay in seconds to report after no motion is detected"
+    required: false
+    preferenceType: integer
+    definition:
+      minimum: 0
+      maximum: 65534
+      default: 240
+  - title: "Motion Turn-On Delay (s)"
+    name: unoccupiedToOccupiedD
+    description: "Delay in seconds to report after motion is detected"
+    required: false
+    preferenceType: integer
+    definition:
+      minimum: 0
+      maximum: 65534
+      default: 0
+  - title: "Movement Threshold in Turn-On Delay"
+    name: unoccupiedToOccupiedT
+    description: "Number of movements to detect before reporting motion during the Motion Turn-On Delay"
+    required: false
+    preferenceType: integer
+    definition:
+      minimum: 1
+      maximum: 254
+      default: 1

drivers/SmartThings/zigbee-motion-sensor/profiles/frient-motion-temp-illuminance-tamper-battery.yml

@@ -0,0 +1,59 @@
+name: frient-motion-temp-illuminance-tamper-battery
+components:
+- id: main
+  capabilities:
+  - id: motionSensor
+    version: 1
+  - id: temperatureMeasurement
+    version: 1
+  - id: illuminanceMeasurement
+    version: 1
+  - id: battery
+    version: 1
+  - id: tamperAlert
+    version: 1
+  - id: firmwareUpdate
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: MotionSensor
+preferences:
+  - preferenceId: tempOffset
+    explicit: true
+  - title: "Temperature Sensitivity (°C)"
+    name: temperatureSensitivity
+    description: "Minimum change in temperature to report"
+    required: false
+    preferenceType: number
+    definition:
+      minimum: 0.1
+      maximum: 2.0
+      default: 1.0
+  - title: "Motion Turn-Off Delay (s)"
+    name: occupiedToUnoccupiedD
+    description: "Delay in seconds to report after no motion is detected"
+    required: false
+    preferenceType: integer
+    definition:
+      minimum: 0
+      maximum: 65534
+      default: 240
+  - title: "Motion Turn-On Delay (s)"
+    name: unoccupiedToOccupiedD
+    description: "Delay in seconds to report after motion is detected"
+    required: false
+    preferenceType: integer
+    definition:
+      minimum: 0
+      maximum: 65534
+      default: 0
+  - title: "Movement Threshold in Turn-On Delay"
+    name: unoccupiedToOccupiedT
+    description: "Number of movements to detect before reporting motion during the Motion Turn-On Delay"
+    required: false
+    preferenceType: integer
+    definition:
+      minimum: 1
+      maximum: 254
+      default: 1