Update main.py

main.py

@@ -25,7 +25,7 @@ ua = UserAgent(fallback='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/5
 
 # Global Async Client
 client = httpx.AsyncClient(
-    timeout=httpx.Timeout(30.0, read=None), 
+    timeout=httpx.Timeout(60.0, read=None), 
     follow_redirects=True,
     limits=httpx.Limits(max_connections=100, max_keepalive_connections=20)
 )
@@ -60,73 +60,74 @@ async def download_proxy(request: Request, url: str, key: str = None):
     if key != ACCESS_KEY:
         raise HTTPException(status_code=403, detail="Access Denied")
 
-    # Double encoded ဖြစ်နေသော URL များကို ရှင်းလင်းရန်
     url = urllib.parse.unquote(url)
-
     range_header = request.headers.get('range')
 
-    # --- MediaFire & Others ---
-    if "drive.google.com" not in url:
+    # --- MediaFire ---
+    if "mediafire.com" in url:
         target_link = None
-        headers = {'User-Agent': ua.random, 'Accept-Language': 'en-US,en;q=0.9'}
-
-        if "mediafire.com" in url:
-            try:
-                headers['Referer'] = 'https://www.mediafire.com/'
-                r = await client.get(url, headers=headers)
-                
-                # Regex ဖြင့် Direct Link ကို ရှာဖွေခြင်း
-                match = re.search(r'href="(https?://[a-zA-Z0-9-]+\.mediafire\.com/download/[^"]+)"', r.text)
-                if match:
-                    target_link = match.group(1)
-                else:
-                    soup = BeautifulSoup(r.text, 'html.parser')
-                    btn = soup.find('a', {'id': 'downloadButton'})
-                    if btn and btn.get('href'):
-                        # ပေးလာတဲ့ href မှာ https:// မပါရင် မူလ URL နဲ့ ပေါင်းပြီး အပြည့်အစုံဖြစ်အောင် ပြုလုပ်ခြင်း
-                        target_link = urllib.parse.urljoin(url, btn.get('href'))
-            except Exception as e:
-                print(f"MediaFire Error: {e}")
-        
-        elif "dropbox.com" in url:
-            target_link = url.replace("?dl=0", "").split("?")[0] + "?dl=1"
+        headers = {'User-Agent': ua.random}
+        try:
+            r = await client.get(url, headers=headers)
+            # ပိုမိုတိကျသော Regex ဖြင့် Direct Link ရှာခြင်း
+            match = re.search(r'https?://download[0-9]+\.mediafire\.com/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+/[^"]+', r.text)
+            if match:
+                target_link = match.group(0)
+            else:
+                soup = BeautifulSoup(r.text, 'html.parser')
+                btn = soup.find('a', {'id': 'downloadButton'})
+                if btn and btn.get('href'):
+                    target_link = btn.get('href')
             
-        elif "1drv.ms" in url or "onedrive.live.com" in url:
-            encoded_url = base64.b64encode(bytes(url, 'utf-8')).decode('utf-8').replace('=', '').replace('/', '_').replace('+', '-')
-            target_link = f"https://api.onedrive.com/v1.0/shares/u!{encoded_url}/root/content"
+            if not target_link:
+                raise HTTPException(status_code=404, detail="MediaFire direct link not found")
+            
+            return await stream_file(target_link, range_header)
+        except Exception as e:
+            raise HTTPException(status_code=500, detail=f"MediaFire Error: {str(e)}")
 
-        if not target_link:
-            raise HTTPException(status_code=400, detail="Could not resolve direct link")
-        
+    # --- Dropbox ---
+    elif "dropbox.com" in url:
+        target_link = url.replace("?dl=0", "").split("?")[0] + "?dl=1"
+        return await stream_file(target_link, range_header)
+            
+    # --- OneDrive ---
+    elif "1drv.ms" in url or "onedrive.live.com" in url:
+        encoded_url = base64.b64encode(bytes(url, 'utf-8')).decode('utf-8').replace('=', '').replace('/', '_').replace('+', '-')
+        target_link = f"https://api.onedrive.com/v1.0/shares/u!{encoded_url}/root/content"
         return await stream_file(target_link, range_header)
 
     # --- Google Drive ---
-    file_id = get_google_file_id(url)
-    if not file_id:
-        raise HTTPException(status_code=400, detail="Invalid Google Drive Link")
+    elif "drive.google.com" in url:
+        file_id = get_google_file_id(url)
+        if not file_id:
+            raise HTTPException(status_code=400, detail="Invalid Google Drive Link")
 
-    accounts = get_all_service_accounts()
-    random.shuffle(accounts)
+        accounts = get_all_service_accounts()
+        random.shuffle(accounts)
 
-    for account in accounts:
-        token = await get_token_for_account(account)
-        if not token: continue
+        for account in accounts:
+            token = await get_token_for_account(account)
+            if not token: continue
 
-        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
+            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
 
-        try:
-            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)
-            await r.aclose()
-        except: continue
+            try:
+                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)
+                await r.aclose()
+            except: continue
+
+        public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
+        return await stream_file(public_url, range_header)
 
-    # Public Fallback
-    public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
-    return await stream_file(public_url, range_header)
+    else:
+        # Generic fallback for other direct links
+        return await stream_file(url, range_header)
 
 async def stream_file(target_url, range_header):
     headers = {'User-Agent': ua.random}
@@ -137,24 +138,27 @@ async def stream_file(target_url, range_header):
         r = await client.send(req, stream=True)
         return await process_response(r)
     except Exception as e:
-        print(f"Stream Error for {target_url}: {e}")
         raise HTTPException(status_code=500, detail=str(e))
 
 async def process_response(r):
-    excluded = ['content-encoding', 'content-length', 'transfer-encoding', 'connection', 'content-disposition']
-    response_headers = {n: v for n, v in r.headers.items() if n.lower() not in excluded}
+    # Pass-through critical headers for streaming
+    safe_headers = [
+        'content-type', 'content-length', 'content-range', 
+        'accept-ranges', 'content-disposition', 'cache-control'
+    ]
     
-    response_headers['Accept-Ranges'] = 'bytes'
-    if 'Content-Length' in r.headers:
-        response_headers['Content-Length'] = r.headers['Content-Length']
-    if 'Content-Range' in r.headers:
-        response_headers['Content-Range'] = r.headers['Content-Range']
-
-    response_headers['Content-Disposition'] = 'attachment'
+    response_headers = {n: v for n, v in r.headers.items() if n.lower() in safe_headers}
+    
+    # Force basic streaming headers if missing
+    if 'accept-ranges' not in [k.lower() for k in response_headers.keys()]:
+        response_headers['Accept-Ranges'] = 'bytes'
+    
+    # nPlayer/VLC အတွက် Content-Type သည် အရေးကြီးပါသည်
+    media_type = r.headers.get('content-type', 'application/octet-stream')
 
     async def stream_generator():
         try:
-            async for chunk in r.aiter_bytes(chunk_size=131072):
+            async for chunk in r.aiter_bytes(chunk_size=262144): # Chunk size ကို 256KB သို့ တိုးမြှင့်ထားသည်
                 yield chunk
         finally:
             await r.aclose()
@@ -163,7 +167,7 @@ async def process_response(r):
         stream_generator(),
         status_code=r.status_code,
         headers=response_headers,
-        media_type='application/octet-stream'
+        media_type=media_type
     )
 
 if __name__ == "__main__":