mirror of
https://github.com/neon443/ShhShell.git
synced 2026-03-11 05:19:13 +00:00
fixed race condition opening the terminal, as restoring scrollback would restore content already there 🤦
This commit is contained in:
@@ -24,32 +24,20 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
|
||||
|
||||
applySelectedTheme()
|
||||
|
||||
DispatchQueue.main.async {
|
||||
Task {
|
||||
guard let handler = self.handler else { return }
|
||||
while handler.connected {
|
||||
if let read = handler.readFromChannel() {
|
||||
await MainActor.run {
|
||||
print(read)
|
||||
self.feed(text: read)
|
||||
}
|
||||
} else {
|
||||
try? await Task.sleep(nanoseconds: 10_000_000) //10ms
|
||||
}
|
||||
}
|
||||
handler.disconnect()
|
||||
}
|
||||
Task {
|
||||
await restoreScrollback()
|
||||
await startFeedLoop()
|
||||
}
|
||||
}
|
||||
|
||||
func restoreScrollback() {
|
||||
func restoreScrollback() async {
|
||||
guard let scrollback = handler?.scrollback else { return }
|
||||
guard !scrollback.isEmpty else { return }
|
||||
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
|
||||
await MainActor.run {
|
||||
self.getTerminal().resetToInitialState()
|
||||
for line in scrollback {
|
||||
print(line)
|
||||
print("scrollbak \(line)")
|
||||
self.feed(text: line)
|
||||
}
|
||||
self.setNeedsLayout()
|
||||
@@ -57,6 +45,21 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
|
||||
}
|
||||
}
|
||||
|
||||
func startFeedLoop() async {
|
||||
guard let handler else { return }
|
||||
while handler.connected {
|
||||
if let read = handler.readFromChannel() {
|
||||
await MainActor.run {
|
||||
print("live \(read)F")
|
||||
self.feed(text: read)
|
||||
}
|
||||
} else {
|
||||
try? await Task.sleep(nanoseconds: 10_000_000) //10ms
|
||||
}
|
||||
}
|
||||
handler.disconnect()
|
||||
}
|
||||
|
||||
func applySelectedTheme() {
|
||||
guard let hostsManager else { return }
|
||||
applyTheme(hostsManager.selectedTheme)
|
||||
|
||||
@@ -21,11 +21,6 @@ struct ShellView: View {
|
||||
hostsManager.selectedTheme.background.suiColor
|
||||
.ignoresSafeArea(.all)
|
||||
TerminalController(handler: handler, hostsManager: hostsManager)
|
||||
.onAppear {
|
||||
if let sessionID = handler.sessionID {
|
||||
container.sessions[sessionID]?.terminalView.restoreScrollback()
|
||||
}
|
||||
}
|
||||
|
||||
Group {
|
||||
Color.gray.opacity(0.2)
|
||||
|
||||
Reference in New Issue
Block a user