diff --git a/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift b/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift index 30ea7e7e..369c48bc 100644 --- a/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift +++ b/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift @@ -41,10 +41,15 @@ class AppDelegate: NSObject, NSApplicationDelegate { override init() { vpn = CoderVPNService() - state = AppState(onChange: vpn.configureTunnelProviderProtocol) + let state = AppState(onChange: vpn.configureTunnelProviderProtocol) + vpn.onStart = { + // We don't need this to have finished before the VPN actually starts + Task { await state.refreshDeploymentConfig() } + } if state.startVPNOnLaunch { vpn.startWhenReady = true } + self.state = state vpn.installSystemExtension() #if arch(arm64) let mutagenBinary = "mutagen-darwin-arm64" diff --git a/Coder-Desktop/Coder-Desktop/State.swift b/Coder-Desktop/Coder-Desktop/State.swift index aea2fe99..3aa8842b 100644 --- a/Coder-Desktop/Coder-Desktop/State.swift +++ b/Coder-Desktop/Coder-Desktop/State.swift @@ -25,6 +25,10 @@ class AppState: ObservableObject { } } + @Published private(set) var hostnameSuffix: String = defaultHostnameSuffix + + static let defaultHostnameSuffix: String = "coder" + // Stored in Keychain @Published private(set) var sessionToken: String? { didSet { @@ -33,6 +37,8 @@ class AppState: ObservableObject { } } + private var client: Client? + @Published var useLiteralHeaders: Bool = UserDefaults.standard.bool(forKey: Keys.useLiteralHeaders) { didSet { reconfigure() @@ -80,7 +86,7 @@ class AppState: ObservableObject { private let keychain: Keychain private let persistent: Bool - let onChange: ((NETunnelProviderProtocol?) -> Void)? + private let onChange: ((NETunnelProviderProtocol?) -> Void)? // reconfigure must be called when any property used to configure the VPN changes public func reconfigure() { @@ -107,6 +113,15 @@ class AppState: ObservableObject { if sessionToken == nil || sessionToken!.isEmpty == true { clearSession() } + client = Client( + url: baseAccessURL!, + token: sessionToken!, + headers: useLiteralHeaders ? literalHeaders.map { $0.toSDKHeader() } : [] + ) + Task { + await handleTokenExpiry() + await refreshDeploymentConfig() + } } } @@ -114,14 +129,19 @@ class AppState: ObservableObject { hasSession = true self.baseAccessURL = baseAccessURL self.sessionToken = sessionToken + client = Client( + url: baseAccessURL, + token: sessionToken, + headers: useLiteralHeaders ? literalHeaders.map { $0.toSDKHeader() } : [] + ) + Task { await refreshDeploymentConfig() } reconfigure() } public func handleTokenExpiry() async { if hasSession { - let client = Client(url: baseAccessURL!, token: sessionToken!) do { - _ = try await client.user("me") + _ = try await client!.user("me") } catch let SDKError.api(apiErr) { // Expired token if apiErr.statusCode == 401 { @@ -135,9 +155,34 @@ class AppState: ObservableObject { } } + private var refreshTask: Task? + public func refreshDeploymentConfig() async { + // Client is non-nil if there's a sesssion + if hasSession, let client { + refreshTask?.cancel() + + refreshTask = Task { + let res = try? await retry(floor: .milliseconds(100), ceil: .seconds(10)) { + do { + let config = try await client.agentConnectionInfoGeneric() + return config.hostname_suffix + } catch { + logger.error("failed to get agent connection info (retrying): \(error)") + throw error + } + } + return res + } + + hostnameSuffix = await refreshTask?.value ?? Self.defaultHostnameSuffix + } + } + public func clearSession() { hasSession = false sessionToken = nil + refreshTask?.cancel() + client = nil reconfigure() } diff --git a/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift b/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift index 50078d5f..c3c17738 100644 --- a/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift +++ b/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift @@ -76,6 +76,7 @@ final class CoderVPNService: NSObject, VPNService { // Whether the VPN should start as soon as possible var startWhenReady: Bool = false + var onStart: (() -> Void)? // systemExtnDelegate holds a reference to the SystemExtensionDelegate so that it doesn't get // garbage collected while the OSSystemExtensionRequest is in flight, since the OS framework @@ -187,8 +188,11 @@ extension CoderVPNService { xpc.connect() xpc.ping() tunnelState = .connecting - // Non-connected -> Connected: Retrieve Peers + // Non-connected -> Connected: + // - Retrieve Peers + // - Run `onStart` closure case (_, .connected): + onStart?() xpc.connect() xpc.getPeerState() tunnelState = .connected diff --git a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift index af7e6bb8..0b231de3 100644 --- a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift +++ b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift @@ -42,6 +42,8 @@ enum VPNMenuItem: Equatable, Comparable, Identifiable { } struct MenuItemView: View { + @EnvironmentObject var state: AppState + let item: VPNMenuItem let baseAccessURL: URL @State private var nameIsSelected: Bool = false @@ -49,13 +51,14 @@ struct MenuItemView: View { private var itemName: AttributedString { let name = switch item { - case let .agent(agent): agent.primaryHost ?? "\(item.wsName).coder" - case .offlineWorkspace: "\(item.wsName).coder" + case let .agent(agent): agent.primaryHost ?? "\(item.wsName).\(state.hostnameSuffix)" + case .offlineWorkspace: "\(item.wsName).\(state.hostnameSuffix)" } var formattedName = AttributedString(name) formattedName.foregroundColor = .primary - if let range = formattedName.range(of: ".coder") { + + if let range = formattedName.range(of: ".\(state.hostnameSuffix)", options: .backwards) { formattedName[range].foregroundColor = .secondary } return formattedName diff --git a/Coder-Desktop/CoderSDK/Util.swift b/Coder-Desktop/CoderSDK/Util.swift new file mode 100644 index 00000000..4eab2db9 --- /dev/null +++ b/Coder-Desktop/CoderSDK/Util.swift @@ -0,0 +1,25 @@ +import Foundation + +public func retry( + floor: Duration, + ceil: Duration, + rate: Double = 1.618, + operation: @Sendable () async throws -> T +) async throws -> T { + var delay = floor + + while !Task.isCancelled { + do { + return try await operation() + } catch let error as CancellationError { + throw error + } catch { + try Task.checkCancellation() + + delay = min(ceil, delay * rate) + try await Task.sleep(for: delay) + } + } + + throw CancellationError() +} diff --git a/Coder-Desktop/CoderSDK/WorkspaceAgents.swift b/Coder-Desktop/CoderSDK/WorkspaceAgents.swift new file mode 100644 index 00000000..4144a582 --- /dev/null +++ b/Coder-Desktop/CoderSDK/WorkspaceAgents.swift @@ -0,0 +1,15 @@ +import Foundation + +public extension Client { + func agentConnectionInfoGeneric() async throws(SDKError) -> AgentConnectionInfo { + let res = try await request("/api/v2/workspaceagents/connection", method: .get) + guard res.resp.statusCode == 200 else { + throw responseAsError(res) + } + return try decode(AgentConnectionInfo.self, from: res.data) + } +} + +public struct AgentConnectionInfo: Codable, Sendable { + public let hostname_suffix: String? +} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy