Skip to content

Add timeout alert with log viewer #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenDev0 merged 6 commits into from
Jul 23, 2025
Merged

Add timeout alert with log viewer #238

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
195a2e5
Add timeout error and log viewer
StephenDev0 Jul 23, 2025
b96055f
Fix parameter order in timeout alert
StephenDev0 Jul 23, 2025
9e2fd8c
Add timeout timer for loading
StephenDev0 Jul 23, 2025
abd989f
Update timeout actions and log view
StephenDev0 Jul 23, 2025
86b068b
Open ConsoleLogsView from timeout alert
StephenDev0 Jul 23, 2025
18f4f15
Open logs without dismissing loading
StephenDev0 Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions StikJIT/StikJITApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,9 @@ struct HeartbeatApp: App {
@State private var show_alert = false
@State private var alert_string = ""
@State private var alert_title = ""
@State private var showTimeoutError = false
@State private var showLogs = false
@State private var timeoutTimer: Timer?
@StateObject private var mount = MountingProgress.shared
@StateObject private var dnsChecker = DNSChecker() // New DNS check state object
@AppStorage("appTheme") private var appTheme: String = "system"
Expand Down Expand Up @@ -530,6 +533,12 @@ struct HeartbeatApp: App {
LoadingView(showAlert: $show_alert, alertTitle: $alert_title, alertMessage: $alert_string)
.onAppear {
dnsChecker.checkDNS()
timeoutTimer?.invalidate()
timeoutTimer = Timer.scheduledTimer(withTimeInterval: 30, repeats: false) { _ in
if isLoading2 {
showTimeoutError = true
}
}
checkVPNConnection() { result, vpn_error in
if result {
if FileManager.default.fileExists(atPath: URL.documentsDirectory.appendingPathComponent("pairingFile.plist").path) {
Expand Down Expand Up @@ -593,6 +602,34 @@ struct HeartbeatApp: App {
print("Failed")
}
}
.overlay(
ZStack {
if showTimeoutError {
CustomErrorView(
title: "Connection Error",
message: "Check your connection and ensure your pairing file is valid and try again.",
onDismiss: {
showTimeoutError = false
},
showButton: true,
primaryButtonText: "Continue Anyway",
secondaryButtonText: "View Logs",
onPrimaryButtonTap: {
isLoading2 = false
},
onSecondaryButtonTap: {
showLogs = true
},
showSecondaryButton: true
)
}
}
)
.sheet(isPresented: $showLogs, onDismiss: {
isLoading2 = false
}) {
ConsoleLogsView()
}
} else {
MainTabView()
.onAppear {
Expand Down Expand Up @@ -652,6 +689,12 @@ struct HeartbeatApp: App {
startHeartbeatInBackground()
}
}
.onChange(of: isLoading2) { newValue in
if !newValue {
timeoutTimer?.invalidate()
timeoutTimer = nil
}
}
.onChange(of: dnsChecker.dnsError) { newError in
if let errorMsg = newError, !errorMsg.contains("Not connected to WiFi") {
alert_title = "Network Issue"
Expand Down