feat: add remote reboot support
This commit is contained in:
@@ -26,6 +26,7 @@ struct MainView: View {
|
||||
@State private var refreshTimer: Timer.TimerPublisher?
|
||||
@State private var refreshSubscription: AnyCancellable?
|
||||
@State private var pingTimer: Timer?
|
||||
@State private var restartingServerID: UUID?
|
||||
@State private var lastRefreshInterval: Int?
|
||||
@State private var previousServiceStates: [String: String] = [:]
|
||||
private let serverOrderKey = MainView.serverOrderKeyStatic
|
||||
@@ -79,7 +80,15 @@ struct MainView: View {
|
||||
} detail: {
|
||||
if let selectedServerID,
|
||||
let index = servers.firstIndex(where: { selectedServerID == $0.id }) {
|
||||
ServerDetailView(server: $servers[index], isFetching: isFetchingInfo)
|
||||
let serverID = servers[index].id
|
||||
ServerDetailView(
|
||||
server: $servers[index],
|
||||
isFetching: isFetchingInfo,
|
||||
canRestart: servers[index].info?.supportsRestartCommand == true,
|
||||
isRestarting: restartingServerID == serverID
|
||||
) {
|
||||
await restartServer(for: serverID)
|
||||
}
|
||||
} else {
|
||||
ContentUnavailableView("No Server Selected", systemImage: "server.rack")
|
||||
}
|
||||
@@ -235,9 +244,6 @@ struct MainView: View {
|
||||
await MainActor.run {
|
||||
servers[index].pingable = pingable
|
||||
}
|
||||
if !pingable {
|
||||
print("📶 [MainView] Ping \(server.hostname): offline")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -332,6 +338,87 @@ struct MainView: View {
|
||||
let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
|
||||
UNUserNotificationCenter.current().add(request)
|
||||
}
|
||||
|
||||
private func restartServer(for id: UUID) async -> ServerActionFeedback {
|
||||
guard let server = servers.first(where: { $0.id == id }) else {
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Failed",
|
||||
message: "The selected server could not be found."
|
||||
)
|
||||
}
|
||||
|
||||
guard server.info?.supportsRestartCommand == true else {
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Unavailable",
|
||||
message: "\(server.hostname) does not support remote reboot via the API."
|
||||
)
|
||||
}
|
||||
|
||||
guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
!apiKey.isEmpty else {
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Failed",
|
||||
message: "No API key is configured for \(server.hostname)."
|
||||
)
|
||||
}
|
||||
|
||||
guard let baseURL = URL(string: "https://\(server.hostname)") else {
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Failed",
|
||||
message: "The server URL for \(server.hostname) is invalid."
|
||||
)
|
||||
}
|
||||
|
||||
restartingServerID = id
|
||||
defer { restartingServerID = nil }
|
||||
|
||||
do {
|
||||
let api: AnyServerAPI
|
||||
if let versionString = server.info?.apiVersion,
|
||||
let versionedAPI = APIFactory.createAPI(baseURL: baseURL, versionString: versionString) {
|
||||
api = versionedAPI
|
||||
} else {
|
||||
api = try await APIFactory.detectAndCreateAPI(baseURL: baseURL, apiKey: apiKey)
|
||||
}
|
||||
try await api.restartServer(apiKey: apiKey)
|
||||
PingService.suppressChecks(for: server.hostname, duration: 90)
|
||||
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Requested",
|
||||
message: "The reboot command was sent to \(server.hostname). The host may become unavailable briefly while it restarts."
|
||||
)
|
||||
} catch let error as URLError where Self.isExpectedRestartDisconnect(error) {
|
||||
PingService.suppressChecks(for: server.hostname, duration: 90)
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Requested",
|
||||
message: "The reboot command appears to have been accepted by \(server.hostname). The connection dropped while the host was going away, which is expected during a reboot."
|
||||
)
|
||||
} catch APIError.httpError(404, let message) {
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Unavailable",
|
||||
message: message ?? "\(server.hostname) returned 404 for /api/v2/server/reboot."
|
||||
)
|
||||
} catch {
|
||||
return ServerActionFeedback(
|
||||
title: "Reboot Failed",
|
||||
message: error.localizedDescription
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private static func isExpectedRestartDisconnect(_ error: URLError) -> Bool {
|
||||
switch error.code {
|
||||
case .timedOut,
|
||||
.cannotConnectToHost,
|
||||
.networkConnectionLost,
|
||||
.notConnectedToInternet,
|
||||
.cannotFindHost,
|
||||
.dnsLookupFailed:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
|
||||
@@ -7,9 +7,18 @@
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct ServerActionFeedback: Identifiable {
|
||||
let id = UUID()
|
||||
let title: String
|
||||
let message: String
|
||||
}
|
||||
|
||||
struct ServerDetailView: View {
|
||||
@Binding var server: Server
|
||||
var isFetching: Bool
|
||||
var canRestart: Bool = false
|
||||
var isRestarting: Bool = false
|
||||
var onRestart: (() async -> ServerActionFeedback)? = nil
|
||||
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
||||
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
|
||||
|
||||
@@ -18,6 +27,8 @@ struct ServerDetailView: View {
|
||||
}
|
||||
|
||||
@State private var progress: Double = 0
|
||||
@State private var showRestartSheet = false
|
||||
@State private var restartFeedback: ServerActionFeedback?
|
||||
let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
|
||||
|
||||
var body: some View {
|
||||
@@ -33,7 +44,13 @@ struct ServerDetailView: View {
|
||||
VStack(spacing: 0) {
|
||||
Spacer().frame(height: 6)
|
||||
TabView {
|
||||
GeneralView(server: resolvedBinding)
|
||||
GeneralView(
|
||||
server: resolvedBinding,
|
||||
canRestart: canRestart,
|
||||
isRestarting: isRestarting
|
||||
) {
|
||||
showRestartSheet = true
|
||||
}
|
||||
.tabItem {
|
||||
Text("General").unredacted()
|
||||
}
|
||||
@@ -57,6 +74,17 @@ struct ServerDetailView: View {
|
||||
}
|
||||
.padding(0)
|
||||
}
|
||||
.overlay(alignment: .bottomTrailing) {
|
||||
if let feedback = restartFeedback {
|
||||
RestartFeedbackBanner(
|
||||
feedback: feedback,
|
||||
onDismiss: {
|
||||
restartFeedback = nil
|
||||
}
|
||||
)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
.onReceive(timer) { _ in
|
||||
guard showIntervalIndicator else { return }
|
||||
withAnimation(.linear(duration: 1.0 / 60.0)) {
|
||||
@@ -64,6 +92,25 @@ struct ServerDetailView: View {
|
||||
if progress >= 1 { progress = 0 }
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $showRestartSheet) {
|
||||
RestartConfirmationSheet(
|
||||
hostname: server.hostname,
|
||||
isRestarting: isRestarting,
|
||||
onCancel: {
|
||||
showRestartSheet = false
|
||||
},
|
||||
onConfirm: {
|
||||
guard let onRestart else { return }
|
||||
showRestartSheet = false
|
||||
Task {
|
||||
let feedback = await onRestart()
|
||||
await MainActor.run {
|
||||
restartFeedback = feedback
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private var resolvedBinding: Binding<Server> {
|
||||
@@ -81,7 +128,8 @@ struct ServerDetailView: View {
|
||||
#Preview {
|
||||
ServerDetailView(
|
||||
server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
|
||||
isFetching: false
|
||||
isFetching: false,
|
||||
canRestart: true
|
||||
)
|
||||
}
|
||||
|
||||
@@ -97,3 +145,67 @@ private struct LoadingBadge: View {
|
||||
.background(.ultraThinMaterial, in: Capsule())
|
||||
}
|
||||
}
|
||||
|
||||
private struct RestartConfirmationSheet: View {
|
||||
let hostname: String
|
||||
let isRestarting: Bool
|
||||
let onCancel: () -> Void
|
||||
let onConfirm: () -> Void
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
Text("Reboot this server?")
|
||||
.font(.title3.weight(.semibold))
|
||||
|
||||
Text("This will send a reboot command to \(hostname).")
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
HStack {
|
||||
Spacer()
|
||||
|
||||
Button("Cancel") {
|
||||
onCancel()
|
||||
}
|
||||
.keyboardShortcut(.cancelAction)
|
||||
.disabled(isRestarting)
|
||||
|
||||
Button("Reboot", role: .destructive) {
|
||||
onConfirm()
|
||||
}
|
||||
.keyboardShortcut(.defaultAction)
|
||||
.disabled(isRestarting)
|
||||
}
|
||||
}
|
||||
.padding(24)
|
||||
.frame(width: 420)
|
||||
}
|
||||
}
|
||||
|
||||
private struct RestartFeedbackBanner: View {
|
||||
let feedback: ServerActionFeedback
|
||||
let onDismiss: () -> Void
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
Text(feedback.title)
|
||||
.font(.headline)
|
||||
|
||||
Text(feedback.message)
|
||||
.font(.subheadline)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
HStack {
|
||||
Spacer()
|
||||
|
||||
Button("OK") {
|
||||
onDismiss()
|
||||
}
|
||||
.keyboardShortcut(.defaultAction)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: 360, alignment: .leading)
|
||||
.padding(24)
|
||||
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 16, style: .continuous))
|
||||
.shadow(radius: 12)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,9 @@ import SwiftUI
|
||||
|
||||
struct GeneralView: View {
|
||||
@Binding var server: Server
|
||||
var canRestart: Bool = false
|
||||
var isRestarting: Bool = false
|
||||
var onRestart: (() -> Void)? = nil
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
@@ -117,6 +120,33 @@ struct GeneralView: View {
|
||||
monospaced: true
|
||||
)
|
||||
}
|
||||
|
||||
if canRestart, let onRestart {
|
||||
TableRowView(showDivider: false) {
|
||||
Text("Actions")
|
||||
} value: {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Button(role: .destructive) {
|
||||
onRestart()
|
||||
} label: {
|
||||
if isRestarting {
|
||||
HStack(spacing: 8) {
|
||||
ProgressView()
|
||||
.controlSize(.small)
|
||||
Text("Rebooting…")
|
||||
}
|
||||
} else {
|
||||
Label("Reboot Server", systemImage: "arrow.clockwise.circle")
|
||||
}
|
||||
}
|
||||
.disabled(isRestarting)
|
||||
|
||||
Text("Sends a reboot command to the selected host.")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.frame(minHeight: geometry.size.height, alignment: .top)
|
||||
@@ -132,7 +162,7 @@ struct GeneralView: View {
|
||||
@State var previewServer = Server(hostname: "example.com", info: .placeholder)
|
||||
|
||||
var body: some View {
|
||||
GeneralView(server: $previewServer)
|
||||
GeneralView(server: $previewServer, canRestart: true)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user