improve error handling

Author: ethanndickson

Coder-Desktop/Coder-Desktop/URLHandler.swift

@@ -1,4 +1,5 @@
 import Foundation
+import SwiftUI
 import VPNLib
 
 @MainActor
@@ -29,32 +30,36 @@ class URLHandler {
 
         switch route {
         case let .open(workspace, agent, type):
-            switch type {
-            case let .rdp(creds):
-                try handleRDP(workspace: workspace, agent: agent, creds: creds)
+            do {
+                switch type {
+                case let .rdp(creds):
+                    try handleRDP(workspace: workspace, agent: agent, creds: creds)
+                }
+            } catch {
+                throw .openError(error)
             }
         }
     }
 
-    private func handleRDP(workspace: String, agent: String, creds: RDPCredentials) throws(URLError) {
+    private func handleRDP(workspace: String, agent: String, creds: RDPCredentials) throws(OpenError) {
         guard vpn.state == .connected else {
-            throw .openError(.coderConnectOffline)
+            throw .coderConnectOffline
         }
 
         guard let workspace = vpn.menuState.findWorkspace(name: workspace) else {
-            throw .openError(.invalidWorkspace(workspace: workspace))
+            throw .invalidWorkspace(workspace: workspace)
         }
 
         guard let agent = vpn.menuState.findAgent(workspaceID: workspace.id, name: agent) else {
-            throw .openError(.invalidAgent(workspace: workspace.name, agent: agent))
+            throw .invalidAgent(workspace: workspace.name, agent: agent)
         }
 
         var rdpString = "rdp:full address=s:\(agent.primaryHost):3389"
         if let username = creds.username {
             rdpString += "&username=s:\(username)"
         }
         guard let url = URL(string: rdpString) else {
-            throw .openError(.couldNotCreateRDPURL(rdpString))
+            throw .couldNotCreateRDPURL(rdpString)
         }
 
         let alert = NSAlert()

Coder-Desktop/VPNLib/CoderRouter.swift

@@ -35,7 +35,7 @@ public enum RouterError: Error {
     case noSession
     case openError(OpenError)
 
-    var description: String {
+    public var description: String {
         switch self {
         case let .invalidAuthority(authority):
             "Authority '\(authority)' does not match the host of the current Coder deployment."
@@ -48,7 +48,7 @@ public enum RouterError: Error {
         }
     }
 
-    var localizedDescription: String { description }
+    public var localizedDescription: String { description }
 }
 
 public enum OpenError: Error {