Skip to content

refactor(client): use context.WithTimeout for upload timeout #13

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
4ier merged 2 commits into from
Mar 20, 2026
Merged

refactor(client): use context.WithTimeout for upload timeout #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
218de49
refactor(client): use context.WithTimeout for upload instead of mutat…
4ier Mar 20, 2026
f1d4d11
fix(client): replace go1.25 multipart.FileContentDisposition with com…
4ier Mar 20, 2026
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
10 changes: 5 additions & 5 deletions internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
Expand Down Expand Up @@ -294,7 +295,7 @@ func (c *Client) UploadFileContent(uploadID, fileName, contentType string, fileB
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
partHeader := make(textproto.MIMEHeader)
partHeader.Set("Content-Disposition", multipart.FileContentDisposition("file", fileName))
partHeader.Set("Content-Disposition", fmt.Sprintf(`form-data; name="file"; filename="%s"`, strings.NewReplacer(`\`, `\\`, `"`, `\"`).Replace(fileName)))
if contentType == "" {
contentType = "application/octet-stream"
}
Expand Down Expand Up @@ -323,10 +324,9 @@ func (c *Client) UploadFileContent(uploadID, fileName, contentType string, fileB
fmt.Printf("→ POST %s (multipart, %d bytes)\n", url, body.Len())
}

origTimeout := c.httpClient.Timeout
c.httpClient.Timeout = UploadTimeout
resp, err := c.httpClient.Do(req)
c.httpClient.Timeout = origTimeout
ctx, cancel := context.WithTimeout(context.Background(), UploadTimeout)
defer cancel()
resp, err := c.httpClient.Do(req.WithContext(ctx))
if err != nil {
return nil, fmt.Errorf("upload request failed: %w", err)
}
Expand Down
Loading