github/Bose-SoundTouch
1
0
Fork 0
mirror of https://github.com/gesellix/Bose-SoundTouch.git synced 2026-09-07 15:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(client): share one-shot HTTP client setup between mutatingGet variants

Browse Source 
Splitting mutatingGet into two functions during the main rebase
(mutatingGet keeps the existing result-unmarshaling form used by
/removeGroup; the new mutatingGetConfirmStatus validates a <status>
echo instead, for endpoints with no meaningful response body) left
~30 lines of one-shot-transport setup (clone, disable keep-alives,
CheckRedirect) duplicated between them. Extracted newOneShotHTTPClient
so a future fix to that mechanism can't be applied to one copy and
forgotten in the other.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Tobias Gesellchen
2026-09-05 13:32:57 +02:00
co-authored by Claude Sonnet 5
parent 0748e4042c
commit 791ae0e26f
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/client/client.go
+25 -30
View File
@@ -1307,11 +1307,13 @@ func (c *Client) getWithHTTPClient(httpClient *http.Client, endpoint string, res
return nil
}
// mutatingGet performs a firmware-required state-changing GET exactly once at
// the HTTP transport layer, unmarshaling the response into result. A fresh
// connection prevents net/http from automatically replaying the request
// after an ambiguous failure on a reused connection.
func (c *Client) mutatingGet(endpoint string, result interface{}) error {
// newOneShotHTTPClient clones the client's transport with keep-alives
// disabled, so a firmware-required state-changing GET runs exactly once at
// the HTTP transport layer instead of risking an automatic replay by
// net/http after an ambiguous failure on a reused connection. The caller
// owns the returned transport's lifetime and must close its idle
// connections once done (defer oneShotTransport.CloseIdleConnections()).
func (c *Client) newOneShotHTTPClient() (client *http.Client, oneShotTransport *http.Transport, err error) {
baseTransport := c.httpClient.Transport
if baseTransport == nil {
baseTransport = http.DefaultTransport
@@ -1319,21 +1321,31 @@ func (c *Client) mutatingGet(endpoint string, result interface{}) error {
transport, ok := baseTransport.(*http.Transport)
if !ok {
return errors.New("state-changing GET requires a cloneable HTTP transport")
return nil, nil, errors.New("state-changing GET requires a cloneable HTTP transport")
}
oneShotTransport := transport.Clone()
oneShotTransport = transport.Clone()
oneShotTransport.DisableKeepAlives = true
defer oneShotTransport.CloseIdleConnections()
oneShotClient := &http.Client{
return &http.Client{
Transport: oneShotTransport,
Timeout: c.httpClient.Timeout,
CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
return http.ErrUseLastResponse
},
}, oneShotTransport, nil
}
// mutatingGet performs a firmware-required state-changing GET exactly once at
// the HTTP transport layer, unmarshaling the response into result. A fresh
// connection prevents net/http from automatically replaying the request
// after an ambiguous failure on a reused connection.
func (c *Client) mutatingGet(endpoint string, result interface{}) error {
oneShotClient, oneShotTransport, err := c.newOneShotHTTPClient()
if err != nil {
return err
}
defer oneShotTransport.CloseIdleConnections()
return c.getWithHTTPClient(oneShotClient, endpoint, result)
}
@@ -1343,29 +1355,12 @@ func (c *Client) mutatingGet(endpoint string, result interface{}) error {
// body to unmarshal -- confirmation instead comes from the device echoing
// back <status>{endpoint}</status>.
func (c *Client) mutatingGetConfirmStatus(endpoint string) error {
baseTransport := c.httpClient.Transport
if baseTransport == nil {
baseTransport = http.DefaultTransport
oneShotClient, oneShotTransport, err := c.newOneShotHTTPClient()
if err != nil {
return err
}
transport, ok := baseTransport.(*http.Transport)
if !ok {
return errors.New("state-changing GET requires a cloneable HTTP transport")
}
oneShotTransport := transport.Clone()
oneShotTransport.DisableKeepAlives = true
defer oneShotTransport.CloseIdleConnections()
oneShotClient := &http.Client{
Transport: oneShotTransport,
Timeout: c.httpClient.Timeout,
CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
return http.ErrUseLastResponse
},
}
req, err := http.NewRequest(http.MethodGet, c.baseURL+endpoint, nil)
if err != nil {
return fmt.Errorf("failed to create request: %w", err)