Update bot.py

bot.py

@@ -1,6 +1,5 @@
 import os
 import gc
-import sys
 import asyncio
 import aiosqlite
 import time
@@ -10,18 +9,17 @@ from threading import Thread
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from pyrogram import Client, filters, idle
 from pyrogram.errors import FloodWait
-from pyrogram.enums import ChatType
 from pyrogram.types import InputMediaPhoto, InputMediaVideo, InputMediaDocument, InputMediaAudio
 
-# --- 1. الإعدادات والتنسيق الأساسي ---
+# --- 1. الإعدادات الأساسية ---
 DATA_DIR = "./data"
 DOWNLOAD_DIR = os.path.join(DATA_DIR, "downloads")
 DB_PATH = os.path.join(DATA_DIR, 'bot_archiver.db')
 os.makedirs(DOWNLOAD_DIR, exist_ok=True)
 
-HEALTHCHECK_URL = os.environ.get("HEALTHCHECK_URL", "") # رابط اختياري لمراقبة Uptime
-MAX_FILE_SIZE = 2000 * 1024 * 1024 # 2GB الحد الأقصى للملفات
-DYNAMIC_UPLOAD_DELAY = 5
+HEALTHCHECK_URL = os.environ.get("HEALTHCHECK_URL", "")
+MAX_FILE_SIZE = 2000 * 1024 * 1024 # 2GB
+DYNAMIC_UPLOAD_DELAY = 3 # تم تقليل وقت الانتظار الافتراضي
 download_queue = asyncio.Queue()
 
 # --- 2. سيرفر الحفاظ على التشغيل ---
@@ -29,12 +27,12 @@ class RequestHandler(BaseHTTPRequestHandler):
     def do_GET(self):
         self.send_response(200)
         self.end_headers()
-        self.wfile.write(b"Enterprise Async Archiver Engine Active!")
+        self.wfile.write(b"Live Radar Archiver Engine Active!")
     def log_message(self, format, *args): pass
 
 Thread(target=lambda: HTTPServer(('0.0.0.0', 7860), RequestHandler).serve_forever(), daemon=True).start()
 
-# --- 3. إعدادات حساب Pyrogram ---
+# --- 3. إعدادات الحساب (محاكاة هاتف حقيقي) ---
 API_ID = int(os.environ.get("API_ID", 0))
 API_HASH = os.environ.get("API_HASH", "")
 SESSION_STRING = os.environ.get("SESSION_STRING", "")
@@ -46,10 +44,13 @@ app = Client(
     api_hash=API_HASH,
     session_string=SESSION_STRING,
     in_memory=True,
-    max_concurrent_transmissions=3
+    # السر هنا: التخفي كأنه هاتف حقيقي لتجنب الحظر
+    device_model="Samsung Galaxy S23 Ultra",
+    system_version="Android 14.0",
+    app_version="10.14.1"
 )
 
-# --- 4. أدوات فحص النظام والتنظيف ---
+# --- 4. أدوات النظام وقاعدة البيانات ---
 def check_disk_space():
     total, used, free = shutil.disk_usage(DATA_DIR)
     return (free / (1024 * 1024)) > 500
@@ -57,7 +58,6 @@ def check_disk_space():
 async def init_db():
     async with aiosqlite.connect(DB_PATH) as db:
         await db.execute("PRAGMA journal_mode=WAL;")
-        await db.execute("PRAGMA auto_vacuum = FULL;")
         await db.execute('''
         CREATE TABLE IF NOT EXISTS queue (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -73,7 +73,6 @@ async def init_db():
             timestamp REAL,
             UNIQUE(chat_id, msg_id)
         )''')
-        await db.execute('''CREATE TABLE IF NOT EXISTS scan_progress (chat_id INTEGER PRIMARY KEY, last_msg_id INTEGER)''')
         await db.commit()
 
 def get_media_details(message):
@@ -92,7 +91,7 @@ def get_media_details(message):
     file_size = getattr(media, "file_size", 0)
     return unique_id, m_type, file_size
 
-# --- 5. محرك التنزيل المتوازي العالي السرعة ---
+# --- 5. محرك التنزيل المتوازي ---
 async def download_worker_task(worker_id):
     while True:
         message = await download_queue.get()
@@ -102,13 +101,11 @@ async def download_worker_task(worker_id):
 
             unique_id, m_type, file_size = get_media_details(message)
             if not unique_id or file_size > MAX_FILE_SIZE:
-                download_queue.task_done()
                 continue
 
             async with aiosqlite.connect(DB_PATH) as db:
                 async with db.execute("SELECT id FROM queue WHERE file_unique_id=?", (unique_id,)) as cursor:
                     if await cursor.fetchone():
-                        download_queue.task_done()
                         continue
 
             unique_name = f"{DOWNLOAD_DIR}/{message.chat.id}_{message.id}"
@@ -128,24 +125,24 @@ async def download_worker_task(worker_id):
                                 (message.chat.id, message.id, unique_id, group_id, m_type, final_caption, file_path, file_size, time.time())
                             )
                             await db.commit()
-                        print(f"⚡ [Worker-{worker_id}] تم التنزيل: {message.id}")
+                        print(f"⚡ [Worker-{worker_id}] تم تنزيل رسالة: {message.id}")
                         break
                     else:
                         if file_path and os.path.exists(file_path): os.remove(file_path)
                 except Exception:
                     await asyncio.sleep(2)
         except Exception as e:
-            print(f"❌ خطأ في عامل التنزيل {worker_id}: {e}")
+            print(f"❌ خطأ في التنزيل: {e}")
         finally:
-            download_queue.task_done()
+            download_queue.task_done() # يعمل مرة واحدة فقط لتجنب انهيار الطابور
 
-# --- 6. صائد الرسائل الحية ---
+# --- 6. صائد الرسائل الحية (الرادار) ---
 @app.on_message(filters.incoming & ~filters.me & (filters.channel | filters.group) & filters.media)
 async def catch_incoming(client, message):
     if message.chat.id != TARGET_CHAT:
         await download_queue.put(message)
 
-# --- 7. لوحة التحكم بالأوامر ---
+# --- 7. لوحة المراقبة ---
 @app.on_message(filters.me & filters.command("status"))
 async def status_command(client, message):
     async with aiosqlite.connect(DB_PATH) as db:
@@ -158,46 +155,26 @@ async def status_command(client, message):
     free_mb = round(free / (1024 * 1024), 2)
     
     report = (
-        f"👑 **حالة المحرك المتوازي (Enterprise):**\n\n"
-        f"📥 بالطابور المعلق: `{pending}`\n"
-        f"📤 المرفوع بنجاح: `{uploaded}`\n"
+        f"👑 **حالة رادار الأرشفة:**\n\n"
+        f"📥 جاهز للرفع (بالترتيب): `{pending}`\n"
+        f"📤 تم رفعه: `{uploaded}`\n"
         f"🔄 قيد التنزيل الآن: `{download_queue.qsize()}`\n"
-        f"💾 المساحة المتاحة: `{free_mb} MB`\n"
-        f"⏱️ الفاصل الزمني: `{DYNAMIC_UPLOAD_DELAY}s`"
+        f"💾 المساحة المتاحة: `{free_mb} MB`"
     )
     await message.reply_text(report)
 
-# --- 8. مسح السجلات التاريخية ---
-async def scan_history_worker():
-    async for dialog in app.get_dialogs():
-        if dialog.chat.type in [ChatType.CHANNEL, ChatType.SUPERGROUP, ChatType.GROUP] and dialog.chat.id != TARGET_CHAT:
-            try:
-                async with aiosqlite.connect(DB_PATH) as db:
-                    async with db.execute("SELECT last_msg_id FROM scan_progress WHERE chat_id=?", (dialog.chat.id,)) as cursor:
-                        res = await cursor.fetchone()
-                        last_id = res[0] if res else 0
-
-                async for message in app.get_chat_history(dialog.chat.id):
-                    if message.id <= last_id: break
-                    if message.media: await download_queue.put(message)
-                    
-                    async with aiosqlite.connect(DB_PATH) as db:
-                        await db.execute("INSERT OR REPLACE INTO scan_progress (chat_id, last_msg_id) VALUES (?, ?)", (dialog.chat.id, message.id))
-                        await db.commit()
-            except Exception: pass
-            await asyncio.sleep(2)
-
-# --- 9. محرك الرفع المستقل ---
+# --- 8. محرك الرفع التسلسلي الصارم ---
 async def upload_worker():
     global DYNAMIC_UPLOAD_DELAY
     while True:
         try:
             async with aiosqlite.connect(DB_PATH) as db:
-                async with db.execute("SELECT id, chat_id, msg_id, media_group_id, media_type, caption, file_path, timestamp FROM queue WHERE status='DOWNLOADED' ORDER BY file_size ASC, id ASC LIMIT 1") as cursor:
+                # التعديل الأهم: الترتيب حسب id ASC لضمان رفع الملفات بنفس ترتيب وصولها بالضبط
+                async with db.execute("SELECT id, chat_id, msg_id, media_group_id, media_type, caption, file_path, timestamp FROM queue WHERE status='DOWNLOADED' ORDER BY id ASC LIMIT 1") as cursor:
                     row = await cursor.fetchone()
 
             if not row:
-                await asyncio.sleep(4)
+                await asyncio.sleep(2)
                 continue
 
             q_id, chat_id, msg_id, group_id, m_type, caption, file_path, ts = row
@@ -208,10 +185,10 @@ async def upload_worker():
                     await db.commit()
                 continue
 
-            # معالجة الألبومات
+            # معالجة الألبومات (بنفس ترتيبها الأصلي)
             if group_id:
                 time_passed = time.time() - ts
-                if time_passed < 12: await asyncio.sleep(12 - time_passed)
+                if time_passed < 8: await asyncio.sleep(8 - time_passed) # انتظار قصير لتكتمل أجزاء الألبوم
 
                 async with aiosqlite.connect(DB_PATH) as db:
                     async with db.execute(
@@ -221,13 +198,13 @@ async def upload_worker():
                         group_rows = await cursor.fetchall()
 
                 if group_rows:
-                    for i in range(0, len(group_rows), 10):
+                    for i in range(0, len(group_rows), 10): # تليجرام يقبل 10 ملفات كحد أقصى في الألبوم
                         chunk = group_rows[i:i+10]
                         media_list, ids_to_update, files_to_delete = [], [], []
 
                         for idx, g_item in enumerate(chunk):
                             g_id, g_type, g_cap, g_path = g_item
-                            item_caption = g_cap if idx == 0 else ""
+                            item_caption = g_cap if idx == 0 else "" # النص للصورة الأولى فقط لتجنب التكرار
 
                             if g_type == "photo": media_list.append(InputMediaPhoto(media=g_path, caption=item_caption))
                             elif g_type == "video": media_list.append(InputMediaVideo(media=g_path, caption=item_caption, supports_streaming=True))
@@ -265,36 +242,34 @@ async def upload_worker():
                 await db.commit()
 
             if os.path.exists(file_path): os.remove(file_path)
-            if DYNAMIC_UPLOAD_DELAY > 4: DYNAMIC_UPLOAD_DELAY -= 0.1
+            if DYNAMIC_UPLOAD_DELAY > 3: DYNAMIC_UPLOAD_DELAY -= 0.1
             gc.collect()
             await asyncio.sleep(DYNAMIC_UPLOAD_DELAY)
 
         except FloodWait as e:
-            DYNAMIC_UPLOAD_DELAY += 4
+            print(f"⚠️ تليجرام يطلب الانتظار {e.value} ثانية... (نظام الحماية يعمل)")
+            DYNAMIC_UPLOAD_DELAY += 2
             await asyncio.sleep(e.value + 5)
-        except Exception:
+        except Exception as e:
+            print(f"⚠️ خطأ أثناء الرفع: {e}")
             await asyncio.sleep(5)
 
-# --- 10. إرسال نبضات الحفاظ على الخدمة (Healthcheck Ping) ---
 async def healthcheck_ping():
     while True:
-        await asyncio.sleep(300) # كل 5 دقائق
+        await asyncio.sleep(300)
         if HEALTHCHECK_URL:
             try: urllib.request.urlopen(HEALTHCHECK_URL, timeout=10)
             except: pass
 
-# --- 11. التشغيل الرئيسي المتوازي ---
 async def main():
     await init_db()
     await app.start()
-    print("🚀 تم تشغيل المحرك بالتوازي الكامل (3 Downloader Workers + 1 Uploader)!")
+    print("🚀 تم تشغيل وضع الرادار الحي! (محاكاة هاتف حقيقي فعالة)")
     
-    # تشغيل 3 عمال تنزيل بالتوازي
     for i in range(3):
         asyncio.create_task(download_worker_task(i + 1))
         
     asyncio.create_task(upload_worker())
-    asyncio.create_task(scan_history_worker())
     asyncio.create_task(healthcheck_ping())
     
     await idle()
@@ -305,5 +280,5 @@ if __name__ == "__main__":
         try:
             app.run(main())
         except Exception as crash_error:
-            print(f"⚠️ إعادة تشغيل ذكية بعد الانهيار: {crash_error}")
-            time.sleep(10)
+            print(f"⚠️ إعادة تشغيل ذكية: {crash_error}")
+            time.sleep(5)