Update main.py

main.py

@@ -28,10 +28,11 @@ ua = UserAgent(fallback='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/5
 MEDIAFIRE_CACHE = {}
 CACHE_TTL = 1800 
 
+# Global Client
 client = httpx.AsyncClient(
     timeout=httpx.Timeout(60.0, read=None), 
     follow_redirects=True,
-    limits=httpx.Limits(max_connections=300, max_keepalive_connections=100)
+    limits=httpx.Limits(max_connections=500, max_keepalive_connections=100)
 )
 
 @app.get("/")
@@ -65,25 +66,32 @@ def get_clean_filename(url):
     return name if (name and '.' in name) else "video.mp4"
 
 async def scrape_mediafire(url):
-    """MediaFire Direct Link ကို ပိုမိုတိကျစွာ ရှာဖွေပေးခြင်း"""
+    """MediaFire direct link ကို ပိုမိုခိုင်မာစွာ ရှာဖွေခြင်း"""
     try:
         headers = {
             'User-Agent': ua.random,
             'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
             'Referer': 'https://www.mediafire.com/'
         }
-        async with httpx.AsyncClient(headers=headers, follow_redirects=True, timeout=20.0) as temp_client:
+        async with httpx.AsyncClient(headers=headers, follow_redirects=True, timeout=25.0) as temp_client:
             r = await temp_client.get(url)
-            if r.status_code == 200:
-                # Regex ရှာဖွေခြင်း
-                match = re.search(r'https?://download[^\s"\']+mediafire\.com/[^\s"\']+', r.text)
-                if match: return match.group(0).strip()
-                
-                # BS4 နဲ့ ထပ်ရှာခြင်း
-                soup = BeautifulSoup(r.text, 'html.parser')
-                btn = soup.find('a', {'id': 'downloadButton'}) or soup.find('a', {'aria-label': re.compile(r'Download', re.I)})
-                if btn: return btn.get('href')
-    except: pass
+            if r.status_code != 200: return None
+            
+            # Pattern 1: Direct Regex
+            match = re.search(r'https?://download[^\s"\']+mediafire\.com/[^\s"\']+', r.text)
+            if match: return match.group(0).strip().replace("'", "").replace('"', '')
+            
+            # Pattern 2: BeautifulSoup
+            soup = BeautifulSoup(r.text, 'html.parser')
+            btn = soup.find('a', {'id': 'downloadButton'}) or soup.find('a', {'aria-label': re.compile(r'Download', re.I)})
+            if btn and btn.get('href'): return btn.get('href')
+            
+            # Pattern 3: Javascript Variable
+            js_match = re.search(r"khtmlurl\s*=\s*['\"](https?://download.*?)['\"]", r.text)
+            if js_match: return js_match.group(1)
+            
+    except Exception as e:
+        print(f"Scraper internal error: {e}")
     return None
 
 @app.get("/download")
@@ -107,19 +115,22 @@ async def download_proxy(request: Request, url: str, key: str = None):
                 if target_link.startswith("//"): target_link = f"https:{target_link}"
                 MEDIAFIRE_CACHE[clean_url] = {'link': target_link, 'time': current_time}
 
-        if target_link:
-            # Retry Logic: Block ခံရရင် တစ်ကြိမ်ထပ်ကြိုးစားမည်
-            try:
-                return await stream_file(target_link, range_header, filename, referer=clean_url)
-            except HTTPException as e:
-                if e.status_code == 415: # HTML Blocked ဖြစ်ခဲ့ရင် Cache ဖျက်ပြီး အသစ်တခါပြန်ရှာ
-                    del MEDIAFIRE_CACHE[clean_url]
-                    new_link = await scrape_mediafire(clean_url)
-                    if new_link:
-                        return await stream_file(new_link, range_header, filename, referer=clean_url)
-                raise e
-        else:
-            raise HTTPException(status_code=404, detail="Direct link failure")
+        if not target_link:
+            raise HTTPException(status_code=404, detail="MediaFire direct link could not be found.")
+
+        # Stream with Retry on Block
+        try:
+            return await stream_file(target_link, range_header, filename, referer=clean_url)
+        except HTTPException as e:
+            if e.status_code == 415: # Detection Triggered
+                if clean_url in MEDIAFIRE_CACHE: del MEDIAFIRE_CACHE[clean_url]
+                new_link = await scrape_mediafire(clean_url)
+                if new_link:
+                    return await stream_file(new_link, range_header, filename, referer=clean_url)
+            raise e
+        except Exception as e:
+            print(f"MediaFire Stream Error: {e}")
+            raise HTTPException(status_code=500, detail="Streaming failed.")
 
     # --- Google Drive Section ---
     elif "drive.google.com" in clean_url:
@@ -158,10 +169,11 @@ async def stream_file(target_url, range_header, filename, referer=None):
         req = client.build_request("GET", target_url, headers=headers)
         r = await client.send(req, stream=True)
         
-        # HTML Blocked Detection
-        if "text/html" in r.headers.get("Content-Type", "").lower() and r.status_code == 200:
+        # HTML Content detected (MediaFire error page or bot challenge)
+        ctype = r.headers.get("Content-Type", "").lower()
+        if "text/html" in ctype and r.status_code == 200:
             await r.aclose()
-            raise HTTPException(status_code=415, detail="MediaFire detection triggered.")
+            raise HTTPException(status_code=415, detail="MediaFire blocked request.")
             
         return await process_response(r, filename)
     except HTTPException: raise
@@ -177,19 +189,25 @@ async def process_response(r, filename):
         'Content-Type': mime_type,
         'Accept-Ranges': 'bytes',
         'Content-Disposition': f'inline; filename="{urllib.parse.quote(filename)}"',
-        'Cache-Control': 'no-cache'
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive'
     }
     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']
 
     async def stream_generator():
         try:
-            async for chunk in r.aiter_bytes(chunk_size=131072):
+            async for chunk in r.aiter_bytes(chunk_size=131072): # 128KB
                 yield chunk
         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)