review

Author: ethanndickson

Diff for: Coder-Desktop/Coder-Desktop/State.swift

@@ -157,15 +157,11 @@ 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
+            let res = try? await retry(floor: .milliseconds(100), ceil: .seconds(10)) {
+                let config = try await client!.agentConnectionInfoGeneric()
+                return config.hostname_suffix
             }
+            hostnameSuffix = res ?? Self.defaultHostnameSuffix
         }
     }
 
@@ -194,7 +190,6 @@ 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"

Diff for: Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift

@@ -58,8 +58,8 @@ struct MenuItemView: View {
         var formattedName = AttributedString(name)
         formattedName.foregroundColor = .primary
 
-        if let lastDot = formattedName.range(of: ".", options: .backwards) {
-            formattedName[lastDot.lowerBound ..< formattedName.endIndex].foregroundColor = .secondary
+        if let range = formattedName.range(of: ".\(state.hostnameSuffix)", options: .backwards) {
+            formattedName[range].foregroundColor = .secondary
         }
         return formattedName
     }

Diff for: Coder-Desktop/CoderSDK/Deployment.swift

@@ -8,14 +8,6 @@ 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 {
@@ -27,10 +19,4 @@ public struct BuildInfoResponse: Codable, Equatable, Sendable {
             .firstMatch(in: version, range: NSRange(version.startIndex ..< version.endIndex, in: version))
             .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]
-}
+}

Diff for: Coder-Desktop/CoderSDK/Util.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+public func retry<T>(
+    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 for: Coder-Desktop/CoderSDK/WorkspaceAgents.swift

@@ -0,0 +1,16 @@
+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?
+}