Fix: stderr-Pipe gegen Instant-Exit-Datenverlust, TCP-Vorab-Check, Fehler-Banner; Icon (Dracula) im Bundle

This commit is contained in:
x3
2026-09-21 23:14:08 +02:00
parent 1828a96a2b
commit 7dc6ff75d2
14 changed files with 397 additions and 33 deletions
@@ -2,12 +2,15 @@ import SwiftUI
import AppKit
/// In-App-Terminal im Dracula-Look: Ausgabe (NSTextView, read-only) + Eingabezeile.
/// Verbindet erst nach TCP-Vorab-Check (falscher Port/Host -> sofort klare Meldung).
/// Zeilenumbruch ist an, Autoscroll ans Ende, Passwort-Modus via Auge-Icon.
struct EmbeddedTerminalView: View {
@ObservedObject var term: PTYSession
let profile: ConnectionProfile
var canConnect: Bool
@State private var input = ""
@State private var secureInput = false
@State private var checking = false
var body: some View {
VStack(spacing: 0) {
@@ -18,8 +21,8 @@ struct EmbeddedTerminalView: View {
Spacer()
if term.isRunning {
Button("Trennen") { term.stop() }.buttonStyle(.link).font(.caption)
} else if canConnect {
Button("Verbinden") { term.start() }.buttonStyle(.link).font(.caption)
} else if canConnect && !checking {
Button("Verbinden") { connect() }.buttonStyle(.link).font(.caption)
}
Button("Leeren") { term.clear() }.buttonStyle(.link).font(.caption)
}
@@ -27,6 +30,27 @@ struct EmbeddedTerminalView: View {
.padding(.vertical, 6)
.background(Dracula.currentLine.opacity(0.35))
// Fehler-Banner bei Fehlschlag (statt nur „Sitzung beendet")
if failed {
HStack(spacing: 8) {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundStyle(Dracula.red)
VStack(alignment: .leading, spacing: 2) {
Text("Verbindung fehlgeschlagen\(exitSuffix)")
.font(.callout).bold().foregroundStyle(Dracula.red)
Text(lastMessage)
.font(.caption).foregroundStyle(Dracula.foreground)
.lineLimit(3)
}
Spacer()
Button("Diagnose") { diagnose() }.buttonStyle(.link).font(.caption)
Button("Erneut") { connect() }.buttonStyle(.link).font(.caption)
}
.padding(8)
.background(Dracula.red.opacity(0.12))
.overlay(Rectangle().fill(Dracula.red.opacity(0.4)).frame(height: 1), alignment: .bottom)
}
// Ausgabe im Dracula-Theme
DraculaTextView(lines: term.lines)
.frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -62,8 +86,39 @@ struct EmbeddedTerminalView: View {
.cornerRadius(10)
.overlay(RoundedRectangle(cornerRadius: 10).stroke(Dracula.currentLine, lineWidth: 1))
.onAppear {
if case .never = term.state, canConnect {
term.start() // Auto-Connect beim Öffnen des Tabs (Bugfix: kein externes Terminal mehr nötig)
if case .never = term.state {
connect() // Auto-Connect beim Öffnen des Tabs
}
}
}
func connect() {
guard canConnect, !term.isRunning, !checking else { return }
checking = true
TCPCheck.check(host: profile.host, port: profile.port) { message in
DispatchQueue.main.async {
checking = false
if let message {
term.fail("Vorab-Check: \(message)")
} else {
term.start()
}
}
}
}
func diagnose() {
guard !checking else { return }
checking = true
term.note("Diagnose: TCP \(profile.host):\(profile.port) …")
TCPCheck.check(host: profile.host, port: profile.port) { message in
DispatchQueue.main.async {
checking = false
if let message {
term.note("Diagnose: \(message)")
} else {
term.note("Diagnose: Port offen — ssh selbst lehnt ab (User/Key/Passwort/Hostkey prüfen).")
}
}
}
}
@@ -74,15 +129,39 @@ struct EmbeddedTerminalView: View {
input = ""
}
var failed: Bool {
if case .done(let code, _) = term.state {
return (code ?? 1) != 0
}
return false
}
var exitSuffix: String {
if case .done(let code, _) = term.state, let code {
return " (Exit \(code))"
}
return ""
}
var lastMessage: String {
for row in term.lines.reversed() {
let t = row.map(\.text).joined().trimmingCharacters(in: .whitespacesAndNewlines)
if !t.isEmpty && !t.hasPrefix("—") { return t }
}
if case .done(_, let msg) = term.state { return msg }
return "Unbekannter Fehler."
}
var statusDot: some View {
Group {
if term.isRunning { Image(systemName: "circle.fill").foregroundStyle(Dracula.green) }
else if case .done = term.state { Image(systemName: "circle.fill").foregroundStyle(Dracula.red) }
if checking || term.isRunning { Image(systemName: "circle.fill").foregroundStyle(Dracula.green) }
else if case .done = term.state { Image(systemName: "circle.fill").foregroundStyle(failed ? Dracula.red : Dracula.comment) }
else { Image(systemName: "circle.fill").foregroundStyle(Dracula.comment) }
}.font(.caption2)
}
var statusText: String {
if checking { return "Prüfe \(profile.host):\(profile.port) …" }
switch term.state {
case .never: return canConnect ? "Bereit — verbindet beim Öffnen." : "Host/Benutzer fehlt."
case .running: return "Verbunden (PTY, TERM=xterm-256color)."