Update main.py

main.py

@@ -60,46 +60,59 @@ async def download_proxy(request: Request, url: str, key: str = None):
     if key != ACCESS_KEY:
         raise HTTPException(status_code=403, detail="Access Denied")
 
-    url = urllib.parse.unquote(url)
+    # URL ကို အကြိမ်ကြိမ် Decode လုပ်ပြီး သန့်စင်ခြင်း
+    clean_url = urllib.parse.unquote(url)
+    while "%" in clean_url:
+        prev_url = clean_url
+        clean_url = urllib.parse.unquote(clean_url)
+        if prev_url == clean_url: break
+
     range_header = request.headers.get('range')
 
     # --- MediaFire ---
-    if "mediafire.com" in url:
-        target_link = None
-        headers = {'User-Agent': ua.random}
+    if "mediafire.com" in clean_url:
         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)
+            # MediaFire Page ကို ခေါ်ယူခြင်း
+            r = await client.get(clean_url, headers={'User-Agent': ua.random})
+            if r.status_code != 200:
+                raise HTTPException(status_code=r.status_code, detail="Failed to access MediaFire page")
+
+            # Direct Link ရှာဖွေခြင်း
+            target_link = None
+            # Method 1: Regex
+            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)
-            else:
+                target_link = match.group(0).replace('"', '').replace("'", "")
+            
+            # Method 2: BeautifulSoup (Regex မတွေ့ရင်)
+            if not target_link:
                 soup = BeautifulSoup(r.text, 'html.parser')
                 btn = soup.find('a', {'id': 'downloadButton'})
                 if btn and btn.get('href'):
                     target_link = btn.get('href')
-            
+
             if not target_link:
-                raise HTTPException(status_code=404, detail="MediaFire direct link not found")
+                raise HTTPException(status_code=404, detail="Direct link not found in MediaFire page")
             
             return await stream_file(target_link, range_header)
         except Exception as e:
-            raise HTTPException(status_code=500, detail=f"MediaFire Error: {str(e)}")
+            print(f"MediaFire Error: {str(e)}")
+            raise HTTPException(status_code=500, detail=str(e))
 
     # --- Dropbox ---
-    elif "dropbox.com" in url:
-        target_link = url.replace("?dl=0", "").split("?")[0] + "?dl=1"
+    elif "dropbox.com" in clean_url:
+        target_link = clean_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('+', '-')
+    elif "1drv.ms" in clean_url or "onedrive.live.com" in clean_url:
+        encoded_url = base64.b64encode(bytes(clean_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 ---
-    elif "drive.google.com" in url:
-        file_id = get_google_file_id(url)
+    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 Google Drive Link")
 
@@ -126,14 +139,14 @@ async def download_proxy(request: Request, url: str, key: str = None):
         return await stream_file(public_url, range_header)
 
     else:
-        # Generic fallback for other direct links
-        return await stream_file(url, range_header)
+        return await stream_file(clean_url, range_header)
 
 async def stream_file(target_url, range_header):
     headers = {'User-Agent': ua.random}
     if range_header: headers['Range'] = range_header
     
     try:
+        # Redirect တွေကို ကိုင်တွယ်နိုင်ရန် client object ကို သုံးသည်
         req = client.build_request("GET", target_url, headers=headers)
         r = await client.send(req, stream=True)
         return await process_response(r)
@@ -141,7 +154,7 @@ async def stream_file(target_url, range_header):
         raise HTTPException(status_code=500, detail=str(e))
 
 async def process_response(r):
-    # Pass-through critical headers for streaming
+    # Streaming အတွက် လိုအပ်သော Header များကို သန့်စင်ယူခြင်း
     safe_headers = [
         'content-type', 'content-length', 'content-range', 
         'accept-ranges', 'content-disposition', 'cache-control'
@@ -149,16 +162,15 @@ async def process_response(r):
     
     response_headers = {n: v for n, v in r.headers.items() if n.lower() in safe_headers}
     
-    # Force basic streaming headers if missing
+    # Header ထဲမှာ မပါလာရင်တောင် Bytes range လက်ခံကြောင်း ပြောထားမှ Player တွေ အဆင်ပြေမည်
     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=262144): # Chunk size ကို 256KB သို့ တိုးမြှင့်ထားသည်
+            async for chunk in r.aiter_bytes(chunk_size=262144):
                 yield chunk
         finally:
             await r.aclose()