Update AppImage

AppImage/components/script-terminal-modal.tsx

@@ -1,13 +1,16 @@
 "use client"
 
+import type React from "react"
+
 import { useState, useEffect, useRef } from "react"
 import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
-import { X, CheckCircle2, XCircle, Loader2 } from "lucide-react"
+import { CheckCircle2, XCircle, Loader2, Activity, GripHorizontal } from "lucide-react"
 import { TerminalPanel } from "./terminal-panel"
 import { API_PORT } from "@/lib/api-config"
+import { useIsMobile } from "@/hooks/use-mobile"
 
 interface WebInteraction {
   type: "yesno" | "menu" | "msgbox" | "input" | "inputbox"
@@ -43,6 +46,14 @@ export function ScriptTerminalModal({
   const [currentInteraction, setCurrentInteraction] = useState<WebInteraction | null>(null)
   const [interactionInput, setInteractionInput] = useState("")
   const wsRef = useRef<WebSocket | null>(null)
+  const [isConnected, setIsConnected] = useState(false)
+  const checkConnectionInterval = useRef<NodeJS.Timeout | null>(null)
+  const isMobile = useIsMobile()
+
+  const [modalHeight, setModalHeight] = useState(80)
+  const [isResizing, setIsResizing] = useState(false)
+  const startYRef = useRef(0)
+  const startHeightRef = useRef(80)
 
   useEffect(() => {
     if (open) {
@@ -50,9 +61,62 @@ export function ScriptTerminalModal({
       setExitCode(null)
       setInteractionInput("")
       setCurrentInteraction(null)
+      setIsConnected(false)
+
+      checkConnectionInterval.current = setInterval(() => {
+        if (wsRef.current) {
+          setIsConnected(wsRef.current.readyState === WebSocket.OPEN)
+        }
+      }, 500)
+    }
+
+    return () => {
+      if (checkConnectionInterval.current) {
+        clearInterval(checkConnectionInterval.current)
+      }
     }
   }, [open])
 
+  const handleResizeStart = (e: React.MouseEvent | React.TouchEvent) => {
+    if (isMobile) return
+
+    setIsResizing(true)
+    startYRef.current = "touches" in e ? e.touches[0].clientY : e.clientY
+    startHeightRef.current = modalHeight
+
+    e.preventDefault()
+  }
+
+  useEffect(() => {
+    if (!isResizing) return
+
+    const handleResizeMove = (e: MouseEvent | TouchEvent) => {
+      const currentY = "touches" in e ? e.touches[0].clientY : e.clientY
+      const deltaY = startYRef.current - currentY
+      const viewportHeight = window.innerHeight
+      const deltaVh = (deltaY / viewportHeight) * 100
+
+      const newHeight = Math.min(Math.max(startHeightRef.current + deltaVh, 50), 95)
+      setModalHeight(newHeight)
+    }
+
+    const handleResizeEnd = () => {
+      setIsResizing(false)
+    }
+
+    document.addEventListener("mousemove", handleResizeMove)
+    document.addEventListener("mouseup", handleResizeEnd)
+    document.addEventListener("touchmove", handleResizeMove)
+    document.addEventListener("touchend", handleResizeEnd)
+
+    return () => {
+      document.removeEventListener("mousemove", handleResizeMove)
+      document.removeEventListener("mouseup", handleResizeEnd)
+      document.removeEventListener("touchmove", handleResizeMove)
+      document.removeEventListener("touchend", handleResizeEnd)
+    }
+  }, [isResizing])
+
   const getScriptWebSocketUrl = (): string => {
     if (typeof window === "undefined") {
       return `ws://localhost:${API_PORT}/ws/script/${sessionId}`
@@ -67,6 +131,7 @@ export function ScriptTerminalModal({
 
   const handleWebSocketCreated = (ws: WebSocket) => {
     wsRef.current = ws
+    setIsConnected(ws.readyState === WebSocket.OPEN)
   }
 
   const handleWebInteraction = (interaction: WebInteraction) => {
@@ -92,15 +157,28 @@ export function ScriptTerminalModal({
     setInteractionInput("")
   }
 
+  const handleCloseModal = () => {
+    if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
+      wsRef.current.close()
+    }
+    if (checkConnectionInterval.current) {
+      clearInterval(checkConnectionInterval.current)
+    }
+    onClose()
+  }
+
   return (
     <>
-      <Dialog open={open} onOpenChange={onClose}>
-        <DialogContent className="max-w-4xl h-[80vh] p-0 flex flex-col">
+      <Dialog open={open}>
+        <DialogContent
+          className="max-w-4xl p-0 flex flex-col"
+          style={{ height: isMobile ? "80vh" : `${modalHeight}vh` }}
+          onInteractOutside={(e) => e.preventDefault()}
+          onEscapeKeyDown={(e) => e.preventDefault()}
+        >
           <DialogTitle className="sr-only">{title}</DialogTitle>
 
-          {/* Header */}
-          <div className="flex items-center justify-between p-4 border-b">
-            <div className="flex items-center gap-2">
+          <div className="flex items-center gap-2 p-4 border-b">
             {isComplete ? (
               exitCode === 0 ? (
                 <CheckCircle2 className="h-5 w-5 text-green-500" />
@@ -115,10 +193,6 @@ export function ScriptTerminalModal({
               {description && <p className="text-sm text-muted-foreground">{description}</p>}
             </div>
           </div>
-            <Button variant="ghost" size="icon" onClick={onClose}>
-              <X className="h-4 w-4" />
-            </Button>
-          </div>
 
           <div className="flex-1 overflow-hidden">
             <TerminalPanel
@@ -129,13 +203,37 @@ export function ScriptTerminalModal({
               }}
               onWebInteraction={handleWebInteraction}
               onWebSocketCreated={handleWebSocketCreated}
+              isScriptModal={true}
             />
           </div>
 
-          {/* Footer */}
+          {!isMobile && (
+            <div
+              className="h-2 bg-border hover:bg-primary/20 cursor-ns-resize flex items-center justify-center transition-colors"
+              onMouseDown={handleResizeStart}
+              onTouchStart={handleResizeStart}
+            >
+              <GripHorizontal className="h-4 w-4 text-muted-foreground" />
+            </div>
+          )}
+
           <div className="flex items-center justify-between p-4 border-t">
-            <div className="text-sm text-muted-foreground">Session ID: {sessionId}</div>
-            {isComplete && <Button onClick={onClose}>Close</Button>}
+            <div className="flex items-center gap-3">
+              <Activity className="h-5 w-5 text-blue-500" />
+              <div
+                className={`w-2 h-2 rounded-full ${isConnected ? "bg-green-500" : "bg-red-500"}`}
+                title={isConnected ? "Connected" : "Disconnected"}
+              ></div>
+              <span className="text-xs text-muted-foreground">{isConnected ? "Online" : "Offline"}</span>
+            </div>
+
+            <Button
+              onClick={handleCloseModal}
+              variant="outline"
+              className="bg-red-600 hover:bg-red-700 border-red-500 text-white"
+            >
+              Close
+            </Button>
           </div>
         </DialogContent>
       </Dialog>
@@ -176,11 +274,18 @@ export function ScriptTerminalModal({
                       key={option.value}
                       onClick={() => handleInteractionResponse(option.value)}
                       variant="outline"
-                      className="w-full justify-start"
+                      className="w-full justify-start hover:bg-blue-600 hover:text-white"
                     >
                       {option.label}
                     </Button>
                   ))}
+                  <Button
+                    onClick={() => handleInteractionResponse("cancel")}
+                    variant="outline"
+                    className="w-full hover:bg-red-600 hover:text-white hover:border-red-600"
+                  >
+                    Cancel / Go Back
+                  </Button>
                 </div>
               )}
 
@@ -197,14 +302,29 @@ export function ScriptTerminalModal({
                     }}
                     placeholder={currentInteraction.default || ""}
                   />
-                  <Button onClick={() => handleInteractionResponse(interactionInput)} className="w-full">
+                  <div className="flex gap-2">
+                    <Button
+                      onClick={() => handleInteractionResponse(interactionInput)}
+                      className="flex-1 bg-blue-600 hover:bg-blue-700"
+                    >
                       Submit
                     </Button>
+                    <Button
+                      onClick={() => handleInteractionResponse("")}
+                      variant="outline"
+                      className="flex-1 hover:bg-red-600 hover:text-white hover:border-red-600"
+                    >
+                      Cancel
+                    </Button>
+                  </div>
                 </div>
               )}
 
               {currentInteraction.type === "msgbox" && (
-                <Button onClick={() => handleInteractionResponse("ok")} className="w-full">
+                <Button
+                  onClick={() => handleInteractionResponse("ok")}
+                  className="w-full bg-blue-600 hover:bg-blue-700"
+                >
                   OK
                 </Button>
               )}

AppImage/components/terminal-panel.tsx

@@ -29,6 +29,7 @@ type TerminalPanelProps = {
   initMessage?: Record<string, any>
   onWebInteraction?: (interaction: any) => void
   onWebSocketCreated?: (ws: WebSocket) => void
+  isScriptModal?: boolean
 }
 
 interface TerminalInstance {
@@ -141,6 +142,7 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
   initMessage,
   onWebInteraction,
   onWebSocketCreated,
+  isScriptModal = false,
 }) => {
   const [terminals, setTerminals] = useState<TerminalInstance[]>([])
   const [activeTerminalId, setActiveTerminalId] = useState<string>("")
@@ -246,8 +248,6 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
           throw new Error("No examples found")
         }
 
-        console.log("[v0] Received parsed examples from server:", data.examples.length)
-
         const formattedResults: CheatSheetResult[] = data.examples.map((example: any) => ({
           command: example.command,
           description: example.description || "",
@@ -257,7 +257,6 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
         setUseOnline(true)
         setSearchResults(formattedResults)
       } catch (error) {
-        console.log("[v0] Error fetching from cheat.sh proxy, using offline commands:", error)
         const filtered = proxmoxCommands.filter(
           (item) =>
             item.cmd.toLowerCase().includes(query.toLowerCase()) ||
@@ -442,7 +441,6 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
       }
 
       if (initMessage) {
-        console.log("[v0] TerminalPanel: Sending init message:", initMessage)
         ws.send(JSON.stringify(initMessage))
       } else {
         term.writeln("\x1b[32mConnected to ProxMenux terminal.\x1b[0m")
@@ -454,8 +452,7 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
     ws.onmessage = (event) => {
       try {
         const data = JSON.parse(event.data)
-        if (data.type === "web_interaction" && onWebInteraction) {
-          console.log("[v0] TerminalPanel: Intercepted web_interaction:", data.interaction)
+        if (data.type === "web_interaction" && data.interaction && onWebInteraction) {
           onWebInteraction(data.interaction)
           return // Don't write to terminal
         }
@@ -466,8 +463,7 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
       term.write(event.data)
     }
 
-    ws.onerror = (error) => {
-      console.error("[v0] TerminalPanel: WebSocket error:", error)
+    ws.onerror = () => {
       setTerminals((prev) => prev.map((t) => (t.id === terminal.id ? { ...t, isConnected: false } : t)))
       term.writeln("\r\n\x1b[31m[ERROR] WebSocket connection error\x1b[0m")
     }
@@ -603,6 +599,7 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
 
   return (
     <div className="flex flex-col h-full bg-zinc-950 rounded-md overflow-hidden">
+      {!isScriptModal && (
         <div className="flex items-center justify-between px-4 py-2 bg-zinc-900 border-b border-zinc-800">
           <div className="flex items-center gap-3">
             <Activity className="h-5 w-5 text-blue-500" />
@@ -677,6 +674,13 @@ export const TerminalPanel: React.FC<TerminalPanelProps> = ({
             </Button>
           </div>
         </div>
+      )}
+
+      {isScriptModal && (
+        <div className="sr-only" data-connection-status={activeTerminal?.isConnected ? "connected" : "disconnected"}>
+          Connection Status
+        </div>
+      )}
 
       <div
         data-terminal-container

AppImage/scripts/flask_terminal_routes.py

@@ -242,54 +242,38 @@ def terminal_websocket(ws):
 def script_websocket(ws, session_id):
     """WebSocket endpoint for executing scripts with hybrid web mode"""
     
-    print(f"[DEBUG] Script WebSocket connected for session: {session_id}")
-    
     try:
-        print(f"[DEBUG] Waiting for init data...")
         init_data = ws.receive(timeout=10)
-        print(f"[DEBUG] Received init data: {init_data}")
         
         if not init_data:
             error_msg = '{"type": "error", "message": "No script data received"}\r\n'
-            print(f"[DEBUG] Error: No init data received")
             ws.send(error_msg)
             return
             
         script_data = json.loads(init_data)
-        print(f"[DEBUG] Parsed script data: {script_data}")
         
         script_path = script_data.get('script_path')
         params = script_data.get('params', {})
         
-        print(f"[DEBUG] Script path: {script_path}")
-        print(f"[DEBUG] Params: {params}")
-        
         if not script_path:
             error_msg = '{"type": "error", "message": "No script_path provided"}\r\n'
-            print(f"[DEBUG] Error: No script_path in data")
             ws.send(error_msg)
             return
         
         if not os.path.exists(script_path):
             error_msg = f'{{"type": "error", "message": "Script not found: {script_path}"}}\r\n'
-            print(f"[DEBUG] Error: Script file not found: {script_path}")
             ws.send(error_msg)
             return
             
-        print(f"[DEBUG] Script file exists, starting execution...")
-            
     except Exception as e:
         error_msg = f'{{"type": "error", "message": "Invalid init data: {str(e)}"}}\r\n'
-        print(f"[DEBUG] Exception parsing init data: {e}")
         ws.send(error_msg)
         return
     
     web_log_fd, web_log_path = tempfile.mkstemp(suffix='.log', prefix='proxmenux_web_')
-    print(f"[DEBUG] Created WEB_LOG file: {web_log_path}")
     
     # Create pseudo-terminal for script execution
     master_fd, slave_fd = pty.openpty()
-    print(f"[DEBUG] Created PTY: master_fd={master_fd}, slave_fd={slave_fd}")
     
     env = os.environ.copy()
     env['EXECUTION_MODE'] = 'web'
@@ -299,7 +283,6 @@ def script_websocket(ws, session_id):
     env['PYTHONUNBUFFERED'] = '1'
     env['TERM'] = 'xterm-256color'
     
-    print(f"[DEBUG] Starting script in hybrid web mode: {script_path}")
     script_process = subprocess.Popen(
         ['/bin/bash', script_path],
         stdin=slave_fd,
@@ -308,7 +291,6 @@ def script_websocket(ws, session_id):
         preexec_fn=os.setsid,
         env=env
     )
-    print(f"[DEBUG] Script process started with PID: {script_process.pid}")
     
     # Set non-blocking mode for master_fd
     flags = fcntl.fcntl(master_fd, fcntl.F_GETFL)
@@ -318,7 +300,6 @@ def script_websocket(ws, session_id):
     set_winsize(master_fd, 30, 120)
     
     def monitor_web_log():
-        print(f"[DEBUG] WEB_LOG monitor thread started")
         last_position = 0
         
         while script_process.poll() is None:
@@ -332,7 +313,6 @@ def script_websocket(ws, session_id):
                         for line in new_lines:
                             line = line.strip()
                             if line.startswith('WEB_INTERACTION:'):
-                                print(f"[DEBUG] Detected web interaction: {line[:100]}")
                                 try:
                                     # Parse: WEB_INTERACTION:type:id:title_b64:message_b64[:options_json]
                                     parts = line[16:].split(':', 4)
@@ -366,24 +346,19 @@ def script_websocket(ws, session_id):
                                     
                                     # Send interaction to WebSocket
                                     ws.send(json.dumps(interaction_data))
-                                    print(f"[DEBUG] Sent web interaction to client: {interaction_type}")
                                     
                                 except Exception as e:
-                                    print(f"[DEBUG] Error parsing web interaction: {e}")
+                                    pass
                 
                 time.sleep(0.1)
             except Exception as e:
-                print(f"[DEBUG] Error monitoring WEB_LOG: {e}")
                 break
     
-        print(f"[DEBUG] WEB_LOG monitor thread stopped")
-    
     web_log_thread = threading.Thread(target=monitor_web_log, daemon=True)
     web_log_thread.start()
     
     # Thread to read script output and forward to WebSocket
     def read_script_output():
-        print(f"[DEBUG] Output reader thread started")
         while True:
             try:
                 r, _, _ = select.select([master_fd], [], [], 0.01)
@@ -391,7 +366,6 @@ def script_websocket(ws, session_id):
                     try:
                         data = os.read(master_fd, 4096)
                         if not data:
-                            print(f"[DEBUG] No more data from script")
                             break
                         
                         text = data.decode('utf-8', errors='ignore')
@@ -400,35 +374,29 @@ def script_websocket(ws, session_id):
                         try:
                             ws.send(text)
                         except Exception as e:
-                            print(f"[DEBUG] Error sending to WebSocket: {e}")
                             break
                             
                     except OSError as e:
-                        print(f"[DEBUG] OSError reading from PTY: {e}")
                         break
             except Exception as e:
-                print(f"[DEBUG] Error reading script output: {e}")
                 break
         
         script_process.wait()
         exit_code = script_process.returncode if script_process.returncode is not None else 0
-        print(f"[DEBUG] Script exited with code: {exit_code}")
         
         try:
             ws.send(f'\r\n[Script exited with code {exit_code}]\r\n')
         except Exception as e:
-            print(f"[DEBUG] Could not send exit message: {e}")
+            pass
     
     output_thread = threading.Thread(target=read_script_output, daemon=True)
     output_thread.start()
-    print(f"[DEBUG] Output thread started")
     
     try:
         while True:
             data = ws.receive(timeout=None)
             
             if data is None:
-                print(f"[DEBUG] WebSocket closed by client")
                 break
             
             try:
@@ -440,7 +408,6 @@ def script_websocket(ws, session_id):
                     
                     # Write response to the file the script is waiting for
                     response_file = f"/tmp/proxmenux_response_{interaction_id}"
-                    print(f"[DEBUG] Writing interaction response to {response_file}: {value}")
                     
                     with open(response_file, 'w') as f:
                         f.write(value)
@@ -452,7 +419,6 @@ def script_websocket(ws, session_id):
                     cols = int(msg.get('cols', 120))
                     rows = int(msg.get('rows', 30))
                     set_winsize(master_fd, rows, cols)
-                    print(f"[DEBUG] Resized terminal to {cols}x{rows}")
                     continue
                     
             except json.JSONDecodeError:
@@ -460,17 +426,14 @@ def script_websocket(ws, session_id):
                 try:
                     os.write(master_fd, data.encode('utf-8'))
                 except OSError as e:
-                    print(f"[DEBUG] Error writing to script: {e}")
                     break
             
             if script_process.poll() is not None:
-                print(f"[DEBUG] Script process terminated")
                 break
                 
     except Exception as e:
-        print(f"[DEBUG] Script session error: {e}")
+        pass
     finally:
-        print(f"[DEBUG] Cleaning up script session")
         try:
             script_process.terminate()
             script_process.wait(timeout=1)
@@ -493,7 +456,6 @@ def script_websocket(ws, session_id):
         try:
             os.close(web_log_fd)
             os.unlink(web_log_path)
-            print(f"[DEBUG] Removed WEB_LOG file: {web_log_path}")
         except:
             pass