h

config.py

@@ -1,49 +1,45 @@
 """
 config.py — Centralized configuration loader.
-Reads environment variables from the system (Hugging Face Secrets in production)
-or from a .env file (local development via python-dotenv).
 """
 
 import os
 from dotenv import load_dotenv
 
-# Load .env file if it exists (for local dev). In production (HF Spaces),
-# this does nothing — secrets are already in the environment.
 load_dotenv()
 
 
 class Config:
-    """Holds all configuration values for the application."""
-
-    # --- Telegram ---
-    BOT_TOKEN: str = os.getenv("BOT_TOKEN", "")
+    # Telegram
+    BOT_TOKEN:      str = os.getenv("BOT_TOKEN", "")
     OWNER_USERNAME: str = os.getenv("OWNER_USERNAME", "Ahmad_Gebril")
 
-    # --- Database ---
-    DATABASE_URL: str = os.getenv("DATABASE_URL", "")
+    # Database
+    DATABASE_URL:   str = os.getenv("DATABASE_URL", "")
+
+    # Webhook — your HF Space public URL (no trailing slash)
+    # Example: https://ahmad3g-telegram-bot.hf.space
+    WEBHOOK_URL:    str = os.getenv("WEBHOOK_URL", "")
 
-    # --- Web Server ---
-    # Hugging Face Spaces require the app to listen on port 7860
+    # Web server
     WEB_HOST: str = "0.0.0.0"
     WEB_PORT: int = 7860
 
-    # --- Pagination ---
+    # Pagination
     ITEMS_PER_PAGE: int = 10
 
     @classmethod
     def validate(cls):
-        """Check that all critical config values are present at startup."""
         missing = []
         if not cls.BOT_TOKEN:
             missing.append("BOT_TOKEN")
         if not cls.DATABASE_URL:
             missing.append("DATABASE_URL")
+        if not cls.WEBHOOK_URL:
+            missing.append("WEBHOOK_URL")
         if missing:
             raise EnvironmentError(
-                f"❌ Missing critical environment variables: {', '.join(missing)}\n"
-                f"Please check your .env file or Hugging Face Secrets."
+                f"❌ Missing environment variables: {', '.join(missing)}"
             )
 
 
-# Instantiate config for easy importing
 config = Config()

main.py

@@ -1,13 +1,22 @@
 """
-main.py — Application entry point.
-
-Runs TWO concurrent async services:
-1. An aiohttp web server on port 7860 (Hugging Face keepalive — starts FIRST)
-2. The aiogram Telegram bot (long polling)
-
-FIX: Removed bot["view_states"] assignment — aiogram v3 Bot object does NOT
-     support item assignment. VIEW_STATES is a plain module-level dict in
-     handlers/admin.py and is imported directly by any handler that needs it.
+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
@@ -20,12 +29,16 @@ from aiogram import Bot, Dispatcher
 from aiogram.client.default import DefaultBotProperties
 from aiogram.enums import ParseMode
 from aiogram.fsm.storage.memory import MemoryStorage
+from aiogram.webhook.aiohttp_server import (
+    SimpleRequestHandler,
+    setup_application,
+)
 
 from config import config
 from database.db import init_db
 from handlers import admin, owner, user
 
-# ─────────────────────────── LOGGING ───────────────────────────
+# ─────────────────────────── LOGGING ─────────────────────────────────────
 
 logging.basicConfig(
     level=logging.INFO,
@@ -35,19 +48,15 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-# Track bot health for the status endpoint
 BOT_STATUS = {"running": False, "started_at": None, "error": None}
 
+# Webhook path — Telegram will POST updates here
+WEBHOOK_PATH = "/webhook"
 
-# ══════════════════════════════════════════════════════════════
-#  WEB SERVER  (must respond on :7860 for Hugging Face)
-# ══════════════════════════════════════════════════════════════
+
+# ─────────────────────────── HEALTH ENDPOINTS ────────────────────────────
 
 async def handle_root(request: web.Request) -> web.Response:
-    """
-    Root health-check endpoint.
-    UptimeRobot pings this every 5 min to keep the Space awake.
-    """
     status = "✅ running" if BOT_STATUS["running"] else "⏳ starting"
     error  = f"\n❌ Last error: {BOT_STATUS['error']}" if BOT_STATUS["error"] else ""
     body = (
@@ -60,7 +69,6 @@ async def handle_root(request: web.Request) -> web.Response:
 
 
 async def handle_health(request: web.Request) -> web.Response:
-    """JSON health endpoint — handy for monitoring dashboards."""
     import json
     payload = {
         "status" : "ok" if BOT_STATUS["running"] else "starting",
@@ -75,36 +83,9 @@ async def handle_health(request: web.Request) -> web.Response:
     )
 
 
-async def run_web_server() -> None:
-    """
-    Starts aiohttp on 0.0.0.0:7860.
-    This coroutine NEVER exits — keeps the HF Space alive.
-    """
-    app = web.Application()
-    app.router.add_get("/",       handle_root)
-    app.router.add_get("/health", handle_health)
-
-    runner = web.AppRunner(app)
-    await runner.setup()
-    site = web.TCPSite(runner, host=config.WEB_HOST, port=config.WEB_PORT)
-    await site.start()
-
-    logger.info(f"✅ Web server listening on http://{config.WEB_HOST}:{config.WEB_PORT}/")
-
-    # Keep this coroutine alive forever
-    while True:
-        await asyncio.sleep(3600)
-
-
-# ══════════════════════════════════════════════════════════════
-#  TELEGRAM BOT
-# ══════════════════════════════════════════════════════════════
+# ─────────────────────────── DISPATCHER ──────────────────────────────────
 
 def build_dispatcher() -> Dispatcher:
-    """
-    Creates the Dispatcher and registers all routers.
-    Order: owner > admin > user — privileged handlers intercept first.
-    """
     dp = Dispatcher(storage=MemoryStorage())
     dp.include_router(owner.router)
     dp.include_router(admin.router)
@@ -112,92 +93,104 @@ def build_dispatcher() -> Dispatcher:
     return dp
 
 
-async def run_bot() -> None:
-    """
-    Initialises the database, then starts the Telegram bot.
-    Retries the DB connection up to 5 times before giving up.
-    The web server keeps running even if the bot fails to start.
-    """
-    # ── 1. Config validation ──────────────────────────────────
+# ─────────────────────────── MAIN ────────────────────────────────────────
+
+async def main() -> None:
+    print(f"\n{'='*50}")
+    print(f"  Startup at {datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')} UTC")
+    print(f"{'='*50}\n")
+
+    # ── 1. Validate config ────────────────────────────────────
     try:
         config.validate()
     except EnvironmentError as e:
         logger.critical(str(e))
         BOT_STATUS["error"] = str(e)
-        return
-
-    # ── 2. DB initialisation with retry ──────────────────────
-    MAX_RETRIES = 5
-    RETRY_DELAY = 5   # seconds
-
-    for attempt in range(1, MAX_RETRIES + 1):
+        # Still start the web server so HF Space shows something
+        app = web.Application()
+        app.router.add_get("/", handle_root)
+        runner = web.AppRunner(app)
+        await runner.setup()
+        await web.TCPSite(runner, config.WEB_HOST, config.WEB_PORT).start()
+        while True:
+            await asyncio.sleep(3600)
+
+    # ── 2. Database with retry ────────────────────────────────
+    for attempt in range(1, 6):
         try:
-            logger.info(f"🔌 Connecting to database (attempt {attempt}/{MAX_RETRIES})…")
+            logger.info(f"🔌 DB connect attempt {attempt}/5…")
             await init_db()
             logger.info("✅ Database ready.")
             break
         except Exception as exc:
             BOT_STATUS["error"] = str(exc)
-            logger.error(f"❌ DB connection failed: {exc}")
-            if attempt < MAX_RETRIES:
-                logger.info(f"⏳ Retrying in {RETRY_DELAY}s…")
-                await asyncio.sleep(RETRY_DELAY)
+            logger.error(f"❌ DB failed: {exc}")
+            if attempt < 5:
+                await asyncio.sleep(5)
             else:
-                logger.critical("💥 Could not connect to database after all retries.")
-                return
+                logger.critical("💥 DB unavailable — bot will not start.")
+                # Web server still starts below
+                break
 
-    # ── 3. Create Bot instance ────────────────────────────────
+    # ── 3. Bot + webhook setup ────────────────────────────────
     bot = Bot(
         token=config.BOT_TOKEN,
         default=DefaultBotProperties(parse_mode=ParseMode.HTML),
     )
 
-    # NOTE: VIEW_STATES is a plain module-level dict in handlers/admin.py.
-    #       Any handler that needs it imports it directly:
-    #           from handlers.admin import VIEW_STATES
-    #       No need to attach anything to the Bot object.
-
     dp = build_dispatcher()
 
-    # ── 4. Start polling ──────────────────────────────────────
-    BOT_STATUS["running"]    = True
-    BOT_STATUS["started_at"] = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
-    BOT_STATUS["error"]      = None
-    logger.info("🚀 Bot is now polling for updates…")
+    # 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 dp.start_polling(
-            bot,
+        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:
-        BOT_STATUS["running"] = False
-        BOT_STATUS["error"]   = str(exc)
-        logger.critical(f"💥 Bot polling crashed: {exc}")
-    finally:
-        await bot.session.close()
-        logger.info("🛑 Bot session closed.")
+        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}"
 
+    # ── 4. aiohttp app with webhook handler ───────────────────
+    app = web.Application()
 
-# ══════════════════════════════════════════════════════════════
-#  ENTRY POINT
-# ══════════════════════════════════════════════════════════════
+    # Health endpoints
+    app.router.add_get("/",       handle_root)
+    app.router.add_get("/health", handle_health)
 
-async def main() -> None:
-    """
-    Runs the web server and the bot concurrently via asyncio.gather.
-    The web server binds port 7860 within milliseconds.
-    The bot's DB retry loop runs in the background without blocking it.
-    """
-    print(f"\n{'='*50}")
-    print(f"  Application Startup at {datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')} UTC")
-    print(f"{'='*50}\n")
+    # aiogram webhook handler — Telegram POSTs updates here
+    SimpleRequestHandler(dispatcher=dp, bot=bot).register(app, path=WEBHOOK_PATH)
+    setup_application(app, dp, bot=bot)
 
-    await asyncio.gather(
-        run_web_server(),
-        run_bot(),
-    )
+    # ── 5. Start server ───────────────────────────────────────
+    runner = web.AppRunner(app)
+    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}")
+
+    # Keep running forever
+    while True:
+        await asyncio.sleep(3600)
 
 
 if __name__ == "__main__":