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
+from fastapi.responses import StreamingResponse, RedirectResponse
 from fake_useragent import UserAgent
 import uvicorn
 
@@ -28,7 +28,6 @@ ua = UserAgent(fallback='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/5
 MEDIAFIRE_CACHE = {}
 CACHE_TTL = 3600 
 
-# Global Client
 client = httpx.AsyncClient(
     timeout=httpx.Timeout(60.0, read=None), 
     follow_redirects=True,
@@ -77,7 +76,7 @@ async def download_proxy(request: Request, url: str, key: str = None):
     range_header = request.headers.get('range')
     current_time = time.time()
 
-    # --- MediaFire Section ---
+    # --- MediaFire Section (Redirect with Path Trick) ---
     if "mediafire.com" in clean_url:
         target_link = None
         cached = MEDIAFIRE_CACHE.get(clean_url)
@@ -87,8 +86,8 @@ async def download_proxy(request: Request, url: str, key: str = None):
         
         if not target_link:
             try:
-                headers = {'User-Agent': ua.random}
-                async with httpx.AsyncClient(headers=headers, follow_redirects=True, timeout=30.0) as temp_client:
+                # Scrape Direct Link
+                async with httpx.AsyncClient(headers={'User-Agent': ua.random}, 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)
@@ -105,11 +104,19 @@ async def download_proxy(request: Request, url: str, key: str = None):
             except: pass
 
         if target_link:
-            return await stream_file(target_link, range_header, filename)
+            # 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)
         else:
             raise HTTPException(status_code=404, detail="MediaFire direct link not found.")
 
-    # --- Google Drive Section ---
+    # --- Google Drive Section (Proxy as usual) ---
     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")
@@ -123,10 +130,12 @@ async def download_proxy(request: Request, url: str, key: str = None):
             api_link = f"https://www.googleapis.com/drive/v3/files/{file_id}?alt=media"
             headers = {"Authorization": f"Bearer {token}"}
             if range_header: headers['Range'] = range_header
-            
-            # Google Drive API Stream
             try:
-                return await stream_file(api_link, range_header, filename, extra_headers=headers)
+                req = client.build_request("GET", api_link, headers=headers)
+                r = await client.send(req, stream=True)
+                if r.status_code in [200, 206]:
+                    return await process_response(r, filename)
+                await r.aclose()
             except: continue
         
         public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
@@ -135,50 +144,14 @@ 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, extra_headers=None):
+async def stream_file(target_url, range_header, filename):
     headers = {'User-Agent': ua.random}
     if range_header: headers['Range'] = range_header
-    if extra_headers: headers.update(extra_headers)
-    
-    # Correct Way to Stream with HTTPX
     try:
-        # We use a context manager to ensure the request is properly handled
-        async def response_streamer():
-            async with client.stream("GET", target_url, headers=headers) as r:
-                if r.status_code >= 400:
-                    yield b"Error accessing file"
-                    return
-
-                mime_type, _ = mimetypes.guess_type(filename)
-                if not mime_type or 'application' in mime_type:
-                    mime_type = 'video/mp4' if filename.lower().endswith('.mp4') else 'video/x-matroska'
-
-                # Headers for Resume/Seek
-                res_headers = {
-                    'Content-Type': mime_type,
-                    'Accept-Ranges': 'bytes',
-                    'Content-Disposition': f'inline; filename="{urllib.parse.quote(filename)}"',
-                    'Cache-Control': 'no-cache'
-                }
-                if 'content-length' in r.headers: res_headers['Content-Length'] = r.headers['content-length']
-                if 'content-range' in r.headers: res_headers['Content-Range'] = r.headers['content-range']
-
-                # Note: StreamingResponse requires the generator to be passed, 
-                # but we need to send headers first. So we use a nested approach.
-                # Since FastAPI's StreamingResponse needs an async iterator:
-                
-        # ပြန်လည်ပြင်ဆင်ထားသော Stream Logic
         req = client.build_request("GET", target_url, headers=headers)
         r = await client.send(req, stream=True)
-        
-        if "text/html" in r.headers.get("Content-Type", "").lower() and r.status_code == 200:
-            await r.aclose()
-            raise HTTPException(status_code=415, detail="MediaFire Blocked (HTML received)")
-            
         return await process_response(r, filename)
-        
     except Exception as e:
-        print(f"Stream Error: {e}")
         raise HTTPException(status_code=500, detail=str(e))
 
 async def process_response(r, filename):
@@ -202,12 +175,7 @@ async def process_response(r, filename):
         finally:
             await r.aclose()
 
-    return StreamingResponse(
-        stream_generator(),
-        status_code=r.status_code,
-        headers=res_headers,
-        media_type=mime_type
-    )
+    return StreamingResponse(stream_generator(), status_code=r.status_code, headers=res_headers, media_type=mime_type)
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)