Skip to content

fix: retry PutConnectState on error, check ContentLength to avoid EOF error #102

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
devgianlu merged 4 commits into from
Sep 29, 2024
Merged

fix: retry PutConnectState on error, check ContentLength to avoid EOF error #102

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
423d091
fix: retry PutConnectState on error, check ContentLength to avoid EOF…
kenny59 Sep 23, 2024
de4cbdc
Merge branch 'devgianlu:master' into fix/spclient_putconnectstate_500
kenny59 Sep 23, 2024
9fa5ad9
Merge branch 'devgianlu:master' into fix/spclient_putconnectstate_500
kenny59 Sep 28, 2024
b01b41f
fix: remove redundant check for ContentLength <= 0 and revert log mes…
kenny59 Sep 29, 2024
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
56 changes: 31 additions & 25 deletions spclient/spclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"net/http"
"net/url"
"strconv"
"time"

"github.com/cenkalti/backoff/v4"
librespot "github.com/devgianlu/go-librespot"
Expand Down Expand Up @@ -145,34 +146,39 @@ func (c *Spclient) PutConnectState(spotConnId string, reqProto *connectpb.PutSta
if err != nil {
return fmt.Errorf("failed marshalling PutStateRequest: %w", err)
}

resp, err := c.request(
"PUT",
fmt.Sprintf("/connect-state/v1/devices/%s", c.deviceId),
nil,
http.Header{
"X-Spotify-Connection-Id": []string{spotConnId},
"Content-Type": []string{"application/x-protobuf"},
},
reqBody,
)
_, err = backoff.RetryWithData(func() (*http.Response, error) {
resp, err := c.request(
"PUT",
fmt.Sprintf("/connect-state/v1/devices/%s", c.deviceId),
nil,
http.Header{
"X-Spotify-Connection-Id": []string{spotConnId},
"Content-Type": []string{"application/x-protobuf"},
},
reqBody,
)
if err != nil {
return nil, err
}
defer func() { _ = resp.Body.Close() }()

if resp.StatusCode != 200 {
var putError putStateError
if err := json.NewDecoder(resp.Body).Decode(&putError); err != nil {
log.Debugf("failed reading error response %s", err)
return nil, fmt.Errorf("failed reading error response: %w", err)
}
log.Debugf("put state request failed with status %d: %s", resp.StatusCode, putError.Message)
return nil, fmt.Errorf("put state request failed with status %d: %s", resp.StatusCode, putError.Message)
} else {
log.Debugf("put connect state because %s", reqProto.PutStateReason)
return resp, nil
}
}, backoff.WithMaxRetries(backoff.NewConstantBackOff(1*time.Second), 2))
if err != nil {
return err
}

defer func() { _ = resp.Body.Close() }()

if resp.StatusCode != 200 {
var putError putStateError
if err := json.NewDecoder(resp.Body).Decode(&putError); err != nil {
return fmt.Errorf("failed reading error response: %w", err)
}

return fmt.Errorf("put state request failed with status %d: %s", resp.StatusCode, putError.Message)
} else {
log.Debugf("put connect state because %s", reqProto.PutStateReason)
return nil
}
return nil
}

func (c *Spclient) ResolveStorageInteractive(fileId []byte, prefetch bool) (*storagepb.StorageResolveResponse, error) {
Expand Down