refactor(client): add baseURL and httpClient to client ID extraction

Author: hellsontime

client.go

@@ -20,11 +20,15 @@ type Client struct {
 // NewClient creates a new SoundCloud client by extracting a client_id
 // from the SoundCloud website.
 func NewClient() (*Client, error) {
+	return newClient("https://soundcloud.com", &http.Client{})
+}
+
+func newClient(baseURL string, httpClient *http.Client) (*Client, error) {
 	c := &Client{
-		httpClient: &http.Client{},
+		httpClient: httpClient,
 	}
 
-	clientID, err := c.extractClientID()
+	clientID, err := c.extractClientIDFrom(baseURL)
 	if err != nil {
 		return nil, fmt.Errorf("extract client_id: %w", err)
 	}
@@ -61,9 +65,13 @@ var (
 )
 
 func (c *Client) extractClientID() (string, error) {
-	body, err := c.get("https://soundcloud.com")
+	return c.extractClientIDFrom("https://soundcloud.com")
+}
+
+func (c *Client) extractClientIDFrom(baseURL string) (string, error) {
+	body, err := c.get(baseURL)
 	if err != nil {
-		return "", fmt.Errorf("fetch soundcloud.com: %w", err)
+		return "", fmt.Errorf("fetch %s: %w", baseURL, err)
 	}
 
 	matches := assetRe.FindAllSubmatch(body, -1)

download.go

@@ -33,14 +33,7 @@ func (c *Client) Download(track *Track, outputDir string, progress func(download
 		return "", fmt.Errorf("parse M3U8: %w", err)
 	}
 
-	countUint := mpl.Count()
-	// Check for integer overflow before converting uint to int
-	// Max int value on this architecture
-	const maxInt = int(^uint(0) >> 1)
-	if countUint > uint(maxInt) {
-		return "", fmt.Errorf("playlist too large to handle")
-	}
-	count := int(countUint)
+	count := int(mpl.Count())
 	if count == 0 {
 		return "", fmt.Errorf("no segments in playlist")
 	}
@@ -127,10 +120,7 @@ func (c *Client) parseM3U8(m3u8URL string) (*m3u8.MediaPlaylist, error) {
 	}
 
 	mpl := playlist.(*m3u8.MediaPlaylist)
-	base, err := url.Parse(m3u8URL)
-	if err != nil {
-		return nil, err
-	}
+	base, _ := url.Parse(m3u8URL)
 
 	if mpl.Key != nil && mpl.Key.URI != "" {
 		mpl.Key.URI, err = resolveURI(base, mpl.Key.URI)

stream.go

@@ -47,7 +47,7 @@ func parseHLSURL(hlsURL string) (trackID, streamToken string, err error) {
 
 	// Find the part containing "soundcloud:tracks:"
 	for i, part := range parts {
-		if strings.HasPrefix(part, "soundcloud:tracks:") {
+		if strings.HasPrefix(part, "soundcloud:tracks") {
 			idParts := strings.Split(part, ":")
 			if len(idParts) < 3 {
 				return "", "", fmt.Errorf("invalid track ID format in URL")