Update app.py

app.py

@@ -2,29 +2,30 @@ import gradio as gr
 import subprocess
 import asyncio
 import threading
-from queue import Queue, Empty
 import os
 import time
+from queue import Queue, Empty
 from telegram import Update
 from telegram.ext import ApplicationBuilder, CommandHandler, ContextTypes
 
 # --- Config ---
 BOT_TOKEN = os.environ.get("BOT_TOKEN", "YOUR_BOT_TOKEN_HERE")
-
-# --- Globals ---
-bot_app = None
-bot_running = False
 log_queue = Queue()
 telegram_cmd_logs = []
+bot_should_run = True  # Thread-safe flag
 
-# --- Telegram Bot Command Handler ---
+# --- Telegram Command Handler ---
 async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if not bot_should_run:
+        await update.message.reply_text("Bot is disabled.")
+        return
+
     cmd = ' '.join(context.args)
     if not cmd:
         await update.message.reply_text("Usage: /bash <command>")
         return
 
-    log_queue.put(f"[Telegram] Received command: {cmd}")
+    log_queue.put(f"[Telegram] /bash {cmd}")
     try:
         proc = await asyncio.create_subprocess_shell(
             cmd,
@@ -33,8 +34,6 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
         )
         stdout, _ = await proc.communicate()
         output = stdout.decode().strip()
-        if len(output) > 4000:
-            output = output[:4000] + "\n...[truncated]"
     except Exception as e:
         output = f"Error: {e}"
 
@@ -43,7 +42,21 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     if len(telegram_cmd_logs) > 50:
         telegram_cmd_logs.pop(0)
 
-# --- Terminal Command Function ---
+# --- Start bot once in main thread ---
+def launch_bot():
+    async def main():
+        app = ApplicationBuilder().token(BOT_TOKEN).build()
+        app.add_handler(CommandHandler("bash", bash_command))
+        log_queue.put("[Bot] Running...")
+        await app.run_polling()
+
+    def bot_thread():
+        asyncio.run(main())
+
+    thread = threading.Thread(target=bot_thread, daemon=True)
+    thread.start()
+
+# --- Terminal Function ---
 def live_terminal(cmd):
     if not cmd.strip():
         yield "$ "
@@ -56,42 +69,8 @@ def live_terminal(cmd):
     process.wait()
     yield "$ "
 
-# --- Bot Start/Stop Functions ---
-def start_bot_sync():
-    global bot_app, bot_running
-    if bot_running:
-        log_queue.put("[Bot] Already running.")
-        return
-
-    async def main():
-        global bot_app, bot_running
-        bot_app = ApplicationBuilder().token(BOT_TOKEN).build()
-        bot_app.add_handler(CommandHandler("bash", bash_command))
-        bot_running = True
-        log_queue.put("[Bot] Started.")
-        await bot_app.initialize()
-        await bot_app.start()
-        await bot_app.updater.start_polling()
-
-    asyncio.run(main())
-
-def stop_bot_sync():
-    global bot_app, bot_running
-    if not bot_running:
-        log_queue.put("[Bot] Not running.")
-        return
-
-    async def shutdown():
-        await bot_app.updater.stop()
-        await bot_app.stop()
-        await bot_app.shutdown()
-        log_queue.put("[Bot] Stopped.")
-
-    asyncio.run(shutdown())
-    bot_running = False
-
-# --- Log Collector ---
-def update_log_box():
+# --- Log Updater ---
+def update_logs():
     logs = []
     try:
         while True:
@@ -101,7 +80,20 @@ def update_log_box():
     logs.extend(telegram_cmd_logs[-20:])
     return "\n".join(logs[-20:])
 
-# --- Gradio UI ---
+# --- Start/Stop Bot Command Execution Only ---
+def enable_bot():
+    global bot_should_run
+    bot_should_run = True
+    log_queue.put("[Bot] Enabled")
+    return update_logs()
+
+def disable_bot():
+    global bot_should_run
+    bot_should_run = False
+    log_queue.put("[Bot] Disabled")
+    return update_logs()
+
+# --- Gradio Interface ---
 with gr.Blocks() as demo:
     gr.Markdown("## 🖥️ Live Terminal + Telegram Bot Interface")
 
@@ -109,26 +101,25 @@ with gr.Blocks() as demo:
         terminal_output = gr.Textbox(label="Live Terminal", lines=20, interactive=False)
         cmd_input = gr.Textbox(placeholder="Type shell command", label="Command Input")
 
-    with gr.Row():
-        run_btn = gr.Button("▶️ Run")
-        start_btn = gr.Button("🤖 Start Telegram Bot")
-        stop_btn = gr.Button("🛑 Stop Telegram Bot")
+    run_btn = gr.Button("▶️ Run Command")
 
-    log_output = gr.Textbox(label="📜 Bot & Telegram Logs", lines=15, interactive=False)
+    with gr.Row():
+        start_btn = gr.Button("✅ Enable Bot")
+        stop_btn = gr.Button("🛑 Disable Bot")
 
-    # Streaming terminal output
-    run_btn.click(fn=live_terminal, inputs=cmd_input, outputs=terminal_output)
+    log_output = gr.Textbox(label="📜 Logs", lines=15, interactive=False)
 
-    # Start/Stop bot
-    start_btn.click(lambda: update_log_box() or start_bot_sync(), outputs=log_output)
-    stop_btn.click(lambda: update_log_box() or stop_bot_sync(), outputs=log_output)
+    run_btn.click(live_terminal, inputs=cmd_input, outputs=terminal_output)
+    start_btn.click(fn=enable_bot, outputs=log_output)
+    stop_btn.click(fn=disable_bot, outputs=log_output)
 
-    # Auto log updater every 3 seconds (Gradio v5 style)
     def background_log_updater():
         while True:
             time.sleep(3)
-            yield update_log_box()
+            yield update_logs()
 
     demo.load(background_log_updater, outputs=log_output)
 
+# --- Launch everything ---
+launch_bot()
 demo.launch()