Update main.py

main.py

@@ -9,7 +9,7 @@ import urllib.parse
 import mimetypes
 from bs4 import BeautifulSoup
 from fastapi import FastAPI, HTTPException, Request
-from fastapi.responses import StreamingResponse, RedirectResponse
+from fastapi.responses import StreamingResponse
 from fake_useragent import UserAgent
 import uvicorn
 
@@ -26,8 +26,9 @@ ua = UserAgent(fallback='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/5
 
 # MediaFire Cache
 MEDIAFIRE_CACHE = {}
-CACHE_TTL = 3600 
+CACHE_TTL = 1800 
 
+# Persistent Client for connection pooling
 client = httpx.AsyncClient(
     timeout=httpx.Timeout(60.0, read=None), 
     follow_redirects=True,
@@ -62,9 +63,7 @@ def get_google_file_id(url):
 def get_clean_filename(url):
     decoded_url = urllib.parse.unquote(url)
     name = decoded_url.split('/')[-1].split('?')[0]
-    if not name or '.' not in name:
-        return "video.mp4"
-    return name
+    return name if (name and '.' in name) else "video.mp4"
 
 @app.get("/download")
 async def download_proxy(request: Request, url: str, key: str = None):
@@ -76,7 +75,7 @@ async def download_proxy(request: Request, url: str, key: str = None):
     range_header = request.headers.get('range')
     current_time = time.time()
 
-    # --- MediaFire Section (Redirect with Path Trick) ---
+    # --- MediaFire Section ---
     if "mediafire.com" in clean_url:
         target_link = None
         cached = MEDIAFIRE_CACHE.get(clean_url)
@@ -86,37 +85,31 @@ async def download_proxy(request: Request, url: str, key: str = None):
         
         if not target_link:
             try:
-                # Scrape Direct Link
-                async with httpx.AsyncClient(headers={'User-Agent': ua.random}, follow_redirects=True) as temp_client:
+                # Browser အစစ်လိုမျိုး Header တွေထည့်ပြီး Scrape လုပ်ခြင်း
+                headers = {
+                    'User-Agent': ua.random,
+                    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
+                    'Accept-Language': 'en-US,en;q=0.5',
+                    'Connection': 'keep-alive',
+                    'Upgrade-Insecure-Requests': '1'
+                }
+                async with httpx.AsyncClient(headers=headers, follow_redirects=True) as temp_client:
                     r = await temp_client.get(clean_url)
                     if r.status_code == 200:
                         match = re.search(r"https?://download[0-9]+\.mediafire\.com/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+/[^\s'\"]+", r.text)
                         if match:
                             target_link = match.group(0).replace('"', '').replace("'", "")
-                        else:
-                            soup = BeautifulSoup(r.text, 'html.parser')
-                            btn = soup.find('a', {'id': 'downloadButton'}) or soup.find('a', {'class': 'input_btn_p'})
-                            if btn: target_link = btn.get('href')
-
+                        
                         if target_link:
-                            if target_link.startswith("//"): target_link = f"https:{target_link}"
                             MEDIAFIRE_CACHE[clean_url] = {'link': target_link, 'time': current_time}
             except: pass
 
         if target_link:
-            # Player က Video လို့သိအောင် Link ကို ပုံစံပြောင်းပြီး Redirect လုပ်ခြင်း
-            # MediaFire link ထဲမှာ filename ကို Path အနေနဲ့ ကပ်ပေးလိုက်တာပါ (ဒါကို Player က ပိုကြိုက်ပါတယ်)
-            if "?" in target_link:
-                redirect_url = f"{target_link}&file={urllib.parse.quote(filename)}"
-            else:
-                # Link ရဲ့ အဆုံးမှာ /filename.mp4 ကပ်ပေးခြင်း (MediaFire server က ဒါကို ignore လုပ်လေ့ရှိပါတယ်)
-                redirect_url = f"{target_link}/{urllib.parse.quote(filename)}"
-            
-            return RedirectResponse(url=redirect_url)
+            return await stream_file(target_link, range_header, filename, referer=clean_url)
         else:
-            raise HTTPException(status_code=404, detail="MediaFire direct link not found.")
+            raise HTTPException(status_code=404, detail="Could not find direct link")
 
-    # --- Google Drive Section (Proxy as usual) ---
+    # --- Google Drive Section ---
     elif "drive.google.com" in clean_url:
         file_id = get_google_file_id(clean_url)
         if not file_id: raise HTTPException(status_code=400, detail="Invalid GD Link")
@@ -144,13 +137,26 @@ async def download_proxy(request: Request, url: str, key: str = None):
     else:
         return await stream_file(clean_url, range_header, filename)
 
-async def stream_file(target_url, range_header, filename):
+async def stream_file(target_url, range_header, filename, referer=None):
     headers = {'User-Agent': ua.random}
     if range_header: headers['Range'] = range_header
+    if referer: headers['Referer'] = referer # MediaFire အတွက် Referer ထည့်ပေးခြင်း
+    
     try:
         req = client.build_request("GET", target_url, headers=headers)
         r = await client.send(req, stream=True)
+        
+        # အကယ်၍ MediaFire က Block ပြီး HTML ပြန်ပို့ရင် Cache ကိုဖျက်ပြီး အသစ်ပြန်လုပ်ရန်
+        if "text/html" in r.headers.get("Content-Type", "").lower() and r.status_code == 200:
+            await r.aclose()
+            # Cache ရှင်းလင်းခြင်း
+            for key, val in list(MEDIAFIRE_CACHE.items()):
+                if val['link'] == target_url:
+                    del MEDIAFIRE_CACHE[key]
+            raise HTTPException(status_code=415, detail="MediaFire detection triggered. Retrying...")
+            
         return await process_response(r, filename)
+    except HTTPException: raise
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))