Upload 3 files

app.py

@@ -16,6 +16,26 @@ from urllib.parse import urljoin
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
+# Try to load .env file for local development
+try:
+    from dotenv import load_dotenv
+    load_dotenv()
+except ImportError:
+    pass
+
+def parse_jwt_country_code(token):
+    """Extract country code from Tidal access token"""
+    try:
+        if not token or '.' not in token:
+            return None
+        payload = token.split('.')[1]
+        # Fix padding
+        payload += '=' * (-len(payload) % 4)
+        decoded = json.loads(base64.b64decode(payload))
+        return decoded.get('cc')
+    except Exception:
+        return None
+
 app = FastAPI(
     title="Tidal FLAC Download API",
     description="Get FLAC download URLs for Tidal tracks",
@@ -67,7 +87,10 @@ r_session = create_requests_session()
 class TidalSession:
     def __init__(self, session_data, client_id=None, client_secret=None):
         self.session_data = session_data
-        self.country_code = session_data.get('country_code', 'US')
+        # Extract from token if possible, fallback to session_data, then env, then US
+        token_cc = parse_jwt_country_code(session_data.get('access_token'))
+        self.country_code = token_cc or session_data.get('country_code') or os.environ.get('TIDAL_COUNTRY_CODE', 'US')
+        
         self.access_token = session_data.get('access_token')
         self.refresh_token = session_data.get('refresh_token')
         self.token_type = 'Bearer'
@@ -76,6 +99,8 @@ class TidalSession:
         # TV Client ID - Best for DASH XML and FLAC
         self.client_id = client_id or 'fX2JxdmntZWK0ixT'
         self.client_secret = client_secret or '1nqpgx8uvBdZigrx4hUPDV2hOwgYAAAG5DYXOr6uNf8='
+        
+        print(f"✓ Tidal session initialized for region: {self.country_code}")
 
     def auth_headers(self):
         return {
@@ -118,7 +143,7 @@ class TidalSession:
 
     def get_stream_url(self, track_id, quality):
         # We use the standard params for v4 API
-        print(f"DEBUG: Requesting stream for {track_id} with quality {quality}")
+        print(f"DEBUG: Requesting stream for {track_id} with quality {quality} (Region: {self.country_code})")
         return self._get(
             f"tracks/{track_id}/playbackinfopostpaywall/v4",
             {

requirements.txt

@@ -3,4 +3,5 @@ uvicorn
 requests
 urllib3
 python-multipart
-httpx
+httpx
+python-dotenv