Repository: yt-dlp/yt-dlp

Issue:
[17Live] VOD download
### Checklist

- [x] I'm requesting a site-specific feature
- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
- [x] I've checked that all provided URLs are playable in a browser with the same IP and same login details
- [x] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
- [x] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required

### Region

Japan

### Example URLs

https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068

### Provide a description that is worded well enough to be understood

17Live livestream and clip (?) were already currently supported.

I was wondering if we can add support for VODs too.

### Provide verbose output that clearly demonstrates the problem

- [x] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
- [x] If using API, add `'verbose': True` to `YoutubeDL` params instead
- [x] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below

### Complete Verbose Output

```shell
>yt-dlp -Uv --ignore-config "https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068"
[debug] Command-line config: ['-Uv', '--ignore-config', 'https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068']
[debug] Encodings: locale cp1252, fs utf-8, pref cp1252, out utf-8, error utf-8, screen utf-8
[debug] yt-dlp version master@2025.03.07.211453 from yt-dlp/yt-dlp-master-builds [05c8023a2] (win_exe)
[debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.19045-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
[debug] exe versions: ffmpeg 7.0-full_build-www.gyan.dev (setts), ffprobe 7.0-full_build-www.gyan.dev, phantomjs 2.1.1, rtmpdump 2.3
[debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2025.01.31, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.3.0, websockets-15.0.1
[debug] Proxy map: {'http': 'http://127.0.0.1:7890', 'https': 'http://127.0.0.1:7890', 'ftp': 'http://127.0.0.1:7890'}
[debug] Request Handlers: urllib, requests, websockets, curl_cffi
[debug] Extractor Plugins: RadikoLiveIE, RadikoSearchIE, RadikoShareIE, RadikoStationButtonIE, RadikoTimeFreeIE
[debug] Plugin directories: C:\Users\ikena\AppData\Roaming\yt-dlp\plugins\yt_dlp_rajiko-1.1-py3-none-any.whl\yt_dlp_plugins
[debug] Loaded 1849 extractors
[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-master-builds/releases/latest
Latest version: master@2025.03.07.211453 from yt-dlp/yt-dlp-master-builds
yt-dlp is up to date (master@2025.03.07.211453 from yt-dlp/yt-dlp-master-builds)
[generic] Extracting URL: https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068
[generic] 2cf84520-e65e-4b22-891e-1d3a00b0f068: Downloading webpage
WARNING: [generic] Falling back on generic information extractor
[generic] 2cf84520-e65e-4b22-891e-1d3a00b0f068: Extracting information
[debug] Looking for embeds
ERROR: Unsupported URL: https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068
Traceback (most recent call last):
  File "yt_dlp\YoutubeDL.py", line 1651, in wrapper
  File "yt_dlp\YoutubeDL.py", line 1786, in __extract_info
  File "yt_dlp\extractor\common.py", line 747, in extract
  File "yt_dlp\extractor\generic.py", line 2566, in _real_extract
yt_dlp.utils.UnsupportedError: Unsupported URL: https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068
```

Discussion:

Solution patch:
diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py
index c56ec9df6..28d410fa8 100644
--- a/yt_dlp/extractor/_extractors.py
+++ b/yt_dlp/extractor/_extractors.py
@@ -839,6 +839,7 @@
 from .ichinanalive import (
     IchinanaLiveClipIE,
     IchinanaLiveIE,
+    IchinanaLiveVODIE,
 )
 from .idolplus import IdolPlusIE
 from .ign import (
@@ -2392,6 +2393,12 @@
     VoxMediaIE,
     VoxMediaVolumeIE,
 )
+from .vrsquare import (
+    VrSquareChannelIE,
+    VrSquareIE,
+    VrSquareSearchIE,
+    VrSquareSectionIE,
+)
 from .vrt import (
     VRTIE,
     DagelijkseKostIE,
diff --git a/yt_dlp/extractor/generic.py b/yt_dlp/extractor/generic.py
index 67c224e50..c144069b3 100644
--- a/yt_dlp/extractor/generic.py
+++ b/yt_dlp/extractor/generic.py
@@ -16,6 +16,7 @@
     MEDIA_EXTENSIONS,
     ExtractorError,
     UnsupportedError,
+    base_url,
     determine_ext,
     determine_protocol,
     dict_get,
@@ -2531,7 +2532,7 @@ def _real_extract(self, url):
             elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag):
                 info_dict['formats'], info_dict['subtitles'] = self._parse_mpd_formats_and_subtitles(
                     doc,
-                    mpd_base_url=full_response.url.rpartition('/')[0],
+                    mpd_base_url=base_url(full_response.url),
                     mpd_url=url)
                 info_dict['live_status'] = 'is_live' if doc.get('type') == 'dynamic' else None
                 self._extra_manifest_info(info_dict, url)
diff --git a/yt_dlp/extractor/ichinanalive.py b/yt_dlp/extractor/ichinanalive.py
index a37cfe77b..475d33593 100644
--- a/yt_dlp/extractor/ichinanalive.py
+++ b/yt_dlp/extractor/ichinanalive.py
@@ -1,5 +1,13 @@
+
 from .common import InfoExtractor
-from ..utils import ExtractorError, str_or_none, traverse_obj, unified_strdate
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    str_or_none,
+    traverse_obj,
+    unified_strdate,
+    url_or_none,
+)
 
 
 class IchinanaLiveIE(InfoExtractor):
@@ -157,3 +165,51 @@ def _real_extract(self, url):
             'description': view_data.get('caption'),
             'upload_date': unified_strdate(str_or_none(view_data.get('createdAt'))),
         }
+
+
+class IchinanaLiveVODIE(InfoExtractor):
+    IE_NAME = '17live:vod'
+    _VALID_URL = r'https?://(?:www\.)?17\.live/ja/vod/[^/?#]+/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068',
+        'md5': '3299b930d7457b069639486998a89580',
+        'info_dict': {
+            'id': '2cf84520-e65e-4b22-891e-1d3a00b0f068',
+            'ext': 'mp4',
+            'title': 'md5:b5f8cbf497d54cc6a60eb3b480182f01',
+            'uploader': 'md5:29fb12122ab94b5a8495586e7c3085a5',
+            'uploader_id': '27323042',
+            'channel': '🌟オールナイトニッポン アーカイブ🌟',
+            'channel_id': '2b4f85f1-d61e-429d-a901-68d32bdd8645',
+            'like_count': int,
+            'view_count': int,
+            'thumbnail': r're:https?://.+/.+\.(?:jpe?g|png)',
+            'duration': 549,
+            'description': 'md5:116f326579700f00eaaf5581aae1192e',
+            'timestamp': 1741058645,
+            'upload_date': '20250304',
+        },
+    }, {
+        'url': 'https://17.live/ja/vod/27323042/0de11bac-9bea-40b8-9eab-0239a7d88079',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        json_data = self._download_json(f'https://wap-api.17app.co/api/v1/vods/{video_id}', video_id)
+
+        return traverse_obj(json_data, {
+            'id': ('vodID', {str}),
+            'title': ('title', {str}),
+            'formats': ('vodURL', {lambda x: self._extract_m3u8_formats(x, video_id)}),
+            'uploader': ('userInfo', 'displayName', {str}),
+            'uploader_id': ('userInfo', 'roomID', {int}, {str_or_none}),
+            'channel': ('userInfo', 'name', {str}),
+            'channel_id': ('userInfo', 'userID', {str}),
+            'like_count': ('likeCount', {int_or_none}),
+            'view_count': ('viewCount', {int_or_none}),
+            'thumbnail': ('imageURL', {url_or_none}),
+            'duration': ('duration', {int_or_none}),
+            'description': ('description', {str}),
+            'timestamp': ('createdAt', {int_or_none}),
+        })
diff --git a/yt_dlp/extractor/vrsquare.py b/yt_dlp/extractor/vrsquare.py
new file mode 100644
index 000000000..9e8740b42
--- /dev/null
+++ b/yt_dlp/extractor/vrsquare.py
@@ -0,0 +1,185 @@
+import itertools
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    extract_attributes,
+    parse_duration,
+    parse_qs,
+)
+from ..utils.traversal import (
+    find_element,
+    find_elements,
+    traverse_obj,
+)
+
+
+class VrSquareIE(InfoExtractor):
+    IE_NAME = 'vrsquare'
+    IE_DESC = 'VR SQUARE'
+
+    _BASE_URL = 'https://livr.jp'
+    _VALID_URL = r'https?://livr\.jp/contents/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://livr.jp/contents/P470896661',
+        'info_dict': {
+            'id': 'P470896661',
+            'ext': 'mp4',
+            'title': 'そこ曲がったら、櫻坂？ ７年間お疲れ様！菅井友香の卒業を祝う会！前半 2022年11月6日放送分',
+            'description': 'md5:523726dc835aa8014dfe1e2b38d36cd1',
+            'duration': 1515.0,
+            'tags': 'count:2',
+            'thumbnail': r're:https?://media\.livr\.jp/vod/img/.+\.jpg',
+        },
+    }, {
+        'url': 'https://livr.jp/contents/P589523973',
+        'info_dict': {
+            'id': 'P589523973',
+            'ext': 'mp4',
+            'title': '薄闇に仰ぐ しだれ桜の妖艶',
+            'description': 'md5:a042f517b2cbb4ed6746707afec4d306',
+            'duration': 1084.0,
+            'tags': list,
+            'thumbnail': r're:https?://media\.livr\.jp/vod/img/.+\.jpg',
+        },
+        'skip': 'Paid video',
+    }, {
+        'url': 'https://livr.jp/contents/P316939908',
+        'info_dict': {
+            'id': 'P316939908',
+            'ext': 'mp4',
+            'title': '2024年5月16日（木） 「今日は誰に恋をする？」公演 小栗有以 生誕祭',
+            'description': 'md5:2110bdcf947f28bd7d06ec420e51b619',
+            'duration': 8559.0,
+            'tags': list,
+            'thumbnail': r're:https?://media\.livr\.jp/vod/img/.+\.jpg',
+        },
+        'skip': 'Premium channel subscribers only',
+    }, {
+        # Accessible only in the VR SQUARE app
+        'url': 'https://livr.jp/contents/P126481458',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        status = self._download_json(
+            f'{self._BASE_URL}/webApi/contentsStatus/{video_id}',
+            video_id, 'Checking contents status', fatal=False)
+        if traverse_obj(status, 'result_code') == '40407':
+            self.raise_login_required('Unable to access this video')
+
+        try:
+            web_api = self._download_json(
+                f'{self._BASE_URL}/webApi/play/url/{video_id}', video_id)
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 500:
+                raise ExtractorError('VR SQUARE app-only videos are not supported', expected=True)
+            raise
+
+        return {
+            'id': video_id,
+            'title': self._html_search_meta(['og:title', 'twitter:title'], webpage),
+            'description': self._html_search_meta('description', webpage),
+            'formats': self._extract_m3u8_formats(traverse_obj(web_api, (
+                'urls', ..., 'url', any)), video_id, 'mp4', fatal=False),
+            'thumbnail': self._html_search_meta('og:image', webpage),
+            **traverse_obj(webpage, {
+                'duration': ({find_element(cls='layout-product-data-time')}, {parse_duration}),
+                'tags': ({find_elements(cls='search-tag')}, ..., {clean_html}),
+            }),
+        }
+
+
+class VrSquarePlaylistBaseIE(InfoExtractor):
+    _BASE_URL = 'https://livr.jp'
+
+    def _fetch_vids(self, source, keys=()):
+        for url_path in traverse_obj(source, (
+            *keys, {find_elements(cls='video', html=True)}, ...,
+            {extract_attributes}, 'data-url', {str}, filter),
+        ):
+            yield self.url_result(
+                f'{self._BASE_URL}/contents/{url_path.removeprefix("/contents/")}', VrSquareIE)
+
+    def _entries(self, path, display_id, query=None):
+        for page in itertools.count(1):
+            ajax = self._download_json(
+                f'{self._BASE_URL}{path}', display_id,
+                f'Downloading playlist JSON page {page}',
+                query={'p': page, **(query or {})})
+            yield from self._fetch_vids(ajax, ('contents_render_list', ...))
+            if not traverse_obj(ajax, (('has_next', 'hasNext'), {bool}, any)):
+                break
+
+
+class VrSquareChannelIE(VrSquarePlaylistBaseIE):
+    IE_NAME = 'vrsquare:channel'
+
+    _VALID_URL = r'https?://livr\.jp/channel/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://livr.jp/channel/H372648599',
+        'info_dict': {
+            'id': 'H372648599',
+            'title': 'AKB48＋チャンネル',
+        },
+        'playlist_mincount': 502,
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+
+        return self.playlist_result(
+            self._entries(f'/ajax/channel/{playlist_id}', playlist_id),
+            playlist_id, self._html_search_meta('og:title', webpage))
+
+
+class VrSquareSearchIE(VrSquarePlaylistBaseIE):
+    IE_NAME = 'vrsquare:search'
+
+    _VALID_URL = r'https?://livr\.jp/web-search/?\?(?:[^#]+&)?w=[^#]+'
+    _TESTS = [{
+        'url': 'https://livr.jp/web-search?w=%23%E5%B0%8F%E6%A0%97%E6%9C%89%E4%BB%A5',
+        'info_dict': {
+            'id': '#小栗有以',
+        },
+        'playlist_mincount': 60,
+    }]
+
+    def _real_extract(self, url):
+        search_query = parse_qs(url)['w'][0]
+
+        return self.playlist_result(
+            self._entries('/ajax/web-search', search_query, {'w': search_query}), search_query)
+
+
+class VrSquareSectionIE(VrSquarePlaylistBaseIE):
+    IE_NAME = 'vrsquare:section'
+
+    _VALID_URL = r'https?://livr\.jp/(?:category|headline)/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://livr.jp/category/C133936275',
+        'info_dict': {
+            'id': 'C133936275',
+            'title': 'そこ曲がったら、櫻坂？VR',
+        },
+        'playlist_mincount': 308,
+    }, {
+        'url': 'https://livr.jp/headline/A296449604',
+        'info_dict': {
+            'id': 'A296449604',
+            'title': 'AKB48 アフターVR',
+        },
+        'playlist_mincount': 22,
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+
+        return self.playlist_result(
+            self._fetch_vids(webpage), playlist_id, self._html_search_meta('og:title', webpage))
diff --git a/yt_dlp/extractor/youtube/_video.py b/yt_dlp/extractor/youtube/_video.py
index c773ba2f1..b8cc72ab1 100644
--- a/yt_dlp/extractor/youtube/_video.py
+++ b/yt_dlp/extractor/youtube/_video.py
@@ -2176,10 +2176,13 @@ def _extract_player_js_global_var(self, jscode):
         """Returns tuple of strings: variable assignment code, variable name, variable value code"""
         return self._search_regex(
             r'''(?x)
-                \'use\s+strict\';\s*
+                (?P<q1>["\'])use\s+strict(?P=q1);\s*
                 (?P<code>
                     var\s+(?P<name>[a-zA-Z0-9_$]+)\s*=\s*
-                    (?P<value>"(?:[^"\\]|\\.)+"\.split\("[^"]+"\))
+                    (?P<value>
+                        (?P<q2>["\'])(?:(?!(?P=q2)).|\\.)+(?P=q2)
+                        \.split\((?P<q3>["\'])(?:(?!(?P=q3)).)+(?P=q3)\)
+                    )
                 )[;,]
             ''', jscode, 'global variable', group=('code', 'name', 'value'), default=(None, None, None))
 
@@ -2187,7 +2190,7 @@ def _fixup_n_function_code(self, argnames, code, full_code):
         global_var, varname, _ = self._extract_player_js_global_var(full_code)
         if global_var:
             self.write_debug(f'Prepending n function code with global array variable "{varname}"')
-            code = global_var + ', ' + code
+            code = global_var + '; ' + code
         else:
             self.write_debug('No global array variable found in player JS')
         return argnames, re.sub(
@@ -2196,7 +2199,7 @@ def _fixup_n_function_code(self, argnames, code, full_code):
 
     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.21')
+        func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.03.24')
         jscode = func_code or self._load_player(video_id, player_url)
         jsi = JSInterpreter(jscode)
 
diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py
index 0140acaa3..24525560e 100644
--- a/yt_dlp/utils/_utils.py
+++ b/yt_dlp/utils/_utils.py
@@ -2767,7 +2767,8 @@ def process_escape(match):
     def template_substitute(match):
         evaluated = js_to_json(match.group(1), vars, strict=strict)
         if evaluated[0] == '"':
-            return json.loads(evaluated)
+            with contextlib.suppress(json.JSONDecodeError):
+                return json.loads(evaluated)
         return evaluated
 
     def fix_kv(m):


Test patch:
diff --git a/test/test_utils.py b/test/test_utils.py
index 42dc7f937..e60ceed8f 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1260,6 +1260,7 @@ def test_js_to_json_edgecases(self):
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
+        self.assertEqual(js_to_json('{a: `${e("")}`}'), '{"a": "\\"e\\"(\\"\\")"}')
 
     def test_js_to_json_template_literal(self):
         self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 45dc9113b..453caacd6 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -83,6 +83,11 @@
         '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
         'AAOAOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7vgpDL0QwbdV06sCIEzpWqMGkFR20CFOS21Tp-7vj_EMu-m37KtXJoOy1',
     ),
+    (
+        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
+        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+    ),
 ]
 
 _NSIG_TESTS = [
@@ -234,6 +239,10 @@
         'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
         'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
     ),
+    (
+        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
+        'eWYu5d5YeY_4LyEDc', 'XJQqf-N7Xra3gg',
+    ),
 ]