fixup! fix(sonos): Improved handling of bonded set membership changes.

Author: NoahCornell

drivers/SmartThings/sonos/src/sonos_driver.lua

@@ -504,14 +504,8 @@ function SonosDriver:handle_player_discovery_info(api_key, info, device)
   -- If the SSDP Group Info is an empty string, then that means it's the non-primary
   -- speaker in a bonded set (e.g. a home theater system, a stereo pair, etc).
   -- These aren't the same as speaker groups, and bonded speakers can't be controlled
-  -- via websocket at all. So we ignore all bonded non-primary speakers
-  -- if  then
-  --   return nil,
-  --     string.format(
-  --       "Player %s is a non-primary bonded Sonos device, ignoring",
-  --       info.discovery_info.device.name
-  --     )
-  -- end
+  -- via websocket at all. So we ignore all bonded non-primary speakers if they are not
+  -- already onboarded.
 
   local discovery_info_mac_addr = utils.extract_mac_addr(info.discovery_info.device)
   local bonded = (#info.ssdp_info.group_id == 0)

drivers/SmartThings/sonos/src/sonos_state.lua

@@ -22,6 +22,8 @@ function _household_mt:reset()
   self.groups = utils.new_case_insensitive_table()
   self.players = utils.new_case_insensitive_table()
   self.player_to_group = utils.new_case_insensitive_table()
+  -- previously bonded devices should not be un-bonded after a reset since these should
+  -- not be treated as distinct devices
   if not self.bonded_players then
     self.bonded_players = utils.new_case_insensitive_table()
   end
@@ -117,9 +119,8 @@ function SonosState:associate_device_record(device, info)
     return
   end
 
-  local player_tbl = household.players[player_id]
-  local player = (player_tbl or {}).player
-  local sonos_device = (player_tbl or {}).device
+  local player = (household.players[player_id] or {}).player
+  local sonos_device = (household.players[player_id] or {}).device
 
   if not (player and sonos_device) then
     log.error(
@@ -330,7 +331,7 @@ function SonosState:update_household_info(id, groups_event, driver)
       local group_id
       -- non-primary bonded players are excluded from a group's list of PlayerID's so we use the group membership
       -- of the primary device
-      if type(device.primaryDeviceId) == "string" and #device.primaryDeviceId > 0 then
+      if type(device.primaryDeviceId) == "string" and device.primaryDeviceId ~= "" then
         currently_bonded = true
         group_id = household.player_to_group[device.primaryDeviceId]
       else