iv-org/inv_sig_helper
1
0
Fork 0
mirror of https://github.com/iv-org/inv_sig_helper.git synced 2024-11-23 05:59:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8 from MMaster/fix_extraction_20240803

Browse Source 
Update & improve nsig extraction based on current player js code
This commit is contained in:
techmetx11 2024-08-05 14:22:17 +00:00 committed by GitHub
commit 2db19fb81f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/consts.rs
View File

@ -7,13 +7,15 @@ pub static DEFAULT_TCP_URL: &str = "127.0.0.1:12999";
pub static TEST_YOUTUBE_VIDEO: &str = "https://www.youtube.com/watch?v=jNQXAC9IVRw"; pub static TEST_YOUTUBE_VIDEO: &str = "https://www.youtube.com/watch?v=jNQXAC9IVRw";
pub static REGEX_PLAYER_ID: &Lazy<Regex> = regex!("\\/s\\/player\\/([0-9a-f]{8})"); pub static REGEX_PLAYER_ID: &Lazy<Regex> = regex!("\\/s\\/player\\/([0-9a-f]{8})");
pub static NSIG_FUNCTION_ARRAY: &Lazy<Regex> = regex!( pub static NSIG_FUNCTION_ARRAYS: &[&str] = &[
r#"(?x)&&\(b="n+"\[[a-zA-Z0-9.+$]+\],c=a\.get\(b\)\)&&\(c=(?P<nfunc>[a-zA-Z0-9$]+)(?:\[(?P<idx>\d+)\])?\([a-zA-Z0-9]\)"# r#"null\)&&\([a-zA-Z]=(?P<nfunc>[a-zA-Z0-9$]+)\[(?P<idx>\d+)\]\([a-zA-Z0-9]\)"#,
); r#"(?x)&&\(b="n+"\[[a-zA-Z0-9.+$]+\],c=a\.get\(b\)\)&&\(c=(?P<nfunc>[a-zA-Z0-9$]+)(?:\[(?P<idx>\d+)\])?\([a-zA-Z0-9]\)"#,
];
pub static NSIG_FUNCTION_ENDINGS: &[&str] = &[ pub static NSIG_FUNCTION_ENDINGS: &[&str] = &[
"=\\s*function([\\S\\s]*?\\}\\s*return \\w+?\\.join\\(\"\"\\)\\s*\\};)", r#"=\s*function(\([\w]+\)\{\s*var\s+[\w\s]+=[\w\.\s]+?\.call\s*\([\w\s$]+?,[\(\)\",\s]+\)[\S\s]*?\}\s*return [\w\.\s$]+?\.call\s*\([\w\s$]+?\s*,[\(\)\",\s]+\)\s*\}\s*;)"#,
"=\\s*function([\\S\\s]*?\\}\\s*return [\\W\\w$]+?\\.call\\([\\w$]+?,\"\"\\)\\s*\\};)", r#"=\s*function([\S\s]*?\}\s*return \w+?\.join\(\"\"\)\s*\};)"#,
r#"=\s*function([\S\s]*?\}\s*return [\W\w$]+?\.call\([\w$]+?,\"\"\)\s*\};)"#,
]; ];
pub static REGEX_SIGNATURE_TIMESTAMP: &Lazy<Regex> = regex!("signatureTimestamp[=:](\\d+)"); pub static REGEX_SIGNATURE_TIMESTAMP: &Lazy<Regex> = regex!("signatureTimestamp[=:](\\d+)");

35
src/player.rs
View File

@ -4,7 +4,7 @@ use regex::Regex;
use crate::{ use crate::{
consts::{ consts::{
NSIG_FUNCTION_ARRAY, NSIG_FUNCTION_ENDINGS, NSIG_FUNCTION_NAME, REGEX_HELPER_OBJ_NAME, NSIG_FUNCTION_ARRAYS, NSIG_FUNCTION_ENDINGS, NSIG_FUNCTION_NAME, REGEX_HELPER_OBJ_NAME,
REGEX_PLAYER_ID, REGEX_SIGNATURE_FUNCTION, REGEX_SIGNATURE_TIMESTAMP, TEST_YOUTUBE_VIDEO, REGEX_PLAYER_ID, REGEX_SIGNATURE_FUNCTION, REGEX_SIGNATURE_TIMESTAMP, TEST_YOUTUBE_VIDEO,
}, },
jobs::GlobalState, jobs::GlobalState,
@ -51,6 +51,7 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
"https://www.youtube.com/s/player/{:08x}/player_ias.vflset/en_US/base.js", "https://www.youtube.com/s/player/{:08x}/player_ias.vflset/en_US/base.js",
player_id player_id
); );
println!("Fetching player JS URL: {}", player_js_url);
let player_javascript = match reqwest::get(player_js_url).await { let player_javascript = match reqwest::get(player_js_url).await {
Ok(req) => req.text().await.unwrap(), Ok(req) => req.text().await.unwrap(),
Err(x) => { Err(x) => {
@ -59,7 +60,27 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
} }
}; };
let nsig_function_array = NSIG_FUNCTION_ARRAY.captures(&player_javascript).unwrap(); let mut nsig_function_array_opt = None;
// Extract nsig function array code
for (index, nsig_function_array_str) in NSIG_FUNCTION_ARRAYS.iter().enumerate() {
let nsig_function_array_regex = Regex::new(&nsig_function_array_str).unwrap();
nsig_function_array_opt = match nsig_function_array_regex.captures(&player_javascript) {
None => {
println!("nsig function array did not work: {}", nsig_function_array_str);
if index == NSIG_FUNCTION_ARRAYS.len() {
println!("!!ERROR!! nsig function array unable to be extracted");
return Err(FetchUpdateStatus::NsigRegexCompileFailed);
}
continue;
}
Some(i) => {
Some(i)
}
};
break;
}
let nsig_function_array = nsig_function_array_opt.unwrap();
let nsig_array_name = nsig_function_array.name("nfunc").unwrap().as_str(); let nsig_array_name = nsig_function_array.name("nfunc").unwrap().as_str();
let nsig_array_value = nsig_function_array let nsig_array_value = nsig_function_array
.name("idx") .name("idx")
@ -97,7 +118,6 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
nsig_function_code += "function "; nsig_function_code += "function ";
nsig_function_code += NSIG_FUNCTION_NAME; nsig_function_code += NSIG_FUNCTION_NAME;
let mut extracted = false;
// Extract nsig function code // Extract nsig function code
for (index, ending) in NSIG_FUNCTION_ENDINGS.iter().enumerate() { for (index, ending) in NSIG_FUNCTION_ENDINGS.iter().enumerate() {
let mut nsig_function_code_regex_str: String = String::new(); let mut nsig_function_code_regex_str: String = String::new();
@ -116,14 +136,11 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
continue; continue;
} }
Some(i) => { Some(i) => {
extracted = true;
i.get(1).unwrap().as_str() i.get(1).unwrap().as_str()
} }
}; };
//println!("got nsig fn code: {}", nsig_function_code);
if extracted { break;
break;
}
} }
// Extract signature function name // Extract signature function name
@ -176,7 +193,7 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
sig_code += helper_object_body; sig_code += helper_object_body;
sig_code += sig_function_body; sig_code += sig_function_body;
println!("{}", sig_code); println!("sig code: {}", sig_code);
// Get signature timestamp // Get signature timestamp
let signature_timestamp: u64 = REGEX_SIGNATURE_TIMESTAMP let signature_timestamp: u64 = REGEX_SIGNATURE_TIMESTAMP