Skip to content

chore: reduce error verbosity #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2025
Merged

chore: reduce error verbosity #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
780a30c
chore: reduce error verbosity
ethanndickson Feb 26, 2025
1d60b35
add url to network error
ethanndickson Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Coder Desktop/Coder Desktop/Views/LoginForm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ enum LoginError: Error {
case .invalidURL:
"Invalid URL"
case let .failedAuth(err):
"Could not authenticate with Coder deployment:\n\(err.description)"
"Could not authenticate with Coder deployment:\n\(err.localizedDescription)"
}
}

Expand Down
2 changes: 1 addition & 1 deletion Coder Desktop/CoderSDK/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public enum ClientError: Error {
case let .unexpectedResponse(data):
"Unexpected or non HTTP response: \(data)"
case let .encodeFailure(error):
"Failed to encode body: \(error)"
"Failed to encode body: \(error.localizedDescription)"
}
}

Expand Down
12 changes: 6 additions & 6 deletions Coder Desktop/VPN/Manager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,17 @@ enum ManagerError: Error {
var description: String {
switch self {
case let .download(err):
"Download error: \(err)"
"Download error: \(err.localizedDescription)"
case let .tunnelSetup(err):
"Tunnel setup error: \(err)"
"Tunnel setup error: \(err.localizedDescription)"
case let .handshake(err):
"Handshake error: \(err)"
"Handshake error: \(err.localizedDescription)"
case let .validation(err):
"Validation error: \(err)"
"Validation error: \(err.localizedDescription)"
case .incorrectResponse:
"Received unexpected response over tunnel"
case let .failedRPC(err):
"Failed rpc: \(err)"
"Failed rpc: \(err.localizedDescription)"
case let .serverInfo(msg):
msg
case let .errorResponse(msg):
Expand All @@ -273,7 +273,7 @@ enum ManagerError: Error {
case .permissionDenied:
"Permission was not granted to execute the CoderVPN dylib"
case let .tunnelFail(err):
"Failed to communicate with dylib over tunnel: \(err)"
"Failed to communicate with dylib over tunnel: \(err.localizedDescription)"
}
}

Expand Down
2 changes: 1 addition & 1 deletion Coder Desktop/VPN/TunnelHandle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ enum TunnelHandleError: Error {

var description: String {
switch self {
case let .pipe(err): "pipe error: \(err)"
case let .pipe(err): "pipe error: \(err.localizedDescription)"
case let .dylib(d): d
case let .symbol(symbol, message): "\(symbol): \(message)"
case let .openTunnel(error): "OpenTunnel: \(error.message)"
Expand Down
8 changes: 4 additions & 4 deletions Coder Desktop/VPNLib/Download.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public func download(src: URL, dest: URL, urlSession: URLSession) async throws(D
do {
(tempURL, response) = try await urlSession.download(for: req)
} catch {
throw .networkError(error)
throw .networkError(error, url: src.absoluteString)
}
defer {
if FileManager.default.fileExists(atPath: tempURL.path) {
Expand Down Expand Up @@ -155,15 +155,15 @@ func etag(data: Data) -> String {
public enum DownloadError: Error {
case unexpectedStatusCode(Int)
case invalidResponse
case networkError(any Error)
case networkError(any Error, url: String)
case fileOpError(any Error)

public var description: String {
switch self {
case let .unexpectedStatusCode(code):
"Unexpected HTTP status code: \(code)"
case let .networkError(error):
"Network error: \(error.localizedDescription)"
case let .networkError(error, url):
"Network error: \(url) - \(error.localizedDescription)"
case let .fileOpError(error):
"File operation error: \(error.localizedDescription)"
case .invalidResponse:
Expand Down
Loading