neon443/ShhShell
1
0
Fork 0
mirror of https://github.com/neon443/ShhShell.git synced 2026-03-11 13:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed race condition opening the terminal, as restoring scrollback would restore content already there 🤦

Browse Source
This commit is contained in:
neon443
2025-07-04 15:41:45 +01:00
parent b5f8c4e716
commit f68b08d45c
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ShhShell/Views/Terminal/SSHTerminalDelegate.swift
View File

@@ -24,32 +24,20 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
applySelectedTheme() applySelectedTheme()
DispatchQueue.main.async { Task {
Task { await restoreScrollback()
guard let handler = self.handler else { return } await startFeedLoop()
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()
}
} }
} }
func restoreScrollback() { func restoreScrollback() async {
guard let scrollback = handler?.scrollback else { return } guard let scrollback = handler?.scrollback else { return }
guard !scrollback.isEmpty else { return } guard !scrollback.isEmpty else { return }
DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) { await MainActor.run {
self.getTerminal().resetToInitialState() self.getTerminal().resetToInitialState()
for line in scrollback { for line in scrollback {
print(line) print("scrollbak \(line)")
self.feed(text: line) self.feed(text: line)
} }
self.setNeedsLayout() 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() { func applySelectedTheme() {
guard let hostsManager else { return } guard let hostsManager else { return }
applyTheme(hostsManager.selectedTheme) applyTheme(hostsManager.selectedTheme)

5
ShhShell/Views/Terminal/ShellView.swift
View File

@@ -21,11 +21,6 @@ struct ShellView: View {
hostsManager.selectedTheme.background.suiColor hostsManager.selectedTheme.background.suiColor
.ignoresSafeArea(.all) .ignoresSafeArea(.all)
TerminalController(handler: handler, hostsManager: hostsManager) TerminalController(handler: handler, hostsManager: hostsManager)
.onAppear {
if let sessionID = handler.sessionID {
container.sessions[sessionID]?.terminalView.restoreScrollback()
}
}
Group { Group {
Color.gray.opacity(0.2) Color.gray.opacity(0.2)