spotify-monitor 2.4__py3-none-any.whl → 2.5__py3-none-any.whl

{spotify_monitor-2.4.dist-info → spotify_monitor-2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spotify_monitor
-Version: 2.4
+Version: 2.5
 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
@@ -80,7 +80,8 @@ Tool for real-time monitoring of **Spotify friends' music activity feed**.
    * [Access Token Retrieval via sp_dc Cookie and TOTP](#access-token-retrieval-via-sp_dc-cookie-and-totp)
    * [Secret Key Extraction from Spotify Web Player Bundles](#secret-key-extraction-from-spotify-web-player-bundles)
 7. [Change Log](#change-log)
-8. [License](#license)
+8. [Maintainers](#maintainers)
+9. [License](#license)
 
 <a id="requirements"></a>
 ## Requirements
@@ -90,8 +91,8 @@ Tool for real-time monitoring of **Spotify friends' music activity feed**.
 
 Tested on:
 
-* **macOS**: Ventura, Sonoma, Sequoia
-* **Linux**: Raspberry Pi OS (Bullseye, Bookworm), Ubuntu 24, Rocky Linux 8.x/9.x, Kali Linux 2024/2025
+* **macOS**: Ventura, Sonoma, Sequoia, Tahoe
+* **Linux**: Raspberry Pi OS (Bullseye, Bookworm, Trixie), Ubuntu 24/25, Rocky Linux 8.x/9.x, Kali Linux 2024/2025
 * **Windows**: 10, 11
 
 It should work on other versions of macOS, Linux, Unix and Windows as well.
@@ -605,13 +606,15 @@ You should get a valid Spotify access token, example output:
    <img src="https://raw.githubusercontent.com/misiektoja/spotify_monitor/refs/heads/main/assets/spotify_monitor_totp_test.png" alt="spotify_monitor_totp_test" width="100%"/>
 </p>
 
-> **NOTE:** secrets used for TOTP generation (`SECRET_CIPHER_DICT`) expire every two days; you can either run the [spotify_monitor_secret_grabber](https://github.com/misiektoja/spotify_monitor/blob/dev/debug/spotify_monitor_secret_grabber.py) and extract it by yourself (see [here](#secret-key-extraction-from-spotify-web-player-bundles) for more info) or you can pass `--fetch-secrets` flag in [spotify_monitor_totp_test](https://github.com/misiektoja/spotify_monitor/blob/dev/debug/spotify_monitor_totp_test.py) (available since v1.6). There is also a [Thereallo1026/spotify-secrets](https://github.com/Thereallo1026/spotify-secrets) repo which offers JSON files that are automatically updated with current secrets.
+> **NOTE:** secrets used for TOTP generation (`SECRET_CIPHER_DICT`) expire every two days; you can either run the [spotify_monitor_secret_grabber](https://github.com/misiektoja/spotify_monitor/blob/dev/debug/spotify_monitor_secret_grabber.py) and extract it by yourself (see [here](#secret-key-extraction-from-spotify-web-player-bundles) for more info) or you can pass `--fetch-secrets` flag in `spotify_monitor_totp_test` (available since v1.6). There is also a [xyloflake/spot-secrets-go/](https://github.com/xyloflake/spot-secrets-go/) repo which offers JSON files that are automatically updated with current secrets (you can pass `--download-secrets` flag in `spotify_monitor_totp_test` to get it automatically from remote URL, available since v1.8).
 
 <a id="secret-key-extraction-from-spotify-web-player-bundles"></a>
 ### Secret Key Extraction from Spotify Web Player Bundles
 
 The [spotify_monitor_secret_grabber](https://github.com/misiektoja/spotify_monitor/blob/dev/debug/spotify_monitor_secret_grabber.py) tool automatically extracts secret keys used for TOTP generation in Spotify Web Player JavaScript bundles. 
 
+> 💡 **Quick tip:** The easiest and recommended way to run this tool is via Docker. Jump directly to the [Docker usage section below](#-secret-key-extraction-via-docker-recommended-easiest-way).
+
 Download from [here](https://github.com/misiektoja/spotify_monitor/blob/dev/debug/spotify_monitor_secret_grabber.py) or:
 
 ```sh
@@ -625,7 +628,7 @@ pip install playwright
 playwright install
 ```
 
-Run:
+Run interactively (default output mode):
 
 ```sh
 python3 spotify_monitor_secret_grabber.py
@@ -637,15 +640,100 @@ You should get output similar to below:
    <img src="https://raw.githubusercontent.com/misiektoja/spotify_monitor/refs/heads/main/assets/spotify_monitor_secret_grabber.png" alt="spotify_monitor_secret_grabber" width="100%"/>
 </p>
 
-You can now update the secrets used for TOTP generation (for example `SECRET_CIPHER_DICT` in `spotify_monitor_totp_test`, `spotify_monitor` and `spotify_profile_monitor`).
+Show help:
+```sh
+python3 spotify_monitor_secret_grabber.py -h
+```
+
+---
+
+<a id="cli-output-modes"></a>
+### CLI Output Modes
+
+The script supports several output modes for different use cases:
+
+| Flag | Description | Output |
+|------|--------------|--------|
+| `--secret` | Prints plain JSON array of extracted secrets | `[{"version": X, "secret": "..."}, ...]` |
+| `--secretbytes` | Prints JSON array with ASCII byte values | `[{"version": X, "secret": [..]}, ...]` |
+| `--secretdict` | Prints JSON object/dict mapping version → byte list | `{"X": [..], "Y": [..]}` |
+| `--all` | Extracts secrets and **writes all three outputs** to local files | `secrets.json`, `secretBytes.json`, `secretDict.json` |
+
+Print extracted secrets in specific format, for example Python-friendly secret bytes (JSON object/dict) and save to indicated file:
+
+```sh
+python3 spotify_monitor_secret_grabber.py --secretdict > secretDict.json
+```
+
+Or, to generate and save all secret formats to files (`secrets.json`, `secretBytes.json`, `secretDict.json`) at once:
+
+```sh
+python3 spotify_monitor_secret_grabber.py --all
+```
+
+Default file paths and names can be configured directly in the `OUTPUT_FILES` dictionary at the top of the script.
+
+---
+
+<a id="-secret-key-extraction-via-docker-recommended-easiest-way"></a>
+### 🐳 Secret Key Extraction via Docker (Recommended Easiest Way)
+
+A prebuilt multi-architecture image is available on Docker Hub: [`misiektoja/spotify-secrets-grabber`](https://hub.docker.com/r/misiektoja/spotify-secrets-grabber)
+
+This image works on:
+- macOS (Intel & Apple Silicon)
+- Linux (x86_64 and ARM64)
+- Windows (Docker Desktop / WSL2)
+- Raspberry Pi 4/5 (64-bit OS)
+
+Run interactively (default output mode):
 
-> **NOTE:** you can also use [Thereallo1026/spotify-secrets](https://github.com/Thereallo1026/spotify-secrets) repo which offers JSON files that are automatically updated with current secrets (its secret extraction code is based on `spotify_monitor_secret_grabber`).
+```sh
+docker run --rm misiektoja/spotify-secrets-grabber
+```
+
+Show help:
+```sh
+docker run --rm misiektoja/spotify-secrets-grabber -h
+```
+
+Print extracted secrets in specific format, for example Python-friendly secret bytes (JSON object/dict) and save to indicated file:
+```sh
+docker run --rm misiektoja/spotify-secrets-grabber --secretdict > secretDict.json
+```
+
+Or, to generate and save all secret formats to files (`secrets.json`, `secretBytes.json`, `secretDict.json`) at once:
+
+```sh
+docker run --rm -v .:/work -w /work misiektoja/spotify-secrets-grabber --all
+```
+
+*For SELinux hosts (Fedora/RHEL), use `-v .:/work:Z`.*
+
+<a id="optional-use-docker-compose-one-command-for-all-oss"></a>
+Or optionally use Docker Compose (a preconfigured [compose.yaml](https://github.com/misiektoja/spotify_monitor/blob/dev/debug/spotify_monitor_secret_grabber_docker/compose.yaml) file is included in the repo):
+
+```sh
+docker compose run --rm spotify-secrets-grabber --all
+```
+
+This will save all files into your current directory on any system (macOS, Linux or Windows).
+
+---
+
+You can now update the secrets used for TOTP generation (for example `SECRET_CIPHER_DICT` in `spotify_monitor_totp_test`, `spotify_monitor` and `spotify_profile_monitor`) either manually or by referencing an external `secretDict.json` file, which can be hosted in another repo or stored locally. See the description of `SECRET_CIPHER_DICT_URL` in those files for details.
 
 <a id="change-log"></a>
 ## Change Log
 
 See [RELEASE_NOTES.md](https://github.com/misiektoja/spotify_monitor/blob/main/RELEASE_NOTES.md) for details.
 
+<a id="maintainers"></a>
+## Maintainers
+
+[![Maintainer: misiektoja](https://img.shields.io/badge/maintainer-misiektoja-blue)](https://github.com/misiektoja)  
+[![Maintainer: tomballgithub](https://img.shields.io/badge/maintainer-tomballgithub-blue)](https://github.com/tomballgithub)
+
 <a id="license"></a>
 ## License
 

spotify_monitor-2.5.dist-info/RECORD

@@ -0,0 +1,7 @@
+spotify_monitor.py,sha256=YGmW3_nq8NDJsM953_NO_W4c4GOianpZJp6RTk7u_Gs,162665
+spotify_monitor-2.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+spotify_monitor-2.5.dist-info/METADATA,sha256=CtQagsvmirnZ1G1krTwfCnSgwrPRxQCQxxiQzumztqA,31063
+spotify_monitor-2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+spotify_monitor-2.5.dist-info/entry_points.txt,sha256=8HzePfUcCSXrYaXOwLbNNYO8GJcnhgCSl4wcDNECht8,57
+spotify_monitor-2.5.dist-info/top_level.txt,sha256=EP6IPD4vHT12rLM5b_jo2i3nrfOuwk3ehhr2gWdQx9Y,16
+spotify_monitor-2.5.dist-info/RECORD,,

spotify_monitor.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
 Author: Michal Szymanski <misiektoja-github@rm-rf.ninja>
-v2.4
+v2.5
 
 Tool implementing real-time tracking of Spotify friends music activity:
 https://github.com/misiektoja/spotify_monitor/
@@ -16,7 +16,7 @@ python-dotenv (optional)
 wcwidth (optional, needed by TRUNCATE_CHARS feature)
 """
 
-VERSION = "2.4"
+VERSION = "2.5"
 
 # ---------------------------
 # CONFIGURATION SECTION START
@@ -253,19 +253,17 @@ TOKEN_RETRY_TIMEOUT = 0.5  # 0.5 second
 # Newest secrets are downloaded automatically from SECRET_CIPHER_DICT_URL (see below)
 # Can also be fetched via spotify_monitor_secret_grabber.py utility - see debug dir
 SECRET_CIPHER_DICT = {
-    "12": [107, 81, 49, 57, 67, 93, 87, 81, 69, 67, 40, 93, 48, 50, 46, 91, 94, 113, 41, 108, 77, 107, 34],
-    "11": [111, 45, 40, 73, 95, 74, 35, 85, 105, 107, 60, 110, 55, 72, 69, 70, 114, 83, 63, 88, 91],
-    "10": [61, 110, 58, 98, 35, 79, 117, 69, 102, 72, 92, 102, 69, 93, 41, 101, 42, 75],
-    "9": [109, 101, 90, 99, 66, 92, 116, 108, 85, 70, 86, 49, 68, 54, 87, 50, 72, 121, 52, 64, 57, 43, 36, 81, 97, 72, 53, 41, 78, 56],
-    "8": [37, 84, 32, 76, 87, 90, 87, 47, 13, 75, 48, 54, 44, 28, 19, 21, 22],
-    "7": [59, 91, 66, 74, 30, 66, 74, 38, 46, 50, 72, 61, 44, 71, 86, 39, 89],
     "6": [21, 24, 85, 46, 48, 35, 33, 8, 11, 63, 76, 12, 55, 77, 14, 7, 54],
     "5": [12, 56, 76, 33, 88, 44, 88, 33, 78, 78, 11, 66, 22, 22, 55, 69, 54],
 }
 
-# Remote URL used to fetch updated secrets needed for TOTP generation
+# Remote or local URL used to fetch updated secrets needed for TOTP generation
 # Set to empty string to disable
-SECRET_CIPHER_DICT_URL = "https://github.com/Thereallo1026/spotify-secrets/blob/main/secrets/secretDict.json?raw=true"
+# If you used "spotify_monitor_secret_grabber.py --secretdict > secretDict.json" specify the file location below
+# SECRET_CIPHER_DICT_URL = "https://github.com/Thereallo1026/spotify-secrets/blob/main/secrets/secretDict.json?raw=true"
+SECRET_CIPHER_DICT_URL = "https://github.com/xyloflake/spot-secrets-go/blob/main/secrets/secretDict.json?raw=true"
+# SECRET_CIPHER_DICT_URL = file:///C:/your_path/secretDict.json
+# SECRET_CIPHER_DICT_URL = "file:///your_path/secretDict.json"
 
 # Identifier used to select the appropriate secret from SECRET_CIPHER_DICT when generating a TOTP token
 # Set to 0 to auto-select the highest available version
@@ -1282,7 +1280,8 @@ def fetch_server_time(session: req.Session, ua: str) -> int:
 def generate_totp():
     import pyotp
 
-    if str((ver := TOTP_VER or max(map(int, SECRET_CIPHER_DICT)))) not in SECRET_CIPHER_DICT:
+    ver = TOTP_VER or max(map(int, SECRET_CIPHER_DICT))
+    if str(ver) not in SECRET_CIPHER_DICT:
         raise Exception(f"generate_totp(): Defined TOTP_VER ({ver}) is missing in SECRET_CIPHER_DICT")
 
     secret_cipher_bytes = SECRET_CIPHER_DICT[str(ver)]
@@ -1302,12 +1301,43 @@ def fetch_and_update_secrets():
         return False
 
     try:
-        response = req.get(SECRET_CIPHER_DICT_URL, timeout=FUNCTION_TIMEOUT, verify=VERIFY_SSL)
-        response.raise_for_status()
-        secrets = response.json()
+        if SECRET_CIPHER_DICT_URL.startswith("file:"):
+            import os
+            from urllib.parse import urlparse, unquote
+
+            parsed = urlparse(SECRET_CIPHER_DICT_URL)
+
+            if parsed.netloc:
+                raw_path = f"/{parsed.netloc}{parsed.path or ''}"
+            else:
+                if SECRET_CIPHER_DICT_URL.startswith("file://"):
+                    raw_path = parsed.path or SECRET_CIPHER_DICT_URL[len("file://"):]
+                else:
+                    raw_path = parsed.path or SECRET_CIPHER_DICT_URL[len("file:"):]
+
+            raw_path = unquote(raw_path)
+
+            if raw_path.startswith("/~"):
+                raw_path = raw_path[1:]
+
+            if not raw_path.startswith("/") and not raw_path.startswith("~"):
+                raw_path = "/" + raw_path
+
+            path = os.path.expanduser(os.path.expandvars(raw_path))
+
+            print(f"Loading Spotify web-player TOTP secrets from file: {path}")
+            with open(path, "r", encoding="utf-8") as f:
+                secrets = json.load(f)
+            print("─" * HORIZONTAL_LINE)
+        else:
+            print(f"Fetching Spotify web-player TOTP secrets from URL: {SECRET_CIPHER_DICT_URL}")
+            response = req.get(SECRET_CIPHER_DICT_URL, timeout=FUNCTION_TIMEOUT, verify=VERIFY_SSL)
+            response.raise_for_status()
+            secrets = response.json()
+            print("─" * HORIZONTAL_LINE)
 
         if not isinstance(secrets, dict) or not secrets:
-            raise ValueError("fetch_and_update_secrets(): Fetched payload not a non‑empty dict")
+            raise ValueError("fetch_and_update_secrets(): Fetched payload not a non-empty dict")
 
         for key, value in secrets.items():
             if not isinstance(key, str) or not key.isdigit():
@@ -2045,7 +2075,7 @@ def spotify_convert_uri_to_url(uri):
     return url
 
 
-# Prints the list of Spotify friends with the last listened track (-l flag)
+# Returns list of Spotify friends
 def spotify_list_friends(friend_activity):
 
     print(f"Number of friends:\t\t{len(friend_activity['friends'])}\n")
@@ -3374,6 +3404,7 @@ def main():
     else:
         if FLAG_FILE:
             FLAG_FILE = os.path.expanduser(FLAG_FILE)
+            flag_file_delete()
 
     if args.send_test_email:
         print("* Sending test email notification ...\n")

spotify_monitor-2.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-spotify_monitor.py,sha256=TtB0dWvl5Yn1ti4y8VFk61V8rqXEZfnLY2PJZ26hVsw,161638
-spotify_monitor-2.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-spotify_monitor-2.4.dist-info/METADATA,sha256=rcnYf1XgMu4k55OO0m1yfP61TXRA_CkZLLDXUzDLHLM,27747
-spotify_monitor-2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-spotify_monitor-2.4.dist-info/entry_points.txt,sha256=8HzePfUcCSXrYaXOwLbNNYO8GJcnhgCSl4wcDNECht8,57
-spotify_monitor-2.4.dist-info/top_level.txt,sha256=EP6IPD4vHT12rLM5b_jo2i3nrfOuwk3ehhr2gWdQx9Y,16
-spotify_monitor-2.4.dist-info/RECORD,,