Update main.py

main.py

@@ -24,14 +24,14 @@ ACCESS_KEY = os.getenv("ACCESS_KEY", "0000")
 SERVICE_ACCOUNT_JSON_STR = os.getenv("GOOGLE_SERVICE_ACCOUNT_JSON")
 ua = UserAgent(fallback='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36')
 
-# MediaFire Cache (RAM)
+# MediaFire Cache
 MEDIAFIRE_CACHE = {}
-CACHE_TTL = 3600  # ၁ နာရီအထိ တိုးမြှင့်ထားသည်
+CACHE_TTL = 1800 
 
 client = httpx.AsyncClient(
     timeout=httpx.Timeout(60.0, read=None), 
     follow_redirects=True,
-    limits=httpx.Limits(max_connections=200, max_keepalive_connections=50)
+    limits=httpx.Limits(max_connections=100, max_keepalive_connections=20)
 )
 
 @app.get("/")
@@ -63,7 +63,7 @@ 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"
+        name = "video.mp4"
     return name
 
 @app.get("/download")
@@ -81,35 +81,40 @@ async def download_proxy(request: Request, url: str, key: str = None):
         cached_data = MEDIAFIRE_CACHE.get(clean_url)
         
         target_link = None
-        # Cache စစ်ဆေးခြင်း
         if cached_data and (current_time - cached_data['time']) < CACHE_TTL:
             target_link = cached_data['link']
         else:
             try:
-                # User-Agent တစ်ခုတည်းကို Session တစ်ခုလုံးအတွက် သုံးရန်
                 req_ua = ua.random
                 async with httpx.AsyncClient(headers={'User-Agent': req_ua}, follow_redirects=True) as temp_client:
                     page_res = await temp_client.get(clean_url)
-                    if page_res.status_code == 200:
-                        html_content = page_res.text
-                        match = re.search(r"https?://download[0-9]+\.mediafire\.com/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+/[^\s'\"]+", html_content)
-                        if match:
-                            target_link = match.group(0).replace('"', '').replace("'", "")
-                        
-                        if not target_link:
-                            soup = BeautifulSoup(html_content, 'html.parser')
-                            download_btn = soup.find('a', {'id': 'downloadButton'}) or soup.find('a', {'class': 'input_btn_p'})
-                            if download_btn: target_link = download_btn.get('href')
-
-                        if target_link:
-                            if target_link.startswith("//"): target_link = f"https:{target_link}"
-                            elif target_link.startswith("/"): target_link = f"https://www.mediafire.com{target_link}"
-                            MEDIAFIRE_CACHE[clean_url] = {'link': target_link, 'time': current_time}
-            except: pass
+                    if page_res.status_code != 200:
+                        raise HTTPException(status_code=page_res.status_code, detail="MediaFire access failed")
+                    
+                    html_content = page_res.text
+                    match = re.search(r"https?://download[0-9]+\.mediafire\.com/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+/[^\s'\"]+", html_content)
+                    if match:
+                        target_link = match.group(0).replace('"', '').replace("'", "")
+                    
+                    if not target_link:
+                        soup = BeautifulSoup(html_content, 'html.parser')
+                        download_btn = soup.find('a', {'id': 'downloadButton'}) or soup.find('a', {'class': 'input_btn_p'})
+                        if download_btn: target_link = download_btn.get('href')
+
+                    if target_link:
+                        if target_link.startswith("//"): target_link = f"https:{target_link}"
+                        elif target_link.startswith("/"): target_link = f"https://www.mediafire.com{target_link}"
+                        MEDIAFIRE_CACHE[clean_url] = {'link': target_link, 'time': current_time}
+            except Exception as e:
+                print(f"MediaFire Error: {e}")
+                raise HTTPException(status_code=500, detail=str(e))
 
         if target_link:
-            # MediaFire က Redirect လုပ်ရင် Player မှာ Resume/Seek ရအောင် Proxy နဲ့ပဲ ပြန်ပို့ပေးမည်
-            return await stream_file(target_link, range_header, filename)
+            # FIX: Player က Video မှန်းသိအောင် Link အဆုံးမှာ /filename.mkv ကို Hint အနေနဲ့ ထည့်ပေးလိုက်ခြင်း
+            # ဒါဟာ MediaFire ဆီ Request ရောက်တဲ့အခါ query parameter အနေနဲ့ပဲ မြင်သွားမှာမို့ link မပျက်ပါဘူး
+            separator = "&" if "?" in target_link else "?"
+            hinted_link = f"{target_link}{separator}ext={filename}"
+            return RedirectResponse(url=hinted_link)
         else:
             raise HTTPException(status_code=404, detail="Direct link extraction failed")
 
@@ -147,10 +152,6 @@ async def stream_file(target_url, range_header, filename):
     try:
         req = client.build_request("GET", target_url, headers=headers)
         r = await client.send(req, stream=True)
-        # အကယ်၍ HTML ပြန်လာပါက Cache ကို ဖျက်ပြီး အသစ်ပြန်လုပ်ရန် error ပေးမည်
-        if 'text/html' in r.headers.get('content-type', '').lower():
-            await r.aclose()
-            raise HTTPException(status_code=415, detail="Link Expired")
         return await process_response(r, filename)
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
@@ -158,20 +159,15 @@ async def stream_file(target_url, range_header, filename):
 async def process_response(r, filename):
     mime_type, _ = mimetypes.guess_type(filename)
     if not mime_type or 'application' in mime_type:
-        mime_type = 'video/mp4' if filename.endswith('.mp4') else 'video/x-matroska'
-
-    # Seek/Resume ရရှိစေရန် အဓိကကျသော Header များကို ထည့်သွင်းခြင်း
-    res_headers = {
-        'Content-Type': mime_type,
-        'Accept-Ranges': 'bytes',
-        'Cache-Control': 'no-cache',
-        'Content-Disposition': f'inline; filename=\"{urllib.parse.quote(filename)}\"'
-    }
+        mime_type = 'video/x-matroska' if filename.endswith('.mkv') else 'video/mp4'
+
+    safe_headers = ['content-length', 'content-range', 'accept-ranges', 'cache-control']
+    res_headers = {n: v for n, v in r.headers.items() if n.lower() in safe_headers}
+    res_headers['Content-Type'] = mime_type
+    res_headers['Accept-Ranges'] = 'bytes'
     
-    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']
+    quoted_name = urllib.parse.quote(filename)
+    res_headers['Content-Disposition'] = f'inline; filename="{quoted_name}"'
 
     async def stream_generator():
         try:
@@ -180,12 +176,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)