feat: use the deployment's hostname suffix in the UI

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"

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,21 +113,35 @@ 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()
+            }
         }
     }
 
     public func login(baseAccessURL: URL, sessionToken: String) {
         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,24 @@ class AppState: ObservableObject {
         }
     }
 
+    public func refreshDeploymentConfig() async {
+        if hasSession {
+            do {
+                let config = try await client!.sshConfiguration()
+                hostnameSuffix = config.hostname_suffix ?? Self.defaultHostnameSuffix
+            } catch {
+                // If fetching the config fails, there's likely a bigger issue.
+                // We'll show an error in the UI if they try and do something
+                logger.error("failed to refresh deployment config: \(error)")
+                return
+            }
+        }
+    }
+
     public func clearSession() {
         hasSession = false
         sessionToken = nil
+        client = nil
         reconfigure()
     }
 
@@ -159,6 +194,7 @@ class AppState: ObservableObject {
         static let hasSession = "hasSession"
         static let baseAccessURL = "baseAccessURL"
         static let sessionToken = "sessionToken"
+        static let hostnameSuffix = "hostnameSuffix"
 
         static let useLiteralHeaders = "UseLiteralHeaders"
         static let literalHeaders = "LiteralHeaders"

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
@@ -182,8 +183,11 @@ extension CoderVPNService {
         // Connected -> Connected: no-op
         case (.connected, .connected):
             break
-        // Non-connecting -> Connecting: Establish XPC
+        // Non-connecting -> Connecting:
+        // - Establish XPC
+        // - Run `onStart` closure
         case (_, .connecting):
+            onStart?()
             xpc.connect()
             xpc.ping()
             tunnelState = .connecting

Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift

@@ -42,21 +42,24 @@ enum VPNMenuItem: Equatable, Comparable, Identifiable {
 }
 
 struct MenuItemView: View {
+    @EnvironmentObject var state: AppState
+
     let item: VPNMenuItem
     let baseAccessURL: URL
     @State private var nameIsSelected: Bool = false
     @State private var copyIsSelected: Bool = false
 
     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") {
-            formattedName[range].foregroundColor = .secondary
+
+        if let lastDot = formattedName.range(of: ".", options: .backwards) {
+            formattedName[lastDot.lowerBound ..< formattedName.endIndex].foregroundColor = .secondary
         }
         return formattedName
     }

Coder-Desktop/CoderSDK/Deployment.swift

@@ -8,6 +8,14 @@ public extension Client {
         }
         return try decode(BuildInfoResponse.self, from: res.data)
     }
+
+    func sshConfiguration() async throws(SDKError) -> SSHConfigResponse {
+        let res = try await request("/api/v2/deployment/ssh", method: .get)
+        guard res.resp.statusCode == 200 else {
+            throw responseAsError(res)
+        }
+        return try decode(SSHConfigResponse.self, from: res.data)
+    }
 }
 
 public struct BuildInfoResponse: Codable, Equatable, Sendable {
@@ -20,3 +28,9 @@ public struct BuildInfoResponse: Codable, Equatable, Sendable {
             .flatMap { Range($0.range(at: 1), in: version).map { String(version[$0]) } }
     }
 }
+
+public struct SSHConfigResponse: Codable, Equatable, Sendable {
+    public let hostname_prefix: String?
+    public let hostname_suffix: String?
+    public let ssh_config_options: [String: String]
+}