spotifywebapiPython 1.0.51__py3-none-any.whl → 1.0.53__py3-none-any.whl

spotifywebapipython/models/spotifyconnectdevices.py

@@ -5,6 +5,7 @@ from typing import Iterator
 from ..sautils import export
 from .device import Device
 from .spotifyconnectdevice import SpotifyConnectDevice
+from .zeroconfdiscoveryresult import ZeroconfDiscoveryResult
 from spotifywebapipython.zeroconfapi import ZeroconfGetInfo, ZeroconfGetInfoAlias
 
 @export
@@ -58,6 +59,108 @@ class SpotifyConnectDevices():
         return 0
     
 
+    def AddDynamicDevice(self, device:Device, activeUser:str) -> None:
+        """ 
+        Adds a new dynamic device entry to the `Items` collection.  
+        
+        Dynamic devices are Spotify Connect devices that are not found in Zeroconf discovery
+        process, but still exist in the player device list.  These are usually devices in
+        a Spotify Connect web or mobile player.
+        """
+        # validations.
+        if (device is None) or (not isinstance(device, Device)):
+            return
+        
+        # build zeroconf discovery result with what we can.
+        discoverResult:ZeroconfDiscoveryResult = ZeroconfDiscoveryResult()
+        discoverResult.DeviceName = device.Name
+        discoverResult.HostIpv4Address = '127.0.0.1'
+        discoverResult.HostIpPort = 0
+        discoverResult.Name = device.Name
+        discoverResult.SpotifyConnectCPath = '/zc'
+        discoverResult.SpotifyConnectVersion = '1.0'
+
+        # build zeroconf getinfo result with what we can.
+        info:ZeroconfGetInfo = ZeroconfGetInfo()
+        info.ActiveUser = activeUser
+        info.DeviceId = device.Id
+        info.DeviceType = device.Type
+        info.RemoteName = device.Name
+        info.SpotifyError = 0
+        info.Status = 101
+        info.StatusString = 'OK'
+        
+        # add the device.
+        scDevice:SpotifyConnectDevice = SpotifyConnectDevice()
+        scDevice.DeviceInfo = info
+        scDevice.DiscoveryResult = discoverResult
+        self._Items.append(scDevice)
+
+
+    def ContainsDeviceId(self, value:str) -> bool:
+        """ 
+        Returns True if the `Items` collection contains the specified device id value;
+        otherwise, False.
+        
+        Alias entries (if any) are also compared.
+        """
+        result:bool = False
+        if value is None:
+            return result
+        
+        # convert case for comparison.
+        value = value.lower()
+        
+        # process all discovered devices.
+        scDevice:SpotifyConnectDevice
+        for scDevice in self._Items:
+            if (scDevice.DeviceInfo.HasAliases):
+                scAlias:ZeroconfGetInfoAlias
+                for scAlias in scDevice.DeviceInfo.Aliases:
+                    if (scAlias.Id.lower() == value):
+                        result = True
+                        break
+                if result:
+                    break
+            else:
+                if (scDevice.DeviceInfo.DeviceId.lower() == value):
+                    result = True
+                    break
+        return result
+    
+
+    def ContainsDeviceName(self, value:str) -> bool:
+        """ 
+        Returns True if the `Items` collection contains the specified device name value;
+        otherwise, False.
+        
+        Alias entries (if any) are also compared.
+        """
+        result:bool = False
+        if value is None:
+            return result
+        
+        # convert case for comparison.
+        value = value.lower()
+        
+        # process all discovered devices.
+        scDevice:SpotifyConnectDevice
+        for scDevice in self._Items:
+            if (scDevice.DeviceInfo.HasAliases):
+                scAlias:ZeroconfGetInfoAlias
+                for scAlias in scDevice.DeviceInfo.Aliases:
+                    if (scAlias.Name.lower() == value):
+                        result = True
+                        break
+                if result:
+                    break
+            else:
+                if (scDevice.DeviceInfo.RemoteName.lower() == value):
+                    result = True
+                    break
+        return result
+    
+
     def GetDeviceList(self) -> list[Device]:
         """
         Returns a list of `Device` objects that can be used to build a selection list

spotifywebapipython/models/zeroconfdiscoveryresult.py

@@ -127,6 +127,19 @@ class ZeroconfDiscoveryResult:
             self._HostTTL = value
 
 
+    @property
+    def IsDynamicDevice(self) -> bool:
+        """
+        Returns True if the device is a dynamic device;
+        otherwise, False.
+        
+        Dynamic devices are Spotify Connect devices that are not found in Zeroconf discovery
+        process, but still exist in the player device list.  These are usually Spotify Connect
+        web or mobile players with temporary device id's.       
+        """
+        return (self._HostIpPort == 0)
+
+
     @property
     def Key(self) -> str:
         """ 

spotifywebapipython/sautils.py

@@ -56,6 +56,37 @@ def export(fn):
     return fn
     
 
+def validateDelay(
+        self, 
+        delay:float, 
+        default:float=0.5, 
+        maxDelay:float=10
+        ) -> float:
+    """
+    Validates a delay value.
+        
+    Args:
+        delay (int):
+            The delay value to validate.
+        default (int):
+            The default delay value to set if the user-input delay is not valid.
+        maxDelay (int):
+            The maximum delay value allowed.  
+            Default is 10.
+    """
+    if (isinstance(delay,int)): 
+        delay = float(delay)
+            
+    if (not isinstance(delay,float)) or (delay < 0): 
+        result = default
+    elif (delay > maxDelay): 
+        result = maxDelay
+    else:
+        result = delay
+            
+    return result
+
+
 def _xmlGetInnerText(elmNode, default:str=None) -> str:
     """
     Finds the specified xml node inner text from the root Element object and returns its value

spotifywebapipython/spotifyclient.py

@@ -15,7 +15,7 @@ from zeroconf import Zeroconf
 from .oauthcli import AuthClient
 from .models import *
 from .models import UserProfile as UserProfileCurrentUser
-from .sautils import export, GetUnixTimestampMSFromUtcNow, _xmlGetInnerText
+from .sautils import export, GetUnixTimestampMSFromUtcNow, _xmlGetInnerText, validateDelay
 from .saappmessages import SAAppMessages
 from .spotifyapierror import SpotifyApiError
 from .spotifyapimessage import SpotifyApiMessage
@@ -631,32 +631,6 @@ class SpotifyClient:
         return result
     
 
-    def _ValidateDelay(self, delay:float, default:float=0.5, maxDelay:float=10) -> float:
-        """
-        Validates a delay value.
-        
-        Args:
-            delay (int):
-                The delay value to validate.
-            default (int):
-                The default delay value to set if the user-input delay is not valid.
-            maxDelay (int):
-                The maximum delay value allowed.  
-                Default is 10.
-        """
-        if (isinstance(delay,int)): 
-            delay = float(delay)
-            
-        if (not isinstance(delay,float)) or (delay < 0): 
-            result = default
-        elif (delay > maxDelay): 
-            result = maxDelay
-        else:
-            result = delay
-            
-        return result
-
-
     def _ValidateMarket(self, 
                         market:str,
                         ) -> str:
@@ -5945,10 +5919,10 @@ class SpotifyClient:
     def PlayerActivateDevices(
             self, 
             verifyUserContext:bool=False,
-            delay:float=0.50,
-            ) -> None:
+            delay:float=0.25
+            ) -> str:
         """
-        Activates all Spotify Connect player devices, and (optionally) switches the active user
+        Activates all static Spotify Connect player devices, and (optionally) switches the active user
         context to the current user context.
         
         Args:
@@ -5961,7 +5935,10 @@ class SpotifyClient:
                 Time delay (in seconds) to wait AFTER issuing the final Connect command (if necessary).
                 This delay will give the spotify web api time to process the device list change before 
                 another command is issued.  
-                Default is 0.50; value range is 0 - 10.
+                Default is 0.25; value range is 0 - 10.
+                
+        Returns:
+            A string that contains status text.
                 
         Raises:
             SpotifyWebApiError: 
@@ -5982,6 +5959,10 @@ class SpotifyClient:
         The user context switch is bypassed if the `verifyUserContext` argument is False.  If the user context 
         is to be switched, then a Disconnect will be issued if a user context is active on the device followed 
         by a Connect to the user context specified on the class constructor.
+        
+        Dynamic Spotify Connect devices are not processed by this method, as they are temporary devices and are 
+        already active and in the device list.  These devices are not found in Zeroconf discovery process, and only
+        exist in the player device list.  These are usually Spotify Connect web or mobile players with temporary device id's.        
 
         <details>
           <summary>Sample Code</summary>
@@ -6009,46 +5990,44 @@ class SpotifyClient:
                 raise SpotifyZeroconfApiError(SAAppMessages.ARGUMENT_REQUIRED_ERROR % (apiMethodName, 'SpotifyConnectUsername'), logsi=_logsi)
 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.25, 10)
             if (not isinstance(verifyUserContext, bool)):
                 verifyUserContext = False
 
             deviceActiveUser:str = None
             deviceIdResult:str = None
-                
-            # discover Spotify Connect devices on the network, waiting up to the specified timeout 
-            # for all devices to be discovered.  this will return all Spotify Connect devices that
-            # are currently powered on, and are registered to Zeroconf / mDNS.
-            _logsi.LogVerbose("Discovering Spotify Connect devices on the local network")
-            discovery:SpotifyDiscovery = SpotifyDiscovery(self._ZeroconfClient, printToConsole=False)
-            discovery.DiscoverDevices(timeout=self._SpotifyConnectDiscoveryTimeout)
+            discoverResult:ZeroconfDiscoveryResult
+            info:ZeroconfGetInfo
+            scDevice:SpotifyConnectDevice
+            
+            # get all Spotify Connect available devices on the network.
+            scDevices:SpotifyConnectDevices = self.GetSpotifyConnectDevices()
 
             # process all discovered devices.
-            discoverResult:ZeroconfDiscoveryResult
-            for discoverResult in discovery.DiscoveryResults:
+            for scDevice in scDevices:
                 
-                # get the id from the device via the zeroconf API getInfo endpoint, as the id is not 
-                # returned in the zeroconf discovery result.
-                zconn:ZeroconfConnect = ZeroconfConnect(discoverResult.HostIpv4Address, 
-                                                        discoverResult.HostIpPort, 
-                                                        discoverResult.SpotifyConnectCPath,
-                                                        useSSL=False)
-                info:ZeroconfGetInfo = zconn.GetInformation()
+                discoverResult = scDevice.DiscoveryResult
+                info = scDevice.DeviceInfo
 
                 # store the currently active user of the device, in case we need to switch users later on.
                 deviceActiveUser = info.ActiveUser.lower()
                 deviceIdResult = info.DeviceId
                 
-                status:str = "INACTIVE"
+                status:str = "INACTIVE, "
                 if (info.HasActiveUser):
                     status = "ACTIVE, "
                 
                 # did we resolve the device id?
                 if deviceIdResult is not None:
                     
+                    # is this a dynamic device?  if so, then we can't control it.
+                    if (discoverResult.IsDynamicDevice):
+                        _logsi.LogVerbose("Spotify Connect Device id '%s' (%s) is a dynamic device; we cannot control it" % (deviceIdResult, info.RemoteName))
+                        status = status + "dynamic device, cannot switch user context"
+                    
                     # does our Spotify Connect user account need to take control of the device?
                     # if not, then we are done.
-                    if (deviceActiveUser == self._SpotifyConnectUsername.lower()):  # or (deviceActiveUser == self.UserProfile.Id.lower()):
+                    elif (deviceActiveUser == self._SpotifyConnectUsername.lower()):  # or (deviceActiveUser == self.UserProfile.Id.lower()):
                         _logsi.LogVerbose("Spotify Connect user context '%s' was verified for Device id '%s'; switch not necessary" % (deviceActiveUser, deviceIdResult))
                         status = status + "user context switch not needed"
                     
@@ -6060,28 +6039,29 @@ class SpotifyClient:
 
                     else:
                         zcfResult:ZeroconfResponse
+
+                        # create a ZeroconfConnect object to access the device.
+                        zconn:ZeroconfConnect = ZeroconfConnect(discoverResult.HostIpv4Address, 
+                                                                discoverResult.HostIpPort, 
+                                                                discoverResult.SpotifyConnectCPath,
+                                                                useSSL=False)
                     
                         # if a different user context has control of the device then we need to disconnect 
                         # the current user context before connecting a different user.
                         if (info.HasActiveUser):
                             _logsi.LogVerbose("Spotify Connect user context '%s' is being disconnected for Device id '%s'" % (deviceActiveUser, deviceIdResult))
-                            zcfResult = zconn.Disconnect()
+                            zcfResult = zconn.Disconnect(delay)
                             status = status + 'disconnected from user context "%s";' % deviceActiveUser
-                    
+
                         # connect the device to OUR Spotify Connect user context.
                         # note that the result here only indicates that the connect was submitted - NOT that it was successful!
                         _logsi.LogVerbose("Spotify Connect user context '%s' is being connected for Device id '%s'" % (self._SpotifyConnectUsername, deviceIdResult))
-                        zcfResult = zconn.Connect(self._SpotifyConnectUsername, self._SpotifyConnectPassword)
+                        zcfResult = zconn.Connect(self._SpotifyConnectUsername, self._SpotifyConnectPassword, delay)
                         status = status + 'connected to user context "%s"' % self._SpotifyConnectUsername
 
                         # trace.
                         _logsi.LogVerbose("Spotify Connect user context switch from '%s' to '%s' was requested for Device id '%s'" % (deviceActiveUser, self._SpotifyConnectUsername, deviceIdResult))
 
-                        # give spotify web api time to process the change and add the device to the device list.
-                        if delay > 0:
-                            _logsi.LogVerbose(TRACE_MSG_DELAY_DEVICE % delay)
-                            time.sleep(delay)
-                        
                 # append device status to results.
                 result = "%s%s\n" % (result, MSG_RESULT % (info.RemoteName, info.DeviceId, info.ActiveUser, status))
 
@@ -6236,6 +6216,11 @@ class SpotifyClient:
             SpotifApiError: 
                 If the method fails for any other reason.
 
+        Note that this method will only return the devices for which the current user
+        context has control of, or other available devices that do not have an active
+        user context assigned.  Use the `GetSpotifyConnectDevices` method to retrieve
+        a complete list of devices that are available to all users.
+                
         The `ConfigurationCache` is updated with the results of this method.  Use the
         `refresh` argument (with False value) to retrieve the cached value and avoid
         the spotify web api request.  This results in better performance.
@@ -7894,7 +7879,7 @@ class SpotifyClient:
             self, 
             ) -> SpotifyConnectDevices:
         """
-        Get information about all available Spotify Connect player devices. 
+        Get information about all available Spotify Connect player devices.
         
         Returns:
             A `SpotifyConnectDevices` object that contain the discovery results
@@ -7912,6 +7897,11 @@ class SpotifyClient:
         This method is similar to the `GetPlayerDevices` method, but it contains ALL
         available Spotify Connect devices that are known to the local network (versus
         just the devices known to a specific user).
+        
+        It will also call the `GetPlayerDevices` method, in case we have any dynamic devices.
+        Dynamic devices are Spotify Connect devices that are not found in Zeroconf discovery
+        process, but still exist in the player device list.  These are usually Spotify Connect
+        web or mobile players with temporary device id's.
                         
         <details>
           <summary>Sample Code</summary>
@@ -7927,7 +7917,6 @@ class SpotifyClient:
             
             # trace.
             _logsi.EnterMethod(SILevel.Debug, apiMethodName)
-            _logsi.LogVerbose("Get all available Spotify Connect devices")
                 
             # discover Spotify Connect devices on the network, waiting up to the specified timeout 
             # for all devices to be discovered.  this will return all Spotify Connect devices that
@@ -7954,6 +7943,17 @@ class SpotifyClient:
                 scDevice.DeviceInfo = info
                 result.Items.append(scDevice)
                 
+            # we will also call the GetPlayerDevices method, in case we have any dynamic devices.
+            # dynamic devices are Spotify Connect devices that are not found in Zeroconf discovery
+            # process, but still exist in the player device list.  these are usually Spotify Connect
+            # web or mobile players with temporary device id's.
+            devices:list[Device] = self.GetPlayerDevices(True)
+          
+            device:Device
+            for device in devices:
+                if not result.ContainsDeviceId(device.Id):
+                    result.AddDynamicDevice(device, self.UserProfile.Id)
+
             # trace.
             _logsi.LogArray(SILevel.Verbose, TRACE_METHOD_RESULT_TYPE % (apiMethodName, type(result).__name__), result)
             return result
@@ -9400,7 +9400,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device pause playback", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -9533,7 +9533,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device play context", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             #deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -9641,7 +9641,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device play track favorites", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # get current users favorite tracks.
             tracks:TrackPageSaved = self.GetTrackFavorites(limitTotal=200)
@@ -9752,7 +9752,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device play tracks", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # build a list of all item uri's.
             # remove any leading / trailing spaces in case user put a space between the items.
@@ -9863,7 +9863,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device resume playback", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -9960,7 +9960,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device seek position", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10052,7 +10052,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device skip next", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10141,7 +10141,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Spotify Connect device skip previous", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10184,6 +10184,7 @@ class SpotifyClient:
             deviceValue:str, 
             verifyUserContext:bool=True,
             verifyTimeout:float=5.0,
+            delay:float=0.25
             ) -> str:
         """
         Resolves a Spotify Connect device identifier from a specified device id, name, alias id,
@@ -10203,6 +10204,11 @@ class SpotifyClient:
                 Connect device list.  This value is only used if a Connect command has to be
                 issued to activate the device.
                 Default is 5; value range is 0 - 10.
+            delay (float):
+                Time delay (in seconds) to wait AFTER issuing any command to the device.  
+                This delay will give the spotify zeroconf api time to process the change before 
+                another command is issued.  
+                Default is 0.25; value range is 0 - 10.
                 
         Returns:
             A device Id for the deviceValue if one could be resolved; 
@@ -10251,6 +10257,7 @@ class SpotifyClient:
             apiMethodParms.AppendKeyValue("deviceValue", deviceValue)
             apiMethodParms.AppendKeyValue("verifyUserContext", verifyUserContext)
             apiMethodParms.AppendKeyValue("verifyTimeout", verifyTimeout)
+            apiMethodParms.AppendKeyValue("delay", delay)
             _logsi.LogMethodParmList(SILevel.Verbose, "Resolving Spotify Connect Player Device Id", apiMethodParms)
 
             # if device value not specified then we are done.
@@ -10259,40 +10266,35 @@ class SpotifyClient:
                 return None
             
             # validations.
-            verifyTimeout = self._ValidateDelay(verifyTimeout, 5, 10)
+            delay = validateDelay(delay, 0.25, 10)
+            verifyTimeout = validateDelay(verifyTimeout, 5, 10)
             if (not isinstance(verifyUserContext, bool)):
                 verifyUserContext = True
 
             # determine if the device value specified is a name (e.g. "Bose-ST10-1") or 
             # an id (e.g. "30fbc80e35598f3c242f2120413c943dfd9715fe").
             isDeviceId:bool = SpotifyClient.IsDeviceId(deviceValue)
+
             deviceValueCompare:str = deviceValue.lower()
             deviceActiveUser:str = None
-                
-            # discover Spotify Connect devices on the network, waiting up to the specified timeout 
-            # for all devices to be discovered.  this will return all Spotify Connect devices that
-            # are currently powered on, and are registered to Zeroconf / mDNS.
-            _logsi.LogVerbose("Discovering Spotify Connect devices on the local network")
-            discovery:SpotifyDiscovery = SpotifyDiscovery(self._ZeroconfClient, printToConsole=False)
-            discovery.DiscoverDevices(timeout=self._SpotifyConnectDiscoveryTimeout)
+            discoverResult:ZeroconfDiscoveryResult
+            info:ZeroconfGetInfo
+            scDevice:SpotifyConnectDevice
+
+            # get all Spotify Connect available devices on the network.
+            scDevices:SpotifyConnectDevices = self.GetSpotifyConnectDevices()
 
             # process all discovered devices.
-            discoverResult:ZeroconfDiscoveryResult
-            for discoverResult in discovery.DiscoveryResults:
+            for scDevice in scDevices:
                 
-                # get the id from the device via the zeroconf API getInfo endpoint, as the id is not 
-                # returned in the zeroconf discovery result.
-                zconn:ZeroconfConnect = ZeroconfConnect(discoverResult.HostIpv4Address, 
-                                                        discoverResult.HostIpPort, 
-                                                        discoverResult.SpotifyConnectCPath,
-                                                        useSSL=False)
-                info:ZeroconfGetInfo = zconn.GetInformation()
+                discoverResult = scDevice.DiscoveryResult
+                info = scDevice.DeviceInfo
 
                 # store the currently active user of the device, in case we need to switch users later on.
                 deviceActiveUser = info.ActiveUser.lower()
 
                 # are aliases being used (RemoteName is null if so)?
-                if info.RemoteName is None:
+                if info.HasAliases:
                     
                     # if aliases are defined for the device, then we have to check each alias for a match.
                     infoAlias:ZeroconfGetInfoAlias
@@ -10325,6 +10327,11 @@ class SpotifyClient:
                 # did we resolve the device id?
                 if deviceIdResult is not None:
                     
+                    # is this a dynamic device?  if so, then we can't control it.
+                    if (discoverResult.IsDynamicDevice):
+                        _logsi.LogVerbose("Spotify Connect Device '%s' (%s) is a dynamic device; we cannot control it" % (info.RemoteName, deviceIdResult))
+                        break
+                    
                     # did caller request user context switch bypass?
                     # if so, then just return the device id.
                     if (not verifyUserContext):
@@ -10345,11 +10352,17 @@ class SpotifyClient:
                     
                     zcfResult:ZeroconfResponse
                     
+                    # create a ZeroconfConnect object to access the device.
+                    zconn:ZeroconfConnect = ZeroconfConnect(discoverResult.HostIpv4Address, 
+                                                            discoverResult.HostIpPort, 
+                                                            discoverResult.SpotifyConnectCPath,
+                                                            useSSL=False)
+
                     # if a different user context has control of the device then we need to disconnect 
                     # the current user context before connecting a different user.
                     if (info.HasActiveUser):
                         _logsi.LogVerbose("Spotify Connect user context '%s' is being disconnected for Device id '%s'" % (deviceActiveUser, deviceIdResult))
-                        zcfResult = zconn.Disconnect()
+                        zcfResult = zconn.Disconnect(delay)
                     
                     # connect the device to OUR Spotify Connect user context.
                     # note that the result here only indicates that the connect was submitted - NOT that it was successful!
@@ -10463,7 +10476,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Set Spotify Connect device set repeat mode", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10562,7 +10575,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Set Spotify Connect device set shuffle mode", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10660,7 +10673,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Set Spotify Connect device set volume level", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # check for device name; convert to an id if a name was supplied.
             deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10758,7 +10771,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Transfer playback to a new Spotify Connect device", apiMethodParms)
             
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
             
             # check for device name; convert to an id if a name was supplied.
             #deviceId = self.PlayerConvertDeviceNameToId(deviceId)
@@ -10864,7 +10877,7 @@ class SpotifyClient:
             _logsi.LogMethodParmList(SILevel.Verbose, "Checks if a Spotify Connect device is active, and activate one if not", apiMethodParms)
                 
             # validations.
-            delay = self._ValidateDelay(delay, 0.50, 10)
+            delay = validateDelay(delay, 0.50, 10)
 
             # get current Spotify Connect player state.
             result = self.GetPlayerPlaybackState()