From 46730ee8fa2f2d43aebfc13d79a08e45c9823405 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Mon, 1 Aug 2022 19:50:38 +0200 Subject: [PATCH] add player data mapping --- Cargo.toml | 1 + notes/deobf.md | 2 +- notes/player/fetched_streams.txt | 115 +++++++++++ notes/player/fetched_streams_hdr.txt | 180 ++++++++++++++++ notes/video_ids.txt | 4 +- src/client/mod.rs | 33 +-- src/client/player.rs | 297 ++++++++++++++++++++++++++- src/client/response/player.rs | 43 ++-- src/deobfuscate.rs | 59 ++---- src/lib.rs | 1 + src/model/mod.rs | 119 +++++++++++ 11 files changed, 777 insertions(+), 77 deletions(-) create mode 100644 notes/player/fetched_streams.txt create mode 100644 notes/player/fetched_streams_hdr.txt create mode 100644 src/model/mod.rs diff --git a/Cargo.toml b/Cargo.toml index a3ed500..051ac0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,7 @@ serde_with = {version = "2.0.0", features = ["json"] } rand = "0.8.5" async-trait = "0.1.56" chrono = {version = "0.4.19", features = ["serde"]} +trie = "0.2.1" [dev-dependencies] env_logger = "0.9.0" diff --git a/notes/deobf.md b/notes/deobf.md index 4d09331..ed874e3 100644 --- a/notes/deobf.md +++ b/notes/deobf.md @@ -1,6 +1,6 @@ https://rr3---sn-h0jeened.googlevideo.com/videoplayback?expire=1658232063&ei=n0jWYuCAFIz3gAeAx4nIAw&ip=93.235.185.61&id=o-AHnSNPNCkequX39D-ysNUiDKYmbe-a8EplrOAV2LQylr&itag=18&source=youtube&requiressl=yes&mh=a7&mm=31%2C29&mn=sn-h0jeened%2Csn-h0jelnez&ms=au%2Crdu&mv=m&mvi=3&pl=26&initcwndbps=1416250&spc=lT-KhsYr92Phls7wH9GQiLWRR-MGnTE&vprv=1&mime=video%2Fmp4&ns=AMUzTf9OiCSKRVVVRqr1VqMH&gir=yes&clen=17923723&ratebypass=yes&dur=208.027&lmt=1641514704547595&mt=1658209972&fvip=4&fexp=24001373%2C24007246&beids=23886220&c=WEB&txp=4538322&n=BI_n4PxQ22is-KKajKUW&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cmime%2Cns%2Cgir%2Cclen%2Cratebypass%2Cdur%2Clmt&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&lsig=AG3C_xAwRgIhAOxJLTqKCFUwInEHtxtsH13V0i_fDws_vgCuilecqHa6AiEAhHMFv4WqPrFNZvxsBx3ee5GdVw_7_hMu0yebsClRfw8%3D&sig=AOq0QJ8wRAIgaryQHmplJ9xJSKFywyaSMHuuwZYsoMTfvRviG51qIGECIA5061zWeyfMPX9hEl_U6f9J0tr7GTJMKyPf5XNrJb5f&cpn=uGaaNCVq9tAJ9K8j -# Signature `(? => sig)` +# Signature `(s => sig)` deobfuscationFunctionName = Rva functionPattern = (Rva=function\([a-zA-Z0-9_]+\)\{.+?\}) diff --git a/notes/player/fetched_streams.txt b/notes/player/fetched_streams.txt new file mode 100644 index 0000000..86d455a --- /dev/null +++ b/notes/player/fetched_streams.txt @@ -0,0 +1,115 @@ +Desktop: +Formats: +[18] 360p @ 659 kb/s video/mp4; codecs="avc1.42001E, mp4a.40.2" +Adaptive Formats: +[313] 2160p @ 18091 kb/s video/webm; codecs="vp9" +[401] 2160p @ 16856 kb/s video/mp4; codecs="av01.0.12M.08" +[271] 1440p @ 9135 kb/s video/webm; codecs="vp9" +[400] 1440p @ 8400 kb/s video/mp4; codecs="av01.0.12M.08" +[137] 1080p @ 4347 kb/s video/mp4; codecs="avc1.640028" +[248] 1080p @ 3397 kb/s video/webm; codecs="vp9" +[399] 1080p @ 2593 kb/s video/mp4; codecs="av01.0.08M.08" +[136] 720p @ 2318 kb/s video/mp4; codecs="avc1.4d401f" +[247] 720p @ 1958 kb/s video/webm; codecs="vp9" +[398] 720p @ 1430 kb/s video/mp4; codecs="av01.0.05M.08" +[135] 480p @ 1159 kb/s video/mp4; codecs="avc1.4d401e" +[244] 480p @ 1006 kb/s video/webm; codecs="vp9" +[397] 480p @ 711 kb/s video/mp4; codecs="av01.0.04M.08" +[134] 360p @ 634 kb/s video/mp4; codecs="avc1.4d401e" +[243] 360p @ 497 kb/s video/webm; codecs="vp9" +[396] 360p @ 386 kb/s video/mp4; codecs="av01.0.01M.08" +[133] 240p @ 246 kb/s video/mp4; codecs="avc1.4d4015" +[242] 240p @ 229 kb/s video/webm; codecs="vp9" +[395] 240p @ 176 kb/s video/mp4; codecs="av01.0.00M.08" +[160] 144p @ 112 kb/s video/mp4; codecs="avc1.4d400c" +[278] 144p @ 99 kb/s video/webm; codecs="vp9" +[394] 144p @ 83 kb/s video/mp4; codecs="av01.0.00M.08" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" +[249] @ 65 kb/s audio/webm; codecs="opus" +[250] @ 83 kb/s audio/webm; codecs="opus" +[251] @ 157 kb/s audio/webm; codecs="opus" + +Android: +Formats: +[17] 144p @ 73 kb/s video/3gpp; codecs="mp4v.20.3, mp4a.40.2" +[18] 360p @ 659 kb/s video/mp4; codecs="avc1.42001E, mp4a.40.2" +[22] 720p @ 1597 kb/s video/mp4; codecs="avc1.64001F, mp4a.40.2" +Adaptive Formats: +[313] 2160p @ 18091 kb/s video/webm; codecs="vp9" +[401] 2160p @ 16856 kb/s video/mp4; codecs="av01.0.12M.08" +[271] 1440p @ 9135 kb/s video/webm; codecs="vp9" +[400] 1440p @ 8400 kb/s video/mp4; codecs="av01.0.12M.08" +[137] 1080p @ 4347 kb/s video/mp4; codecs="avc1.640028" +[248] 1080p @ 3397 kb/s video/webm; codecs="vp9" +[399] 1080p @ 2593 kb/s video/mp4; codecs="av01.0.08M.08" +[136] 720p @ 2318 kb/s video/mp4; codecs="avc1.4d401f" +[247] 720p @ 1958 kb/s video/webm; codecs="vp9" +[398] 720p @ 1430 kb/s video/mp4; codecs="av01.0.05M.08" +[135] 480p @ 1159 kb/s video/mp4; codecs="avc1.4d401e" +[244] 480p @ 1006 kb/s video/webm; codecs="vp9" +[397] 480p @ 711 kb/s video/mp4; codecs="av01.0.04M.08" +[134] 360p @ 634 kb/s video/mp4; codecs="avc1.4d401e" +[243] 360p @ 497 kb/s video/webm; codecs="vp9" +[396] 360p @ 386 kb/s video/mp4; codecs="av01.0.01M.08" +[133] 240p @ 246 kb/s video/mp4; codecs="avc1.4d4015" +[242] 240p @ 229 kb/s video/webm; codecs="vp9" +[395] 240p @ 176 kb/s video/mp4; codecs="av01.0.00M.08" +[160] 144p @ 112 kb/s video/mp4; codecs="avc1.4d400c" +[278] 144p @ 99 kb/s video/webm; codecs="vp9" +[394] 144p @ 83 kb/s video/mp4; codecs="av01.0.00M.08" +[139] @ 49 kb/s audio/mp4; codecs="mp4a.40.5" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" +[249] @ 65 kb/s audio/webm; codecs="opus" +[250] @ 83 kb/s audio/webm; codecs="opus" +[251] @ 157 kb/s audio/webm; codecs="opus" + +iOS: +Formats: +Adaptive Formats: +[313] 2160p @ 18091 kb/s video/webm; codecs="vp09.00.50.08" +[271] 1440p @ 9135 kb/s video/webm; codecs="vp09.00.50.08" +[137] 1080p @ 4347 kb/s video/mp4; codecs="avc1.640028" +[248] 1080p @ 3397 kb/s video/webm; codecs="vp09.00.40.08" +[136] 720p @ 2318 kb/s video/mp4; codecs="avc1.4D401F" +[247] 720p @ 1958 kb/s video/webm; codecs="vp09.00.31.08" +[135] 480p @ 1159 kb/s video/mp4; codecs="avc1.4D401E" +[244] 480p @ 1006 kb/s video/webm; codecs="vp09.00.30.08" +[134] 360p @ 634 kb/s video/mp4; codecs="avc1.4D401E" +[243] 360p @ 497 kb/s video/webm; codecs="vp09.00.21.08" +[133] 240p @ 246 kb/s video/mp4; codecs="avc1.4D4015" +[242] 240p @ 229 kb/s video/webm; codecs="vp09.00.20.08" +[160] 144p @ 112 kb/s video/mp4; codecs="avc1.4D400C" +[278] 144p @ 99 kb/s video/webm; codecs="vp09.00.11.08" +[139] @ 49 kb/s audio/mp4; codecs="mp4a.40.5" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" + +TVHtml5Embed: +Formats: +[18] 360p @ 659 kb/s video/mp4; codecs="avc1.42001E, mp4a.40.2" +Adaptive Formats: +[313] 2160p @ 18091 kb/s video/webm; codecs="vp9" +[401] 2160p @ 16856 kb/s video/mp4; codecs="av01.0.12M.08" +[271] 1440p @ 9135 kb/s video/webm; codecs="vp9" +[400] 1440p @ 8400 kb/s video/mp4; codecs="av01.0.12M.08" +[137] 1080p @ 4347 kb/s video/mp4; codecs="avc1.640028" +[248] 1080p @ 3397 kb/s video/webm; codecs="vp9" +[399] 1080p @ 2593 kb/s video/mp4; codecs="av01.0.08M.08" +[136] 720p @ 2318 kb/s video/mp4; codecs="avc1.4d401f" +[247] 720p @ 1958 kb/s video/webm; codecs="vp9" +[398] 720p @ 1430 kb/s video/mp4; codecs="av01.0.05M.08" +[135] 480p @ 1159 kb/s video/mp4; codecs="avc1.4d401e" +[244] 480p @ 1006 kb/s video/webm; codecs="vp9" +[397] 480p @ 711 kb/s video/mp4; codecs="av01.0.04M.08" +[134] 360p @ 634 kb/s video/mp4; codecs="avc1.4d401e" +[243] 360p @ 497 kb/s video/webm; codecs="vp9" +[396] 360p @ 386 kb/s video/mp4; codecs="av01.0.01M.08" +[133] 240p @ 246 kb/s video/mp4; codecs="avc1.4d4015" +[242] 240p @ 229 kb/s video/webm; codecs="vp9" +[395] 240p @ 176 kb/s video/mp4; codecs="av01.0.00M.08" +[160] 144p @ 112 kb/s video/mp4; codecs="avc1.4d400c" +[278] 144p @ 99 kb/s video/webm; codecs="vp9" +[394] 144p @ 83 kb/s video/mp4; codecs="av01.0.00M.08" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" +[249] @ 65 kb/s audio/webm; codecs="opus" +[250] @ 83 kb/s audio/webm; codecs="opus" +[251] @ 157 kb/s audio/webm; codecs="opus" diff --git a/notes/player/fetched_streams_hdr.txt b/notes/player/fetched_streams_hdr.txt new file mode 100644 index 0000000..98bf488 --- /dev/null +++ b/notes/player/fetched_streams_hdr.txt @@ -0,0 +1,180 @@ +Desktop: +Formats: +[18] 360p @ 600 kb/s video/mp4; codecs="avc1.42001E, mp4a.40.2" +[22] 720p @ 2491 kb/s video/mp4; codecs="avc1.64001F, mp4a.40.2" +Adaptive Formats: +[315] 2160p60 @ 26650 kb/s video/webm; codecs="vp9" +[337] 2160p60 HDR @ 30616 kb/s video/webm; codecs="vp9.2" +[401] 2160p60 HDR @ 17186 kb/s video/mp4; codecs="av01.0.13M.10.0.110.09.16.09.0" +[701] 2160p60 HDR @ 32652 kb/s video/mp4; codecs="av01.0.13M.10.0.110.09.16.09.0" +[308] 1440p60 @ 13327 kb/s video/webm; codecs="vp9" +[336] 1440p60 HDR @ 16904 kb/s video/webm; codecs="vp9.2" +[400] 1440p60 HDR @ 8580 kb/s video/mp4; codecs="av01.0.12M.10.0.110.09.16.09.0" +[700] 1440p60 HDR @ 18487 kb/s video/mp4; codecs="av01.0.12M.10.0.110.09.16.09.0" +[299] 1080p60 @ 5794 kb/s video/mp4; codecs="avc1.64002a" +[303] 1080p60 @ 4620 kb/s video/webm; codecs="vp9" +[335] 1080p60 HDR @ 6956 kb/s video/webm; codecs="vp9.2" +[399] 1080p60 HDR @ 3817 kb/s video/mp4; codecs="av01.0.09M.10.0.110.09.16.09.0" +[699] 1080p60 HDR @ 6531 kb/s video/mp4; codecs="av01.0.09M.10.0.110.09.16.09.0" +[136] 720p @ 3220 kb/s video/mp4; codecs="avc1.4d401f" +[247] 720p @ 1668 kb/s video/webm; codecs="vp9" +[298] 720p60 @ 3483 kb/s video/mp4; codecs="avc1.4d4020" +[302] 720p60 @ 2669 kb/s video/webm; codecs="vp9" +[334] 720p60 HDR @ 4529 kb/s video/webm; codecs="vp9.2" +[398] 720p60 HDR @ 2100 kb/s video/mp4; codecs="av01.0.08M.10.0.110.09.16.09.0" +[698] 720p60 HDR @ 3871 kb/s video/mp4; codecs="av01.0.08M.10.0.110.09.16.09.0" +[135] 480p @ 1158 kb/s video/mp4; codecs="avc1.4d401f" +[244] 480p @ 856 kb/s video/webm; codecs="vp9" +[333] 480p60 HDR @ 1989 kb/s video/webm; codecs="vp9.2" +[397] 480p HDR @ 764 kb/s video/mp4; codecs="av01.0.04M.10.0.110.09.16.09.0" +[697] 480p60 HDR @ 1502 kb/s video/mp4; codecs="av01.0.05M.10.0.110.09.16.09.0" +[134] 360p @ 633 kb/s video/mp4; codecs="avc1.4d401e" +[243] 360p @ 433 kb/s video/webm; codecs="vp9" +[332] 360p60 HDR @ 1060 kb/s video/webm; codecs="vp9.2" +[396] 360p HDR @ 407 kb/s video/mp4; codecs="av01.0.01M.10.0.110.09.16.09.0" +[696] 360p60 HDR @ 837 kb/s video/mp4; codecs="av01.0.04M.10.0.110.09.16.09.0" +[133] 240p @ 245 kb/s video/mp4; codecs="avc1.4d4015" +[242] 240p @ 198 kb/s video/webm; codecs="vp9" +[331] 240p60 HDR @ 500 kb/s video/webm; codecs="vp9.2" +[395] 240p HDR @ 192 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[695] 240p60 HDR @ 397 kb/s video/mp4; codecs="av01.0.01M.10.0.110.09.16.09.0" +[160] 144p @ 111 kb/s video/mp4; codecs="avc1.4d400c" +[278] 144p @ 90 kb/s video/webm; codecs="vp9" +[330] 144p60 HDR @ 244 kb/s video/webm; codecs="vp9.2" +[394] 144p HDR @ 88 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[694] 144p60 HDR @ 188 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" +[249] @ 57 kb/s audio/webm; codecs="opus" +[250] @ 75 kb/s audio/webm; codecs="opus" +[251] @ 148 kb/s audio/webm; codecs="opus" + + +Android: +Formats: +[17] 144p @ 74 kb/s video/3gpp; codecs="mp4v.20.3, mp4a.40.2" +[18] 360p @ 600 kb/s video/mp4; codecs="avc1.42001E, mp4a.40.2" +[22] 720p @ 2491 kb/s video/mp4; codecs="avc1.64001F, mp4a.40.2" +Adaptive Formats: +[315] 2160p60 @ 26650 kb/s video/webm; codecs="vp9" +[337] 2160p60 HDR @ 30616 kb/s video/webm; codecs="vp9.2" +[401] 2160p60 HDR @ 17186 kb/s video/mp4; codecs="av01.0.13M.10.0.110.09.16.09.0" +[701] 2160p60 HDR @ 32652 kb/s video/mp4; codecs="av01.0.13M.10.0.110.09.16.09.0" +[308] 1440p60 @ 13327 kb/s video/webm; codecs="vp9" +[336] 1440p60 HDR @ 16904 kb/s video/webm; codecs="vp9.2" +[400] 1440p60 HDR @ 8580 kb/s video/mp4; codecs="av01.0.12M.10.0.110.09.16.09.0" +[700] 1440p60 HDR @ 18487 kb/s video/mp4; codecs="av01.0.12M.10.0.110.09.16.09.0" +[299] 1080p60 @ 5794 kb/s video/mp4; codecs="avc1.64002a" +[303] 1080p60 @ 4620 kb/s video/webm; codecs="vp9" +[335] 1080p60 HDR @ 6956 kb/s video/webm; codecs="vp9.2" +[399] 1080p60 HDR @ 3817 kb/s video/mp4; codecs="av01.0.09M.10.0.110.09.16.09.0" +[699] 1080p60 HDR @ 6531 kb/s video/mp4; codecs="av01.0.09M.10.0.110.09.16.09.0" +[298] 720p60 @ 3483 kb/s video/mp4; codecs="avc1.4d4020" +[302] 720p60 @ 2669 kb/s video/webm; codecs="vp9" +[334] 720p60 HDR @ 4529 kb/s video/webm; codecs="vp9.2" +[398] 720p60 HDR @ 2100 kb/s video/mp4; codecs="av01.0.08M.10.0.110.09.16.09.0" +[698] 720p60 HDR @ 3871 kb/s video/mp4; codecs="av01.0.08M.10.0.110.09.16.09.0" +[135] 480p @ 1158 kb/s video/mp4; codecs="avc1.4d401f" +[244] 480p @ 856 kb/s video/webm; codecs="vp9" +[333] 480p60 HDR @ 1989 kb/s video/webm; codecs="vp9.2" +[397] 480p HDR @ 764 kb/s video/mp4; codecs="av01.0.04M.10.0.110.09.16.09.0" +[697] 480p60 HDR @ 1502 kb/s video/mp4; codecs="av01.0.05M.10.0.110.09.16.09.0" +[134] 360p @ 633 kb/s video/mp4; codecs="avc1.4d401e" +[243] 360p @ 433 kb/s video/webm; codecs="vp9" +[332] 360p60 HDR @ 1060 kb/s video/webm; codecs="vp9.2" +[396] 360p HDR @ 407 kb/s video/mp4; codecs="av01.0.01M.10.0.110.09.16.09.0" +[696] 360p60 HDR @ 837 kb/s video/mp4; codecs="av01.0.04M.10.0.110.09.16.09.0" +[133] 240p @ 245 kb/s video/mp4; codecs="avc1.4d4015" +[242] 240p @ 198 kb/s video/webm; codecs="vp9" +[331] 240p60 HDR @ 500 kb/s video/webm; codecs="vp9.2" +[395] 240p HDR @ 192 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[695] 240p60 HDR @ 397 kb/s video/mp4; codecs="av01.0.01M.10.0.110.09.16.09.0" +[160] 144p @ 111 kb/s video/mp4; codecs="avc1.4d400c" +[278] 144p @ 90 kb/s video/webm; codecs="vp9" +[330] 144p60 HDR @ 244 kb/s video/webm; codecs="vp9.2" +[394] 144p HDR @ 88 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[694] 144p60 HDR @ 188 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[139] @ 50 kb/s audio/mp4; codecs="mp4a.40.5" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" +[249] @ 57 kb/s audio/webm; codecs="opus" +[250] @ 75 kb/s audio/webm; codecs="opus" +[251] @ 148 kb/s audio/webm; codecs="opus" + + +iOS: +Formats: +Adaptive Formats: +[315] 2160p60 @ 26650 kb/s video/webm; codecs="vp09.00.51.08" +[337] 2160p60 HDR @ 30616 kb/s video/webm; codecs="vp09.02.51.10.01.09.16.09.00" +[308] 1440p60 @ 13327 kb/s video/webm; codecs="vp09.00.50.08" +[336] 1440p60 HDR @ 16904 kb/s video/webm; codecs="vp09.02.50.10.01.09.16.09.00" +[299] 1080p60 @ 5794 kb/s video/mp4; codecs="avc1.64002A" +[303] 1080p60 @ 4620 kb/s video/webm; codecs="vp09.00.41.08" +[335] 1080p60 HDR @ 6956 kb/s video/webm; codecs="vp09.02.41.10.01.09.16.09.00" +[298] 720p60 @ 3483 kb/s video/mp4; codecs="avc1.4D4020" +[302] 720p60 @ 2669 kb/s video/webm; codecs="vp09.00.40.08" +[334] 720p60 HDR @ 4529 kb/s video/webm; codecs="vp09.02.40.10.01.09.16.09.00" +[135] 480p @ 1158 kb/s video/mp4; codecs="avc1.4D401F" +[244] 480p @ 856 kb/s video/webm; codecs="vp09.00.30.08" +[333] 480p60 HDR @ 1989 kb/s video/webm; codecs="vp09.02.31.10.01.09.16.09.00" +[134] 360p @ 633 kb/s video/mp4; codecs="avc1.4D401E" +[243] 360p @ 433 kb/s video/webm; codecs="vp09.00.21.08" +[332] 360p60 HDR @ 1060 kb/s video/webm; codecs="vp09.02.30.10.01.09.16.09.00" +[133] 240p @ 245 kb/s video/mp4; codecs="avc1.4D4015" +[242] 240p @ 198 kb/s video/webm; codecs="vp09.00.20.08" +[331] 240p60 HDR @ 500 kb/s video/webm; codecs="vp09.02.21.10.01.09.16.09.00" +[160] 144p @ 111 kb/s video/mp4; codecs="avc1.4D400C" +[278] 144p @ 90 kb/s video/webm; codecs="vp09.00.11.08" +[330] 144p60 HDR @ 244 kb/s video/webm; codecs="vp09.02.11.10.01.09.16.09.00" +[139] @ 50 kb/s audio/mp4; codecs="mp4a.40.5" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" + + +TVHtml5Embed: +Formats: +[18] 360p @ 600 kb/s video/mp4; codecs="avc1.42001E, mp4a.40.2" +[22] 720p @ 2491 kb/s video/mp4; codecs="avc1.64001F, mp4a.40.2" +Adaptive Formats: +[315] 2160p60 @ 26650 kb/s video/webm; codecs="vp9" +[337] 2160p60 HDR @ 30616 kb/s video/webm; codecs="vp9.2" +[401] 2160p60 HDR @ 17186 kb/s video/mp4; codecs="av01.0.13M.10.0.110.09.16.09.0" +[701] 2160p60 HDR @ 32652 kb/s video/mp4; codecs="av01.0.13M.10.0.110.09.16.09.0" +[308] 1440p60 @ 13327 kb/s video/webm; codecs="vp9" +[336] 1440p60 HDR @ 16904 kb/s video/webm; codecs="vp9.2" +[400] 1440p60 HDR @ 8580 kb/s video/mp4; codecs="av01.0.12M.10.0.110.09.16.09.0" +[700] 1440p60 HDR @ 18487 kb/s video/mp4; codecs="av01.0.12M.10.0.110.09.16.09.0" +[299] 1080p60 @ 5794 kb/s video/mp4; codecs="avc1.64002a" +[303] 1080p60 @ 4620 kb/s video/webm; codecs="vp9" +[335] 1080p60 HDR @ 6956 kb/s video/webm; codecs="vp9.2" +[399] 1080p60 HDR @ 3817 kb/s video/mp4; codecs="av01.0.09M.10.0.110.09.16.09.0" +[699] 1080p60 HDR @ 6531 kb/s video/mp4; codecs="av01.0.09M.10.0.110.09.16.09.0" +[136] 720p @ 3220 kb/s video/mp4; codecs="avc1.4d401f" +[247] 720p @ 1668 kb/s video/webm; codecs="vp9" +[298] 720p60 @ 3483 kb/s video/mp4; codecs="avc1.4d4020" +[302] 720p60 @ 2669 kb/s video/webm; codecs="vp9" +[334] 720p60 HDR @ 4529 kb/s video/webm; codecs="vp9.2" +[398] 720p60 HDR @ 2100 kb/s video/mp4; codecs="av01.0.08M.10.0.110.09.16.09.0" +[698] 720p60 HDR @ 3871 kb/s video/mp4; codecs="av01.0.08M.10.0.110.09.16.09.0" +[135] 480p @ 1158 kb/s video/mp4; codecs="avc1.4d401f" +[244] 480p @ 856 kb/s video/webm; codecs="vp9" +[333] 480p60 HDR @ 1989 kb/s video/webm; codecs="vp9.2" +[397] 480p HDR @ 764 kb/s video/mp4; codecs="av01.0.04M.10.0.110.09.16.09.0" +[697] 480p60 HDR @ 1502 kb/s video/mp4; codecs="av01.0.05M.10.0.110.09.16.09.0" +[134] 360p @ 633 kb/s video/mp4; codecs="avc1.4d401e" +[243] 360p @ 433 kb/s video/webm; codecs="vp9" +[332] 360p60 HDR @ 1060 kb/s video/webm; codecs="vp9.2" +[396] 360p HDR @ 407 kb/s video/mp4; codecs="av01.0.01M.10.0.110.09.16.09.0" +[696] 360p60 HDR @ 837 kb/s video/mp4; codecs="av01.0.04M.10.0.110.09.16.09.0" +[133] 240p @ 245 kb/s video/mp4; codecs="avc1.4d4015" +[242] 240p @ 198 kb/s video/webm; codecs="vp9" +[331] 240p60 HDR @ 500 kb/s video/webm; codecs="vp9.2" +[395] 240p HDR @ 192 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[695] 240p60 HDR @ 397 kb/s video/mp4; codecs="av01.0.01M.10.0.110.09.16.09.0" +[160] 144p @ 111 kb/s video/mp4; codecs="avc1.4d400c" +[278] 144p @ 90 kb/s video/webm; codecs="vp9" +[330] 144p60 HDR @ 244 kb/s video/webm; codecs="vp9.2" +[394] 144p HDR @ 88 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[694] 144p60 HDR @ 188 kb/s video/mp4; codecs="av01.0.00M.10.0.110.09.16.09.0" +[140] @ 130 kb/s audio/mp4; codecs="mp4a.40.2" +[249] @ 57 kb/s audio/webm; codecs="opus" +[250] @ 75 kb/s audio/webm; codecs="opus" +[251] @ 148 kb/s audio/webm; codecs="opus" diff --git a/notes/video_ids.txt b/notes/video_ids.txt index d499720..42626d2 100644 --- a/notes/video_ids.txt +++ b/notes/video_ids.txt @@ -1,5 +1,5 @@ -Video: h7pDGP1XjZM -4K: LXb3EKWsInQ +Video: ZeerrnuLi5E +4K HDR: LXb3EKWsInQ 8K: Zv11L-ZfrSg Music: ihUZMeYFZHA diff --git a/src/client/mod.rs b/src/client/mod.rs index eab0279..372c928 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -14,7 +14,7 @@ use serde::Serialize; use crate::{ cache::{Cache, DesktopClientData}, - deobfuscate::Deobfuscator, + model::Locale, util, }; @@ -124,12 +124,6 @@ pub struct RustyTube { tvhtml5embed_client: Arc, } -#[derive(Clone)] -pub struct Locale { - lang: String, - country: String, -} - impl RustyTube { #[must_use] pub fn new() -> Self { @@ -154,7 +148,7 @@ impl RustyTube { desktop_client: Arc::new(DesktopClient::new(locale.clone(), cache)), android_client: Arc::new(AndroidClient::new(locale.clone())), ios_client: Arc::new(IosClient::new(locale.clone())), - tvhtml5embed_client: Arc::new(TvHtml5EmbedClient::new(locale)) + tvhtml5embed_client: Arc::new(TvHtml5EmbedClient::new(locale)), } } @@ -173,6 +167,7 @@ impl RustyTube { pub trait YTClient { async fn get_context(&self, localized: bool) -> ContextYT; async fn request_builder(&self, method: Method, url: &str) -> RequestBuilder; + fn http_client(&self) -> Client; } async fn exec_request(http: Client, request: Request) -> Result { @@ -189,7 +184,6 @@ pub struct DesktopClient { cache: Cache, consent_cookie_yes: String, consent_cookie_no: String, - deobf: Deobfuscator, } #[async_trait] @@ -233,6 +227,10 @@ impl YTClient for DesktopClient { .header("X-YouTube-Client-Name", "1") .header("X-YouTube-Client-Version", self.get_client_version().await) } + + fn http_client(&self) -> Client { + self.http.clone() + } } impl DesktopClient { @@ -246,8 +244,6 @@ impl DesktopClient { .build() .expect("unable to build the HTTP client"); - let deobf = Deobfuscator::new(http.clone(), cache.clone()); - Self { locale, http, @@ -264,7 +260,6 @@ impl DesktopClient { CONSENT_COOKIE_NO, rng.gen_range(100..1000) ), - deobf, } } @@ -364,6 +359,10 @@ impl YTClient for AndroidClient { ) .header("X-Goog-Api-Format-Version", "2") } + + fn http_client(&self) -> Client { + self.http.clone() + } } impl AndroidClient { @@ -427,6 +426,10 @@ impl YTClient for IosClient { ) .header("X-Goog-Api-Format-Version", "2") } + + fn http_client(&self) -> Client { + self.http.clone() + } } impl IosClient { @@ -473,7 +476,7 @@ impl YTClient for TvHtml5EmbedClient { request: Some(RequestYT::default()), user: User::default(), third_party: Some(ThirdParty { - embed_url: "https://www.youtube.com/".to_owned() + embed_url: "https://www.youtube.com/".to_owned(), }), } } @@ -493,6 +496,10 @@ impl YTClient for TvHtml5EmbedClient { .header("X-YouTube-Client-Name", "1") .header("X-YouTube-Client-Version", TVHTML5_CLIENT_VERSION) } + + fn http_client(&self) -> Client { + self.http.clone() + } } impl TvHtml5EmbedClient { diff --git a/src/client/player.rs b/src/client/player.rs index e995875..fec0692 100644 --- a/src/client/player.rs +++ b/src/client/player.rs @@ -1,9 +1,23 @@ +use std::{ + borrow::Cow, + collections::{BTreeMap, HashMap}, +}; + use anyhow::{anyhow, bail, Context, Result}; use reqwest::Method; use serde::Serialize; +use url::Url; -use super::{response, ClientType, ContextYT, RustyTube, YTClient}; -use crate::util; +use super::{ + response::{self, Player}, + ClientType, ContextYT, RustyTube, +}; +use crate::{ + client::response::player::{self, FormatType}, + deobfuscate::Deobfuscator, + model::{AudioCodec, AudioStream, PlayerData, Thumbnail, VideoCodec, VideoInfo, VideoStream}, + util, +}; // REQUEST @@ -45,16 +59,20 @@ impl RustyTube { &self, video_id: &str, client_type: ClientType, - ) -> Result { + ) -> Result { let client = self.get_ytclient(client_type); - let context = client.get_context(false).await; + let (context, deobf) = tokio::join!( + client.get_context(false), + Deobfuscator::from_fetched_info(client.http_client(), self.cache.clone()) + ); + let deobf = deobf?; let request_body = if client_type.is_web() { QPlayer { context, playback_context: Some(QPlaybackContext { content_playback_context: QContentPlaybackContext { - signature_timestamp: self.desktop_client.deobf.get_sts().await?, + signature_timestamp: deobf.get_sts(), referer: format!("https://www.youtube.com/watch?v={}", video_id), }, }), @@ -83,24 +101,283 @@ impl RustyTube { // println!("{}", resp.text().await?); // todo!(); - - Ok(resp.json::().await?) + let player_response = resp.json::().await?; + map_player_data(player_response, &deobf) } } +fn map_stream_url( + f: &player::Format, + deobf: &Deobfuscator, + last_nsig: &mut [String; 2], +) -> Result { + match &f.url { + Some(f) => Ok(f.to_owned()), + None => { + match &f.signature_cipher { + Some(signature_cipher) => { + let params: HashMap, Cow> = + url::form_urlencoded::parse(signature_cipher.as_bytes()).collect(); + + // Parameters: + // `s`: Obfuscated signature + // `sp`: Signature parameter + // `url`: URL that is missing the signature parameter + + let sig = some_or_bail!(params.get("s"), Err(anyhow!("no s param"))); + let sp = some_or_bail!(params.get("sp"), Err(anyhow!("no sp param"))); + let raw_url = some_or_bail!(params.get("url"), Err(anyhow!("no url param"))); + let parsed_url = Url::parse(raw_url)?; + + // println!("sig: {}", sig); + let deobf_sig = deobf.deobfuscate_sig(sig)?; + + // Use BTreeMap to get reproducible ordering + let mut url_params: BTreeMap, Cow> = + parsed_url.query_pairs().collect(); + url_params.insert(Cow::Borrowed(sp), Cow::Borrowed(&deobf_sig)); + + let nsig: String; + match url_params.get("n") { + Some(n) => { + // println!("n: {}", n); + + nsig = if n.to_owned() == last_nsig[0] { + last_nsig[1].to_owned() + } else { + let nsig = deobf.deobfuscate_nsig(n)?; + last_nsig[0] = n.to_string(); + last_nsig[1] = nsig.to_owned(); + nsig + }; + + url_params.insert(Cow::Borrowed("n"), Cow::Borrowed(&nsig)); + } + None => {} + } + + let mut url_base = parsed_url.clone(); + url_base.set_query(None); + let new_url = Url::parse_with_params(url_base.as_str(), url_params.iter())?; + Ok(new_url.to_string()) + } + None => Err(anyhow!("stream contains no url or signatureCipher")), + } + } + } +} + +fn map_player_data(response: Player, deobf: &Deobfuscator) -> Result { + // Check playability status + match response.playability_status { + response::player::PlayabilityStatus::Ok { live_streamability } => { + if live_streamability.is_some() { + bail!("Active livestreams are not supported") + } + } + response::player::PlayabilityStatus::Unplayable { reason } => { + bail!("Video is unplayable. Reason: {}", reason) + } + response::player::PlayabilityStatus::LoginRequired { reason } => { + bail!("Playback requires login. Reason: {}", reason) + } + response::player::PlayabilityStatus::LiveStreamOffline { reason } => { + bail!("Livestream is offline. Reason: {}", reason) + } + response::player::PlayabilityStatus::Error { reason } => { + bail!("Video was deleted. Reason: {}", reason) + } + }; + + let streaming_data = some_or_bail!( + response.streaming_data, + Err(anyhow!("No streaming data was returned")) + ); + let video_details = some_or_bail!( + response.video_details, + Err(anyhow!("No video details were returned")) + ); + let microformat = response.microformat.map(|m| m.player_microformat_renderer); + + let video_info = VideoInfo { + id: video_details.video_id, + title: video_details.title, + description: video_details.short_description, + length: video_details.length_seconds, + thumbnails: video_details + .thumbnail + .unwrap_or_default() + .thumbnails + .iter() + .map(|t| Thumbnail { + url: t.url.to_owned(), + height: t.height, + width: t.width, + }) + .collect(), + + channel_id: video_details.channel_id, + channel_name: video_details.author, + + publish_date: microformat.as_ref().map(|m| m.publish_date), + upload_date: microformat.as_ref().map(|m| m.upload_date), + view_count: video_details.view_count, + keywords: video_details.keywords, + category: microformat.as_ref().map(|m| m.category.to_owned()), + is_live_content: video_details.is_live_content, + is_family_safe: microformat.as_ref().map(|m| m.is_family_safe), + }; + + let mut formats = streaming_data.formats.clone(); + formats.append(&mut streaming_data.adaptive_formats.clone()); + + let mut last_nsig: [String; 2] = ["".to_owned(), "".to_owned()]; + + let video_streams = formats + .iter() + .filter_map(|f| { + if f.format_type != FormatType::FormatStreamTypeOtf && f.is_video() && f.is_audio() { + match map_stream_url(&f, deobf, &mut last_nsig) { + Ok(url) => Some(VideoStream { + url, + itag: f.itag, + bitrate: f.bitrate, + average_bitrate: f.average_bitrate, + size: f.content_length, + index_range: f.index_range.clone(), + init_range: f.init_range.clone(), + width: f.width.unwrap(), + height: f.height.unwrap(), + fps: f.fps.unwrap(), + quality: f.quality_label.clone().unwrap(), + hdr: f.color_info.clone().unwrap_or_default().primaries + == player::Primaries::ColorPrimariesBt2020, + mime: f.mime_type.to_owned(), + codec: VideoCodec::Av01, + }), + Err(_) => None, + } + } else { + None + } + }) + .collect::>(); + + let video_only_streams = formats + .iter() + .filter_map(|f| { + if f.format_type != FormatType::FormatStreamTypeOtf && f.is_video() && !f.is_audio() { + match map_stream_url(&f, deobf, &mut last_nsig) { + Ok(url) => Some(VideoStream { + url, + itag: f.itag, + bitrate: f.bitrate, + average_bitrate: f.average_bitrate, + size: f.content_length, + index_range: f.index_range.clone(), + init_range: f.init_range.clone(), + width: f.width.unwrap(), + height: f.height.unwrap(), + fps: f.fps.unwrap(), + quality: f.quality_label.clone().unwrap(), + hdr: f.color_info.clone().unwrap_or_default().primaries + == player::Primaries::ColorPrimariesBt2020, + mime: f.mime_type.to_owned(), + codec: VideoCodec::Av01, + }), + Err(_) => None, + } + } else { + None + } + }) + .collect::>(); + + let audio_streams = formats + .iter() + .filter_map(|f| { + if f.format_type != FormatType::FormatStreamTypeOtf && !f.is_video() && f.is_audio() { + match map_stream_url(&f, deobf, &mut last_nsig) { + Ok(url) => Some(AudioStream { + url, + itag: f.itag, + bitrate: f.bitrate, + average_bitrate: f.average_bitrate, + size: f.content_length, + index_range: f.index_range.to_owned(), + init_range: f.init_range.to_owned(), + mime: f.mime_type.to_owned(), + codec: AudioCodec::Mp4A, + }), + Err(_) => todo!(), + } + } else { + None + } + }) + .collect::>(); + + Ok(PlayerData { + info: video_info, + video_streams, + video_only_streams, + audio_streams, + subtitles: vec![], + expires_in_seconds: streaming_data.expires_in_seconds, + }) +} + #[cfg(test)] mod tests { + use crate::{cache::DeobfData, client::response::player}; + use super::*; use test_log::test; #[test(tokio::test)] async fn t_fetch_stream() { let rt = RustyTube::new(); - let stream = rt - .fetch_player("ZeerrnuLi5E", ClientType::Android) + let player_data = rt + .fetch_player("ZeerrnuLi5E", ClientType::Desktop) .await .unwrap(); - dbg!(stream); + dbg!(player_data); + } + + #[test] + fn t_map_stream_url() { + let deobf = Deobfuscator::from(DeobfData { + js_url: "https://www.youtube.com/s/player/c8b8a173/player_ias.vflset/en_US/base.js".to_owned(), + sig_fn: "var oB={B4:function(a){a.reverse()},xm:function(a,b){a.splice(0,b)},dC:function(a,b){var c=a[0];a[0]=a[b%a.length];a[b%a.length]=c}};var Vva=function(a){a=a.split(\"\");oB.dC(a,42);oB.xm(a,3);oB.dC(a,48);oB.B4(a,68);return a.join(\"\")};function deobfuscate(a){return Vva(a);}".to_owned(), + nsig_fn: "Ska=function(a){var b=a.split(\"\"),c=[-1505243983,function(d,e){e=(e%d.length+d.length)%d.length;d.splice(-e).reverse().forEach(function(f){d.unshift(f)})},\n-1692381986,function(d,e){e=(e%d.length+d.length)%d.length;var f=d[0];d[0]=d[e];d[e]=f},\n-262444939,\"unshift\",function(d){for(var e=d.length;e;)d.push(d.splice(--e,1)[0])},\n1201502951,-546377604,-504264123,-1978377336,1042456724,function(d,e){for(e=(e%d.length+d.length)%d.length;e--;)d.unshift(d.pop())},\n711986897,406699922,-1842537993,-1678108293,1803491779,1671716087,12778705,-718839990,null,null,-1617525823,342523552,-1338406651,-399705108,-696713950,b,function(d,e){e=(e%d.length+d.length)%d.length;d.splice(0,1,d.splice(e,1,d[0])[0])},\nfunction(d,e){e=(e%d.length+d.length)%d.length;d.splice(e,1)},\n-980602034,356396192,null,-1617525823,function(d,e,f){var h=f.length;d.forEach(function(l,m,n){this.push(n[m]=f[(f.indexOf(l)-f.indexOf(this[m])+m+h--)%f.length])},e.split(\"\"))},\n-1029864222,-641353250,-1681901809,-1391247867,1707415199,-1957855835,b,function(){for(var d=64,e=[];++d-e.length-32;)switch(d){case 58:d=96;continue;case 91:d=44;break;case 65:d=47;continue;case 46:d=153;case 123:d-=58;default:e.push(String.fromCharCode(d))}return e},\n-1936558978,-1505243983,function(d){d.reverse()},\n1296889058,-1813915420,-943019300,function(d,e,f){var h=f.length;d.forEach(function(l,m,n){this.push(n[m]=f[(f.indexOf(l)-f.indexOf(this[m])+m+h--)%f.length])},e.split(\"\"))},\n\"join\",b,-2061642263];c[21]=c;c[22]=c;c[33]=c;try{c[3](c[33],c[9]),c[29](c[22],c[25]),c[29](c[22],c[19]),c[29](c[33],c[17]),c[29](c[21],c[2]),c[29](c[42],c[10]),c[1](c[52],c[40]),c[12](c[28],c[8]),c[29](c[21],c[45]),c[1](c[21],c[48]),c[44](c[26]),c[39](c[5],c[2]),c[31](c[53],c[16]),c[30](c[29],c[8]),c[51](c[29],c[6],c[44]()),c[4](c[43],c[1]),c[2](c[23],c[42]),c[2](c[0],c[46]),c[38](c[14],c[52]),c[32](c[5]),c[26](c[29],c[46]),c[26](c[5],c[13]),c[28](c[1],c[37]),c[26](c[31],c[13]),c[26](c[1],c[34]),\nc[46](c[1],c[32],c[40]()),c[26](c[50],c[44]),c[17](c[50],c[51]),c[0](c[3],c[24]),c[32](c[13]),c[43](c[3],c[51]),c[0](c[34],c[17]),c[16](c[45],c[53]),c[29](c[44],c[13]),c[42](c[1],c[50]),c[47](c[22],c[53]),c[37](c[22]),c[13](c[52],c[21]),c[6](c[43],c[34]),c[6](c[31],c[46])}catch(d){return\"enhanced_except_gZYB_un-_w8_\"+a}return b.join(\"\")};function deobfuscate(a){return Ska(a);}".to_owned(), + sts: "19201".to_owned(), + }); + + let fmt = player::Format { + itag: 1, + url: None, + format_type: player::FormatType::Default, + mime_type: "".to_owned(), + bitrate: 10, + width: Some(1920), + height: Some(1080), + index_range: None, + init_range: None, + content_length: 1000, + quality: Some(player::Quality::Hd1080), + fps: Some(24), + quality_label: Some("".to_owned()), + average_bitrate: 100, + color_info: Some(player::ColorInfo::default()), + audio_quality: None, + audio_sample_rate: None, + audio_channels: None, + loudness_db: None, + signature_cipher: Some("s=w%3DAe%3DA6aDNQLkViKS7LOm9QtxZJHKwb53riq9qEFw-ecBWJCAiA%3DcEg0tn3dty9jEHszfzh4Ud__bg9CEHVx4ix-7dKsIPAhIQRw8JQ0qOA&sp=sig&url=https://rr5---sn-h0jelnez.googlevideo.com/videoplayback%3Fexpire%3D1659376413%26ei%3Dvb7nYvH5BMK8gAfBj7ToBQ%26ip%3D2003%253Ade%253Aaf06%253A6300%253Ac750%253A1b77%253Ac74a%253A80e3%26id%3Do-AB_BABwrXZJN428ZwDxq5ScPn2AbcGODnRlTVhCQ3mj2%26itag%3D251%26source%3Dyoutube%26requiressl%3Dyes%26mh%3DhH%26mm%3D31%252C26%26mn%3Dsn-h0jelnez%252Csn-4g5ednsl%26ms%3Dau%252Conr%26mv%3Dm%26mvi%3D5%26pl%3D37%26initcwndbps%3D1588750%26spc%3DlT-Khi831z8dTejFIRCvCEwx_6romtM%26vprv%3D1%26mime%3Daudio%252Fwebm%26ns%3Db_Mq_qlTFcSGlG9RpwpM9xQH%26gir%3Dyes%26clen%3D3781277%26dur%3D229.301%26lmt%3D1655510291473933%26mt%3D1659354538%26fvip%3D5%26keepalive%3Dyes%26fexp%3D24001373%252C24007246%26c%3DWEB%26rbqsm%3Dfr%26txp%3D4532434%26n%3Dd2g6G2hVqWIXxedQ%26sparams%3Dexpire%252Cei%252Cip%252Cid%252Citag%252Csource%252Crequiressl%252Cspc%252Cvprv%252Cmime%252Cns%252Cgir%252Cclen%252Cdur%252Clmt%26lsparams%3Dmh%252Cmm%252Cmn%252Cms%252Cmv%252Cmvi%252Cpl%252Cinitcwndbps%26lsig%3DAG3C_xAwRQIgCKCGJ1iu4wlaGXy3jcJyU3inh9dr1FIfqYOZEG_MdmACIQCbungkQYFk7EhD6K2YvLaHFMjKOFWjw001_tLb0lPDtg%253D%253D".to_owned()) + }; + + let url = map_stream_url(&fmt, &deobf, &mut ["".to_string(), "".to_string()]).unwrap(); + assert_eq!(url, "https://rr5---sn-h0jelnez.googlevideo.com/videoplayback?c=WEB&clen=3781277&dur=229.301&ei=vb7nYvH5BMK8gAfBj7ToBQ&expire=1659376413&fexp=24001373%2C24007246&fvip=5&gir=yes&id=o-AB_BABwrXZJN428ZwDxq5ScPn2AbcGODnRlTVhCQ3mj2&initcwndbps=1588750&ip=2003%3Ade%3Aaf06%3A6300%3Ac750%3A1b77%3Ac74a%3A80e3&itag=251&keepalive=yes&lmt=1655510291473933&lsig=AG3C_xAwRQIgCKCGJ1iu4wlaGXy3jcJyU3inh9dr1FIfqYOZEG_MdmACIQCbungkQYFk7EhD6K2YvLaHFMjKOFWjw001_tLb0lPDtg%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=hH&mime=audio%2Fwebm&mm=31%2C26&mn=sn-h0jelnez%2Csn-4g5ednsl&ms=au%2Conr&mt=1659354538&mv=m&mvi=5&n=Qde6XdWqVh2Gx&ns=b_Mq_qlTFcSGlG9RpwpM9xQH&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRQIhAPIsKd7-xi4xVHEC9gb__dU4hzfzsHEj9ytd3nt0gEceAiACJWBcw-wFEq9qir35bwKHJZxtQ9mOL7SKiVkLQNDa6A%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khi831z8dTejFIRCvCEwx_6romtM&txp=4532434&vprv=1"); } } diff --git a/src/client/response/player.rs b/src/client/response/player.rs index c3ba6f0..6ccaa71 100644 --- a/src/client/response/player.rs +++ b/src/client/response/player.rs @@ -53,11 +53,13 @@ pub struct Empty {} #[serde(rename_all = "camelCase")] pub struct StreamingData { #[serde_as(as = "JsonString")] - pub expires_in_seconds: u64, - #[serde_as(as = "Option>")] - pub formats: Option>, - #[serde_as(as = "Option>")] - pub adaptive_formats: Option>, + pub expires_in_seconds: u32, + #[serde(default)] + #[serde_as(as = "VecSkipError<_>")] + pub formats: Vec, + #[serde(default)] + #[serde_as(as = "VecSkipError<_>")] + pub adaptive_formats: Vec, /// Only on livestreams pub dash_manifest_url: Option, /// Only on livestreams @@ -76,25 +78,25 @@ pub struct Format { pub mime_type: String, - pub bitrate: Option, + pub bitrate: u32, - pub width: Option, - pub height: Option, + pub width: Option, + pub height: Option, #[serde_as(as = "Option")] pub index_range: Option>, #[serde_as(as = "Option")] pub init_range: Option>, - #[serde_as(as = "Option")] - pub content_length: Option, + #[serde_as(as = "JsonString")] + pub content_length: u64, #[serde(default)] #[serde_as(deserialize_as = "DefaultOnError")] pub quality: Option, pub fps: Option, pub quality_label: Option, - pub average_bitrate: Option, + pub average_bitrate: u32, pub color_info: Option, // Audio only @@ -114,6 +116,23 @@ pub struct Format { pub signature_cipher: Option, } +impl Format { + pub fn is_audio(&self) -> bool { + self.audio_quality.is_some() + && self.audio_sample_rate.is_some() + && self.audio_channels.is_some() + && self.loudness_db.is_some() + } + + pub fn is_video(&self) -> bool { + self.quality.is_some() + && self.quality_label.is_some() + && self.fps.is_some() + && self.height.is_some() + && self.width.is_some() + } +} + #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)] #[serde(rename_all = "lowercase")] pub enum Quality { @@ -203,7 +222,7 @@ pub struct VideoDetails { pub is_live_content: bool, } -#[derive(Clone, Debug, Deserialize)] +#[derive(Default, Clone, Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub struct Thumbnails { pub thumbnails: Vec, diff --git a/src/deobfuscate.rs b/src/deobfuscate.rs index 12aa74f..10b1d41 100644 --- a/src/deobfuscate.rs +++ b/src/deobfuscate.rs @@ -9,20 +9,12 @@ use crate::cache::{Cache, DeobfData}; use crate::util; pub struct Deobfuscator { - http: Client, - cache: Cache, + data: DeobfData, } impl Deobfuscator { - #[must_use] - pub fn new(http: Client, cache: Cache) -> Self { - Self { http, cache } - } - - async fn get_deobf_data(&self) -> Result { - let http = self.http.clone(); - - self.cache + pub async fn from_fetched_info(http: Client, cache: Cache) -> Result { + let data = cache .get_deobf_data(async move { let js_url = get_player_js_url(&http) .await @@ -45,22 +37,27 @@ impl Deobfuscator { sts, }) }) - .await + .await?; + + Ok(Self { data }) } - pub async fn deobfuscate_sig(&self, sig: &str) -> Result { - let deobf_data = self.get_deobf_data().await?; - deobfuscate_sig(sig, &deobf_data.sig_fn) + pub fn deobfuscate_sig(&self, sig: &str) -> Result { + deobfuscate_sig(sig, &self.data.sig_fn) } - pub async fn deobfuscate_nsig(&self, nsig: &str) -> Result { - let deobf_data = self.get_deobf_data().await?; - deobfuscate_nsig(nsig, &deobf_data.nsig_fn) + pub fn deobfuscate_nsig(&self, nsig: &str) -> Result { + deobfuscate_sig(nsig, &self.data.sig_fn) } - pub async fn get_sts(&self) -> Result { - let deobf_data = self.get_deobf_data().await?; - Ok(deobf_data.sts) + pub fn get_sts(&self) -> String { + self.data.sts.to_owned() + } +} + +impl From for Deobfuscator { + fn from(data: DeobfData) -> Self { + Self {data} } } @@ -383,25 +380,9 @@ c[36](c[8],c[32]),c[20](c[25],c[10]),c[2](c[22],c[8]),c[32](c[20],c[16]),c[32](c async fn t_update() { let client = Client::new(); let cache = Cache::default(); - let deobf = Deobfuscator::new(client, cache); + let mut deobf = Deobfuscator::from_fetched_info(client, cache).await.unwrap(); - let deobf_sig = deobf.deobfuscate_sig("GOqGOqGOq0QJ8wRAIgaryQHfplJ9xJSKFywyaSMHuuwZYsoMTAvRvfm51qIGECIA5061zWeyfMPX9hEl_U6f9J0tr7GTJMKyPf5XNrJb5fb5i").await.unwrap(); + let deobf_sig = deobf.deobfuscate_sig("GOqGOqGOq0QJ8wRAIgaryQHfplJ9xJSKFywyaSMHuuwZYsoMTAvRvfm51qIGECIA5061zWeyfMPX9hEl_U6f9J0tr7GTJMKyPf5XNrJb5fb5i").unwrap(); println!("{}", deobf_sig); } - - #[test(tokio::test)] - async fn t_parallel() { - let client = Client::new(); - let cache = Cache::default(); - let deobf = Deobfuscator::new(client, cache); - let deobf_arc = Arc::new(deobf); - - let (deobf_sig, deobf_nsig) = tokio::join!( - deobf_arc.deobfuscate_sig("GOqGOqGOq0QJ8wRAIgaryQHfplJ9xJSKFywyaSMHuuwZYsoMTAvRvfm51qIGECIA5061zWeyfMPX9hEl_U6f9J0tr7GTJMKyPf5XNrJb5fb5i"), - deobf_arc.deobfuscate_nsig("BI_n4PxQ22is-KKajKUW"), - ); - - println!("{}", deobf_sig.unwrap()); - println!("{}", deobf_nsig.unwrap()); - } } diff --git a/src/lib.rs b/src/lib.rs index 62ef102..2e5decb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,4 +8,5 @@ mod serializer; mod cache; mod deobfuscate; +pub mod model; pub mod client; diff --git a/src/model/mod.rs b/src/model/mod.rs new file mode 100644 index 0000000..57be517 --- /dev/null +++ b/src/model/mod.rs @@ -0,0 +1,119 @@ +use std::ops::Range; + +use chrono::NaiveDate; +use serde::{Serialize, Deserialize}; + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct PlayerData { + pub info: VideoInfo, + pub video_streams: Vec, + pub video_only_streams: Vec, + pub audio_streams: Vec, + pub subtitles: Vec, + pub expires_in_seconds: u32, +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +pub struct VideoInfo { + pub id: String, + pub title: String, + pub description: String, + pub length: u32, + pub thumbnails: Vec, + + pub channel_id: String, + pub channel_name: String, + + pub publish_date: Option, + pub upload_date: Option, + pub view_count: u64, + pub keywords: Vec, + pub category: Option, + pub is_live_content: bool, + pub is_family_safe: Option, + + // pub like_count: Option, + // pub dislike_count: Option +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +pub struct VideoStream { + pub url: String, + pub itag: u32, + pub bitrate: u32, + pub average_bitrate: u32, + pub size: u64, + pub index_range: Option>, + pub init_range: Option>, + pub width: u32, + pub height: u32, + pub fps: u8, + pub quality: String, + pub hdr: bool, + pub mime: String, + pub codec: VideoCodec, +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +pub struct AudioStream { + pub url: String, + pub itag: u32, + pub bitrate: u32, + pub average_bitrate: u32, + pub size: u64, + pub index_range: Option>, + pub init_range: Option>, + pub mime: String, + pub codec: AudioCodec, +} + +#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)] +#[non_exhaustive] +pub enum VideoCodec { + #[default] + Unknown, + /// avc1 aka H.264: https://en.wikipedia.org/wiki/Advanced_Video_Coding + Avc1, + /// VP9: https://en.wikipedia.org/wiki/VP9 + Vp9, + /// AV1, the latest codec: https://en.wikipedia.org/wiki/AV1 + Av01, +} + +/* +impl VideoCodec { + pub fn from_mime_type(mime_type: &str) -> Self { + + } +}*/ + +#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)] +#[non_exhaustive] +pub enum AudioCodec { + #[default] + Unknown, + /// MP4A aka AAC: https://en.wikipedia.org/wiki/Advanced_Audio_Coding + Mp4A, + /// Opus: https://en.wikipedia.org/wiki/Opus_(audio_format) + Opus +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +pub struct Thumbnail { + pub url: String, + pub width: u32, + pub height: u32, +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +pub struct Subtitle { + pub url: String, + pub locale: Locale, + pub auto_generated: bool, +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +pub struct Locale { + pub lang: String, + pub country: String, +}