From ecee97b4fa90d51c48f9154c3a6d5a8ffe46cd5c Mon Sep 17 00:00:00 2001 From: sepro Date: Wed, 26 Mar 2025 00:47:45 +0100 Subject: [PATCH] [ie/youtube] Only cache nsig code on successful decoding (#12750) Authored by: seproDev, bashonly Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com> --- yt_dlp/extractor/youtube/_video.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/yt_dlp/extractor/youtube/_video.py b/yt_dlp/extractor/youtube/_video.py index 16e9a3eed..e349b3651 100644 --- a/yt_dlp/extractor/youtube/_video.py +++ b/yt_dlp/extractor/youtube/_video.py @@ -2087,6 +2087,24 @@ class YoutubeIE(YoutubeBaseInfoExtractor): return ret return inner + def _load_nsig_code_from_cache(self, player_id): + cache_id = ('nsig code', player_id) + + if func_code := self._player_cache.get(cache_id): + return func_code + + func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.03.26') + if func_code: + self._player_cache[cache_id] = func_code + + return func_code + + def _store_nsig_code_to_cache(self, player_id, func_code): + cache_id = ('nsig code', player_id) + if cache_id not in self._player_cache: + self.cache.store('youtube-nsig', player_id, func_code) + self._player_cache[cache_id] = func_code + def _decrypt_signature(self, s, video_id, player_url): """Turn the encrypted s field into a working signature""" extract_sig = self._cached( @@ -2127,6 +2145,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor): video_id=video_id, note='Executing signature code').strip() self.write_debug(f'Decrypted nsig {s} => {ret}') + # Only cache nsig func JS code to disk if successful, and only once + self._store_nsig_code_to_cache(player_id, func_code) return ret def _extract_n_function_name(self, jscode, player_url=None): @@ -2200,7 +2220,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): def _extract_n_function_code(self, video_id, player_url): player_id = self._extract_player_info(player_url) - func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.03.26') + func_code = self._load_nsig_code_from_cache(player_id) jscode = func_code or self._load_player(video_id, player_url) jsi = JSInterpreter(jscode) @@ -2212,7 +2232,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor): # XXX: Workaround for the global array variable and lack of `typeof` implementation func_code = self._fixup_n_function_code(*jsi.extract_function_code(func_name), jscode) - self.cache.store('youtube-nsig', player_id, func_code) return jsi, player_id, func_code def _extract_n_function_from_code(self, jsi, func_code):