workaround xcode linking bug

ethanndickson · ethanndickson · commit 00132401eca9 · 2025-05-09T13:55:46.000+10:00
diff --git a/Coder-Desktop/Coder-Desktop/URLHandler.swift b/Coder-Desktop/Coder-Desktop/URLHandler.swift
@@ -1,5 +1,5 @@
 import Foundation
-import URLRouting
+import VPNLib
 
 @MainActor
 class URLHandler {
@@ -13,7 +13,7 @@ class URLHandler {
         router = CoderRouter()
     }
 
-    func handle(_ url: URL) throws(URLError) {
+    func handle(_ url: URL) throws(RouterError) {
         guard state.hasSession, let deployment = state.baseAccessURL else {
             throw .noSession
         }
@@ -29,69 +29,11 @@ class URLHandler {
                 }
             }
         } catch {
-            throw .routerError(url: url)
+            throw .matchError(url: url)
         }
 
         func handleRDP(workspace _: String, agent _: String, creds _: RDPCredentials) {
             // TODO: Handle RDP
         }
     }
 }
-
-struct CoderRouter: ParserPrinter {
-    public var body: some ParserPrinter<URLRequestData, CoderRoute> {
-        Route(.case(CoderRoute.open(workspace:agent:route:))) {
-            // v0/open/ws/<workspace>/agent/<agent>/<openType>
-            Path { "v0"; "open"; "ws"; Parse(.string); "agent"; Parse(.string) }
-            openRouter
-        }
-    }
-
-    var openRouter: some ParserPrinter<URLRequestData, OpenRoute> {
-        OneOf {
-            Route(.memberwise(OpenRoute.rdp)) {
-                Path { "rdp" }
-                Query {
-                    Parse(.memberwise(RDPCredentials.init)) {
-                        Optionally { Field("username") }
-                        Optionally { Field("password") }
-                    }
-                }
-            }
-        }
-    }
-}
-
-enum URLError: Error {
-    case invalidAuthority(String)
-    case routerError(url: URL)
-    case noSession
-
-    var description: String {
-        switch self {
-        case let .invalidAuthority(authority):
-            "Authority '\(authority)' does not match the host of the current Coder deployment."
-        case let .routerError(url):
-            "Failed to handle \(url.absoluteString) because the format is unsupported."
-        case .noSession:
-            "Not logged in."
-        }
-    }
-
-    var localizedDescription: String { description }
-}
-
-public enum CoderRoute: Equatable, Sendable {
-    case open(workspace: String, agent: String, route: OpenRoute)
-}
-
-public enum OpenRoute: Equatable, Sendable {
-    case rdp(RDPCredentials)
-}
-
-// Due to a Swift Result builder limitation, we can't flatten this out to `case rdp(String?, String?)`
-// https://github.com/pointfreeco/swift-url-routing/issues/50
-public struct RDPCredentials: Equatable, Sendable {
-    let username: String?
-    let password: String?
-}
diff --git a/Coder-Desktop/VPNLib/CoderRouter.swift b/Coder-Desktop/VPNLib/CoderRouter.swift
@@ -0,0 +1,63 @@
+import Foundation
+import URLRouting
+
+// This is in VPNLib to avoid depending on `swift-collections` in both the app & extension.
+public struct CoderRouter: ParserPrinter {
+    public init() {}
+
+    public var body: some ParserPrinter<URLRequestData, CoderRoute> {
+        Route(.case(CoderRoute.open(workspace:agent:route:))) {
+            // v0/open/ws/<workspace>/agent/<agent>/<openType>
+            Path { "v0"; "open"; "ws"; Parse(.string); "agent"; Parse(.string) }
+            openRouter
+        }
+    }
+
+    var openRouter: some ParserPrinter<URLRequestData, OpenRoute> {
+        OneOf {
+            Route(.memberwise(OpenRoute.rdp)) {
+                Path { "rdp" }
+                Query {
+                    Parse(.memberwise(RDPCredentials.init)) {
+                        Optionally { Field("username") }
+                        Optionally { Field("password") }
+                    }
+                }
+            }
+        }
+    }
+}
+
+public enum RouterError: Error {
+    case invalidAuthority(String)
+    case matchError(url: URL)
+    case noSession
+
+    public var description: String {
+        switch self {
+        case let .invalidAuthority(authority):
+            "Authority '\(authority)' does not match the host of the current Coder deployment."
+        case let .matchError(url):
+            "Failed to handle \(url.absoluteString) because the format is unsupported."
+        case .noSession:
+            "Not logged in."
+        }
+    }
+
+    public var localizedDescription: String { description }
+}
+
+public enum CoderRoute: Equatable, Sendable {
+    case open(workspace: String, agent: String, route: OpenRoute)
+}
+
+public enum OpenRoute: Equatable, Sendable {
+    case rdp(RDPCredentials)
+}
+
+// Due to a Swift Result builder limitation, we can't flatten this out to `case rdp(String?, String?)`
+// https://github.com/pointfreeco/swift-url-routing/issues/50
+public struct RDPCredentials: Equatable, Sendable {
+    public let username: String?
+    public let password: String?
+}
diff --git a/Coder-Desktop/VPNLibTests/CoderRouterTests.swift b/Coder-Desktop/VPNLibTests/CoderRouterTests.swift
@@ -1,7 +1,7 @@
-@testable import Coder_Desktop
 import Foundation
 import Testing
 import URLRouting
+@testable import VPNLib
 
 @MainActor
 @Suite(.timeLimit(.minutes(1)))
diff --git a/Coder-Desktop/project.yml b/Coder-Desktop/project.yml
@@ -189,7 +189,6 @@ targets:
       - package: LaunchAtLogin
       - package: SDWebImageSwiftUI
       - package: SDWebImageSVGCoder
-      - package: URLRouting
     scheme:
       testPlans:
         - path: Coder-Desktop.xctestplan
@@ -295,6 +294,7 @@ targets:
       - package: GRPC
       - package: Subprocess
       - package: Semaphore
+      - package: URLRouting
       - target: CoderSDK
         embed: false
 
