Merge pull request #266 from kokarare1212/dependabot/pip/zeroconf-0.132.2

Bump zeroconf from 0.131.0 to 0.132.2

README.md

@@ -3,10 +3,17 @@
 ![Forks](https://img.shields.io/github/forks/kokarare1212/librespot-python.svg)
 [![DeepSource](https://deepsource.io/gh/kokarare1212/librespot-python.svg/?label=active+issues&show_trend=true)](https://deepsource.io/gh/kokarare1212/librespot-python/?ref=repository-badge)
 
+![Counter](https://count.getloli.com/get/@librespot-python?theme=moebooru)
+
 # Librespot-Python
 
 Open Source Spotify Client
 
+## Support Project
+If you find our project useful and want to support its development, please consider making a donation. Your contribution will help us maintain and improve the project, ensuring that it remains free and accessible to everyone.<br><br>
+[![GitHub Sponsor](https://img.shields.io/github/sponsors/kokarare1212?label=GitHub%20Sponsor&logo=GitHub)](https://github.com/sponsors/kokarare1212)
+[![Liberapay receiving](https://img.shields.io/liberapay/receives/kokarare1212?label=Liberapay&logo=Liberapay)](https://liberapay.com/kokarare1212/)
+
 ## About The Project
 
 This project was developed to make the music streaming service Spotify available
@@ -117,7 +124,3 @@ for more information.
 
 - [Librespot](https://github.com/librespot-org/librespot) (Concept)
 - [Librespot-Java](https://github.com/librespot-org/librespot-java) (Core)
-
-## Special thanks
-
-<a href="https://www.jetbrains.com/"><img src="https://github.com/kokarare1212/librespot-python/blob/main/img/jetbrains.png?raw=true" width="100" height="100" alt="JetBrains"></a>

librespot/audio/__init__.py

@@ -320,7 +320,10 @@ class CdnFeedHelper:
 
     @staticmethod
     def get_url(resp: StorageResolve.StorageResolveResponse) -> str:
-        return random.choice(resp.cdnurl)
+        selected_url = random.choice(resp.cdnurl)
+        while "audio4-gm-fb" in selected_url or "audio-gm-fb" in selected_url:
+            selected_url = random.choice(resp.cdnurl)
+        return selected_url
 
     @staticmethod
     def load_track(
@@ -503,6 +506,11 @@ class CdnManager:
                     token_str = str(token_list[0])
                 except TypeError:
                     token_str = ""
+                expires_list = token_query.get("Expires")
+                try:
+                    expires_str = str(expires_list[0])
+                except TypeError:
+                    expires_str = ""
                 if token_str != "None" and len(token_str) != 0:
                     expire_at = None
                     split = token_str.split("~")
@@ -520,6 +528,15 @@ class CdnManager:
                             "Invalid __token__ in CDN url: {}".format(url))
                         return
                     self.__expiration = expire_at * 1000
+                elif expires_str != "None" and len(expires_str) != 0:
+                    expires_at = None
+                    expires_str = expires_str.split("~")[0]
+                    expires_at = int(expires_str)
+                    if expires_at is None:
+                        self.__expiration = -1
+                        self.__cdn_manager.logger.warning("Invalid Expires param in CDN url: {}".format(url))
+                        return
+                    self.__expiration = expires_at * 1000
                 else:
                     try:
                         i = token_url.query.index("_")

requirements.txt

@@ -1,7 +1,7 @@
 defusedxml==0.7.1
 protobuf==3.20.1
-pycryptodomex==3.17
+pycryptodomex==3.20.0
 pyogg==0.6.14a.1
-requests==2.30.0
-websocket-client==1.5.1
-zeroconf==0.62.0
+requests==2.31.0
+websocket-client==1.8.0
+zeroconf==0.132.2