Sonos: Remove Hardcoded Ports (#2855)

Author: hcarter-775

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

@@ -487,9 +487,11 @@ function SonosConnection.new(driver, device)
               return
             end
 
-            local url_ip = lb_utils.force_url_table(coordinator_player.player.websocket_url).host
+            local url_table =  lb_utils.force_url_table(coordinator_player.player.websocket_url)
+            local url_ip = url_table.host
+            local url_port = url_table.port or SonosApi.DEFAULT_SONOS_PORT
             local base_url = lb_utils.force_url_table(
-              string.format("https://%s:%s", url_ip, SonosApi.DEFAULT_SONOS_PORT)
+              string.format("https://%s:%s", url_ip, url_port)
             )
             local _, api_key = driver:check_auth(device)
             local maybe_token = driver:get_oauth_token()

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

@@ -421,12 +421,11 @@ function sonos_ssdp.spawn_persistent_ssdp_task()
 
     if is_new_information then
       local headers = SonosApi.make_headers()
-      local discovery_info, err = SonosApi.RestApi.get_player_info(
-        net_url.parse(
-          string.format("https://%s:%s", sonos_ssdp_info.ip, SonosApi.DEFAULT_SONOS_PORT)
-        ),
-        headers
+      local parsed_wss_url = net_url.parse(sonos_ssdp_info.wss_url) or {}
+      local base_url = net_url.parse(
+        string.format("https://%s:%s", parsed_wss_url.host, parsed_wss_url.port or SonosApi.DEFAULT_SONOS_PORT)
       )
+      local discovery_info, err = SonosApi.RestApi.get_player_info(base_url, headers)
       if not discovery_info then
         log.error(string.format("Error getting discovery info from SSDP response: %s", err))
       elseif discovery_info._objectType == "globalError" then