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

Merge branch 'ervert'

Browse Source 
# Conflicts:
#	ShhShell/Views/Terminal/SSHTerminalDelegate.swift
This commit is contained in:
neon443
2025-07-04 17:08:26 +01:00
parent a85022e351 6ce6f5c823
commit 7c0332427c
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,33 +19,24 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
self.handler = handler self.handler = handler
self.hostsManager = hostsManager self.hostsManager = hostsManager
print(getTerminal().backgroundColor.colorCodable)
print(getTerminal().foregroundColor.colorCodable)
applySelectedTheme() applySelectedTheme()
DispatchQueue.main.async { Task {
Task { await startFeedLoop()
guard let handler = self.handler else { return }
while handler.connected {
if let read = handler.readFromChannel() {
await MainActor.run {
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) { try? await Task.sleep(nanoseconds: 10_000_000)
await MainActor.run {
self.getTerminal().resetToInitialState() self.getTerminal().resetToInitialState()
for line in scrollback { for line in scrollback {
print("scrollbak \(line)")
self.feed(text: line) self.feed(text: line)
} }
self.setNeedsLayout() self.setNeedsLayout()
@@ -53,6 +44,20 @@ 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 {
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)

3
ShhShell/Views/Terminal/TerminalController.swift
View File

@@ -19,6 +19,9 @@ struct TerminalController: UIViewRepresentable {
func makeUIView(context: Context) -> TerminalView { func makeUIView(context: Context) -> TerminalView {
if let sessionID = handler.sessionID { if let sessionID = handler.sessionID {
if let existing = container.sessions[sessionID] { if let existing = container.sessions[sessionID] {
Task {
await existing.terminalView.restoreScrollback()
}
return existing.terminalView return existing.terminalView
} }
} }