Update main.py

main.py

@@ -10,7 +10,8 @@ import json
 import requests
 import time
 import hashlib
-import re # HTML ထဲက link ရှာဖို့ လိုအပ်သည်
+import re
+import urllib.parse
 
 app = FastAPI()
 
@@ -27,67 +28,86 @@ if not os.path.exists(TEMP_DIR):
     os.makedirs(TEMP_DIR)
 
 # --- CONFIGURATION ---
-RAPID_API_KEY = "76af57b863msh20fecf9aaa3b6c6p1bbc52jsn3b00ca30e34f" # <--- ဘရိုရဲ့ Key ကို ဒီမှာ ထည့်ပါ
+RAPID_API_KEY = "76af57b863msh20fecf9aaa3b6c6p1bbc52jsn3b00ca30e34f" # <--- ဘရိုရဲ့ Key ကို ဒီမှာ ထည့်ပေးပါ
 RAPID_API_HOST = "facebook-media-downloader1.p.rapidapi.com"
 
 def cleanup(file_path: str):
     if os.path.exists(file_path):
         os.remove(file_path)
 
-@app.get("/")
-def root():
-    return {"message": "Bumiz FB API: Public & Private Logic Active"}
+def clean_fb_url(url: str):
+    """Facebook Source ထဲက ဝှက်ထားတဲ့ link တွေကို သန့်စင်ပေးခြင်း"""
+    if not url: return None
+    # Unescape backslashes (\/) and unicode
+    url = url.replace('\\/', '/')
+    try:
+        url = json.loads(f'"{url}"')
+    except:
+        pass
+    # HTML entities (&amp;) ကို ရှင်းလင်းခြင်း
+    return urllib.parse.unquote(url).replace('&amp;', '&')
 
-# --- PRIVATE VIDEO DOWNLOADER LOGIC ---
+# --- AGGRESSIVE PRIVATE SCRAPER ---
 @app.post("/download-private")
 async def download_private_fb(payload: dict = Body(...)):
     html_source = payload.get("html", "")
-    logs = ["Parsing HTML Source Code..."]
+    logs = ["Aggressive Search started..."]
     
     if not html_source:
-        raise HTTPException(status_code=400, detail="HTML Source is empty")
+        return {"success": False, "error": "HTML Source is empty."}
 
-    try:
-        # ၁။ Regex သုံးပြီး HD နှင့် SD လင့်ခ်များကို ရှာဖွေခြင်း
-        # playable_url_quality_hd သို့မဟုတ် playable_url ဆိုတဲ့ key တွေကို ရှာတာပါ
-        hd_match = re.search(r'"playable_url_quality_hd":"([^"]+)"', html_source)
-        sd_match = re.search(r'"playable_url":"([^"]+)"', html_source)
-        
-        video_url = None
-        if hd_match:
-            video_url = hd_match.group(1).replace('\\/', '/')
-            logs.append("HD Quality link found in source.")
-        elif sd_match:
-            video_url = sd_match.group(1).replace('\\/', '/')
-            logs.append("SD Quality link found in source.")
+    # ရှာဖွေမည့် Key ပုံစံများ (Facebook က ဝှက်ထားတတ်သမျှ အကုန်ထည့်ထားပါသည်)
+    patterns = [
+        r'"browser_native_hd_url":"([^"]+)"',
+        r'"browser_native_sd_url":"([^"]+)"',
+        r'"playable_url_quality_hd":"([^"]+)"',
+        r'"playable_url":"([^"]+)"',
+        r'"base_url":"([^"]+)"',
+        r'hd_src:"([^"]+)"',
+        r'sd_src:"([^"]+)"',
+        r'video:\[\{url:"([^"]+)"'
+    ]
 
-        if video_url:
-            return {
-                "success": True,
-                "method": "Private Source Parser",
-                "video_url": video_url,
-                "logs": logs
-            }
-        else:
-            return {"success": False, "error": "Could not find video links in HTML. Make sure you copied everything.", "logs": logs}
-            
-    except Exception as e:
-        return {"success": False, "error": str(e), "logs": logs}
+    hd_url = None
+    sd_url = None
 
-# --- PUBLIC VIDEO DOWNLOADER (YT-DLP + API) ---
-@app.get("/download")
-async def download_fb_video(background_tasks: BackgroundTasks, url: str = Query(...)):
-    # (ဒီနေရာမှာ အရင်က အလုပ်လုပ်ခဲ့တဲ့ Public download logic တွေကို ဆက်ထားပေးရပါမယ်)
-    # ဘရို အဆင်ပြေခဲ့တဲ့ အစောက logic အတိုင်းပါပဲ
-    file_id = hashlib.md5(url.encode()).hexdigest()
-    video_path = os.path.join(TEMP_DIR, f"{file_id}.mp4")
-    space_id = os.getenv('SPACE_ID', '').replace("/", "-")
+    # ၁။ Pattern matching ဖြင့် လင့်ခ်များကို လိုက်ရှာခြင်း
+    for pattern in patterns:
+        matches = re.findall(pattern, html_source)
+        for match in matches:
+            cleaned = clean_fb_url(match)
+            if cleaned and "fbcdn.net" in cleaned:
+                if "_hd" in pattern or "hd_src" in pattern or "quality_hd" in pattern:
+                    if not hd_url: hd_url = cleaned
+                else:
+                    if not sd_url: sd_url = cleaned
+
+    # ၂။ အကယ်၍ ပုံမှန် Regex နဲ့ ရှာမတွေ့ရင် Raw CDN Link တွေကို ဇွတ်လိုက်ရှာခြင်း
+    if not hd_url and not sd_url:
+        logs.append("Direct CDN scan active...")
+        raw_links = re.findall(r'https?://[^\s"\'\\]+fbcdn\.net/[^\s"\'\\]+', html_source)
+        for link in raw_links:
+            cleaned = clean_fb_url(link)
+            if "/v/" in cleaned and ".mp4" in cleaned:
+                if "bytestart" not in cleaned: # အပိုင်းအစတွေ မဟုတ်တာ သေချာအောင်
+                    hd_url = cleaned
+                    break
+
+    if hd_url or sd_url:
+        logs.append("Success! Link extracted from source.")
+        return {
+            "success": True,
+            "method": "Aggressive Scraper",
+            "video_url": hd_url or sd_url,
+            "logs": logs
+        }
     
-    # Cache Check
-    if os.path.exists(video_path):
-        return {"success": True, "method": "Cache", "video_url": f"https://{space_id}.hf.space/get_file?id={file_id}.mp4"}
+    return {"success": False, "error": "Could not find any video stream. Are you sure you copied the FULL source code?", "logs": logs}
 
-    # RapidAPI POST Request (Your Working Method)
+# --- PUBLIC DOWNLOADER ---
+@app.get("/download")
+async def download_fb_video(url: str = Query(...)):
+    # ဘရိုရဲ့ အရင်က အောင်မြင်ခဲ့တဲ့ API logic အတိုင်း ထားပေးထားပါတယ်
     try:
         api_url = f"https://{RAPID_API_HOST}/get_media"
         res = requests.post(api_url, json={"url": url}, headers={"x-rapidapi-key": RAPID_API_KEY, "x-rapidapi-host": RAPID_API_HOST}, timeout=15)
@@ -95,17 +115,14 @@ async def download_fb_video(background_tasks: BackgroundTasks, url: str = Query(
             data = res.json()
             v_url = data.get("hd") or data.get("sd") or data.get("url")
             if isinstance(v_url, list): v_url = v_url[0]
-            if v_url:
-                return {"success": True, "method": "RapidAPI", "video_url": v_url, "music_url": data.get("audio")}
+            if v_url: return {"success": True, "method": "RapidAPI", "video_url": v_url}
     except:
         pass
-
-    # Fallback to yt-dlp
-    return {"success": False, "error": "Public download failed. Try Private Mode if this is a restricted video."}
+    return {"success": False, "error": "Public link failed. Try Private Mode."}
 
 @app.get("/get_file")
 async def get_file(id: str):
     file_path = os.path.join(TEMP_DIR, id)
     if os.path.exists(file_path):
         return FileResponse(file_path, media_type="video/mp4", filename=f"fb_hq_{id}")
-    raise HTTPException(status_code=404, detail="File expired")
+    raise HTTPException(status_code=404, detail="Expired")