Skip to content
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

cache visitor ID on first use #738

Merged
merged 1 commit into from
Feb 4, 2025
Merged

cache visitor ID on first use #738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 13 additions & 20 deletions ytmusicapi/ytmusic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import time
from collections.abc import Iterator
from contextlib import contextmanager, suppress
from functools import partial
from functools import cached_property, partial
from pathlib import Path
from typing import Optional, Union

Expand All @@ -15,14 +15,13 @@
from ytmusicapi.helpers import (
SUPPORTED_LANGUAGES,
SUPPORTED_LOCATIONS,
USER_AGENT,
YTM_BASE_API,
YTM_DOMAIN,
YTM_PARAMS,
YTM_PARAMS_KEY,
get_authorization,
get_visitor_id,
initialize_context,
initialize_headers,
sapisid_from_cookie,
)
from ytmusicapi.mixins.browsing import BrowsingMixin
Expand Down Expand Up @@ -150,29 +149,23 @@ def __init__(
except KeyError:
raise YTMusicUserError("Your cookie is missing the required value __Secure-3PAPISID")

@property
@cached_property
def base_headers(self) -> CaseInsensitiveDict:
if self.auth_type == AuthType.BROWSER or self.auth_type == AuthType.OAUTH_CUSTOM_FULL:
return self._auth_headers

return CaseInsensitiveDict(
{
"user-agent": USER_AGENT,
"accept": "*/*",
"accept-encoding": "gzip, deflate",
"content-type": "application/json",
"content-encoding": "gzip",
"origin": YTM_DOMAIN,
}
headers = (
self._auth_headers
if self.auth_type == AuthType.BROWSER or self.auth_type == AuthType.OAUTH_CUSTOM_FULL
else initialize_headers()
)

if "X-Goog-Visitor-Id" not in headers:
headers.update(get_visitor_id(partial(self._send_get_request, use_base_headers=True)))

return headers

@property
def headers(self) -> CaseInsensitiveDict:
headers = self.base_headers

if "X-Goog-Visitor-Id" not in headers:
headers.update(get_visitor_id(partial(self._send_get_request, use_base_headers=True)))

# keys updated each use, custom oauth implementations left untouched
if self.auth_type == AuthType.BROWSER:
headers["authorization"] = get_authorization(self.sapisid + " " + self.origin)
Expand Down Expand Up @@ -251,7 +244,7 @@ def _send_get_request(
url,
params=params,
# handle first-use x-goog-visitor-id fetching
headers=self.base_headers if use_base_headers else self.headers,
headers=initialize_headers() if use_base_headers else self.headers,
proxies=self.proxies,
cookies=self.cookies,
)
Expand Down