fixup

Author: ethanndickson

Coder-Desktop/Coder-Desktop/Preview Content/PreviewVPN.swift

@@ -33,7 +33,7 @@ final class PreviewVPN: Coder_Desktop.VPNService {
         self.shouldFail = shouldFail
     }
 
-    @Published var progress: VPNProgress = .init(stage: .none, downloadProgress: nil)
+    @Published var progress: VPNProgress = .init(stage: .initial, downloadProgress: nil)
 
     var startTask: Task<Void, Never>?
     func start() async {

Coder-Desktop/Coder-Desktop/VPN/VPNProgress.swift

@@ -41,7 +41,7 @@ struct VPNProgressView: View {
             return nil
         }
         switch progress.stage {
-        case .none:
+        case .initial:
             return 0.10
         case .downloading:
             guard let downloadProgress = progress.downloadProgress else {

Coder-Desktop/Coder-Desktop/VPN/VPNService.swift

@@ -56,7 +56,14 @@ final class CoderVPNService: NSObject, VPNService {
     var logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "vpn")
     lazy var xpc: VPNXPCInterface = .init(vpn: self)
 
-    @Published var tunnelState: VPNServiceState = .disabled
+    @Published var tunnelState: VPNServiceState = .disabled {
+        didSet {
+            if tunnelState == .connecting {
+                progress = .init(stage: .initial, downloadProgress: nil)
+            }
+        }
+    }
+
     @Published var sysExtnState: SystemExtensionState = .uninstalled
     @Published var neState: NetworkExtensionState = .unconfigured
     var state: VPNServiceState {
@@ -73,7 +80,7 @@ final class CoderVPNService: NSObject, VPNService {
         return tunnelState
     }
 
-    @Published var progress: VPNProgress = .init(stage: .none, downloadProgress: nil)
+    @Published var progress: VPNProgress = .init(stage: .initial, downloadProgress: nil)
 
     @Published var menuState: VPNMenuState = .init()
 

Coder-Desktop/Coder-DesktopTests/Util.swift

@@ -10,7 +10,7 @@ class MockVPNService: VPNService, ObservableObject {
     @Published var state: Coder_Desktop.VPNServiceState = .disabled
     @Published var baseAccessURL: URL = .init(string: "https://dev.coder.com")!
     @Published var menuState: VPNMenuState = .init()
-    @Published var progress: VPNProgress = .init(stage: .none, downloadProgress: nil)
+    @Published var progress: VPNProgress = .init(stage: .initial, downloadProgress: nil)
     var onStart: (() async -> Void)?
     var onStop: (() async -> Void)?
 

Coder-Desktop/VPN/PacketTunnelProvider.swift

@@ -92,8 +92,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
                 logger.info("vpn started")
                 self.manager = manager
                 completionHandler(nil)
-                // Clear progress message
-                pushProgress(stage: .none, downloadProgress: nil)
             } catch {
                 logger.error("error starting manager: \(error.description, privacy: .public)")
                 completionHandler(

Coder-Desktop/VPNLib/XPC.swift

@@ -15,7 +15,7 @@ import Foundation
 }
 
 @objc public enum ProgressStage: Int, Sendable {
-    case none
+    case initial
     case downloading
     case validating
     case removingQuarantine
@@ -25,7 +25,7 @@ import Foundation
 
     public var description: String? {
         switch self {
-        case .none:
+        case .initial:
             nil
         case .downloading:
             "Downloading library..."