Update file-manager/app.py

file-manager/app.py

@@ -1,5 +1,5 @@
-import os, shutil, html, urllib.parse, subprocess, threading, queue, sys, time, json
-from flask import Flask, request, redirect, send_file, Response, stream_with_context
+import os, shutil, html, urllib.parse, subprocess, pty, select, termios, struct, fcntl, signal, threading, json
+from flask import Flask, request, redirect, send_file, Response
 from werkzeug.middleware.dispatcher import DispatcherMiddleware
 from werkzeug.serving import run_simple
 
@@ -13,58 +13,83 @@ def is_sensitive(name):
 
 def mask_secrets(text):
     out = []
-    for line in text.splitlines():
+    for line in text.splitlines(keepends=True):
         if any(h in line.upper() for h in SECRET_HINTS) and ("=" in line or ":" in line):
-            out.append("*** line masked (possible secret) ***")
+            out.append("*** line masked (possible secret) ***\n")
         else:
             out.append(line)
-    return "\n".join(out)
+    return "".join(out)
 
 # =================================================================
-# PERSISTENT INTERACTIVE PYTHON REPL (supports input + streaming)
+# PERSISTENT PTY SHELL  (real terminal: proper buffering, prompts,
+# interactive input, cd persistence, colors)
 # =================================================================
-class Repl:
+class PtyShell:
     def __init__(self):
-        self.p = subprocess.Popen(
-            [sys.executable, "-i", "-u"],   # -i interactive, -u unbuffered
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-            text=True, bufsize=1,
-        )
-        self.q = queue.Queue()
-        threading.Thread(target=self._reader, daemon=True).start()
+        self.pid, self.fd = pty.fork()
+        if self.pid == 0:
+            # child: become an interactive bash inside the PTY
+            os.environ["TERM"] = "xterm-256color"
+            os.execvp("bash", ["bash", "-i"])
+        else:
+            # parent: set the fd non-blocking so reads never hang
+            flags = fcntl.fcntl(self.fd, fcntl.F_GETFL)
+            fcntl.fcntl(self.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
+            self._set_size(40, 120)
+            self.buffer = ""
+            self.lock = threading.Lock()
+            threading.Thread(target=self._reader, daemon=True).start()
+
+    def _set_size(self, rows, cols):
+        try:
+            fcntl.ioctl(self.fd, termios.TIOCSWINSZ,
+                        struct.pack("HHHH", rows, cols, 0, 0))
+        except Exception:
+            pass
 
     def _reader(self):
-        for line in self.p.stdout:
-            self.q.put(line)
+        while True:
+            try:
+                r, _, _ = select.select([self.fd], [], [], 0.5)
+                if r:
+                    data = os.read(self.fd, 65536)
+                    if not data:
+                        break
+                    with self.lock:
+                        self.buffer += data.decode(errors="replace")
+            except OSError:
+                break
 
-    def send(self, text):
-        if self.p.poll() is None:
-            self.p.stdin.write(text + "\n")
-            self.p.stdin.flush()
+    def write(self, text):
+        try:
+            os.write(self.fd, text.encode())
+        except OSError:
+            pass
 
-    def drain(self, wait=0.3):
-        # collect whatever the REPL has produced so far
-        time.sleep(wait)
-        chunks = []
-        while not self.q.empty():
-            chunks.append(self.q.get())
-        return mask_secrets("".join(chunks))
+    def read_new(self):
+        with self.lock:
+            data = self.buffer
+            self.buffer = ""
+        return mask_secrets(data)
 
     def alive(self):
-        return self.p.poll() is None
+        try:
+            pid, _ = os.waitpid(self.pid, os.WNOHANG)
+            return pid == 0
+        except OSError:
+            return False
 
     def kill(self):
         try:
-            self.p.kill()
-        except Exception:
+            os.kill(self.pid, signal.SIGKILL)
+        except OSError:
             pass
 
-_repl = {"r": None}
-def get_repl():
-    if _repl["r"] is None or not _repl["r"].alive():
-        _repl["r"] = Repl()
-        _repl["r"].drain(0.5)  # swallow the startup banner
-    return _repl["r"]
+_shell = {"s": None}
+def get_shell():
+    if _shell["s"] is None or not _shell["s"].alive():
+        _shell["s"] = PtyShell()
+    return _shell["s"]
 
 PAGE = """<!doctype html><html><head><title>Box</title>
 <style>
@@ -74,112 +99,82 @@ table{{border-collapse:collapse;width:100%}} td,th{{padding:4px 8px;border-botto
 .bar{{background:#1a1a1a;padding:10px;margin-bottom:10px;border-radius:6px}}
 .tabs a{{margin-right:14px;font-weight:bold}}
 textarea{{width:100%;background:#000;color:#47E6C1;border:1px solid #333;padding:8px}}
-pre{{background:#000;color:#78D64B;padding:12px;border-radius:6px;overflow:auto;height:55vh;white-space:pre-wrap}}
-input[type=text]{{background:#000;color:#eee;border:1px solid #333;padding:8px}}
+pre{{background:#000;color:#e6e6e6;padding:12px;border-radius:6px;overflow:auto;height:60vh;white-space:pre-wrap}}
+input[type=text]{{background:#000;color:#eee;border:1px solid #333;padding:8px;font-family:monospace}}
 button{{background:#F46821;color:#fff;border:0;padding:8px 14px;border-radius:4px;cursor:pointer}}
 </style></head><body>
-<div class="tabs bar"><a href="/fm/">📁 Files</a><a href="/fm/term">🖥️ Shell (stream)</a>
-<a href="/fm/py">🐍 Python REPL</a><a href="/reload">♻️ Reload</a><a href="/gpuinfo">🎮 GPU</a>
+<div class="tabs bar"><a href="/fm/">📁 Files</a><a href="/fm/term">🖥️ Terminal</a>
+<a href="/reload">♻️ Reload</a><a href="/gpuinfo">🎮 GPU</a>
 <span style="color:#777">test mode · ephemeral</span></div>
 {body}</body></html>"""
 
-# ---------------- INTERACTIVE PYTHON REPL PAGE ----------------
-@app.route("/py")
-def py_page():
+# ---------------- REAL TERMINAL PAGE ----------------
+@app.route("/term")
+def term_page():
     body = """
-    <div class="bar"><b>Interactive Python</b> — persistent session. Try: <code>2+2</code>,
-      then <code>name = input("your name? ")</code> and answer in the same box.</div>
-    <pre id="out">Python REPL ready. Type code below and press Run (or Enter).\n</pre>
-    <input type="text" id="line" style="width:80%" autofocus
-           placeholder="python code or input to a running prompt">
-    <button onclick="send()">Run</button>
-    <button onclick="reset()">Restart REPL</button>
+    <div class="bar"><b>Live PTY terminal</b> — persistent bash. Full logs, prompts,
+      and interactive input all work. Try: <code>python3</code> then <code>2+2</code>,
+      or <code>python3 -c "n=input('name? '); print('hi',n)"</code>.</div>
+    <pre id="out"></pre>
+    <input type="text" id="line" style="width:82%" autofocus
+           placeholder="type a command or input, then Enter">
+    <button onclick="send()">Send</button>
+    <button onclick="ctrlc()">Ctrl-C</button>
+    <button onclick="reset()">Restart</button>
     <script>
       const out = document.getElementById('out');
       const line = document.getElementById('line');
       function append(t){ out.textContent += t; out.scrollTop = out.scrollHeight; }
+
       async function send(){
-        const code = line.value;
-        append('>>> ' + code + '\\n');
+        const text = line.value;
         line.value = '';
-        const r = await fetch('/fm/py_send', {
-          method:'POST', headers:{'Content-Type':'application/json'},
-          body: JSON.stringify({code})
-        });
-        const data = await r.json();
-        if (data.output) append(data.output);
+        await fetch('/fm/term_in', {method:'POST',
+          headers:{'Content-Type':'application/json'},
+          body: JSON.stringify({data: text + "\\n"})});
+      }
+      async function ctrlc(){
+        await fetch('/fm/term_in', {method:'POST',
+          headers:{'Content-Type':'application/json'},
+          body: JSON.stringify({data: "\\u0003"})});   // Ctrl-C
       }
       async function reset(){
-        await fetch('/fm/py_reset', {method:'POST'});
-        out.textContent = 'REPL restarted.\\n';
+        await fetch('/fm/term_reset', {method:'POST'});
+        out.textContent = '';
+      }
+      // Poll for new output every 300ms — reliable through the proxy
+      async function poll(){
+        try{
+          const r = await fetch('/fm/term_out');
+          const d = await r.json();
+          if(d.data) append(d.data);
+        }catch(e){}
+        setTimeout(poll, 300);
       }
       line.addEventListener('keydown', e => { if(e.key==='Enter'){ e.preventDefault(); send(); }});
+      poll();
     </script>"""
     return Response(PAGE.format(body=body))
 
-@app.route("/py_send", methods=["POST"])
-def py_send():
+@app.route("/term_in", methods=["POST"])
+def term_in():
     data = request.get_json(force=True)
-    repl = get_repl()
-    repl.send(data.get("code", ""))
-    return Response(json.dumps({"output": repl.drain(0.4)}), mimetype="application/json")
-
-@app.route("/py_reset", methods=["POST"])
-def py_reset():
-    if _repl["r"]:
-        _repl["r"].kill()
-    _repl["r"] = None
-    get_repl()
+    get_shell().write(data.get("data", ""))
     return Response(json.dumps({"ok": True}), mimetype="application/json")
 
-# ---------------- STREAMING ONE-SHOT SHELL ----------------
-@app.route("/term")
-def term_page():
-    body = """
-    <div class="bar"><b>Streaming shell</b> — output appears live, line by line.</div>
-    <input type="text" id="cmd" style="width:80%" autofocus
-           placeholder="e.g. python -c 'print(2+2)' , pip install rich , ls -la">
-    <button onclick="run()">Run</button>
-    <pre id="out"></pre>
-    <script>
-      const out = document.getElementById('out');
-      async function run(){
-        const cmd = document.getElementById('cmd').value;
-        out.textContent = '$ ' + cmd + '\\n';
-        const resp = await fetch('/fm/term_stream?cmd=' + encodeURIComponent(cmd));
-        const reader = resp.body.getReader();
-        const dec = new TextDecoder();
-        while(true){
-          const {value, done} = await reader.read();
-          if(done) break;
-          out.textContent += dec.decode(value);
-          out.scrollTop = out.scrollHeight;
-        }
-      }
-      document.getElementById('cmd').addEventListener('keydown',
-        e => { if(e.key==='Enter'){ e.preventDefault(); run(); }});
-    </script>"""
-    return Response(PAGE.format(body=body))
+@app.route("/term_out")
+def term_out():
+    return Response(json.dumps({"data": get_shell().read_new()}), mimetype="application/json")
 
-@app.route("/term_stream")
-def term_stream():
-    cmd = request.args.get("cmd", "")
-    @stream_with_context
-    def gen():
-        if not cmd.strip():
-            yield "[empty command]\n"; return
-        p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT, text=True, bufsize=1)
-        try:
-            for line in p.stdout:
-                yield mask_secrets(line)
-            p.wait(timeout=300)
-            yield f"\n[exit code {p.returncode}]\n"
-        except Exception as e:
-            yield f"\n[error: {e}]\n"
-    return Response(gen(), mimetype="text/plain")
+@app.route("/term_reset", methods=["POST"])
+def term_reset():
+    if _shell["s"]:
+        _shell["s"].kill()
+    _shell["s"] = None
+    get_shell()
+    return Response(json.dumps({"ok": True}), mimetype="application/json")
 
-# ---------------- FILE MANAGER (unchanged core) ----------------
+# ---------------- FILE MANAGER ----------------
 @app.route("/")
 def browse():
     path = os.path.abspath(request.args.get("path", "/"))
@@ -302,4 +297,4 @@ def delete():
 
 if __name__ == "__main__":
     wrapped = DispatcherMiddleware(Flask("empty"), {"/fm": app})
-    run_simple("0.0.0.0", 9001, wrapped, threaded=True)   # threaded=True for streaming
+    run_simple("0.0.0.0", 9001, wrapped, threaded=True)   # threaded=True for concurrent poll+input