Spaces:

berryssx
/

hh

Build error

App Files Files Community

berryssx commited on Jun 26

Commit

50bb712

verified ·

1 Parent(s): c26cc29

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +105 -161

Dockerfile CHANGED Viewed

@@ -3,59 +3,82 @@ FROM python:3.10-slim
 WORKDIR /app
 RUN apt-get update && apt-get install -y \
-    git wget curl vim build-essential
-RUN pip install --no-cache-dir \
-    fastapi \
-    uvicorn \
-    huggingface-hub
 RUN cat > app.py << 'PYEOF'
 from fastapi import FastAPI, WebSocket
 from fastapi.responses import HTMLResponse
-import asyncio, subprocess, os, json
 app = FastAPI()
-HTML = open("index.html").read()
 @app.get("/")
 async def root():
-    return HTMLResponse(HTML)
 @app.websocket("/ws")
-async def ws(websocket: WebSocket):
     await websocket.accept()
-    proc = await asyncio.create_subprocess_shell(
         "/bin/bash",
-        stdin=asyncio.subprocess.PIPE,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.STDOUT,
-        env={**os.environ, "TERM": "xterm-256color"}
     )
     async def read_output():
         while True:
-            data = await proc.stdout.read(1024)
-            if not data:
                 break
-            await websocket.send_text(data.decode("utf-8", errors="replace"))
-    asyncio.ensure_future(read_output())
     try:
         while True:
             msg = await websocket.receive_text()
-            if proc.stdin:
-                proc.stdin.write(msg.encode())
-                await proc.stdin.drain()
     except:
         pass
     finally:
         proc.terminate()
 PYEOF
 RUN cat > index.html << 'EOF'
 <!DOCTYPE html>
-<html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -64,170 +87,91 @@ RUN cat > index.html << 'EOF'
 <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.js"></script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.3.0/css/xterm.css">
 <style>
-* { margin: 0; padding: 0; box-sizing: border-box; }
-body { background: #1a1a2e; display: flex; flex-direction: column; height: 100dvh; font-family: monospace; overflow: hidden; }
-#terminal-container { flex: 1; overflow: hidden; }
-#toolbar { background: #16213e; padding: 6px 8px; display: flex; flex-wrap: wrap; gap: 6px; border-top: 1px solid #0f3460; }
-.key-group { display: flex; gap: 4px; }
-.key-btn {
-  background: #0f3460;
-  color: #e0e0e0;
-  border: 1px solid #533483;
-  border-radius: 6px;
-  padding: 8px 12px;
-  font-size: 13px;
-  font-family: monospace;
-  cursor: pointer;
-  min-width: 44px;
-  text-align: center;
-  user-select: none;
-  -webkit-user-select: none;
-  touch-action: manipulation;
-}
-.key-btn:active { background: #533483; }
-.key-btn.ctrl-active { background: #533483; border-color: #e94560; color: #e94560; }
-#ctrl-btn { min-width: 52px; }
-#input-row { background: #16213e; padding: 4px 8px; display: flex; gap: 6px; border-top: 1px solid #0f3460; }
-#mobile-input {
-  flex: 1;
-  background: #0f3460;
-  color: #e0e0e0;
-  border: 1px solid #533483;
-  border-radius: 6px;
-  padding: 8px 10px;
-  font-size: 14px;
-  font-family: monospace;
-  outline: none;
-}
-#send-btn {
-  background: #533483;
-  color: white;
-  border: none;
-  border-radius: 6px;
-  padding: 8px 14px;
-  font-size: 14px;
-  cursor: pointer;
-  touch-action: manipulation;
-}
 </style>
 </head>
 <body>
-<div id="terminal-container"></div>
 <div id="toolbar">
-  <div class="key-group">
-    <button class="key-btn" id="ctrl-btn" onclick="toggleCtrl()">Ctrl</button>
-    <button class="key-btn" onclick="sendSpecial('escape')">Esc</button>
-    <button class="key-btn" onclick="sendSpecial('tab')">Tab</button>
   </div>
-  <div class="key-group">
-    <button class="key-btn" onclick="sendCtrlKey('c')">C</button>
-    <button class="key-btn" onclick="sendCtrlKey('d')">D</button>
-    <button class="key-btn" onclick="sendCtrlKey('l')">L</button>
-    <button class="key-btn" onclick="sendCtrlKey('z')">Z</button>
-    <button class="key-btn" onclick="sendCtrlKey('a')">A</button>
-    <button class="key-btn" onclick="sendCtrlKey('e')">E</button>
-    <button class="key-btn" onclick="sendCtrlKey('u')">U</button>
-    <button class="key-btn" onclick="sendCtrlKey('k')">K</button>
   </div>
-  <div class="key-group">
-    <button class="key-btn" onclick="sendSpecial('up')">▲</button>
-    <button class="key-btn" onclick="sendSpecial('down')">▼</button>
-    <button class="key-btn" onclick="sendSpecial('left')">◀</button>
-    <button class="key-btn" onclick="sendSpecial('right')">▶</button>
   </div>
 </div>
-<div id="input-row">
-  <input id="mobile-input" type="text" placeholder="Введи команду..." autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
-  <button id="send-btn" onclick="sendInputLine()">↵</button>
-</div>
 <script>
 const term = new Terminal({
   cursorBlink: true,
-  theme: {
-    background: '#1a1a2e',
-    foreground: '#e0e0e0',
-    cursor: '#e94560',
-    selectionBackground: '#533483',
-    black: '#1a1a2e', brightBlack: '#404060',
-    red: '#e94560', brightRed: '#ff6b8a',
-    green: '#00d2ff', brightGreen: '#4effa0',
-    yellow: '#f5a623', brightYellow: '#ffd700',
-    blue: '#7b8cde', brightBlue: '#a0b4ff',
-    magenta: '#c678dd', brightMagenta: '#e0a0ff',
-    cyan: '#56b6c2', brightCyan: '#80dfea',
-    white: '#abb2bf', brightWhite: '#ffffff',
-  },
-  fontFamily: '"Courier New", monospace',
   fontSize: 13,
-  lineHeight: 1.2,
-  scrollback: 2000,
 });
-const fitAddon = new FitAddon.FitAddon();
-term.loadAddon(fitAddon);
-term.open(document.getElementById('terminal-container'));
-fitAddon.fit();
 const ws = new WebSocket(`ws://${location.host}/ws`);
-ws.onopen = () => { term.focus(); };
-ws.onmessage = e => term.write(e.data);
-ws.onclose = () => term.write('\r\n[connection closed]\r\n');
 term.onData(data => ws.readyState === 1 && ws.send(data));
-new ResizeObserver(() => fitAddon.fit()).observe(document.getElementById('terminal-container'));
-let ctrlActive = false;
-function toggleCtrl() {
-  ctrlActive = !ctrlActive;
-  document.getElementById('ctrl-btn').classList.toggle('ctrl-active', ctrlActive);
-}
-function sendCtrlKey(key) {
-  if (ws.readyState !== 1) return;
-  const code = key.toUpperCase().charCodeAt(0) - 64;
-  ws.send(String.fromCharCode(code));
-  if (ctrlActive) { ctrlActive = false; document.getElementById('ctrl-btn').classList.remove('ctrl-active'); }
-}
-function sendSpecial(key) {
-  if (ws.readyState !== 1) return;
-  const map = {
-    escape: '\x1b',
-    tab: '\t',
-    up: '\x1b[A',
-    down: '\x1b[B',
-    right: '\x1b[C',
-    left: '\x1b[D',
-  };
-  if (map[key]) ws.send(map[key]);
-}
-const inp = document.getElementById('mobile-input');
-inp.addEventListener('keydown', e => {
-  if (e.key === 'Enter') { sendInputLine(); e.preventDefault(); }
-});
-function sendInputLine() {
-  const val = inp.value;
   if (ws.readyState === 1) {
-    ws.send(val + '\n');
-    inp.value = '';
   }
 }
-term.element.addEventListener('click', () => {
-  term.focus();
-  inp.blur();
-});
 </script>
 </body>
 </html>
 EOF
 EXPOSE 7860
 CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]

 WORKDIR /app
 RUN apt-get update && apt-get install -y \
+    git wget curl vim build-essential bash
+RUN pip install --no-cache-dir fastapi uvicorn websockets
 RUN cat > app.py << 'PYEOF'
 from fastapi import FastAPI, WebSocket
 from fastapi.responses import HTMLResponse
+import asyncio, os, pty, fcntl, termios, struct, json
 app = FastAPI()
 @app.get("/")
 async def root():
+    return HTMLResponse(open("index.html").read())
 @app.websocket("/ws")
+async def ws_endpoint(websocket: WebSocket):
     await websocket.accept()
+    master_fd, slave_fd = pty.openpty()
+    proc = await asyncio.create_subprocess_exec(
         "/bin/bash",
+        stdin=slave_fd,
+        stdout=slave_fd,
+        stderr=slave_fd,
+        close_fds=True,
+        env={**os.environ, "TERM": "xterm-256color", "PS1": r"\u@\h:\w\$ "}
     )
+    os.close(slave_fd)
+    loop = asyncio.get_event_loop()
+    def resize(cols, rows):
+        fcntl.ioctl(master_fd, termios.TIOCSWINSZ,
+                    struct.pack("HHHH", rows, cols, 0, 0))
+    resize(220, 50)
     async def read_output():
         while True:
+            try:
+                data = await loop.run_in_executor(None, lambda: os.read(master_fd, 1024))
+                if data:
+                    await websocket.send_bytes(data)
+            except OSError:
                 break
+    reader_task = asyncio.ensure_future(read_output())
     try:
         while True:
             msg = await websocket.receive_text()
+            try:
+                data = json.loads(msg)
+                if data.get("type") == "resize":
+                    resize(data["cols"], data["rows"])
+                    continue
+            except:
+                pass
+            os.write(master_fd, msg.encode())
     except:
         pass
     finally:
+        reader_task.cancel()
+        try:
+            os.close(master_fd)
+        except:
+            pass
         proc.terminate()
 PYEOF
 RUN cat > index.html << 'EOF'
 <!DOCTYPE html>
+<html>
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.js"></script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.3.0/css/xterm.css">
 <style>
+* { margin:0; padding:0; box-sizing:border-box; }
+body { background:#1a1a2e; display:flex; flex-direction:column; height:100dvh; overflow:hidden; }
+#term { flex:1; overflow:hidden; }
+#toolbar { background:#16213e; padding:6px 8px; display:flex; flex-wrap:wrap; gap:5px; border-top:1px solid #0f3460; }
+.kb { background:#0f3460; color:#e0e0e0; border:1px solid #533483; border-radius:6px; padding:8px 12px; font-size:13px; font-family:monospace; cursor:pointer; min-width:44px; text-align:center; user-select:none; touch-action:manipulation; }
+.kb:active { background:#533483; }
+.kb.on { background:#533483; border-color:#e94560; color:#e94560; }
 </style>
 </head>
 <body>
+<div id="term"></div>
 <div id="toolbar">
+  <div style="display:flex;gap:5px">
+    <button class="kb" id="ctrl-btn" onclick="toggleCtrl()">Ctrl</button>
+    <button class="kb" onclick="send('\x1b')">Esc</button>
+    <button class="kb" onclick="send('\t')">Tab</button>
   </div>
+  <div style="display:flex;gap:5px">
+    <button class="kb" onclick="ctrlKey('c')">C</button>
+    <button class="kb" onclick="ctrlKey('d')">D</button>
+    <button class="kb" onclick="ctrlKey('l')">L</button>
+    <button class="kb" onclick="ctrlKey('z')">Z</button>
+    <button class="kb" onclick="ctrlKey('a')">A</button>
+    <button class="kb" onclick="ctrlKey('e')">E</button>
+    <button class="kb" onclick="ctrlKey('u')">U</button>
+    <button class="kb" onclick="ctrlKey('k')">K</button>
   </div>
+  <div style="display:flex;gap:5px">
+    <button class="kb" onclick="send('\x1b[A')">▲</button>
+    <button class="kb" onclick="send('\x1b[B')">▼</button>
+    <button class="kb" onclick="send('\x1b[D')">◀</button>
+    <button class="kb" onclick="send('\x1b[C')">▶</button>
   </div>
 </div>
 <script>
 const term = new Terminal({
   cursorBlink: true,
+  theme: { background:'#1a1a2e', foreground:'#e0e0e0', cursor:'#e94560' },
+  fontFamily:'"Courier New",monospace',
   fontSize: 13,
+  scrollback: 3000,
 });
+const fit = new FitAddon.FitAddon();
+term.loadAddon(fit);
+term.open(document.getElementById('term'));
+fit.fit();
 const ws = new WebSocket(`ws://${location.host}/ws`);
+ws.binaryType = 'arraybuffer';
+ws.onopen = () => {
+  term.focus();
+  sendResize();
+};
+ws.onmessage = e => {
+  if (e.data instanceof ArrayBuffer) {
+    term.write(new Uint8Array(e.data));
+  } else {
+    term.write(e.data);
+  }
+};
 term.onData(data => ws.readyState === 1 && ws.send(data));
+function sendResize() {
   if (ws.readyState === 1) {
+    ws.send(JSON.stringify({ type:'resize', cols: term.cols, rows: term.rows }));
   }
 }
+new ResizeObserver(() => { fit.fit(); sendResize(); })
+  .observe(document.getElementById('term'));
+let ctrl = false;
+function toggleCtrl() {
+  ctrl = !ctrl;
+  document.getElementById('ctrl-btn').classList.toggle('on', ctrl);
+}
+function send(data) { ws.readyState === 1 && ws.send(data); }
+function ctrlKey(k) {
+  send(String.fromCharCode(k.toUpperCase().charCodeAt(0) - 64));
+  if (ctrl) { ctrl = false; document.getElementById('ctrl-btn').classList.remove('on'); }
+}
 </script>
 </body>
 </html>
 EOF
 EXPOSE 7860
 CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]