Update app.py

app.py

@@ -1,13 +1,10 @@
-from flask import Flask, request, jsonify, render_template
+from flask import Flask, request, jsonify, render_template, stream_with_context, Response
 import os
 import subprocess
 import tempfile
 import shutil
-from flask_socketio import SocketIO, emit
 
 app = Flask(__name__)
-app.config['SECRET_KEY'] = 'secret!'
-socketio = SocketIO(app)
 
 # Create a temporary directory for operations
 temp_dir = tempfile.mkdtemp()
@@ -16,56 +13,55 @@ temp_dir = tempfile.mkdtemp()
 def index():
     return render_template("index.html")
 
-@socketio.on("execute")
-def execute_command(data):
-    command = data.get("code", "").strip()
-    response = ""
+def execute_shell_command(command):
+    """Executes a shell command and streams output."""
+    process = subprocess.Popen(
+        command,
+        shell=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        cwd=temp_dir
+    )
+    for line in iter(process.stdout.readline, ""):
+        yield f"{line}<br>"
+    for line in iter(process.stderr.readline, ""):
+        yield f"Error: {line}<br>"
+    process.stdout.close()
+    process.stderr.close()
+    process.wait()
 
-    try:
-        os.chdir(temp_dir)  # Ensure all operations happen within the temporary directory
-        emit("output", {"data": f"$ {command}\n"}, broadcast=True)
+@app.route("/execute", methods=["POST"])
+def execute_code():
+    command = request.json.get("code", "").strip()
+    if not command:
+        return jsonify({"result": "Error: No command provided."})
 
+    try:
+        # If the command starts with "!", treat it as a shell command
         if command.startswith("!"):
             shell_command = command[1:]
-            process = subprocess.Popen(
-                shell_command,
-                shell=True,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True,
-            )
-            # Stream output live
-            for line in process.stdout:
-                emit("output", {"data": line}, broadcast=True)
-            for line in process.stderr:
-                emit("output", {"data": line}, broadcast=True)
-
-            process.wait()
-            emit("output", {"data": "Command execution complete.\n"}, broadcast=True)
+            return Response(stream_with_context(execute_shell_command(shell_command)))
         else:
-            # Handle Python script execution
-            process = subprocess.Popen(
+            # Treat the command as Python code
+            process = subprocess.run(
                 ["python3", "-c", command],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 text=True,
+                cwd=temp_dir
             )
-            for line in process.stdout:
-                emit("output", {"data": line}, broadcast=True)
-            for line in process.stderr:
-                emit("output", {"data": line}, broadcast=True)
-            process.wait()
-            emit("output", {"data": "Python execution complete.\n"}, broadcast=True)
+            return jsonify({"result": process.stdout + process.stderr})
     except Exception as e:
-        emit("output", {"data": f"Error: {e}\n"}, broadcast=True)
+        return jsonify({"result": f"Error: {e}"})
 
-@socketio.on("cleanup")
+@app.route("/cleanup", methods=["POST"])
 def cleanup():
     global temp_dir
     if os.path.exists(temp_dir):
         shutil.rmtree(temp_dir)
-        temp_dir = tempfile.mkdtemp()
-    emit("output", {"data": "Temporary files cleaned up.\n"}, broadcast=True)
+    temp_dir = tempfile.mkdtemp()  # Recreate for a new session
+    return jsonify({"result": "Temporary files cleaned up."})
 
 if __name__ == "__main__":
-    socketio.run(app, host="0.0.0.0", port=7860)
+    app.run(host="0.0.0.0", port=7860)