Update app.py

app.py

@@ -11,8 +11,8 @@ BOT_TOKEN = os.environ.get("BOT_TOKEN")  # Set it only via environment for safet
 
 log_queue = Queue()
 MAX_LOGS = 20000
-all_logs = []
-telegram_cmd_logs = []
+terminal_logs = []
+bot_logs = []
 bot_app = None
 bot_running = False
 bot_thread = None
@@ -24,9 +24,9 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
         await update.message.reply_text("Usage: /bash <command>")
         return
 
-    log_entry = f"[Telegram] $ {cmd}"
-    log_queue.put(log_entry)
-    add_log(log_entry)
+    entry = f"[Bot] $ {cmd}"
+    log_queue.put(entry)
+    add_bot_log(entry)
 
     try:
         proc = await asyncio.create_subprocess_shell(cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.STDOUT)
@@ -38,22 +38,57 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
         output = f"Error: {e}"
 
     result = f"$ {cmd}\n{output}"
-    telegram_cmd_logs.append(result)
-    add_log(result)
+    log_queue.put(result)
+    add_bot_log(result)
     await update.message.reply_text(result)
 
+# --- Logging Functions ---
+def add_terminal_log(entry):
+    terminal_logs.append(entry)
+    if len(terminal_logs) > MAX_LOGS:
+        del terminal_logs[0]
+
+def add_bot_log(entry):
+    bot_logs.append(entry)
+    if len(bot_logs) > MAX_LOGS:
+        del bot_logs[0]
+
+# --- Terminal ---
+def live_terminal(cmd):
+    if not cmd.strip():
+        yield "$ "
+        return
+    yield f"$ {cmd}\n"
+
+    try:
+        proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+        for line in iter(proc.stdout.readline, ''):
+            line = line.strip()
+            log_queue.put(line)
+            add_terminal_log(line)
+            yield line + "\n"
+        proc.stdout.close()
+        proc.wait()
+    except Exception as e:
+        error = f"[Error] {e}"
+        log_queue.put(error)
+        add_terminal_log(error)
+        yield error + "\n"
+    yield "$ "
+
+# --- Bot ---
 def start_bot():
     global bot_app, bot_running, bot_thread
 
     if bot_running or not BOT_TOKEN:
-        log_queue.put("[Bot] Bot already running or no token.")
+        log_queue.put("[Bot] Already running or token missing.")
         return
 
     async def run_bot():
         global bot_app
         bot_app = ApplicationBuilder().token(BOT_TOKEN).build()
         bot_app.add_handler(CommandHandler("bash", bash_command))
-        log_queue.put("[Bot] Starting Telegram bot...")
+        log_queue.put("[Bot] Starting bot...")
         await bot_app.run_polling()
 
     def runner():
@@ -67,7 +102,7 @@ def start_bot():
 def stop_bot():
     global bot_app, bot_running
     if not bot_running:
-        log_queue.put("[Bot] Bot is not running.")
+        log_queue.put("[Bot] Bot not running.")
         return
 
     async def shutdown():
@@ -78,76 +113,53 @@ def stop_bot():
     asyncio.run(shutdown())
     bot_running = False
 
-# --- Logging ---
-def add_log(entry):
-    all_logs.append(entry)
-    if len(all_logs) > MAX_LOGS:
-        del all_logs[0]
-
-# --- Terminal Handler ---
-def live_terminal(cmd):
-    if not cmd.strip():
-        yield "$ "
-        return
-    yield f"$ {cmd}\n"
+# --- UI Log Updates ---
+def update_terminal_logs():
+    return "\n".join(terminal_logs[-100:])
 
-    try:
-        proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
-        for line in iter(proc.stdout.readline, ''):
-            add_log(line.strip())
-            yield line
-        proc.stdout.close()
-        proc.wait()
-    except Exception as e:
-        error = f"[Error] {e}"
-        add_log(error)
-        yield error
-    yield "$ "
+def update_bot_logs():
+    return "\n".join(bot_logs[-100:])
 
-# --- Log Updater ---
-def update_logs():
-    logs = []
-    try:
-        while True:
-            logs.append(log_queue.get_nowait())
-    except Empty:
-        pass
-    logs.extend(telegram_cmd_logs[-20:])
-    logs = all_logs[-100:]  # Only show latest 100 logs in UI
-    return "\n".join(logs)
-
-# --- UI ---
+# --- Gradio UI ---
 with gr.Blocks() as demo:
-    gr.Markdown("## 🖥️ Live Terminal with Telegram Bot")
+    gr.Markdown("## 🖥️ Terminal + 🤖 Telegram Bot (Live Logs)")
 
     with gr.Row():
-        terminal_output = gr.Textbox(label="Live Terminal Output", lines=20, interactive=False)
-        cmd_input = gr.Textbox(placeholder="Enter shell command", label="Command Input")
+        terminal_output = gr.Textbox(label="📟 Terminal Output", lines=20, interactive=False)
+        bot_output = gr.Textbox(label="🤖 Telegram Bot Logs", lines=20, interactive=False)
 
-    run_btn = gr.Button("▶️ Run")
-    start_btn = gr.Button("🚀 Start Telegram Bot")
-    stop_btn = gr.Button("🛑 Stop Telegram Bot")
+    with gr.Row():
+        cmd_input = gr.Textbox(placeholder="Enter shell command", label="Command Input")
+        run_btn = gr.Button("▶️ Run Command")
 
-    log_output = gr.Textbox(label="📜 Logs (Recent 100 shown)", lines=20, interactive=False)
+    with gr.Row():
+        start_btn = gr.Button("🚀 Start Telegram Bot")
+        stop_btn = gr.Button("🛑 Stop Telegram Bot")
 
     run_btn.click(fn=live_terminal, inputs=cmd_input, outputs=terminal_output)
 
     def handle_start():
         start_bot()
-        return update_logs()
+        return update_bot_logs()
 
     def handle_stop():
         stop_bot()
-        return update_logs()
+        return update_bot_logs()
+
+    start_btn.click(fn=handle_start, outputs=bot_output)
+    stop_btn.click(fn=handle_stop, outputs=bot_output)
 
-    start_btn.click(fn=handle_start, outputs=log_output)
-    stop_btn.click(fn=handle_stop, outputs=log_output)
+    def auto_update_terminal():
+        while True:
+            import time; time.sleep(3)
+            yield update_terminal_logs()
 
-    def auto_log_updater():
+    def auto_update_bot():
         while True:
-            yield update_logs()
             import time; time.sleep(3)
+            yield update_bot_logs()
 
-    demo.load(fn=auto_log_updater, outputs=log_output)
+    demo.load(fn=auto_update_terminal, outputs=terminal_output)
+    demo.load(fn=auto_update_bot, outputs=bot_output)
 
 demo.launch()