Skip to content

fix: replace raw network errors with user-friendly gateway messages #49

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
johnnyfish merged 1 commit into from
May 9, 2026
Merged

fix: replace raw network errors with user-friendly gateway messages #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion internal/api/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ import (
"crypto/tls"
"crypto/x509"
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"net/url"
"os"
"syscall"
"time"
)

Expand Down Expand Up @@ -76,6 +78,21 @@ func (e *APIError) Error() string {
return e.Message
}

// networkError translates raw Go network errors into user-friendly messages.
func (c *Client) networkError(err error) error {
host := c.baseURL
if u, e := url.Parse(c.baseURL); e == nil && u.Host != "" {
host = u.Host
}
if errors.Is(err, syscall.ECONNREFUSED) {
return fmt.Errorf("could not connect to gateway at %s — is the OneCLI gateway running?", host)
}
if os.IsTimeout(err) {
return fmt.Errorf("request to gateway at %s timed out", host)
}
return fmt.Errorf("could not reach gateway at %s: %w", host, err)
}

// do executes an HTTP request and decodes the JSON response.
// For 204 responses, result should be nil.
func (c *Client) do(ctx context.Context, method, path string, body any, result any) error {
Expand All @@ -102,7 +119,7 @@ func (c *Client) do(ctx context.Context, method, path string, body any, result a

resp, err := c.httpClient.Do(req)
if err != nil {
return fmt.Errorf("executing request: %w", err)
return c.networkError(err)
}
defer resp.Body.Close()

Expand Down
Loading