teernisse
4310375dc9
Refactor the internal HTTP helper from get() returning raw bytes to getAndDecode() that streams directly into the target struct via json.NewDecoder. This eliminates the intermediate []byte allocation from io.ReadAll on every API response. The new decoder also validates that responses contain exactly one JSON value by attempting a second Decode after the primary one — any content beyond the first value (e.g., concatenated objects from a misbehaving proxy) returns an error instead of silently discarding it. Changes: - api/client.go: Replace get() with getAndDecode(), update FetchStores and FetchSavings callers to use the new signature - api/client_test.go: Add TestFetchSavings_TrailingJSONIsRejected and TestFetchStores_MalformedJSONReturnsDecodeError covering the new decoder error paths Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
117 lines
3.2 KiB
Go
117 lines
3.2 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
defaultSavingsAPI = "https://services.publix.com/api/v4/savings"
|
|
defaultStoreAPI = "https://services.publix.com/api/v1/storelocation"
|
|
userAgent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36"
|
|
)
|
|
|
|
// Client is an HTTP client for the Publix API.
|
|
type Client struct {
|
|
httpClient *http.Client
|
|
savingsURL string
|
|
storeURL string
|
|
}
|
|
|
|
// NewClient creates a new Publix API client.
|
|
func NewClient() *Client {
|
|
return &Client{
|
|
httpClient: &http.Client{Timeout: 15 * time.Second},
|
|
savingsURL: defaultSavingsAPI,
|
|
storeURL: defaultStoreAPI,
|
|
}
|
|
}
|
|
|
|
// NewClientWithBaseURLs creates a client with custom base URLs (for testing).
|
|
func NewClientWithBaseURLs(savingsURL, storeURL string) *Client {
|
|
return &Client{
|
|
httpClient: &http.Client{Timeout: 15 * time.Second},
|
|
savingsURL: savingsURL,
|
|
storeURL: storeURL,
|
|
}
|
|
}
|
|
|
|
func (c *Client) getAndDecode(ctx context.Context, reqURL, storeNumber string, out any) error {
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("creating request: %w", err)
|
|
}
|
|
|
|
req.Header.Set("Accept", "application/json")
|
|
req.Header.Set("User-Agent", userAgent)
|
|
if storeNumber != "" {
|
|
req.Header.Set("PublixStore", storeNumber)
|
|
}
|
|
|
|
resp, err := c.httpClient.Do(req)
|
|
if err != nil {
|
|
return fmt.Errorf("executing request: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return fmt.Errorf("unexpected status %d from %s", resp.StatusCode, reqURL)
|
|
}
|
|
|
|
dec := json.NewDecoder(resp.Body)
|
|
if err := dec.Decode(out); err != nil {
|
|
return fmt.Errorf("decoding response: %w", err)
|
|
}
|
|
if err := dec.Decode(new(struct{})); !errors.Is(err, io.EOF) {
|
|
return fmt.Errorf("decoding response: trailing JSON content")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// FetchStores finds Publix stores near the given zip code.
|
|
func (c *Client) FetchStores(ctx context.Context, zipCode string, count int) ([]Store, error) {
|
|
params := url.Values{
|
|
"types": {"R,G,H,N,S"},
|
|
"option": {""},
|
|
"count": {fmt.Sprintf("%d", count)},
|
|
"includeOpenAndCloseDates": {"true"},
|
|
"zipCode": {zipCode},
|
|
}
|
|
|
|
var resp StoreResponse
|
|
if err := c.getAndDecode(ctx, c.storeURL+"?"+params.Encode(), "", &resp); err != nil {
|
|
return nil, fmt.Errorf("fetching stores: %w", err)
|
|
}
|
|
return resp.Stores, nil
|
|
}
|
|
|
|
// FetchSavings fetches all weekly ad savings for the given store.
|
|
func (c *Client) FetchSavings(ctx context.Context, storeNumber string) (*SavingsResponse, error) {
|
|
params := url.Values{
|
|
"page": {"1"},
|
|
"pageSize": {"0"},
|
|
"includePersonalizedDeals": {"false"},
|
|
"languageID": {"1"},
|
|
"isWeb": {"true"},
|
|
"getSavingType": {"WeeklyAd"},
|
|
}
|
|
|
|
var resp SavingsResponse
|
|
if err := c.getAndDecode(ctx, c.savingsURL+"?"+params.Encode(), storeNumber, &resp); err != nil {
|
|
return nil, fmt.Errorf("fetching savings: %w", err)
|
|
}
|
|
return &resp, nil
|
|
}
|
|
|
|
// StoreNumber returns the numeric portion of a store key (strips leading zeros).
|
|
func StoreNumber(key string) string {
|
|
return strings.TrimLeft(key, "0")
|
|
}
|