Update main.py

main.py

@@ -19,6 +19,8 @@ app = FastAPI()
 # --- Configurations ---
 ACCESS_KEY = os.getenv("ACCESS_KEY", "0000")
 SERVICE_ACCOUNT_JSON_STR = os.getenv("GOOGLE_SERVICE_ACCOUNT_JSON")
+
+# User-Agent Generator with fallback
 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')
 
 @app.get("/")
@@ -26,18 +28,25 @@ def index():
     return {"message": "Proxy is Online!", "usage": "/download?url=[LINK]&key=[YOUR_KEY]"}
 
 def get_all_service_accounts():
-    if not SERVICE_ACCOUNT_JSON_STR: return []
+    if not SERVICE_ACCOUNT_JSON_STR:
+        return []
     try:
         data = json.loads(SERVICE_ACCOUNT_JSON_STR)
         return data if isinstance(data, list) else [data]
-    except: return []
+    except Exception as e:
+        print(f"JSON Parsing Error: {e}")
+        return []
 
 def get_token_for_account(cred_dict):
     try:
-        creds = service_account.Credentials.from_service_account_info(cred_dict, scopes=['https://www.googleapis.com/auth/drive.readonly'])
-        creds.refresh(google.auth.transport.requests.Request())
+        scopes = ['https://www.googleapis.com/auth/drive.readonly']
+        creds = service_account.Credentials.from_service_account_info(cred_dict, scopes=scopes)
+        auth_req = google.auth.transport.requests.Request()
+        creds.refresh(auth_req)
         return creds.token
-    except: return None
+    except Exception as e:
+        print(f"Auth Error for {cred_dict.get('client_email')}: {e}")
+        return None
 
 def get_google_file_id(url):
     fid = re.search(r'/(?:d|file/d|open\?id=)/([a-zA-Z0-9_-]+)', url)
@@ -48,77 +57,98 @@ def download_proxy(request: Request, url: str, key: str = None):
     if key != ACCESS_KEY:
         raise HTTPException(status_code=403, detail="Access Denied")
 
-    range_header = request.headers.get('range')
-
     if "drive.google.com" not in url:
         target_link = None
-        headers = {'User-Agent': ua.random}
+        current_headers = {'User-Agent': ua.random, 'Accept-Language': 'en-US,en;q=0.9'}
 
         if "mediafire.com" in url:
             try:
-                r = requests.get(url, headers=headers, timeout=15)
+                current_headers['Referer'] = 'https://www.mediafire.com/'
+                r = requests.get(url, headers=current_headers, timeout=15)
                 soup = BeautifulSoup(r.text, 'html.parser')
                 btn = soup.find('a', {'id': 'downloadButton'})
                 target_link = btn.get('href') if btn else None
-            except: pass
+            except Exception as e:
+                print(f"MediaFire Error: {e}")
+        
         elif "dropbox.com" in url:
             target_link = url.replace("?dl=0", "").split("?")[0] + "?dl=1"
+            
         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=400, detail="Link resolution failed")
-        return stream_file(target_link, range_header)
+        if not target_link:
+            raise HTTPException(status_code=400, detail="Could not resolve direct link")
+        
+        return stream_file(target_link, request.headers.get('range'))
 
-    # Google Drive Logic
     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)
 
     for account in accounts:
         token = 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
-        
-        r = requests.get(api_link, headers=headers, stream=True, timeout=15)
-        if r.status_code in [200, 206]: return process_response(r)
+        if request.headers.get('range'):
+            headers['Range'] = request.headers.get('range')
+
+        try:
+            r = requests.get(api_link, headers=headers, stream=True, allow_redirects=True, timeout=15)
+            if r.status_code in [200, 206]:
+                return process_response(r)
+        except Exception as e:
+            print(f"Account Request Error: {e}")
 
     # Public Fallback
-    public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
-    h = {'User-Agent': ua.random}
-    if range_header: h['Range'] = range_header
-    r = requests.get(public_url, headers=h, stream=True, timeout=15)
-    return process_response(r)
+    try:
+        public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
+        headers = {'User-Agent': ua.random} 
+        if request.headers.get('range'):
+            headers['Range'] = request.headers.get('range')
+        r = requests.get(public_url, headers=headers, stream=True, allow_redirects=True, timeout=15)
+        return process_response(r)
+    except:
+        raise HTTPException(status_code=500, detail="Download failed.")
 
 def stream_file(target_url, range_header):
     headers = {'User-Agent': ua.random}
-    if range_header: headers['Range'] = range_header
-    r = requests.get(target_url, headers=headers, stream=True, allow_redirects=True, timeout=20)
-    return process_response(r)
+    if range_header:
+        headers['Range'] = range_header
+    try:
+        r = requests.get(target_url, headers=headers, stream=True, allow_redirects=True, timeout=15)
+        return process_response(r)
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
 
 def process_response(r):
-    # Video ကျော်ကြည့်လို့ရအောင် Header များကို သေချာပြန်ပေးခြင်း
-    excluded = ['content-encoding', 'transfer-encoding', 'connection']
-    headers = {n: v for n, v in r.headers.items() if n.lower() not in excluded}
-    
-    # Video Seek အတွက် မရှိမဖြစ်လိုအပ်သော Header
-    headers['Accept-Ranges'] = 'bytes'
+    excluded = ['content-encoding', 'content-length', 'transfer-encoding', 'connection']
+    response_headers = {n: v for n, v in r.headers.items() if n.lower() not in excluded}
+    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']
 
     def iterfile():
         try:
-            # Video streaming အတွက် 1MB သည် အကောင်းဆုံးဖြစ်သည် (ကျော်ကြည့်လျှင် ပိုမြန်သည်)
+            # Chunk size ကို 5MB တိုးမြှင့်ထားပါတယ် (Speed ပိုကောင်းစေရန်)
             for chunk in r.iter_content(chunk_size=1024*1024):
                 if chunk: yield chunk
         finally:
             r.close()
 
     return StreamingResponse(
-        iterfile(), 
-        status_code=r.status_code, 
-        headers=headers,
-        media_type=r.headers.get('Content-Type', 'video/mp4')
+        iterfile(),
+        status_code=r.status_code,
+        headers=response_headers,
+        media_type=r.headers.get('Content-Type', 'application/octet-stream')
     )
 
 if __name__ == "__main__":