spotify-monitor 2.1.1__tar.gz → 2.1.2__tar.gz

{spotify_monitor-2.1.1 → spotify_monitor-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spotify_monitor
-Version: 2.1.1
+Version: 2.1.2
 Summary: Tool implementing real-time tracking of Spotify friends music activity
 Author-email: Michal Szymanski <misiektoja-pypi@rm-rf.ninja>
 License-Expression: GPL-3.0-or-later
@@ -29,10 +29,6 @@ spotify_monitor is a tool for real-time monitoring of Spotify friends' music act
 
 NOTE: If you're interested in tracking changes to Spotify users' profiles including their playlists, take a look at another tool I've developed: [spotify_profile_monitor](https://github.com/misiektoja/spotify_profile_monitor).
 
-> Spotify made multiple changes to the web endpoint on June 10th 2025, which broke the **[sp_dc cookie](#spotify-sp_dc-cookie)** method.  
-> 📦 The issue is under investigation to determine if it can be restored.  
-> 👉 In the meantime, use **[desktop client](#spotify-desktop-client)** method instead.  
-
 <a id="features"></a>
 ## Features
 

{spotify_monitor-2.1.1 → spotify_monitor-2.1.2}/README.md

@@ -4,10 +4,6 @@ spotify_monitor is a tool for real-time monitoring of Spotify friends' music act
 
 NOTE: If you're interested in tracking changes to Spotify users' profiles including their playlists, take a look at another tool I've developed: [spotify_profile_monitor](https://github.com/misiektoja/spotify_profile_monitor).
 
-> Spotify made multiple changes to the web endpoint on June 10th 2025, which broke the **[sp_dc cookie](#spotify-sp_dc-cookie)** method.  
-> 📦 The issue is under investigation to determine if it can be restored.  
-> 👉 In the meantime, use **[desktop client](#spotify-desktop-client)** method instead.  
-
 <a id="features"></a>
 ## Features
 

{spotify_monitor-2.1.1 → spotify_monitor-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spotify_monitor"
-version = "2.1.1"
+version = "2.1.2"
 description = "Tool implementing real-time tracking of Spotify friends music activity"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{spotify_monitor-2.1.1 → spotify_monitor-2.1.2}/spotify_monitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spotify_monitor
-Version: 2.1.1
+Version: 2.1.2
 Summary: Tool implementing real-time tracking of Spotify friends music activity
 Author-email: Michal Szymanski <misiektoja-pypi@rm-rf.ninja>
 License-Expression: GPL-3.0-or-later
@@ -29,10 +29,6 @@ spotify_monitor is a tool for real-time monitoring of Spotify friends' music act
 
 NOTE: If you're interested in tracking changes to Spotify users' profiles including their playlists, take a look at another tool I've developed: [spotify_profile_monitor](https://github.com/misiektoja/spotify_profile_monitor).
 
-> Spotify made multiple changes to the web endpoint on June 10th 2025, which broke the **[sp_dc cookie](#spotify-sp_dc-cookie)** method.  
-> 📦 The issue is under investigation to determine if it can be restored.  
-> 👉 In the meantime, use **[desktop client](#spotify-desktop-client)** method instead.  
-
 <a id="features"></a>
 ## Features
 

{spotify_monitor-2.1.1 → spotify_monitor-2.1.2}/spotify_monitor.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
 Author: Michal Szymanski <misiektoja-github@rm-rf.ninja>
-v2.1.1
+v2.1.2
 
 Tool implementing real-time tracking of Spotify friends music activity:
 https://github.com/misiektoja/spotify_monitor/
@@ -15,7 +15,7 @@ pyotp (needed when the token source is set to cookie)
 python-dotenv (optional)
 """
 
-VERSION = "2.1.1"
+VERSION = "2.1.2"
 
 # ---------------------------
 # CONFIGURATION SECTION START
@@ -396,10 +396,7 @@ SP_CACHED_CLIENT_ID = ""
 SP_CACHED_USER_AGENT = ""
 
 # URL of the Spotify Web Player endpoint to get access token
-TOKEN_URL = "https://open.spotify.com/get_access_token"
-
-# URL of the endpoint to get server time needed to create TOTP object
-SERVER_TIME_URL = "https://open.spotify.com/server-time"
+TOKEN_URL = "https://open.spotify.com/api/token"
 
 # Variables for caching functionality of the Spotify client token to avoid unnecessary refreshing
 SP_CACHED_CLIENT_TOKEN = None
@@ -451,6 +448,7 @@ import shutil
 from pathlib import Path
 import secrets
 from typing import Optional
+from email.utils import parsedate_to_datetime
 
 import urllib3
 if not VERIFY_SSL:
@@ -1091,30 +1089,10 @@ def get_random_user_agent() -> str:
         return ""
 
 
-# Removes spaces from a hex string and converts it into a corresponding bytes object
-def hex_to_bytes(data: str) -> bytes:
-    data = data.replace(" ", "")
-    return bytes.fromhex(data)
-
-
-# Creates a TOTP object using a secret derived from transformed cipher bytes
-def generate_totp(ua: str):
-    import pyotp
-
-    secret_cipher_bytes = [
-        12, 56, 76, 33, 88, 44, 88, 33,
-        78, 78, 11, 66, 22, 22, 55, 69, 54,
-    ]
-
-    transformed = [e ^ ((t % 33) + 9) for t, e in enumerate(secret_cipher_bytes)]
-    joined = "".join(str(num) for num in transformed)
-    utf8_bytes = joined.encode("utf-8")
-    hex_str = "".join(format(b, 'x') for b in utf8_bytes)
-    secret_bytes = hex_to_bytes(hex_str)
-    secret = base64.b32encode(secret_bytes).decode().rstrip('=')
+# Returns Spotify edge-server Unix time
+def fetch_server_time(session: req.Session, ua: str) -> int:
 
     headers = {
-        "Host": "open.spotify.com",
         "User-Agent": ua,
         "Accept": "*/*",
     }
@@ -1123,24 +1101,34 @@ def generate_totp(ua: str):
         if platform.system() != 'Windows':
             signal.signal(signal.SIGALRM, timeout_handler)
             signal.alarm(FUNCTION_TIMEOUT + 2)
-        resp = req.get(SERVER_TIME_URL, headers=headers, timeout=FUNCTION_TIMEOUT, verify=VERIFY_SSL)
-    except (req.RequestException, TimeoutException) as e:
-        raise Exception(f"generate_totp() network request timeout after {display_time(FUNCTION_TIMEOUT + 2)}: {e}")
+        response = session.head("https://open.spotify.com/", headers=headers, timeout=FUNCTION_TIMEOUT, verify=VERIFY_SSL)
+        response.raise_for_status()
+    except TimeoutException as e:
+        raise Exception(f"fetch_server_time() head network request timeout after {display_time(FUNCTION_TIMEOUT + 2)}: {e}")
+    except Exception as e:
+        raise Exception(f"fetch_server_time() head network request error: {e}")
     finally:
         if platform.system() != 'Windows':
             signal.alarm(0)
 
-    resp.raise_for_status()
+    return int(parsedate_to_datetime(response.headers["Date"]).timestamp())
 
-    json_data = resp.json()
-    server_time = json_data.get("serverTime")
 
-    if server_time is None:
-        raise Exception("Failed to get server time")
+# Creates a TOTP object using a secret derived from transformed cipher bytes
+def generate_totp():
+    import pyotp
 
-    totp_obj = pyotp.TOTP(secret, digits=6, interval=30)
+    secret_cipher_bytes = [
+        12, 56, 76, 33, 88, 44, 88, 33,
+        78, 78, 11, 66, 22, 22, 55, 69, 54,
+    ]
+
+    transformed = [e ^ ((t % 33) + 9) for t, e in enumerate(secret_cipher_bytes)]
+    joined = "".join(str(num) for num in transformed)
+    hex_str = joined.encode().hex()
+    secret = base64.b32encode(bytes.fromhex(hex_str)).decode().rstrip("=")
 
-    return totp_obj, server_time
+    return pyotp.TOTP(secret, digits=6, interval=30)
 
 
 # Retrieves a new Spotify access token using the sp_dc cookie, tries first with mode "transport" and if needed with "init"
@@ -1153,7 +1141,8 @@ def refresh_token(sp_dc: str) -> dict:
     token = ""
 
     ua = get_random_user_agent()
-    totp_obj, server_time = generate_totp(ua)
+    server_time = fetch_server_time(session, ua)
+    totp_obj = generate_totp()
     client_time = int(time_ns() / 1000 / 1000)
     otp_value = totp_obj.at(server_time)
 
@@ -1165,11 +1154,15 @@ def refresh_token(sp_dc: str) -> dict:
         "totpVer": 5,
         "sTime": server_time,
         "cTime": client_time,
+        "buildDate": time.strftime("%Y-%m-%d", time.gmtime(server_time)),
+        "buildVer": f"web-player_{time.strftime('%Y-%m-%d', time.gmtime(server_time))}_{server_time * 1000}_{secrets.token_hex(4)}",
     }
 
     headers = {
         "User-Agent": ua,
         "Accept": "application/json",
+        "Referer": "https://open.spotify.com/",
+        "App-Platform": "WebPlayer",
         "Cookie": f"sp_dc={sp_dc}",
     }
 
@@ -1598,8 +1591,10 @@ def spotify_get_access_token_from_client(device_id, system_id, user_uri_id, refr
             signal.signal(signal.SIGALRM, timeout_handler)
             signal.alarm(FUNCTION_TIMEOUT + 2)
         response = req.post(LOGIN_URL, headers=headers, data=protobuf_body, timeout=FUNCTION_TIMEOUT, verify=VERIFY_SSL)
-    except (req.RequestException, TimeoutException) as e:
+    except TimeoutException as e:
         raise Exception(f"spotify_get_access_token_from_client() network request timeout after {display_time(FUNCTION_TIMEOUT + 2)}: {e}")
+    except Exception as e:
+        raise Exception(f"spotify_get_access_token_from_client() network request error: {e}")
     finally:
         if platform.system() != 'Windows':
             signal.alarm(0)
@@ -1670,8 +1665,10 @@ def spotify_get_client_token(app_version, device_id, system_id, **device_overrid
             signal.signal(signal.SIGALRM, timeout_handler)
             signal.alarm(FUNCTION_TIMEOUT + 2)
         response = req.post(CLIENTTOKEN_URL, headers=headers, data=body, timeout=FUNCTION_TIMEOUT, verify=VERIFY_SSL)
-    except (req.RequestException, TimeoutException) as e:
+    except TimeoutException as e:
         raise Exception(f"spotify_get_client_token() network request timeout after {display_time(FUNCTION_TIMEOUT + 2)}: {e}")
+    except Exception as e:
+        raise Exception(f"spotify_get_client_token() network request error: {e}")
     finally:
         if platform.system() != 'Windows':
             signal.alarm(0)