v2.0: Invidious-first strategy + FFmpeg merge + dynamic instance discovery

Major rewrite based on real API testing (June 2026):

- Removed dead APIs: Cobalt (v7 shut down), Piped (all instances down)
- Added Invidious as primary download source
- Added FFmpeg video+audio merge for high quality downloads
- Added dynamic Invidious instance discovery from api.invidious.io
- Updated yt-dlp clients: tv_embedded, android_vr, mediaconnect
- Better error messages for users
- Frontend shows download source in progress
- Fixed anti-ban client priorities based on real tests
- Health check endpoint with instance status

README.md

@@ -14,13 +14,13 @@ app_port: 8555
 
   **تحميل فيديوهات يوتيوب مع الترجمات بسهولة وأمان**
 
-  [![Python](https://img.shields.io/badge/Python-3.9%2B-ff4444?style=flat-square&logo=python&logoColor=white)](https://python.org)
+  [![Python](https://img.shields.io/badge/Python-3.11%2B-ff4444?style=flat-square&logo=python&logoColor=white)](https://python.org)
   [![FastAPI](https://img.shields.io/badge/FastAPI-0.100%2B-009688?style=flat-square&logo=fastapi&logoColor=white)](https://fastapi.tiangolo.com)
   [![yt-dlp](https://img.shields.io/badge/yt--dlp-2024%2B-282828?style=flat-square&logo=youtube&logoColor=ff4444)](https://github.com/yt-dlp/yt-dlp)
 
   <br>
 
-  **Desktop Web UI** · **Anti-Ban Protection** · **Subtitle Support**
+  **Invidious-First** · **Anti-Ban Protection** · **FFmpeg Merge** · **Subtitle Support**
 
   <br>
 </div>
@@ -29,7 +29,14 @@ app_port: 8555
 
 ## Overview
 
-DownTube is a powerful YouTube downloader with a web interface built with FastAPI. It downloads both **video** and **subtitles** with advanced anti-ban strategies to avoid YouTube rate limiting.
+DownTube is a powerful YouTube downloader with a web interface built with FastAPI. It downloads both **video** and **subtitles** using an Invidious-first strategy that works from cloud servers without cookies.
+
+### Download Strategy (v2.0)
+
+1. **Invidious** (primary): Gets video info + download URLs from Invidious instances (works from cloud IPs!)
+2. **FFmpeg merge**: Downloads video+audio separately from Invidious for high quality, then merges
+3. **yt-dlp** (fallback): Uses `tv_embedded` client if Invidious fails
+4. **Dynamic instance discovery**: Automatically finds working Invidious instances from official API
 
 ---
 
@@ -38,27 +45,16 @@ DownTube is a powerful YouTube downloader with a web interface built with FastAP
 | Feature | Status |
 |---------|:------:|
 | Video Info Fetching | ✅ |
-| Video Download (best/720p/480p) | ✅ |
+| Video Download (360p-4K) | ✅ |
 | Subtitle Download (SRT/VTT) | ✅ |
 | Auto Subtitles | ✅ |
 | Anti-Ban Protection | ✅ |
 | Cookies Import | ✅ |
 | Download Manager | ✅ |
 | Dark Theme | ✅ |
-
-### Anti-Ban System
-- User-Agent rotation (15+ browsers/devices)
-- YouTube client switching (`web` / `android`)
-- Smart request delays with progressive backoff
-- HTTP 429 detection and automatic cooldown
-- Session limits to prevent detection
-- Cookie support to raise download limits
-
-### Subtitle Features
-- Download handwritten and auto-generated subtitles
-- Convert between SRT and VTT formats
-- Timing adjustment for perfect sync
-- Clean formatting and duplicate removal
+| Invidious-First Strategy | ✅ |
+| FFmpeg Video Merge | ✅ |
+| Dynamic Instance Discovery | ✅ |
 
 ---
 
@@ -79,6 +75,7 @@ DownTube is a powerful YouTube downloader with a web interface built with FastAP
 | `DELETE` | `/api/download/file` | Delete a file |
 | `GET` | `/api/anti-ban/status` | Anti-ban system status |
 | `POST` | `/api/anti-ban/reset` | Reset anti-ban session |
+| `GET` | `/api/fallback/status` | Invidious instance status |
 | `POST` | `/api/cookies/set` | Set cookies (paste) |
 | `POST` | `/api/cookies/upload` | Upload cookies file |
 | `GET` | `/api/cookies/status` | Cookies status |

core/anti_ban.py

@@ -43,8 +43,10 @@ USER_AGENTS = [
     "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.34 Safari/537.36",
 ]
 
-# ترتيب العملاء حسب الأولوية - الأقل حظراً على السيرفرات السحابية أولاً
-CLIENT_PRIORITY = ["mweb", "ios", "tv_embedded", "android", "web_creator", "web"]
+# ترتيب العملاء حسب الأولوية - بناءً على اختبارات حقيقية يونيو 2026
+# tv_embedded و android_vr و mediaconnect هم الأكثر فعالية
+# android يعطي 5 صيغ فقط لكنه قد يعمل من datacenter IPs
+CLIENT_PRIORITY = ["tv_embedded", "android_vr", "mediaconnect", "android", "web"]
 
 YOUTUBE_CLIENTS = CLIENT_PRIORITY
 
@@ -313,12 +315,17 @@ class AntiBanManager:
             opts["extractor_args"] = {"youtube": {"player_client": ["ios"]}}
         elif client == "tv_embedded":
             opts["extractor_args"] = {"youtube": {"player_client": ["tv_embedded"]}}
+        elif client == "android_vr":
+            opts["extractor_args"] = {"youtube": {"player_client": ["android_vr"]}}
+        elif client == "mediaconnect":
+            opts["extractor_args"] = {"youtube": {"player_client": ["mediaconnect"]}}
         elif client == "android":
-            opts["extractor_args"] = {"youtube": {"player_client": ["android", "web"]}}
+            opts["extractor_args"] = {"youtube": {"player_client": ["android"]}}
         elif client == "web_creator":
             opts["extractor_args"] = {"youtube": {"player_client": ["web_creator"]}}
         else:
-            opts["extractor_args"] = {"youtube": {"player_client": ["web"]}}
+            # default - لا نحدد عميل، yt-dlp يختار الأنسب
+            pass
 
         return opts
 

core/downloader.py

@@ -1,11 +1,12 @@
 """
 محمل الفيديوهات الرئيسي - نسخة السحابة المحسنة
-YouTube Video Downloader with Smart Hybrid System
+YouTube Video Downloader with Invidious-First Strategy
 
-نظام التحميل الذكي:
-1. جلب معلومات الفيديو من Invidious/Piped (يوفر حدود YouTube)
-2. محاولة التحميل بـ yt-dlp مع Fallback بين العملاء
-3. لو فشل yt-dlp → Fallback تلقائي لـ Cobalt → Invidious → Piped
+نظام التحميل الذكي (مُعاد تصميمه بناءً على اختبارات يونيو 2026):
+1. جلب معلومات الفيديو من Invidious (لا يستهلك حدود YouTube)
+2. تحميل الفيديو من Invidious (جميع الجودات عبر adaptive formats + FFmpeg)
+3. لو فشل Invidious → yt-dlp مع tv_embedded client كـ fallback
+4. الترجمات: Invidious captions → yt-dlp كـ fallback
 """
 
 import os
@@ -46,6 +47,7 @@ class DownloadStatus(Enum):
     WAITING_ANTI_BAN = "waiting_anti_ban"
     DOWNLOADING_VIDEO = "downloading_video"
     FALLBACK_DOWNLOAD = "fallback_download"
+    MERGING_VIDEO = "merging_video"
     COMPLETED = "completed"
     CANCELLED = "cancelled"
     FAILED = "failed"
@@ -63,8 +65,10 @@ class VideoInfo:
     view_count: int = 0
     available_subtitles: List[SubtitleInfo] = field(default_factory=list)
     formats: List[Dict[str, Any]] = field(default_factory=list)
-    # مصدر المعلومات (للتتبع)
+    # مصدر المعلومات
     info_source: str = "youtube"
+    # captions من Invidious
+    captions: List[Dict] = field(default_factory=list)
 
 
 @dataclass
@@ -78,12 +82,16 @@ class DownloadProgress:
     total_bytes: int = 0
     filename: str = ""
     message: str = ""
+    source: str = ""  # مصدر التحميل الحالي
 
 
 class YouTubeDownloader:
     """
-    محمل فيديوهات يوتيوب مع نظام تحميل ذكي مختلط
-    yt-dlp → Cobalt → Invidious → Piped
+    محمل فيديوهات يوتيوب - Invidious أولاً
+    الاستراتيجية:
+    - معلومات الفيديو: Invidious → yt-dlp
+    - تحميل الفيديو: Invidious (direct/adaptive+FFmpeg) → yt-dlp
+    - الترجمات: Invidious captions → yt-dlp
     """
 
     def __init__(self, download_dir: str = "/tmp/youtube_downloads"):
@@ -125,13 +133,26 @@ class YouTubeDownloader:
     def _convert_fallback_info(self, fallback_info: FallbackVideoInfo) -> VideoInfo:
         """تحويل معلومات الفيديو من FallbackVideoInfo إلى VideoInfo"""
         subtitles = []
+
+        # استخراج الترجمات من captions (أكثر فعالية)
+        if fallback_info.captions:
+            for cap in fallback_info.captions:
+                subtitles.append(SubtitleInfo(
+                    language=cap.get("language", ""),
+                    language_code=cap.get("language_code", ""),
+                    auto_generated=cap.get("auto_generated", False),
+                    url=cap.get("url", ""),
+                ))
+
+        # كمان subtitles
         for sub in fallback_info.available_subtitles:
-            subtitles.append(SubtitleInfo(
-                language=sub.get("language", ""),
-                language_code=sub.get("language_code", ""),
-                auto_generated=sub.get("auto_generated", False),
-                url=sub.get("url", ""),
-            ))
+            if not any(s.language_code == sub.get("language_code") for s in subtitles):
+                subtitles.append(SubtitleInfo(
+                    language=sub.get("language", ""),
+                    language_code=sub.get("language_code", ""),
+                    auto_generated=sub.get("auto_generated", False),
+                    url=sub.get("url", ""),
+                ))
 
         return VideoInfo(
             title=fallback_info.title,
@@ -142,39 +163,51 @@ class YouTubeDownloader:
             uploader=fallback_info.uploader,
             view_count=fallback_info.view_count,
             available_subtitles=subtitles,
-            info_source="fallback",
+            info_source="invidious",
+            captions=fallback_info.captions or [],
         )
 
     async def fetch_video_info(self, url: str) -> VideoInfo:
         """
-        جلب معلومات الفيديو - نظام مختلط:
-        1. Invidious/Piped أولاً (يوفر حدود YouTube)
-        2. لو فشلوا → yt-dlp مع Fallback بين العملاء
+        جلب معلومات الفيديو - Invidious أولاً
         """
         self._cancelled = False
-        self._update_progress(status=DownloadStatus.FETCHING_INFO, message="جاري جلب معلومات الفيديو...")
+        self._update_progress(
+            status=DownloadStatus.FETCHING_INFO,
+            message="جاري جلب معلومات الفيديو من Invidious...",
+            source="invidious",
+        )
 
-        # ═══ المحاولة 1: Invidious/Piped (لا يستهلك حدود YouTube) ═══
+        # ═══ المحاولة 1: Invidious (لا يستهلك حدود YouTube) ═══
         try:
             fallback_info = await asyncio.wait_for(
                 self.fallback.get_video_info(url),
-                timeout=15,
+                timeout=20,
             )
             if fallback_info and fallback_info.title:
                 info = self._convert_fallback_info(fallback_info)
-                info.info_source = "fallback"
-                logger.info(f"Got video info from fallback API (source={info.info_source})")
-                self._update_progress(status=DownloadStatus.IDLE, message="تم جلب المعلومات بنجاح")
+                info.info_source = "invidious"
+                logger.info(f"Got video info from Invidious: {info.title}")
+                self._update_progress(
+                    status=DownloadStatus.IDLE,
+                    message="تم جلب المعلومات بنجاح من Invidious",
+                )
                 return info
         except asyncio.TimeoutError:
-            logger.warning("Fallback API timeout for video info, trying yt-dlp...")
+            logger.warning("Invidious timeout for video info, trying yt-dlp...")
         except Exception as e:
-            logger.warning(f"Fallback API failed for video info: {e}, trying yt-dlp...")
+            logger.warning(f"Invidious failed for video info: {e}, trying yt-dlp...")
+
+        # ═══ المحاولة 2: yt-dlp مع tv_embedded client ═══
+        self._update_progress(
+            message="Invidious فشل، جاري المحاولة بـ yt-dlp...",
+            source="yt_dlp",
+        )
 
-        # ═══ المحاولة 2: yt-dlp مع Fallback بين العملاء ═══
         await anti_ban.wait_before_request()
 
-        clients_to_try = [anti_ban.get_current_client()] + anti_ban.get_fallback_clients()
+        # نستخدم tv_embedded و android_vr لأنهم الأكثر فعالية
+        clients_to_try = ["tv_embedded", "android_vr", "mediaconnect", "android", "web"]
         last_error = None
 
         for client in clients_to_try:
@@ -242,7 +275,10 @@ class YouTubeDownloader:
                             break
 
                 anti_ban.report_success()
-                self._update_progress(status=DownloadStatus.IDLE, message="تم جلب المعلومات بنجاح")
+                self._update_progress(
+                    status=DownloadStatus.IDLE,
+                    message="تم جلب المعلومات بنجاح من yt-dlp",
+                )
                 return video_info
 
             except CancelledError:
@@ -261,8 +297,12 @@ class YouTubeDownloader:
                     break
 
         # ═══ كل الطرق فشلت ═══
-        self._update_progress(status=DownloadStatus.FAILED, message=f"فشل جلب المعلومات: {str(last_error)}")
-        raise last_error
+        error_msg = str(last_error) if last_error else "فشل جلب المعلومات"
+        self._update_progress(
+            status=DownloadStatus.FAILED,
+            message=f"فشل جلب المعلومات: {error_msg}",
+        )
+        raise last_error if last_error else Exception("فشل جلب معلومات الفيديو من جميع المصادر")
 
     async def download_subtitle(
         self,
@@ -274,21 +314,21 @@ class YouTubeDownloader:
         """تحميل الترجمة"""
         self._update_progress(
             status=DownloadStatus.DOWNLOADING_SUBTITLE,
-            message=f"جاري تحميل الترجمة ({language_code})...",
+            message=f"جاري تحميل الترجمة ({language_code}) من Invidious...",
             percent=0,
+            source="invidious",
         )
 
         if self._cancelled:
             return None
 
-        # ═══ المحاولة 1: Invidious (لا يستهلك حدود YouTube) ═══
+        # ═══ المحاولة 1: Invidious captions ═══
         try:
             sub_content = await asyncio.wait_for(
                 self.fallback.get_subtitle_content(url, language_code),
                 timeout=15,
             )
             if sub_content:
-                # تحويل الصيغة إذا لزم الأمر
                 content = self.subtitle_converter.format_subtitle(sub_content, subtitle_format)
 
                 final_path = os.path.join(self.download_dir, f"subtitle_{language_code}.{subtitle_format}")
@@ -296,12 +336,21 @@ class YouTubeDownloader:
                     f.write(content)
 
                 logger.info(f"Subtitle downloaded from Invidious: {final_path}")
-                self._update_progress(status=DownloadStatus.DOWNLOADING_SUBTITLE, percent=100, message="تم تحميل الترجمة")
+                self._update_progress(
+                    status=DownloadStatus.DOWNLOADING_SUBTITLE,
+                    percent=100,
+                    message="تم تحميل الترجمة من Invidious",
+                )
                 return final_path
         except Exception as e:
             logger.warning(f"Invidious subtitle failed: {e}, trying yt-dlp...")
 
         # ═══ المحاولة 2: yt-dlp ═══
+        self._update_progress(
+            message="Invidious فشل للترجمة، جاري المحاولة بـ yt-dlp...",
+            source="yt_dlp",
+        )
+
         await anti_ban.wait_before_request()
 
         try:
@@ -334,7 +383,11 @@ class YouTubeDownloader:
 
             await loop.run_in_executor(None, _download_sub)
 
-            self._update_progress(status=DownloadStatus.DOWNLOADING_SUBTITLE, percent=100, message="تم تحميل الترجمة")
+            self._update_progress(
+                status=DownloadStatus.DOWNLOADING_SUBTITLE,
+                percent=100,
+                message="تم تحميل الترجمة من yt-dlp",
+            )
             anti_ban.report_success()
 
             subtitle_file = self._find_subtitle_file(language_code, sub_format)
@@ -362,7 +415,10 @@ class YouTubeDownloader:
             if self._cancelled:
                 return None
             anti_ban.report_failure(status_code=_extract_429_status(e))
-            self._update_progress(status=DownloadStatus.FAILED, message=f"فشل تحميل الترجمة: {str(e)}")
+            self._update_progress(
+                status=DownloadStatus.FAILED,
+                message=f"فشل تحميل الترجمة: {str(e)}",
+            )
             raise
 
     async def download_video(
@@ -372,53 +428,121 @@ class YouTubeDownloader:
         output_filename: Optional[str] = None,
     ) -> Optional[str]:
         """
-        تحميل الفيديو - نظام مختلط:
-        1. yt-dlp مع Fallback بين العملاء
-        2. لو فشل → Cobalt → Invidious → Piped
+        تحميل الفيديو - Invidious أولاً ثم yt-dlp
         """
         self._update_progress(
             status=DownloadStatus.DOWNLOADING_VIDEO,
-            message="جاري تحميل الفيديو...",
+            message="جاري تحميل الفيديو من Invidious...",
             percent=0,
+            source="invidious",
         )
 
         if self._cancelled:
             return None
 
-        # انتظار بين الترجمة والفيديو
-        self._update_progress(
-            status=DownloadStatus.WAITING_ANTI_BAN,
-            message="جاري الانتظار لتجنب الحظر...",
-        )
-        await anti_ban.wait_between_subtitle_and_video()
-
-        if self._cancelled:
-            return None
-
-        # ═══ المحاولة 1: yt-dlp مع Fallback بين العملاء ═══
-        video_file = await self._try_ytdlp_download(url, quality, output_filename)
+        # ═══ المحاولة 1: Invidious ═══
+        video_file = await self._try_invidious_download(url, quality, output_filename)
         if video_file:
             return video_file
 
         if self._cancelled:
             return None
 
-        # ═══ المحاولة 2: Fallback APIs (Cobalt → Invidious → Piped) ═══
-        logger.info("yt-dlp failed, trying fallback APIs...")
+        # ═══ المحاولة 2: yt-dlp ═══
+        logger.info("Invidious failed, trying yt-dlp...")
         self._update_progress(
-            status=DownloadStatus.FALLBACK_DOWNLOAD,
-            message="جاري التحميل من مصدر بديل...",
+            status=DownloadStatus.DOWNLOADING_VIDEO,
+            message="Invidious فشل، جاري المحاولة بـ yt-dlp...",
             percent=0,
+            source="yt_dlp",
         )
 
-        video_file = await self._try_fallback_download(url, quality)
+        video_file = await self._try_ytdlp_download(url, quality, output_filename)
         if video_file:
             return video_file
 
         if self._cancelled:
             return None
 
-        self._update_progress(status=DownloadStatus.FAILED, message="فشل تحميل الفيديو من جميع المصادر")
+        self._update_progress(
+            status=DownloadStatus.FAILED,
+            message="فشل تحميل الفيديو من جميع المصادر. جرب فيديو آخر أو حاول لاحقاً.",
+        )
+        return None
+
+    async def _try_invidious_download(
+        self,
+        url: str,
+        quality: str = "best",
+        output_filename: Optional[str] = None,
+    ) -> Optional[str]:
+        """تحميل الفيديو من Invidious"""
+        try:
+            result = await self.fallback.get_download_url(url, quality)
+            if not result:
+                logger.warning("Invidious returned no download URL")
+                return None
+
+            needs_merge = result.get("needs_merge", False)
+
+            if needs_merge:
+                # تحميل فيديو + صوت منفصلين ودمجهم
+                video_url = result.get("video_url", "")
+                audio_url = result.get("audio_url", "")
+                filename = result.get("filename", "video.mp4")
+
+                if output_filename:
+                    filename = output_filename
+
+                self._update_progress(
+                    status=DownloadStatus.FALLBACK_DOWNLOAD,
+                    percent=10,
+                    message=f"جاري تحميل الفيديو بجودة {result.get('quality', '?')} من Invidious...",
+                    source="invidious_adaptive",
+                )
+
+                filepath = await self.fallback.download_and_merge(
+                    video_url, audio_url, filename
+                )
+
+                if filepath:
+                    self._update_progress(
+                        status=DownloadStatus.COMPLETED,
+                        percent=100,
+                        message=f"تم تحميل الفيديو بنجاح من Invidious! (جودة: {result.get('quality', '?')})",
+                        filename=filepath,
+                    )
+                    return filepath
+
+            else:
+                # تحميل مباشر (فيديو + صوت معاً)
+                download_url = result["url"]
+                filename = result.get("filename", "video.mp4")
+
+                if output_filename:
+                    filename = output_filename
+
+                self._update_progress(
+                    status=DownloadStatus.FALLBACK_DOWNLOAD,
+                    percent=10,
+                    message=f"جاري تحميل الفيديو بجودة {result.get('quality', '?')} من Invidious...",
+                    source="invidious_direct",
+                )
+
+                filepath = await self.fallback.download_from_url(download_url, filename)
+
+                if filepath:
+                    self._update_progress(
+                        status=DownloadStatus.COMPLETED,
+                        percent=100,
+                        message=f"تم تحميل الفيديو بنجاح من Invidious! (جودة: {result.get('quality', '?')})",
+                        filename=filepath,
+                    )
+                    return filepath
+
+        except Exception as e:
+            logger.error(f"Invidious download failed: {e}")
+
         return None
 
     async def _try_ytdlp_download(
@@ -427,8 +551,9 @@ class YouTubeDownloader:
         quality: str = "best",
         output_filename: Optional[str] = None,
     ) -> Optional[str]:
-        """محاولة التحميل بـ yt-dlp مع Fallback بين العملاء"""
-        clients_to_try = [anti_ban.get_current_client()] + anti_ban.get_fallback_clients()
+        """محاولة التحميل بـ yt-dlp"""
+        # tv_embedded و android_vr هم الأكثر فعالية
+        clients_to_try = ["tv_embedded", "android_vr", "mediaconnect", "android", "web"]
 
         for client in clients_to_try:
             if self._cancelled:
@@ -484,7 +609,7 @@ class YouTubeDownloader:
                     self._update_progress(
                         status=DownloadStatus.COMPLETED,
                         percent=100,
-                        message="تم تحميل الفيديو بنجاح!",
+                        message="تم تحميل الفيديو بنجاح من yt-dlp!",
                         filename=video_file,
                     )
                     anti_ban.report_success()
@@ -503,46 +628,6 @@ class YouTubeDownloader:
 
         return None
 
-    async def _try_fallback_download(
-        self,
-        url: str,
-        quality: str = "best",
-    ) -> Optional[str]:
-        """محاولة التحميل من APIs البديلة"""
-        try:
-            result = await self.fallback.get_download_url(url, quality)
-            if not result:
-                logger.error("All fallback APIs failed to get download URL")
-                return None
-
-            download_url = result["url"]
-            filename = result.get("filename", "video.mp4")
-            source = result.get("source", "unknown")
-
-            logger.info(f"Got download URL from {source}, downloading...")
-            self._update_progress(
-                status=DownloadStatus.FALLBACK_DOWNLOAD,
-                percent=10,
-                message=f"جاري التحميل من {source}...",
-            )
-
-            # تحميل الملف من الرابط المباشر
-            filepath = await self.fallback.download_from_url(download_url, filename)
-
-            if filepath:
-                self._update_progress(
-                    status=DownloadStatus.COMPLETED,
-                    percent=100,
-                    message=f"تم تحميل الفيديو بنجاح من {source}!",
-                    filename=filepath,
-                )
-                return filepath
-
-        except Exception as e:
-            logger.error(f"Fallback download failed: {e}")
-
-        return None
-
     async def download_full(
         self,
         url: str,
@@ -551,7 +636,7 @@ class YouTubeDownloader:
         quality: str = "best",
         auto_subtitle: bool = True,
     ) -> Dict[str, Optional[str]]:
-        """التدفق الكامل: جلب معلومات → تحميل ترجمة → انتظار → تحميل فيديو"""
+        """التدفق الكامل: جلب معلومات → تحميل ترجمة → تحميل فيديو"""
         results = {
             "video": None,
             "subtitle": None,
@@ -613,7 +698,8 @@ class YouTubeDownloader:
                 eta=eta,
                 downloaded_bytes=d.get('downloaded_bytes', 0),
                 total_bytes=d.get('total_bytes') or d.get('total_bytes_estimate', 0),
-                message=f"جاري التحميل... {percent}%",
+                message=f"جاري التحميل من yt-dlp... {percent}%",
+                source="yt_dlp",
             )
 
         elif d['status'] == 'finished':

core/fallback_downloader.py

@@ -1,7 +1,12 @@
 """
-نظام التحميل البديل - Fallback Downloader
-Cobalt API + Invidious API + Piped API
-يحل مشكلة حظر IPs السيرفرات السحابية بدون كوكيز
+نظام التحميل البديل - Invidious-First Strategy
+تم إعادة كتابته بالكامل بناءً على اختبارات حقيقية يونيو 2026
+
+المصادر العاملة:
+- Invidious (inv.thepixora.com): ✅ معلومات + تحميل بجميع الجودات
+- اكتشاف ديناميكي للسيرفرات من api.invidious.io
+- Cobalt: ❌ ميت (API v7 أُغلق)
+- Piped: ❌ كل السيرفرات ميتة
 """
 
 import os
@@ -10,8 +15,10 @@ import asyncio
 import logging
 import random
 import time
+import subprocess
+import tempfile
 from typing import Optional, Dict, Any, List
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 import httpx
 
@@ -19,45 +26,20 @@ logger = logging.getLogger(__name__)
 
 
 # ═══════════════════════════════════════════════════
-# 1. Cobalt API - أفضل بديل لـ yt-dlp على السحابة
+# سيرفرات InvidIOUS المعروفة (يتم تحديثها ديناميكياً)
 # ═══════════════════════════════════════════════════
 
-COBALT_INSTANCES = [
-    "https://api.cobalt.tools",
-    "https://cobalt-api.kwiatekmiki.com",
-    "https://cobalt.api.timelessnesses.me",
+# سيرفرات أولية ثابتة (مختبرة وفعّالة)
+SEED_INVIDIOUS_INSTANCES = [
+    "https://inv.thepixora.com",
 ]
 
+# سيرفرات إضافية يتم اكتشافها من api.invidious.io
+DISCOVERED_INSTANCES: List[str] = []
 
-# ═══════════════════════════════════════════════════
-# 2. Invidious - واجهة يوتيوب بديلة مفتوحة المصدر
-# ═══════════════════════════════════════════════════
-
-INVIDIOUS_INSTANCES = [
-    "https://inv.tux.pizza",
-    "https://invidious.privacyredirect.com",
-    "https://vid.puffyan.us",
-    "https://invidious.nerdvpn.de",
-    "https://inv.nadeko.net",
-    "https://invidious.protokolla.fi",
-    "https://iv.ggtyler.dev",
-    "https://invidious.lunar.icu",
-    "https://yt.cdaut.de",
-    "https://invidious.perennialte.ch",
-]
-
-
-# ═══════════════════════════════════════════════════
-# 3. Piped - واجهة يوتيوب بديلة أخرى
-# ═══════════════════════════════════════════════════
-
-PIPED_INSTANCES = [
-    "https://pipedapi.kavin.rocks",
-    "https://pipedapi.adminforge.de",
-    "https://api.piped.projectsegfault.com",
-    "https://pipedapi.in.projectsegfault.com",
-    "https://pipedapi.leptons.xyz",
-]
+# فترة تحديث السيرفرات (كل 30 دقيقة)
+INSTANCE_REFRESH_INTERVAL = 1800
+_last_instance_refresh: float = 0
 
 
 @dataclass
@@ -71,10 +53,19 @@ class FallbackVideoInfo:
     view_count: int = 0
     description: str = ""
     available_subtitles: list = None
+    captions: list = None
+    formats: list = None
+    adaptive_formats: list = None
 
     def __post_init__(self):
         if self.available_subtitles is None:
             self.available_subtitles = []
+        if self.captions is None:
+            self.captions = []
+        if self.formats is None:
+            self.formats = []
+        if self.adaptive_formats is None:
+            self.adaptive_formats = []
 
 
 def _extract_video_id(url: str) -> Optional[str]:
@@ -90,143 +81,124 @@ def _extract_video_id(url: str) -> Optional[str]:
     return None
 
 
-def _shuffle_instances(instances: List[str]) -> List[str]:
-    """ترتيب عشوائي للسيرفرات مع تفضيل آخر سيرفر ناجح"""
-    shuffled = instances.copy()
-    random.shuffle(shuffled)
-    return shuffled
-
-
-class CobaltDownloader:
-    """
-    محمل عبر Cobalt API
-    مصمم خصيصاً للتحميل بدون حظر - يستخدم سيرفرات وسيطة
-    """
-
-    def __init__(self):
-        self._working_instance: Optional[str] = None
-        self._failed_instances: List[str] = []
-
-    def _get_next_instance(self) -> Optional[str]:
-        """اختيار سيرفر Cobalt متاح"""
-        if self._working_instance and self._working_instance not in self._failed_instances:
-            # 70% فرصة نستخدم السيرفر اللي اشتغل قبل كده
-            if random.random() < 0.7:
-                return self._working_instance
-
-        available = [i for i in COBALT_INSTANCES if i not in self._failed_instances]
-        if not available:
-            self._failed_instances.clear()
-            available = COBALT_INSTANCES
+def _get_all_instances() -> List[str]:
+    """الحصول على قائمة كل السيرفرات المتاحة"""
+    global DISCOVERED_INSTANCES, _last_instance_refresh
 
-        return random.choice(available)
+    now = time.time()
+    instances = SEED_INVIDIOUS_INSTANCES.copy()
 
-    async def get_download_url(
-        self,
-        url: str,
-        quality: str = "best",
-    ) -> Optional[Dict[str, Any]]:
-        """
-        الحصول على رابط التحميل المباشر من Cobalt
-        """
-        instances = _shuffle_instances(COBALT_INSTANCES)
-        # لو فيه سيرفر شغال، نبدأ بيه
-        if self._working_instance:
-            instances.insert(0, self._working_instance)
+    # أضف السيرفرات المكتشفة
+    instances.extend([i for i in DISCOVERED_INSTANCES if i not in instances])
 
-        quality_map = {
-            "best": "1080",
-            "medium": "720",
-            "low": "480",
-        }
-        cobalt_quality = quality_map.get(quality, "1080")
+    return instances
 
-        for instance in instances:
-            try:
-                async with httpx.AsyncClient(timeout=15) as client:
-                    response = await client.post(
-                        f"{instance}/",
-                        json={
-                            "url": url,
-                            "videoQuality": cobalt_quality,
-                            "filenameStyle": "basic",
-                            "downloadMode": "auto",
-                        },
-                        headers={
-                            "Accept": "application/json",
-                            "Content-Type": "application/json",
-                        },
-                    )
 
-                    if response.status_code == 200:
-                        data = response.json()
+async def refresh_instances():
+    """اكتشاف سيرفرات Invidious نشطة من API الرسمي"""
+    global DISCOVERED_INSTANCES, _last_instance_refresh
 
-                        if data.get("status") == "redirect" or data.get("status") == "stream":
-                            download_url = data.get("url")
-                            if download_url:
-                                self._working_instance = instance
-                                logger.info(f"Cobalt success with {instance}")
-                                return {
-                                    "url": download_url,
-                                    "filename": data.get("filename", "video.mp4"),
-                                    "source": "cobalt",
-                                }
-
-                        elif data.get("status") == "picker":
-                            # فيديو فيه خيارات متعددة
-                            picker = data.get("picker", [])
-                            if picker:
-                                download_url = picker[0].get("url")
-                                if download_url:
-                                    self._working_instance = instance
-                                    return {
-                                        "url": download_url,
-                                        "filename": data.get("filename", "video.mp4"),
-                                        "source": "cobalt",
-                                    }
+    now = time.time()
+    if now - _last_instance_refresh < INSTANCE_REFRESH_INTERVAL:
+        return
 
-                    elif response.status_code == 429:
-                        logger.warning(f"Cobalt rate limited on {instance}")
-                        if instance not in self._failed_instances:
-                            self._failed_instances.append(instance)
+    logger.info("Refreshing Invidious instance list from official API...")
+    try:
+        async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client:
+            response = await client.get("https://api.invidious.io/instances.json")
+            if response.status_code == 200:
+                data = response.json()
+                discovered = []
+                for item in data:
+                    if not isinstance(item, list) or len(item) < 2:
+                        continue
+                    info = item[1] if len(item) > 1 else {}
+                    if not info or not isinstance(info, dict):
                         continue
+                    uri = info.get("uri", "")
+                    monitor = info.get("monitor") or {}
+                    down = monitor.get("down", True)
+                    api_enabled = info.get("api", False)
+                    uptime = monitor.get("uptime", 0)
 
-                    logger.warning(f"Cobalt returned status {response.status_code} from {instance}")
+                    # نأخذ السيرفرات اللي مو down ولها API أو uptime عالي
+                    if uri and not down and (api_enabled or uptime > 80):
+                        if uri.startswith("https://") and uri not in SEED_INVIDIOUS_INSTANCES:
+                            discovered.append(uri)
 
-            except (httpx.TimeoutException, httpx.ConnectError) as e:
-                logger.warning(f"Cobalt timeout/connection error on {instance}: {e}")
-                if instance not in self._failed_instances:
-                    self._failed_instances.append(instance)
-                continue
-            except Exception as e:
-                logger.warning(f"Cobalt error on {instance}: {e}")
-                continue
+                if discovered:
+                    DISCOVERED_INSTANCES = discovered
+                    logger.info(f"Discovered {len(discovered)} Invidious instances")
 
-        logger.error("All Cobalt instances failed")
-        return None
+    except Exception as e:
+        logger.warning(f"Failed to refresh Invidious instances: {e}")
+
+    _last_instance_refresh = now
 
 
 class InvidiousDownloader:
     """
-    محمل عبر Invidious API
-    يوفر معلومات الفيديو + روابط تحميل مباشرة
+    محمل عبر Invidious API - المصدر الرئيسي للتحميل
+    يوفر: معلومات الفيديو + روابط تحميل مباشرة لجميع الجودات + ترجمات
     """
 
     def __init__(self):
         self._working_instance: Optional[str] = None
         self._failed_instances: List[str] = []
+        self._instance_tested: bool = False
+
+    async def _get_instances(self) -> List[str]:
+        """الحصول على قائمة السيرفرات مرتبة"""
+        await refresh_instances()
 
-    def _get_next_instance(self) -> Optional[str]:
+        instances = _get_all_instances()
+
+        # نبدأ بالسيرفر الشغال
         if self._working_instance and self._working_instance not in self._failed_instances:
-            if random.random() < 0.7:
+            instances = [self._working_instance] + [i for i in instances if i != self._working_instance]
+
+        # نزيل السيرفرات الفاشلة (بس نحتفظ بيهم كـ fallback أخير)
+        available = [i for i in instances if i not in self._failed_instances]
+        failed_but_maybe_ok = [i for i in instances if i in self._failed_instances]
+
+        return available + failed_but_maybe_ok
+
+    async def _test_instance(self, instance: str) -> bool:
+        """اختبار سيرفر Invidious"""
+        try:
+            async with httpx.AsyncClient(timeout=8, follow_redirects=True) as client:
+                r = await client.get(
+                    f"{instance}/api/v1/videos/dQw4w9WgXcQ",
+                    params={"fields": "title"},
+                )
+                if r.status_code == 200:
+                    try:
+                        data = r.json()
+                        return bool(data.get("title"))
+                    except Exception:
+                        return False
+                return False
+        except Exception:
+            return False
+
+    async def _find_working_instance(self) -> Optional[str]:
+        """البحث عن سيرفر شغال"""
+        if self._working_instance:
+            # تحقق أنه لسه شغال
+            if await self._test_instance(self._working_instance):
                 return self._working_instance
+            else:
+                self._working_instance = None
 
-        available = [i for i in INVIDIOUS_INSTANCES if i not in self._failed_instances]
-        if not available:
-            self._failed_instances.clear()
-            available = INVIDIOUS_INSTANCES
+        instances = await self._get_instances()
+        for instance in instances:
+            if await self._test_instance(instance):
+                self._working_instance = instance
+                logger.info(f"Found working Invidious instance: {instance}")
+                return instance
 
-        return random.choice(available)
+        logger.error("No working Invidious instance found!")
+        return None
 
     async def get_video_info(self, url: str) -> Optional[FallbackVideoInfo]:
         """جلب معلومات الفيديو من Invidious"""
@@ -235,22 +207,22 @@ class InvidiousDownloader:
             logger.error(f"Cannot extract video ID from: {url}")
             return None
 
-        instances = _shuffle_instances(INVIDIOUS_INSTANCES)
-        if self._working_instance:
-            instances.insert(0, self._working_instance)
+        instances = await self._get_instances()
 
         for instance in instances:
             try:
-                async with httpx.AsyncClient(timeout=10) as client:
+                async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client:
                     response = await client.get(
                         f"{instance}/api/v1/videos/{video_id}",
-                        params={"fields": "title,lengthSeconds,videoThumbnails,author,viewCount,description,subtitles,formatStreams,adaptiveFormats"},
+                        params={
+                            "fields": "title,lengthSeconds,videoThumbnails,author,viewCount,description,subtitles,captions,formatStreams,adaptiveFormats"
+                        },
                     )
 
                     if response.status_code == 200:
                         data = response.json()
                         self._working_instance = instance
-                        logger.info(f"Invidious success with {instance}")
+                        logger.info(f"Invidious video info success with {instance}")
 
                         # استخراج الصورة المصغرة
                         thumbnail = ""
@@ -262,7 +234,7 @@ class InvidiousDownloader:
                         if not thumbnail and thumbnails:
                             thumbnail = thumbnails[0].get("url", "")
 
-                        # استخراج الترجمات
+                        # استخراج الترجمات (captions = فعّالة أكثر من subtitles)
                         subtitles = []
                         for sub in data.get("subtitles", []):
                             subtitles.append({
@@ -272,6 +244,16 @@ class InvidiousDownloader:
                                 "url": sub.get("url", ""),
                             })
 
+                        # استخراج captions (التلقائية واليدوية)
+                        captions = []
+                        for cap in data.get("captions", []):
+                            captions.append({
+                                "language": cap.get("label", ""),
+                                "language_code": cap.get("language_code", ""),
+                                "auto_generated": "(auto" in cap.get("label", "").lower(),
+                                "url": cap.get("url", ""),
+                            })
+
                         return FallbackVideoInfo(
                             title=data.get("title", ""),
                             video_id=video_id,
@@ -281,6 +263,9 @@ class InvidiousDownloader:
                             view_count=data.get("viewCount", 0),
                             description=data.get("description", "")[:500] if data.get("description") else "",
                             available_subtitles=subtitles,
+                            captions=captions,
+                            formats=data.get("formatStreams", []),
+                            adaptive_formats=data.get("adaptiveFormats", []),
                         )
 
                     elif response.status_code == 429:
@@ -288,8 +273,14 @@ class InvidiousDownloader:
                         if instance not in self._failed_instances:
                             self._failed_instances.append(instance)
                         continue
+                    else:
+                        logger.warning(f"Invidious returned {response.status_code} from {instance}")
+                        if instance not in self._failed_instances:
+                            self._failed_instances.append(instance)
+                        continue
 
-            except (httpx.TimeoutException, httpx.ConnectError):
+            except (httpx.TimeoutException, httpx.ConnectError) as e:
+                logger.warning(f"Invidious connection error on {instance}: {e}")
                 if instance not in self._failed_instances:
                     self._failed_instances.append(instance)
                 continue
@@ -297,6 +288,61 @@ class InvidiousDownloader:
                 logger.warning(f"Invidious error on {instance}: {e}")
                 continue
 
+        # كل السيرفرات فشلت - حاول البحث عن سيرفر جديد
+        logger.warning("All instances failed, trying to find new working instance...")
+        new_instance = await self._find_working_instance()
+        if new_instance:
+            try:
+                async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client:
+                    response = await client.get(
+                        f"{new_instance}/api/v1/videos/{video_id}",
+                        params={"fields": "title,lengthSeconds,videoThumbnails,author,viewCount,description,captions,formatStreams,adaptiveFormats"},
+                    )
+                    if response.status_code == 200:
+                        data = response.json()
+                        thumbnail = ""
+                        thumbnails = data.get("videoThumbnails", [])
+                        for t in thumbnails:
+                            if t.get("quality") == "medium":
+                                thumbnail = t.get("url", "")
+                                break
+                        if not thumbnail and thumbnails:
+                            thumbnail = thumbnails[0].get("url", "")
+
+                        subtitles = []
+                        for sub in data.get("subtitles", []):
+                            subtitles.append({
+                                "language": sub.get("label", sub.get("language_code", "")),
+                                "language_code": sub.get("language_code", ""),
+                                "auto_generated": False,
+                                "url": sub.get("url", ""),
+                            })
+
+                        captions = []
+                        for cap in data.get("captions", []):
+                            captions.append({
+                                "language": cap.get("label", ""),
+                                "language_code": cap.get("language_code", ""),
+                                "auto_generated": "(auto" in cap.get("label", "").lower(),
+                                "url": cap.get("url", ""),
+                            })
+
+                        return FallbackVideoInfo(
+                            title=data.get("title", ""),
+                            video_id=video_id,
+                            duration=data.get("lengthSeconds", 0),
+                            thumbnail=thumbnail,
+                            uploader=data.get("author", ""),
+                            view_count=data.get("viewCount", 0),
+                            description=data.get("description", "")[:500] if data.get("description") else "",
+                            available_subtitles=subtitles,
+                            captions=captions,
+                            formats=data.get("formatStreams", []),
+                            adaptive_formats=data.get("adaptiveFormats", []),
+                        )
+            except Exception as e:
+                logger.error(f"Even newly found instance failed: {e}")
+
         logger.error("All Invidious instances failed for video info")
         return None
 
@@ -305,16 +351,19 @@ class InvidiousDownloader:
         url: str,
         quality: str = "best",
     ) -> Optional[Dict[str, Any]]:
-        """الحصول على رابط تحميل مباشر من Invidious"""
+        """
+        الحصول على روابط تحميل من Invidious
+        يرجع روابط فيديو + صوت منفصلة للدمج بـ FFmpeg
+        """
         video_id = _extract_video_id(url)
         if not video_id:
             return None
 
-        instances = _shuffle_instances(INVIDIOUS_INSTANCES)
+        instances = await self._get_instances()
 
         for instance in instances:
             try:
-                async with httpx.AsyncClient(timeout=10) as client:
+                async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client:
                     response = await client.get(
                         f"{instance}/api/v1/videos/{video_id}",
                         params={"fields": "formatStreams,adaptiveFormats,title"},
@@ -324,38 +373,9 @@ class InvidiousDownloader:
                         data = response.json()
                         self._working_instance = instance
 
-                        # البحث عن أفضل صيغة
-                        formats = data.get("formatStreams", [])
-
-                        # ترتيب حسب الجودة
-                        quality_order = {
-                            "best": ["1080p", "720p", "480p", "360p"],
-                            "medium": ["720p", "480p", "360p"],
-                            "low": ["480p", "360p"],
-                        }
-                        preferred = quality_order.get(quality, ["1080p", "720p", "480p", "360p"])
-
-                        download_url = None
-                        for q in preferred:
-                            for fmt in formats:
-                                if fmt.get("qualityLabel", "").startswith(q) and fmt.get("type", "").startswith("video/mp4"):
-                                    download_url = fmt.get("url")
-                                    break
-                            if download_url:
-                                break
-
-                        # لو ملقيناش mp4، نأخذ أي حاجة
-                        if not download_url and formats:
-                            download_url = formats[0].get("url")
-
-                        if download_url:
-                            title = data.get("title", "video")
-                            safe_title = re.sub(r'[^\w\s-]', '', title)[:50]
-                            return {
-                                "url": download_url,
-                                "filename": f"{safe_title}.mp4",
-                                "source": "invidious",
-                            }
+                        result = self._extract_best_format(data, quality, instance)
+                        if result:
+                            return result
 
                     elif response.status_code == 429:
                         if instance not in self._failed_instances:
@@ -370,169 +390,205 @@ class InvidiousDownloader:
 
         return None
 
-    async def get_subtitle_url(self, url: str, lang: str = "ar") -> Optional[str]:
-        """الحصول على رابط الترجمة من Invidious"""
-        video_id = _extract_video_id(url)
-        if not video_id:
-            return None
-
-        instances = _shuffle_instances(INVIDIOUS_INSTANCES)
-
-        for instance in instances:
-            try:
-                async with httpx.AsyncClient(timeout=10) as client:
-                    response = await client.get(
-                        f"{instance}/api/v1/videos/{video_id}",
-                        params={"fields": "subtitles"},
-                    )
+    def _extract_best_format(
+        self, data: dict, quality: str, instance: str
+    ) -> Optional[Dict[str, Any]]:
+        """استخراج أفضل صيغة تحميل من بيانات Invidious"""
+
+        format_streams = data.get("formatStreams", [])
+        adaptive_formats = data.get("adaptiveFormats", [])
+        title = data.get("title", "video")
+
+        # ═══ الطريقة 1: Format Streams (فيديو + صوت معاً - أسهل) ═══
+        # هذه تحتوي على 360p عادةً فقط، لكنها جاهزة للتحميل مباشرة
+        if format_streams:
+            quality_order = {
+                "best": ["1080p", "720p", "480p", "360p"],
+                "medium": ["720p", "480p", "360p"],
+                "low": ["480p", "360p"],
+            }
+            preferred = quality_order.get(quality, ["720p", "480p", "360p"])
+
+            for q in preferred:
+                for fmt in format_streams:
+                    if fmt.get("qualityLabel", "").startswith(q) and "mp4" in fmt.get("type", ""):
+                        url = fmt.get("url", "")
+                        if url:
+                            safe_title = re.sub(r'[^\w\s-]', '', title)[:50]
+                            return {
+                                "url": url,
+                                "filename": f"{safe_title}.mp4",
+                                "source": "invidious_direct",
+                                "quality": q,
+                                "needs_merge": False,
+                            }
 
-                    if response.status_code == 200:
-                        data = response.json()
-                        subtitles = data.get("subtitles", [])
-
-                        # البحث عن اللغة المطلوبة
-                        for sub in subtitles:
-                            if sub.get("language_code") == lang:
-                                sub_url = sub.get("url", "")
-                                if sub_url and not sub_url.startswith("http"):
-                                    sub_url = f"{instance}{sub_url}"
-                                return sub_url
-
-                        # لو ملقيناش اللغة، نرجع أول ترجمة متاحة
-                        if subtitles:
-                            sub_url = subtitles[0].get("url", "")
-                            if sub_url and not sub_url.startswith("http"):
-                                sub_url = f"{instance}{sub_url}"
-                            return sub_url
-
-            except Exception:
-                continue
+            # أي format stream متاح
+            if format_streams and format_streams[0].get("url"):
+                fmt = format_streams[0]
+                safe_title = re.sub(r'[^\w\s-]', '', title)[:50]
+                return {
+                    "url": fmt["url"],
+                    "filename": f"{safe_title}.mp4",
+                    "source": "invidious_direct",
+                    "quality": fmt.get("qualityLabel", "unknown"),
+                    "needs_merge": False,
+                }
+
+        # ═══ الطريقة 2: Adaptive Formats (فيديو منفصل + صوت منفصل + دمج FFmpeg) ═══
+        if adaptive_formats:
+            return self._extract_adaptive_format(adaptive_formats, quality, title, instance)
 
         return None
 
-
-class PipedDownloader:
-    """
-    محمل عبر Piped API
-    واجهة بديلة ليوتيوب بروكسيات
-    """
-
-    def __init__(self):
-        self._working_instance: Optional[str] = None
-        self._failed_instances: List[str] = []
-
-    async def get_video_info(self, url: str) -> Optional[FallbackVideoInfo]:
-        """جلب معلومات الفيديو من Piped"""
-        video_id = _extract_video_id(url)
-        if not video_id:
+    def _extract_adaptive_format(
+        self, adaptive_formats: list, quality: str, title: str, instance: str
+    ) -> Optional[Dict[str, Any]]:
+        """استخراج أفضل فيديو + صوت منفصل للدمج"""
+
+        # فلترة الفيديو mp4 فقط
+        video_formats = [
+            f for f in adaptive_formats
+            if f.get("type", "").startswith("video/") and f.get("container") == "mp4" and f.get("url")
+        ]
+        # فلترة الصوت m4a فقط
+        audio_formats = [
+            f for f in adaptive_formats
+            if f.get("type", "").startswith("audio/") and f.get("container") == "m4a" and f.get("url")
+        ]
+
+        if not video_formats:
+            # جرّب webm كـ fallback
+            video_formats = [
+                f for f in adaptive_formats
+                if f.get("type", "").startswith("video/") and f.get("url")
+            ]
+        if not audio_formats:
+            audio_formats = [
+                f for f in adaptive_formats
+                if f.get("type", "").startswith("audio/") and f.get("url")
+            ]
+
+        if not video_formats:
             return None
 
-        instances = _shuffle_instances(PIPED_INSTANCES)
-
-        for instance in instances:
-            try:
-                async with httpx.AsyncClient(timeout=10) as client:
-                    response = await client.get(f"{instance}/streams/{video_id}")
-
-                    if response.status_code == 200:
-                        data = response.json()
-                        self._working_instance = instance
-                        logger.info(f"Piped success with {instance}")
-
-                        # استخراج الترجمات
-                        subtitles = []
-                        for sub in data.get("subtitles", []):
-                            subtitles.append({
-                                "language": sub.get("name", sub.get("code", "")),
-                                "language_code": sub.get("code", ""),
-                                "auto_generated": sub.get("auto", False),
-                                "url": sub.get("url", ""),
-                            })
+        # اختيار أفضل جودة فيديو حسب الطلب
+        quality_height_map = {"best": 2160, "medium": 720, "low": 480}
+        max_height = quality_height_map.get(quality, 2160)
 
-                        return FallbackVideoInfo(
-                            title=data.get("title", ""),
-                            video_id=video_id,
-                            duration=data.get("duration", 0),
-                            thumbnail=data.get("thumbnailUrl", ""),
-                            uploader=data.get("uploader", ""),
-                            view_count=data.get("views", 0),
-                            description=data.get("description", "")[:500] if data.get("description") else "",
-                            available_subtitles=subtitles,
-                        )
+        # ترتيب حسب bitrate (أعلى = أفضل)
+        video_formats.sort(key=lambda x: x.get("bitrate", 0), reverse=True)
 
-                    elif response.status_code == 429:
-                        if instance not in self._failed_instances:
-                            self._failed_instances.append(instance)
-                        continue
+        best_video = None
+        for fmt in video_formats:
+            res_str = fmt.get("resolution", fmt.get("qualityLabel", "0p"))
+            height = 0
+            try:
+                height = int(re.search(r'(\d+)', str(res_str)).group(1))
+            except (AttributeError, ValueError):
+                pass
+
+            if height <= max_height:
+                best_video = fmt
+                break
+
+        if not best_video:
+            best_video = video_formats[0]
+
+        # أفضل صوت
+        audio_formats.sort(key=lambda x: x.get("bitrate", 0), reverse=True)
+        best_audio = audio_formats[0] if audio_formats else None
+
+        safe_title = re.sub(r'[^\w\s-]', '', title)[:50]
+
+        result = {
+            "filename": f"{safe_title}.mp4",
+            "source": "invidious_adaptive",
+            "quality": best_video.get("qualityLabel", best_video.get("resolution", "unknown")),
+            "needs_merge": True,
+            "video_url": best_video.get("url", ""),
+            "audio_url": best_audio.get("url", "") if best_audio else "",
+            "video_itag": best_video.get("itag", ""),
+            "audio_itag": best_audio.get("itag", "") if best_audio else "",
+        }
 
-            except (httpx.TimeoutException, httpx.ConnectError):
-                continue
-            except Exception as e:
-                logger.warning(f"Piped error on {instance}: {e}")
-                continue
+        # لو مفيش صوت منفصل، نستخدم الفيديو المدمج
+        if not best_audio:
+            result["needs_merge"] = False
+            result["url"] = best_video.get("url", "")
 
-        return None
+        return result
 
-    async def get_download_url(
-        self,
-        url: str,
-        quality: str = "best",
-    ) -> Optional[Dict[str, Any]]:
-        """الحصول على رابط تحميل مباشر من Piped"""
+    async def get_caption_content(
+        self, url: str, lang: str = "en", auto: bool = True
+    ) -> Optional[str]:
+        """تحميل محتوى الترجمة من Invidious captions"""
         video_id = _extract_video_id(url)
         if not video_id:
             return None
 
-        instances = _shuffle_instances(PIPED_INSTANCES)
+        instances = await self._get_instances()
 
         for instance in instances:
             try:
+                # أولاً: جلب قائمة الترجمات
                 async with httpx.AsyncClient(timeout=10, follow_redirects=True) as client:
-                    response = await client.get(f"{instance}/streams/{video_id}")
-
-                    if response.status_code == 200:
-                        data = response.json()
+                    response = await client.get(
+                        f"{instance}/api/v1/videos/{video_id}",
+                        params={"fields": "captions,subtitles"},
+                    )
 
-                        # Piped بيرجع videoStreams و audioStreams
-                        video_streams = data.get("videoStreams", [])
+                    if response.status_code != 200:
+                        continue
 
-                        # فلترة mp4 فقط
-                        mp4_streams = [s for s in video_streams if s.get("mimeType", "").startswith("video/mp4")]
+                    data = response.json()
+                    captions = data.get("captions", [])
+                    subtitles = data.get("subtitles", [])
+
+                    # البحث عن الترجمة المطلوبة
+                    target_caption = None
+
+                    # أولاً في subtitles
+                    for sub in subtitles:
+                        if sub.get("language_code") == lang:
+                            target_caption = sub
+                            break
+
+                    # ثم في captions
+                    if not target_caption:
+                        for cap in captions:
+                            lc = cap.get("language_code", "")
+                            label = cap.get("label", "")
+                            if lc.startswith(lang.split("-")[0]):
+                                is_auto = "(auto" in label.lower()
+                                if auto and is_auto:
+                                    target_caption = cap
+                                    break
+                                elif not auto and not is_auto:
+                                    target_caption = cap
+                                    break
 
-                        if not mp4_streams:
-                            mp4_streams = video_streams
+                    # أي ترجمة متاحة
+                    if not target_caption and captions:
+                        target_caption = captions[0]
 
-                        # ترتيب حسب الجودة
-                        quality_order = {"best": 1080, "medium": 720, "low": 480}
-                        max_height = quality_order.get(quality, 1080)
+                    if not target_caption:
+                        return None
 
-                        best_stream = None
-                        for stream in mp4_streams:
-                            height = stream.get("quality", 0)
-                            if isinstance(height, str):
-                                height = int(height.replace("p", "")) if height.endswith("p") else 0
-                            if height <= max_height:
-                                best_stream = stream
-                                break
+                    # تحميل محتوى الترجمة
+                    cap_url = target_caption.get("url", "")
+                    if not cap_url:
+                        return None
 
-                        if not best_stream and mp4_streams:
-                            best_stream = mp4_streams[0]
+                    if cap_url.startswith("/"):
+                        cap_url = f"{instance}{cap_url}"
 
-                        if best_stream:
-                            download_url = best_stream.get("url")
-                            if download_url:
-                                title = data.get("title", "video")
-                                safe_title = re.sub(r'[^\w\s-]', '', title)[:50]
-                                return {
-                                    "url": download_url,
-                                    "filename": f"{safe_title}.mp4",
-                                    "source": "piped",
-                                }
+                    cap_response = await client.get(cap_url, follow_redirects=True)
+                    if cap_response.status_code == 200 and cap_response.text.strip():
+                        return cap_response.text
 
-            except (httpx.TimeoutException, httpx.ConnectError):
-                continue
             except Exception as e:
-                logger.warning(f"Piped download error on {instance}: {e}")
+                logger.warning(f"Caption download from {instance} failed: {e}")
                 continue
 
         return None
@@ -540,42 +596,32 @@ class PipedDownloader:
 
 class FallbackDownloader:
     """
-    مدير التحميل البديل - ينسق بين كل الـ APIs
-    الترتيب: yt-dlp → Cobalt → Invidious → Piped
+    مدير التحميل البديل - Invidious أولاً
+    الاستراتيجية: Invidious (معلومات + تحميل) → yt-dlp (ترجمات)
     """
 
     def __init__(self, download_dir: str = "/tmp/downloads"):
         self.download_dir = download_dir
-        self.cobalt = CobaltDownloader()
         self.invidious = InvidiousDownloader()
-        self.piped = PipedDownloader()
 
         # إحصائيات
         self.stats = {
-            "yt_dlp_success": 0,
-            "cobalt_success": 0,
-            "invidious_success": 0,
-            "piped_success": 0,
+            "invidious_info_success": 0,
+            "invidious_download_success": 0,
+            "invidious_adaptive_success": 0,
+            "ffmpeg_merge_success": 0,
+            "ffmpeg_merge_fail": 0,
             "total_fallbacks": 0,
         }
 
     async def get_video_info(self, url: str) -> Optional[FallbackVideoInfo]:
         """
-        جلب معلومات الفيديو - نبدأ بـ Invidious لأنه يوفر حدود YouTube
-        الترتيب: Invidious → Piped → (yt-dlp يتولاه downloader الرئيسي)
+        جلب معلومات الفيديو من Invidious
         """
-        # محاولة 1: Invidious (أفضل مصدر للمعلومات)
         info = await self.invidious.get_video_info(url)
         if info and info.title:
-            self.stats["invidious_success"] += 1
+            self.stats["invidious_info_success"] += 1
             return info
-
-        # محاولة 2: Piped
-        info = await self.piped.get_video_info(url)
-        if info and info.title:
-            self.stats["piped_success"] += 1
-            return info
-
         return None
 
     async def get_download_url(
@@ -583,31 +629,15 @@ class FallbackDownloader:
         url: str,
         quality: str = "best",
     ) -> Optional[Dict[str, Any]]:
-        """
-        الحصول على رابط تحميل مباشر
-        الترتيب: Cobalt → Invidious → Piped
-        """
-        # محاولة 1: Cobalt (الأسرع والأفضل)
-        result = await self.cobalt.get_download_url(url, quality)
-        if result:
-            self.stats["cobalt_success"] += 1
-            self.stats["total_fallbacks"] += 1
-            return result
-
-        # محاولة 2: Invidious
+        """الحصول على رابط تحميل من Invidious"""
         result = await self.invidious.get_download_url(url, quality)
         if result:
-            self.stats["invidious_success"] += 1
+            if result.get("needs_merge"):
+                self.stats["invidious_adaptive_success"] += 1
+            else:
+                self.stats["invidious_download_success"] += 1
             self.stats["total_fallbacks"] += 1
             return result
-
-        # محاولة 3: Piped
-        result = await self.piped.get_download_url(url, quality)
-        if result:
-            self.stats["piped_success"] += 1
-            self.stats["total_fallbacks"] += 1
-            return result
-
         return None
 
     async def download_from_url(self, download_url: str, filename: str) -> Optional[str]:
@@ -634,27 +664,144 @@ class FallbackDownloader:
 
         except Exception as e:
             logger.error(f"Download from URL failed: {e}")
-            # حذف الملف الفارغ أو الناقص
             if os.path.exists(filepath):
                 os.remove(filepath)
             return None
 
-    async def get_subtitle_content(self, url: str, lang: str = "ar") -> Optional[str]:
-        """تحميل محتوى الترجمة من Invidious"""
-        sub_url = await self.invidious.get_subtitle_url(url, lang)
-        if not sub_url:
+    async def download_and_merge(
+        self, video_url: str, audio_url: str, filename: str
+    ) -> Optional[str]:
+        """تحميل فيديو + صوت منفصلين ودمجهم بـ FFmpeg"""
+        output_path = os.path.join(self.download_dir, filename)
+
+        # مسارات مؤقتة
+        video_temp = os.path.join(self.download_dir, f"_temp_video_{int(time.time())}.mp4")
+        audio_temp = os.path.join(self.download_dir, f"_temp_audio_{int(time.time())}.m4a")
+
+        try:
+            # تحميل الفيديو
+            logger.info(f"Downloading video stream for {filename}...")
+            video_path = await self.download_from_url(video_url, os.path.basename(video_temp))
+            if not video_path:
+                logger.error("Failed to download video stream")
+                return None
+
+            # تحميل الصوت
+            logger.info(f"Downloading audio stream for {filename}...")
+            audio_path = await self.download_from_url(audio_url, os.path.basename(audio_temp))
+            if not audio_path:
+                # لو الصوت فشل، نستخدم الفيديو فقط
+                logger.warning("Failed to download audio stream, using video only")
+                try:
+                    os.rename(video_path, output_path)
+                    self.stats["ffmpeg_merge_success"] += 1
+                    return output_path
+                except Exception:
+                    return video_path
+
+            # دمج بـ FFmpeg
+            logger.info(f"Merging video+audio with FFmpeg for {filename}...")
+            merge_result = self._ffmpeg_merge(video_path, audio_path, output_path)
+
+            # تنظيف الملفات المؤقتة
+            for temp_file in [video_path, audio_path]:
+                try:
+                    if os.path.exists(temp_file):
+                        os.remove(temp_file)
+                except Exception:
+                    pass
+
+            if merge_result:
+                self.stats["ffmpeg_merge_success"] += 1
+                return output_path
+            else:
+                self.stats["ffmpeg_merge_fail"] += 1
+                # لو الدمج فشل، نرجع الفيديو بدون صوت
+                try:
+                    os.rename(video_path, output_path)
+                    return output_path
+                except Exception:
+                    return video_path
+
+        except Exception as e:
+            logger.error(f"Download and merge failed: {e}")
+            # تنظيف
+            for temp_file in [video_temp, audio_temp]:
+                try:
+                    if os.path.exists(temp_file):
+                        os.remove(temp_file)
+                except Exception:
+                    pass
             return None
 
+    def _ffmpeg_merge(
+        self, video_path: str, audio_path: str, output_path: str
+    ) -> bool:
+        """دمج فيديو + صوت بـ FFmpeg"""
         try:
-            async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client:
-                response = await client.get(sub_url)
-                if response.status_code == 200:
-                    return response.text
+            cmd = [
+                "ffmpeg", "-y",
+                "-i", video_path,
+                "-i", audio_path,
+                "-c:v", "copy",
+                "-c:a", "aac",
+                "-movflags", "+faststart",
+                output_path,
+            ]
+
+            result = subprocess.run(
+                cmd,
+                capture_output=True,
+                text=True,
+                timeout=120,
+            )
+
+            if result.returncode == 0 and os.path.exists(output_path):
+                file_size = os.path.getsize(output_path)
+                logger.info(f"FFmpeg merge success: {output_path} ({file_size} bytes)")
+                return True
+            else:
+                logger.error(f"FFmpeg merge failed: {result.stderr[:300]}")
+                return False
+
+        except subprocess.TimeoutExpired:
+            logger.error("FFmpeg merge timed out")
+            return False
+        except FileNotFoundError:
+            logger.error("FFmpeg not found! Cannot merge video+audio")
+            return False
         except Exception as e:
-            logger.warning(f"Subtitle download from Invidious failed: {e}")
+            logger.error(f"FFmpeg merge error: {e}")
+            return False
 
-        return None
+    async def get_subtitle_content(self, url: str, lang: str = "ar") -> Optional[str]:
+        """تحميل محتوى الترجمة من Invidious"""
+        return await self.invidious.get_caption_content(url, lang)
 
     def get_stats(self) -> Dict[str, Any]:
         """إحصائيات الاستخدام"""
-        return self.stats.copy()
+        stats = self.stats.copy()
+        stats["working_instance"] = self.invidious._working_instance
+        stats["failed_instances"] = len(self.invidious._failed_instances)
+        stats["discovered_instances"] = len(DISCOVERED_INSTANCES)
+        return stats
+
+    async def get_instance_status(self) -> Dict[str, Any]:
+        """حالة السيرفرات"""
+        await refresh_instances()
+        all_instances = _get_all_instances()
+
+        status = {
+            "working": self.invidious._working_instance,
+            "total_instances": len(all_instances),
+            "failed_instances": len(self.invidious._failed_instances),
+            "seed_instances": SEED_INVIDIOUS_INSTANCES,
+            "discovered_instances": DISCOVERED_INSTANCES[:5],
+        }
+
+        # اختبار سريع للسيرفر الشغال
+        if self.invidious._working_instance:
+            ok = await self.invidious._test_instance(self.invidious._working_instance)
+            status["working_instance_healthy"] = ok
+
+        return status

desktop/main.py

@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
 app = FastAPI(
     title="YouTube Downloader - Desktop",
     description="تطبيق تحميل فيديوهات يوتيوب مع الترجمات",
-    version="1.0.0",
+    version="2.0.0",
 )
 
 # CORS
@@ -54,6 +54,19 @@ downloader = YouTubeDownloader(download_dir=DOWNLOAD_DIR)
 ws_connections: list = []
 
 
+@app.on_event("startup")
+async def startup():
+    """تهيئة عند بدء الخادم"""
+    logger.info("🚀 Server starting up...")
+    # اكتشاف سيرفرات Invidious نشطة
+    try:
+        from core.fallback_downloader import refresh_instances
+        await refresh_instances()
+        logger.info("✅ Invidious instances refreshed")
+    except Exception as e:
+        logger.warning(f"⚠️ Failed to refresh Invidious instances: {e}")
+
+
 @app.get("/")
 async def index():
     """الصفحة الرئيسية"""
@@ -63,7 +76,13 @@ async def index():
 @app.get("/api/health")
 async def health():
     """فحص حالة الخادم"""
-    return {"status": "ok", "version": "1.0.0"}
+    fallback_stats = downloader.fallback.get_stats()
+    return {
+        "status": "ok",
+        "version": "2.0.0",
+        "invidious_working": downloader.fallback.invidious._working_instance,
+        "fallback_stats": fallback_stats,
+    }
 
 
 @app.get("/api/video/info")
@@ -79,6 +98,7 @@ async def get_video_info(url: str):
             "uploader": info.uploader,
             "view_count": info.view_count,
             "description": info.description,
+            "info_source": info.info_source,
             "available_subtitles": [
                 {
                     "language": sub.language,
@@ -89,7 +109,20 @@ async def get_video_info(url: str):
             ],
         }
     except Exception as e:
-        raise HTTPException(status_code=400, detail=str(e))
+        error_msg = str(e)
+        # رسائل خطأ أكثر وضوحاً
+        if "429" in error_msg or "Too Many" in error_msg:
+            raise HTTPException(
+                status_code=429,
+                detail="تم حظر الطلبات مؤقتاً من YouTube. انتظر قليلاً ثم حاول مرة أخرى."
+            )
+        elif "Video unavailable" in error_msg or "Private video" in error_msg:
+            raise HTTPException(
+                status_code=400,
+                detail="الفيديو غير متاح أو خاص. تأكد من الرابط."
+            )
+        else:
+            raise HTTPException(status_code=400, detail=f"فشل جلب معلومات الفيديو: {error_msg}")
 
 
 @app.post("/api/download")
@@ -183,7 +216,7 @@ async def download_video_only(url: str, quality: VideoQuality = VideoQuality.bes
                 "message": "تم تحميل الفيديو بنجاح"
             }
         else:
-            raise HTTPException(status_code=400, detail="فشل تحميل الفيديو")
+            raise HTTPException(status_code=400, detail="فشل تحميل الفيديو من جميع المصادر. جرب فيديو آخر أو حاول لاحقاً.")
 
     except HTTPException:
         raise
@@ -209,6 +242,7 @@ async def get_progress():
         "eta": p.eta,
         "message": p.message,
         "filename": p.filename,
+        "source": p.source,
     }
 
 
@@ -218,7 +252,7 @@ async def list_downloads():
     files = []
     for filename in os.listdir(DOWNLOAD_DIR):
         filepath = os.path.join(DOWNLOAD_DIR, filename)
-        if os.path.isfile(filepath):
+        if os.path.isfile(filepath) and not filename.startswith('_temp_'):
             stat = os.stat(filepath)
             files.append({
                 "name": filename,
@@ -264,9 +298,8 @@ async def anti_ban_status():
         "request_count": anti_ban._request_count,
         "failed_attempts": anti_ban._failed_attempts,
         "session_active": anti_ban.check_session_limits(),
-        "current_user_agent": anti_ban.get_current_user_agent()[:50] + "...",
+        "current_user_agent": (anti_ban.get_current_user_agent() or "")[:50] + "...",
         "current_client": anti_ban.get_current_client(),
-        "current_accept_lang": anti_ban.get_current_accept_lang()[:20] + "...",
         "failed_clients": anti_ban._failed_clients,
         "working_client": anti_ban._working_client,
         "fallback_stats": fallback_stats,
@@ -286,6 +319,25 @@ async def reset_anti_ban():
     return {"status": "reset", "message": "تم إعادة تعيين الجلسة"}
 
 
+@app.get("/api/fallback/status")
+async def fallback_status():
+    """حالة نظام التحميل البديل"""
+    try:
+        status = await downloader.fallback.get_instance_status()
+        stats = downloader.fallback.get_stats()
+        return {
+            "fallback_stats": stats,
+            "instance_status": status,
+            "yt_dlp_clients_tried": anti_ban._failed_clients,
+            "working_client": anti_ban._working_client,
+        }
+    except Exception as e:
+        return {
+            "error": str(e),
+            "fallback_stats": downloader.fallback.get_stats(),
+        }
+
+
 @app.post("/api/cookies/set")
 async def set_cookies(data: dict):
     """حفظ الكوكيز عن طريق لصق المحتوى"""
@@ -332,22 +384,6 @@ async def remove_cookies():
     raise HTTPException(status_code=400, detail="فشل حذف الكوكيز")
 
 
-@app.get("/api/fallback/status")
-async def fallback_status():
-    """حالة نظام التحميل البديل"""
-    stats = downloader.fallback.get_stats()
-    return {
-        "fallback_stats": stats,
-        "yt_dlp_clients_tried": anti_ban._failed_clients,
-        "working_client": anti_ban._working_client,
-        "available_apis": {
-            "cobalt": len(downloader.fallback.cobalt._failed_instances) == 0 or bool(downloader.fallback.cobalt._working_instance),
-            "invidious": len(downloader.fallback.invidious._failed_instances) < len(downloader.fallback.invidious._failed_instances) + 1,
-            "piped": True,
-        },
-    }
-
-
 # WebSocket للتحديثات اللحظية
 @app.websocket("/ws")
 async def websocket_endpoint(websocket: WebSocket):
@@ -384,6 +420,7 @@ async def _send_progress_ws(websocket: WebSocket, progress):
             "eta": progress.eta,
             "message": progress.message,
             "filename": progress.filename,
+            "source": progress.source,
         })
     except Exception:
         pass
@@ -408,11 +445,11 @@ def main():
     """تشغيل الخادم"""
     import uvicorn
     print("=" * 60)
-    print("  YouTube Downloader - Desktop Version")
+    print("  YouTube Downloader v2.0 - Invidious-First")
     print("  تحميل فيديوهات يوتيوب مع الترجمات")
     print("=" * 60)
     print(f"\n  Download Directory: {DOWNLOAD_DIR}")
-    print(f"  Server: http://localhost:8555")
+    print(f"  Server: http://0.0.0.0:8555")
     print(f"\n  Open your browser and go to: http://localhost:8555")
     print("=" * 60)
 

desktop/static/script.js

@@ -351,7 +351,25 @@ class YouTubeDownloaderApp {
         this.progressPercent.textContent = `${Math.round(data.percent)}%`;
         this.progressSpeed.textContent = data.speed || '';
         this.progressEta.textContent = data.eta ? `الوقت المتبقي: ${data.eta}` : '';
-        this.progressMessage.textContent = data.message || '';
+
+        // إظهار مصدر التحميل مع الرسالة
+        let sourceLabel = '';
+        if (data.source) {
+            const sourceNames = {
+                'invidious': 'Invidious',
+                'invidious_direct': 'Invidious',
+                'invidious_adaptive': 'Invidious',
+                'yt_dlp': 'YouTube',
+                'cobalt': 'Cobalt',
+                'piped': 'Piped',
+            };
+            sourceLabel = sourceNames[data.source] || data.source;
+        }
+
+        const messageText = data.message || '';
+        this.progressMessage.textContent = sourceLabel
+            ? `[${sourceLabel}] ${messageText}`
+            : messageText;
 
         // Update steps based on status
         this.updateSteps(data.status);
@@ -363,6 +381,8 @@ class YouTubeDownloaderApp {
             'downloading_subtitle': 2,
             'waiting_anti_ban': 3,
             'downloading_video': 4,
+            'fallback_download': 4,
+            'merging_video': 4,
         };
 
         const currentStep = stepMap[status] || 0;
@@ -473,7 +493,20 @@ class YouTubeDownloaderApp {
         this.btnDownloadFull.disabled = false;
         this.btnDownloadSubtitleOnly.disabled = false;
         this.btnDownloadVideoOnly.disabled = false;
-        this.showToast(error || 'حدث خطأ أثناء التحميل', 'error');
+        
+        // رسائل خطأ أكثر وضوحاً
+        let errorMsg = error || 'حدث خطأ أثناء التحميل';
+        if (typeof errorMsg === 'string') {
+            if (errorMsg.includes('429') || errorMsg.includes('Too Many')) {
+                errorMsg = 'تم حظر الطلبات مؤقتاً. انتظر بضع دقائق ثم حاول مرة أخرى.';
+            } else if (errorMsg.includes('Video unavailable') || errorMsg.includes('Private')) {
+                errorMsg = 'الفيديو غير متاح أو خاص.';
+            } else if (errorMsg.includes('timeout') || errorMsg.includes('Timeout')) {
+                errorMsg = 'انتهت مهلة الاتصال. تحقق من الإنترنت وحاول مرة أخرى.';
+            }
+        }
+        
+        this.showToast(errorMsg, 'error');
     }
 
     async showDownloadsModal() {
@@ -559,8 +592,16 @@ class YouTubeDownloaderApp {
 
     async showAntiBanModal() {
         try {
-            const response = await fetch('/api/anti-ban/status');
-            const data = await response.json();
+            const [antiBanResponse, fallbackResponse] = await Promise.all([
+                fetch('/api/anti-ban/status'),
+                fetch('/api/fallback/status'),
+            ]);
+            const data = await antiBanResponse.json();
+            const fallbackData = await fallbackResponse.json();
+            
+            const instanceStatus = fallbackData.instance_status || {};
+            const workingInstance = instanceStatus.working || 'غير متاح';
+            const isHealthy = instanceStatus.working_instance_healthy !== false;
 
             this.antiBanInfo.innerHTML = `
                 <div class="anti-ban-item">
@@ -578,8 +619,21 @@ class YouTubeDownloaderApp {
                     </span>
                 </div>
                 <div class="anti-ban-item">
-                    <label>User-Agent</label>
-                    <span style="font-size:11px; max-width:200px; overflow:hidden; text-overflow:ellipsis;">${data.current_user_agent}</span>
+                    <label>سيرفر Invidious</label>
+                    <span class="${isHealthy ? 'status-active' : 'status-warning'}" style="font-size:11px; max-width:220px; overflow:hidden; text-overflow:ellipsis;">
+                        ${isHealthy ? '✅' : '❌'} ${workingInstance.replace('https://', '')}
+                    </span>
+                </div>
+                <div class="anti-ban-item">
+                    <label>العميل الحالي</label>
+                    <span>${data.current_client || 'غير محدد'}</span>
+                </div>
+                <div class="anti-ban-item">
+                    <label>إحصائيات التحميل</label>
+                    <span style="font-size:12px;">
+                        Invidious: ${data.fallback_stats?.invidious_download_success || 0} |
+                        FFmpeg: ${data.fallback_stats?.ffmpeg_merge_success || 0}
+                    </span>
                 </div>
             `;