Update main.py

main.py

@@ -7,6 +7,7 @@ import time
 import json
 import aiosqlite
 import uvicorn
+import threading
 from contextlib import asynccontextmanager
 from fastapi import FastAPI, WebSocket, WebSocketDisconnect
 from fastapi.middleware.cors import CORSMiddleware
@@ -30,7 +31,7 @@ WEBAPP_URL = f"https://{SPACE_HOST}"
 
 PORT = int(os.getenv("PORT", 7860))
 DB_PATH = "gift_bot.db"
-HOUSE_EDGE = 0.03
+HOUSE_EDGE = 0.04  # 4% house edge
 BUYBACK_RATE = 0.95
 
 # ==========================================
@@ -124,7 +125,7 @@ async def refresh_prices():
     return cached_prices
 
 # ==========================================
-# GAME ENGINE
+# GAME ENGINE (FIXED ALGORITHM)
 # ==========================================
 class CrashEngine:
     def __init__(self):
@@ -141,27 +142,29 @@ class CrashEngine:
         self.server_seed = secrets.token_hex(32)
         self.server_seed_hash = hashlib.sha256(self.server_seed.encode()).hexdigest()
 
-    def calculate_crash(self, round_id: int) -> float:
-        h = hashlib.sha256(f"{self.server_seed}:{round_id}".encode()).hexdigest()
-        h_int = int(h[:13], 16)
-        E = 2**52
-        if secrets.randbelow(100) < int(HOUSE_EDGE * 100):
-            return 1.00
-        crash = (100 * E - h_int) / (E - h_int) / 100
-        return max(1.00, round(crash, 2))
+    def calculate_crash(self) -> float:
+        # Provably fair formula (generates up to 1000x+)
+        r = secrets.randbelow(2**32) / (2**32)
+        # House edge cut
+        crash = (1 - HOUSE_EDGE) / (1 - r)
+        
+        if crash < 1.0:
+            crash = 1.0
+        
+        # Cap the max multiplier for sanity
+        return min(round(crash, 2), 100.0)
 
     def get_current_multiplier(self) -> float:
         if not self.is_running: return 1.0
         elapsed = time.time() - self.start_time
         
-        # Slow down the curve so it takes time to reach 2x, 3x, etc.
-        # Multiplier grows exponentially based on time elapsed.
-        mult = 1.00 * (1.035 ** (elapsed * 10))
+        # Slower growth curve: 2x takes ~5 seconds, 10x takes ~13 seconds.
+        mult = 1.00 * (1.05 ** (elapsed * 2.5))
         return round(mult, 2)
 
     async def start_countdown(self):
         self.generate_seed()
-        self.crash_point = self.calculate_crash(self.current_round_id)
+        self.crash_point = self.calculate_crash()
         self.is_countdown = True
         self.is_running = False
         self.bets = {}
@@ -193,7 +196,6 @@ class CrashEngine:
         asyncio.create_task(self.start_countdown())
 
     async def place_bet(self, user_id, amount):
-        # You can only place a bet during countdown or the first second
         if not self.is_countdown and not self.is_running:
             return False, "Game is not accepting bets."
         if user_id in self.bets: return False, "Already bet this round."
@@ -223,7 +225,7 @@ class CrashEngine:
 engine = CrashEngine()
 
 # ==========================================
-# TELEGRAM BOT
+# TELEGRAM BOT (ISOLATED THREAD FIX)
 # ==========================================
 bot = Bot(token=BOT_TOKEN) if BOT_TOKEN else None
 dp = Dispatcher()
@@ -254,19 +256,21 @@ async def cmd_start(msg: types.Message):
     await msg.answer(welcome_text, reply_markup=reply_kb)
     await msg.answer("اضغط للدخول:", reply_markup=inline_kb)
 
-@dp.message(lambda message: message.text == "🎮 ادخل اللعبة")
-async def open_game_msg(msg: types.Message):
-    await msg.answer("جاري فتح اللعبة...")
-
-async def run_bot():
+def start_bot_in_thread():
     if not bot:
-        print("[ERROR] Bot token missing. Bot cannot start.")
+        print("[ERROR] Bot token missing.")
         return
-    try:
-        print("[BOT] Starting Telegram bot polling...")
-        await dp.start_polling(bot)
-    except Exception as e:
-        print(f"[BOT ERROR] {e}")
+    print("[BOT] Starting Telegram bot polling in background...")
+    
+    async def run():
+        try:
+            await dp.start_polling(bot)
+        except Exception as e:
+            print(f"[BOT ERROR] {e}")
+            
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    loop.run_until_complete(run())
 
 # ==========================================
 # FASTAPI & WEBSOCKETS
@@ -276,7 +280,9 @@ async def lifespan(app: FastAPI):
     await init_db()
     await refresh_prices()
     asyncio.create_task(engine.start_countdown())
-    asyncio.create_task(run_bot())
+    # Start bot in a separate thread to prevent blocking FastAPI startup
+    threading.Thread(target=start_bot_in_thread, daemon=True).start()
+    
     async def price_loop():
         while True:
             await asyncio.sleep(300)
@@ -302,12 +308,12 @@ async def serve_frontend():
         body { background: #0f0f0f; color: #fff; font-family: -apple-system, sans-serif; padding: 16px; min-height: 100vh; }
         .header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px; }
         .balance { background: #1e1e1e; padding: 8px 16px; border-radius: 12px; font-weight: 600; }
-        .display { text-align: center; padding: 60px 0; background: #1a1a1a; border-radius: 24px; margin-bottom: 16px; position: relative; overflow: hidden; }
+        .display { text-align: center; padding: 60px 0; background: #1a1a1a; border-radius: 24px; margin-bottom: 16px; position: relative; overflow: hidden; transition: background 0.3s; }
         .display h1 { font-size: 4rem; font-weight: 800; letter-spacing: -2px; display: flex; align-items: center; justify-content: center; gap: 10px; }
         .display.crashed h1 { color: #ff3b30; }
         .display.crashed { background: #2a0a0a; }
         .display.countdown { background: #1a1a2a; }
-        .display.countdown h1 { color: #007aff; }
+        .display.countdown h1 { color: #007aff; font-size: 2.5rem; }
         .controls { display: flex; flex-direction: column; gap: 10px; margin-bottom: 20px; }
         .row { display: flex; gap: 10px; }
         input { flex: 1; padding: 16px; border-radius: 12px; border: none; background: #1e1e1e; color: #fff; font-size: 1.2rem; text-align: center; }
@@ -374,7 +380,6 @@ async def serve_frontend():
                 renderGifts(data.inventory);
             } 
             else if (data.type === "countdown") {
-                // Show countdown state
                 displayEl.classList.remove("crashed");
                 displayEl.classList.add("countdown");
                 multEl.innerText = `Starting in ${data.seconds}...`;
@@ -387,12 +392,15 @@ async def serve_frontend():
                 cashBtn.disabled = true;
             }
             else if (data.type === "round_start") {
-                // Hide countdown, start flying
                 displayEl.classList.remove("countdown");
                 displayEl.classList.remove("crashed");
                 multEl.innerText = "🚀 1.00x";
                 isCountdown = false;
                 isRunning = true;
+                // CRITICAL FIX: If player already bet during countdown, unlock cashout
+                if (hasBet) {
+                    cashBtn.disabled = false;
+                }
             } 
             else if (data.type === "tick") {
                 if(isRunning) {
@@ -411,7 +419,9 @@ async def serve_frontend():
                     hasBet = true;
                     betBtn.innerText = "Bet Placed";
                     betBtn.disabled = true;
+                    // CRITICAL FIX: If the round is already running, let them cashout immediately
                     if(isRunning) cashBtn.disabled = false;
+                    
                     const amt = parseFloat(document.getElementById('betAmount').value);
                     balanceEl.innerText = (parseFloat(balanceEl.innerText) - amt).toFixed(2);
                 } else alert(data.msg);