nexus/ProxMenux
2
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-04-18 10:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update lxc-terminal-modal.tsx

Browse Source
This commit is contained in:
MacRimi
2026-03-15 21:34:45 +01:00
parent 6d39acc627
commit c1f8e7f511
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
AppImage/components/lxc-terminal-modal.tsx
View File

@@ -285,51 +285,49 @@ export function LxcTerminalModal({
return return
} }
// DEBUG: Log all incoming data // Helper to strip ANSI escape codes for pattern matching
console.log("[v0] LXC Terminal received:", JSON.stringify(event.data)) const stripAnsi = (str: string) => str.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '')
console.log("[v0] isInsideLxc:", isInsideLxcRef.current)
console.log("[v0] buffer length:", outputBufferRef.current.length)
// Buffer output until we detect we're inside the LXC // Buffer output until we detect we're inside the LXC
// pct enter always enters directly without login prompt when run as root // pct enter always enters directly without login prompt when run as root
if (!isInsideLxcRef.current) { if (!isInsideLxcRef.current) {
outputBufferRef.current += event.data outputBufferRef.current += event.data
// Detect when we're inside the LXC container
// The LXC prompt will NOT contain "constructor" (the host name)
// It will be something like "root@plex:/#" or "user@containername:~$"
const buffer = outputBufferRef.current const buffer = outputBufferRef.current
const cleanBuffer = stripAnsi(buffer)
console.log("[v0] Current buffer:", JSON.stringify(buffer.slice(-200))) // Look for pct enter command followed by a new prompt
const pctEnterMatch = cleanBuffer.match(/pct enter (\d+)\r?\n/)
// Look for a prompt that:
// 1. Comes after pct enter command
// 2. Has @ followed by container name (not host name)
// 3. Ends with # or $
const pctEnterMatch = buffer.match(/pct enter \d+\r?\n/)
console.log("[v0] pctEnterMatch:", pctEnterMatch)
if (pctEnterMatch) { if (pctEnterMatch) {
const afterPctEnter = buffer.substring(buffer.indexOf(pctEnterMatch[0]) + pctEnterMatch[0].length) const afterPctEnter = cleanBuffer.substring(cleanBuffer.indexOf(pctEnterMatch[0]) + pctEnterMatch[0].length)
console.log("[v0] afterPctEnter:", JSON.stringify(afterPctEnter))
// Find the LXC prompt - it should be a line ending with :~# :~$ :/# or similar // Extract the host name from the prompt BEFORE pct enter (e.g., "root@amd")
// and NOT containing the host name "constructor" const hostPromptMatch = cleanBuffer.match(/@([a-zA-Z0-9_-]+).*pct enter/)
const lxcPromptMatch = afterPctEnter.match(/\r?\n?([^\r\n]*@(?!constructor)[^\r\n]*[#$]\s*)$/) const hostName = hostPromptMatch ? hostPromptMatch[1] : null
console.log("[v0] lxcPromptMatch:", lxcPromptMatch)
if (lxcPromptMatch) { // Look for a new prompt after pct enter that ends with # or $
// Successfully inside LXC - only show from the LXC prompt onwards // This works for both bash (user@host:~#) and ash/Alpine ([user@host /]#)
isInsideLxcRef.current = true const promptMatch = afterPctEnter.match(/[@\[]([a-zA-Z0-9_-]+)[^\r\n]*[#$]\s*$/)
console.log("[v0] Detected inside LXC! Prompt:", lxcPromptMatch[1])
if (promptMatch) {
const lxcHostname = promptMatch[1]
// Find where the LXC prompt line starts // If we found a prompt with a DIFFERENT hostname than the Proxmox host,
const promptStart = afterPctEnter.lastIndexOf(lxcPromptMatch[1]) // we're inside the LXC container
if (promptStart !== -1) { if (!hostName || lxcHostname !== hostName) {
// Only show the LXC prompt itself isInsideLxcRef.current = true
term.write(lxcPromptMatch[1])
// Find the original prompt with ANSI codes to display it properly
const afterPctEnterWithAnsi = buffer.substring(buffer.indexOf('pct enter') + pctEnterMatch[0].length)
// Write the LXC prompt (last line with # or $)
const lastPromptMatch = afterPctEnterWithAnsi.match(/[^\r\n]*[#$]\s*$/)
if (lastPromptMatch) {
term.write(lastPromptMatch[0])
}
return
} }
return
} }
} }
} else { } else {