dhjfr

main.py

@@ -1,24 +1,3 @@
-"""
-main.py — Webhook mode for Hugging Face Spaces.
-
-WHY WEBHOOK INSTEAD OF POLLING:
-─────────────────────────────────────────────────────────
-Hugging Face blocks outbound connections from Docker containers.
-Polling requires the bot to connect OUT to api.telegram.org — blocked.
-Webhook is the opposite: Telegram connects IN to our server — allowed.
-
-HOW IT WORKS:
-─────────────────────────────────────────────────────────
-1. We tell Telegram: "Send all updates to https://OUR_HF_URL/webhook"
-2. Telegram POSTs each update to our aiohttp server
-3. aiogram processes it normally — no outbound polling needed
-
-REQUIRED ENVIRONMENT VARIABLE (add to HF Secrets):
-─────────────────────────────────────────────────────────
-WEBHOOK_URL = https://YOUR_USERNAME-YOUR_SPACE_NAME.hf.space
-  Example  : https://ahmad3g-telegram-bot.hf.space
-"""
-
 import asyncio
 import logging
 import sys
@@ -59,11 +38,13 @@ WEBHOOK_PATH = "/webhook"
 async def handle_root(request: web.Request) -> web.Response:
     status = "✅ running" if BOT_STATUS["running"] else "⏳ starting"
     error  = f"\n❌ Last error: {BOT_STATUS['error']}" if BOT_STATUS["error"] else ""
+    # ملاحظة للمستخدم في الصفحة الرئيسية
+    manual_notice = "\n\n💡 Note: Webhook is set manually to bypass HF outbound block."
     body = (
         f"🤖 Knowledge Base Bot — {status}\n"
         f"🕒 Server time : {datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')} UTC\n"
         f"🚀 Bot started : {BOT_STATUS['started_at'] or 'not yet'}"
-        f"{error}"
+        f"{error}{manual_notice}"
     )
     return web.Response(text=body, content_type="text/plain", status=200)
 
@@ -106,7 +87,6 @@ async def main() -> None:
     except EnvironmentError as e:
         logger.critical(str(e))
         BOT_STATUS["error"] = str(e)
-        # Still start the web server so HF Space shows something
         app = web.Application()
         app.router.add_get("/", handle_root)
         runner = web.AppRunner(app)
@@ -128,11 +108,10 @@ async def main() -> None:
             if attempt < 5:
                 await asyncio.sleep(5)
             else:
-                logger.critical("💥 DB unavailable — bot will not start.")
-                # Web server still starts below
+                logger.critical("💥 DB unavailable.")
                 break
 
-    # ── 3. Bot + webhook setup ────────────────────────────────
+    # ── 3. Bot Setup ──────────────────────────────────────────
     bot = Bot(
         token=config.BOT_TOKEN,
         default=DefaultBotProperties(parse_mode=ParseMode.HTML),
@@ -140,34 +119,13 @@ async def main() -> None:
 
     dp = build_dispatcher()
 
-    # Build the full webhook URL
-    webhook_url = f"{config.WEBHOOK_URL.rstrip('/')}{WEBHOOK_PATH}"
-    logger.info(f"🔗 Setting webhook: {webhook_url}")
-
-    # Register webhook with Telegram
-    # (This is an OUTBOUND call — but it only happens ONCE at startup,
-    #  before HF fully locks down the container network in some cases.
-    #  If it fails, set the webhook manually via browser:
-    #  https://api.telegram.org/botTOKEN/setWebhook?url=WEBHOOK_URL)
-    try:
-        await bot.delete_webhook(drop_pending_updates=True)
-        await bot.set_webhook(
-            url=webhook_url,
-            allowed_updates=dp.resolve_used_update_types(),
-            drop_pending_updates=True,
-        )
-        logger.info("✅ Webhook registered with Telegram.")
-        BOT_STATUS["running"]    = True
-        BOT_STATUS["started_at"] = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
-        BOT_STATUS["error"]      = None
-    except Exception as exc:
-        logger.error(f"⚠️ Could not set webhook automatically: {exc}")
-        logger.info(
-            f"👉 Set it manually in browser:\n"
-            f"   https://api.telegram.org/bot{config.BOT_TOKEN}"
-            f"/setWebhook?url={webhook_url}"
-        )
-        BOT_STATUS["error"] = f"Webhook not set: {exc}"
+    # ⚠️ تم تعطيل الحذف والتسجيل التلقائي للويب هوك هنا لتجنب حجب HF
+    # التسجيل يتم يدوياً من المتصفح كما فعلت سابقاً
+    logger.info("ℹ️ Skipping automatic webhook registration (HF compatibility mode).")
+    
+    BOT_STATUS["running"]    = True
+    BOT_STATUS["started_at"] = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
+    BOT_STATUS["error"]      = None
 
     # ── 4. aiohttp app with webhook handler ───────────────────
     app = web.Application()
@@ -176,7 +134,7 @@ async def main() -> None:
     app.router.add_get("/",       handle_root)
     app.router.add_get("/health", handle_health)
 
-    # aiogram webhook handler — Telegram POSTs updates here
+    # تسجيل معالج الويب هوك (هذا يجعل البوت "يسمع" للرسائل القادمة)
     SimpleRequestHandler(dispatcher=dp, bot=bot).register(app, path=WEBHOOK_PATH)
     setup_application(app, dp, bot=bot)
 
@@ -185,8 +143,9 @@ async def main() -> None:
     await runner.setup()
     site = web.TCPSite(runner, host=config.WEB_HOST, port=config.WEB_PORT)
     await site.start()
-    logger.info(f"✅ Server on http://{config.WEB_HOST}:{config.WEB_PORT}/")
-    logger.info(f"✅ Webhook endpoint: {WEBHOOK_PATH}")
+    
+    logger.info(f"🚀 Server is UP on http://{config.WEB_HOST}:{config.WEB_PORT}/")
+    logger.info(f"📡 Waiting for Telegram updates via: {config.WEBHOOK_URL}{WEBHOOK_PATH}")
 
     # Keep running forever
     while True: