|
|
@@ -1,4 +1,4 @@
|
|
|
-console.log('audio')
|
|
|
+console.log('v1')
|
|
|
|
|
|
printable = (platform) => {
|
|
|
return platform === "WEB";
|
|
|
@@ -84,7 +84,7 @@ parseSetCookie = (headers) => {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
-request = async (method, url, data = null, headers = {}, platform) => {
|
|
|
+request = async (method, url, data = null, headers = {}, requestId, platform) => {
|
|
|
if (platform === "WEB") {
|
|
|
url = url.replace("https://www.youtube.com/", "http://127.0.0.1:80/");
|
|
|
url = url.replace("https://music.youtube.com/", "http://127.0.0.1:80/");
|
|
|
@@ -107,8 +107,9 @@ request = async (method, url, data = null, headers = {}, platform) => {
|
|
|
});
|
|
|
}
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- AF.request(url, method, data, headers, (data, headers, err) => {
|
|
|
+ AF.request(url, method, data, headers, requestId, (data, headers, err) => {
|
|
|
if (err) {
|
|
|
+ console.log(`request error: ${err}`);
|
|
|
reject(err);
|
|
|
} else {
|
|
|
console.log(`response headers: ${headers}`);
|
|
|
@@ -121,128 +122,7 @@ request = async (method, url, data = null, headers = {}, platform) => {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-getStringBetween = (string, needleStart, needleEnd, offsetStart = 0, offsetEnd = 0) => {
|
|
|
- const x = string.indexOf(needleStart);
|
|
|
- const y = needleEnd ? string.indexOf(needleEnd, x) : string.length;
|
|
|
- return string.substring(x + needleStart.length + offsetEnd, y + offsetStart);
|
|
|
-}
|
|
|
-
|
|
|
-findFunction = (jsCode, regexp, platform) => {
|
|
|
- const match = jsCode.match(regexp)
|
|
|
- if (!match && match.length <= 1) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- let result = "";
|
|
|
- const dependencyMatches = match[0].match(/([$a-zA-Z0-9]+\.[$a-zA-Z0-9]+)/g)
|
|
|
- const existDependencies = [];
|
|
|
- if (dependencyMatches && dependencyMatches.length >= 1) {
|
|
|
- for (let currentMatch of dependencyMatches) {
|
|
|
- const varName = currentMatch.split('.')[0];
|
|
|
- if (existDependencies.includes(varName)) {
|
|
|
- continue
|
|
|
- }
|
|
|
- if (!/^[$A-Za-z]{2,}$/.test(varName)) {
|
|
|
- continue
|
|
|
- }
|
|
|
- let reg = "var (\$)?" + varName + "={(.|\\n)*?};"
|
|
|
- const varNameMatch = jsCode.match(new RegExp(reg), 'ig');
|
|
|
- if (varNameMatch && varNameMatch.length >= 1) {
|
|
|
- result += varNameMatch[0] + "\n";
|
|
|
- }
|
|
|
- existDependencies.push(varName);
|
|
|
- }
|
|
|
- }
|
|
|
- result += `\n${match[0]}`;
|
|
|
- if (printable(platform)) {
|
|
|
- console.log(`findFunction result: ` + result);
|
|
|
- }
|
|
|
- return eval(result);
|
|
|
-};
|
|
|
-
|
|
|
-const cache = {};
|
|
|
-
|
|
|
-fetchBaseJSContent = async (baseJsUrl, platform) => {
|
|
|
- const cacheKey = `jsContent:${baseJsUrl}`;
|
|
|
- if (cache[cacheKey]) {
|
|
|
- console.log(`baseContent from cache: ${baseJsUrl}`);
|
|
|
- return cache[cacheKey];
|
|
|
- }
|
|
|
- console.log(`extract baseUrl: ${baseJsUrl}`);
|
|
|
- const baseContentResp = await request('GET', baseJsUrl, null, {
|
|
|
- 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.101 Safari/537.36',
|
|
|
- }, platform);
|
|
|
- const {data, _} = baseContentResp;
|
|
|
- cache[cacheKey] = data;
|
|
|
- return data;
|
|
|
-}
|
|
|
-
|
|
|
-extractJSSignatureFunction = async (baseJsUrl, platform) => {
|
|
|
- const cacheKey = `jsSign:${baseJsUrl}`
|
|
|
- if (cache[cacheKey]) {
|
|
|
- console.log(`jsSign from cache: ${baseJsUrl}`);
|
|
|
- return cache[cacheKey];
|
|
|
- }
|
|
|
- const baseJsContent = await fetchBaseJSContent(baseJsUrl, platform);
|
|
|
- const result = findFunction(baseJsContent, /([a-zA-Z0-9]+)=function\([a-zA-Z0-9]+\)\{a=a\.split\(""\).*};/, platform);
|
|
|
- cache[cacheKey] = result
|
|
|
- return result
|
|
|
-}
|
|
|
-
|
|
|
-extractNJSFunction = async (baseJsUrl, platform) => {
|
|
|
- const cacheKey = `jsN:${baseJsUrl}`
|
|
|
- if (cache[cacheKey]) {
|
|
|
- console.log(`jsN from cache: ${baseJsUrl}`);
|
|
|
- return cache[cacheKey];
|
|
|
- }
|
|
|
- const baseJsContent = await fetchBaseJSContent(baseJsUrl, platform);
|
|
|
- const result = findFunction(baseJsContent, /([a-zA-Z0-9]+)=function\([a-zA-Z0-9]+\)\{var b=a\.split\(""\)[\s\S]*?};/, platform);
|
|
|
- cache[cacheKey] = result
|
|
|
- return result
|
|
|
-}
|
|
|
-
|
|
|
-signUrl = async (signatureCipher, baseJsUrl, platform) => {
|
|
|
- const searchParams = {}
|
|
|
- for (const item of signatureCipher.split('&')) {
|
|
|
- const [key, value] = item.split('=');
|
|
|
- searchParams[decodeURIComponent(key)] = decodeURIComponent(value);
|
|
|
- }
|
|
|
- const [url, signature, sp] = [searchParams['url'], searchParams['s'], searchParams['sp']];
|
|
|
- const decipher = await extractJSSignatureFunction(baseJsUrl, platform);
|
|
|
- if (!decipher) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- if (printable(platform)) {
|
|
|
- console.log(`signatureCipher=${signatureCipher}, url=${url}, signature=${signature}, sp=${sp}`)
|
|
|
- }
|
|
|
- let newUrl = `${url}&${sp}=${decipher(signature)}`;
|
|
|
-
|
|
|
- function replaceUrlParam(url, paramName, paramValue) {
|
|
|
- let pattern = new RegExp(`([?&])${paramName}=.*?(&|$)`, 'i');
|
|
|
- let newUrl = url.replace(pattern, `$1${paramName}=${paramValue}$2`);
|
|
|
-
|
|
|
- if (newUrl === url && url.indexOf('?') === -1) {
|
|
|
- newUrl += `?${paramName}=${paramValue}`;
|
|
|
- } else if (newUrl === url) {
|
|
|
- newUrl += `&${paramName}=${paramValue}`;
|
|
|
- }
|
|
|
- return newUrl;
|
|
|
- }
|
|
|
-
|
|
|
- for (const item of url.split('&')) {
|
|
|
- const [key, value] = item.split('=');
|
|
|
- searchParams[decodeURIComponent(key)] = decodeURIComponent(value);
|
|
|
- }
|
|
|
-
|
|
|
- const nFunction = await extractNJSFunction(baseJsUrl, platform);
|
|
|
- const n = searchParams['n']
|
|
|
- if (n && nFunction) {
|
|
|
- const newN = nFunction(n);
|
|
|
- return replaceUrlParam(newUrl, 'n', newN);
|
|
|
- }
|
|
|
- return newUrl;
|
|
|
-}
|
|
|
-
|
|
|
-detail = async (url, platform) => {
|
|
|
+detail = async (url, requestId, platform) => {
|
|
|
try {
|
|
|
const htmlResp = await request('GET', `${url}&bpctr=9999999999&has_verified=1`, null, {
|
|
|
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36',
|
|
|
@@ -251,7 +131,7 @@ detail = async (url, platform) => {
|
|
|
'Sec-Fetch-Mode': 'navigate',
|
|
|
'Accept-Encoding': 'gzip, deflate, br',
|
|
|
'Cookie': 'PREF=hl=en&tz=UTC; SOCS=CAI'
|
|
|
- }, platform);
|
|
|
+ }, requestId, platform);
|
|
|
let {data: html, headers: htmlHeaders} = htmlResp;
|
|
|
|
|
|
let regex = /var ytInitialPlayerResponse\s*=\s*({.*?});/;
|
|
|
@@ -297,12 +177,12 @@ detail = async (url, platform) => {
|
|
|
'Accept-Language': 'en-US,en',
|
|
|
'Cookie': parseSetCookie(htmlHeaders),
|
|
|
'Content-Type': 'application/json'
|
|
|
- }, platform);
|
|
|
+ }, requestId, platform);
|
|
|
let {data: apiData, _} = apiResp;
|
|
|
console.log(`android api result: ${JSON.stringify(apiResp)}`);
|
|
|
const res = JSON.parse(apiData);
|
|
|
const currentFormats = [];
|
|
|
- for (const format of [].concat(res["streamingData"]["formats"]).concat(res["streamingData"]["adaptiveFormats"])) {
|
|
|
+ for (const format of [].concat(res["streamingData"]["formats"] || []).concat(res["streamingData"]["adaptiveFormats"] || [])) {
|
|
|
if (format) {
|
|
|
format["from"] = "android"
|
|
|
currentFormats.push(format);
|
|
|
@@ -311,37 +191,25 @@ detail = async (url, platform) => {
|
|
|
originFormats = originFormats.concat(currentFormats);
|
|
|
} catch (e) {
|
|
|
console.log(`can not found format android api error: ${e}`);
|
|
|
+ console.log(`detail2 result error: ${JSON.stringify(ret)}`);
|
|
|
+ const ret = {
|
|
|
+ "code": -1,
|
|
|
+ "msg": e.toString()
|
|
|
+ }
|
|
|
+ return ret;
|
|
|
}
|
|
|
console.log(`after android api, format size:${originFormats.length}`);
|
|
|
|
|
|
// web
|
|
|
- const currentFormats = [];
|
|
|
- for (const format of ytInitialPlayerResponse["streamingData"]["formats"].concat(ytInitialPlayerResponse["streamingData"]["adaptiveFormats"])) {
|
|
|
- if (format) {
|
|
|
- format["from"] = "web"
|
|
|
- currentFormats.push(format);
|
|
|
- }
|
|
|
- }
|
|
|
- originFormats = originFormats.concat(currentFormats);
|
|
|
- console.log(`after html, format size:${originFormats.length}`);
|
|
|
-
|
|
|
- const baseJsUrl = `https://www.youtube.com${JSON.parse(html.match(/set\(({.+?})\);/)[1])["PLAYER_JS_URL"]}`
|
|
|
- let audioUrl = ""
|
|
|
- for (let format of originFormats) {
|
|
|
- format["originUrl"] = format["url"]
|
|
|
- }
|
|
|
- for (let format of originFormats) {
|
|
|
- if (format["signatureCipher"] || !format["url"]) {
|
|
|
- format["url"] = await signUrl(format["signatureCipher"], baseJsUrl, platform);
|
|
|
- }
|
|
|
- if (format["url"]) {
|
|
|
- const {vcodec, acodec} = parseCodecs(format)
|
|
|
- if (!vcodec && acodec) {
|
|
|
- audioUrl = format["url"]
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // const currentFormats = [];
|
|
|
+ // for (const format of ytInitialPlayerResponse["streamingData"]["formats"].concat(ytInitialPlayerResponse["streamingData"]["adaptiveFormats"])) {
|
|
|
+ // if (format) {
|
|
|
+ // format["from"] = "web"
|
|
|
+ // currentFormats.push(format);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // originFormats = originFormats.concat(currentFormats);
|
|
|
+ // console.log(`after html, format size:${originFormats.length}`);
|
|
|
|
|
|
let qualities = [];
|
|
|
const formats = [];
|
|
|
@@ -349,16 +217,15 @@ detail = async (url, platform) => {
|
|
|
if (printable(platform)) {
|
|
|
console.log(format);
|
|
|
}
|
|
|
- if (format && qualities.indexOf(format['audioQuality']) === -1) {
|
|
|
- if (!format["url"]) {
|
|
|
- format["url"] = await signUrl(format["signatureCipher"], baseJsUrl, platform);
|
|
|
- }
|
|
|
+ if (format && qualities.indexOf(format['itag']) === -1) {
|
|
|
if (format["url"]) {
|
|
|
const {vcodec, acodec} = parseCodecs(format)
|
|
|
- if (!vcodec && acodec) {
|
|
|
+ if (vcodec && acodec) {
|
|
|
const current = {
|
|
|
+ "width": format["width"] + "",
|
|
|
+ "height": format["height"] + "",
|
|
|
"type": format["mimeType"],
|
|
|
- "quality": format["audioQuality"],
|
|
|
+ "quality": format["qualityLabel"],
|
|
|
"itag": format["itag"],
|
|
|
"fps": format["fps"] + "",
|
|
|
"bitrate": format["bitrate"] + "",
|
|
|
@@ -370,13 +237,10 @@ detail = async (url, platform) => {
|
|
|
"abr": "0",
|
|
|
"container": "mp4_dash",
|
|
|
"from": format["from"],
|
|
|
- "audioUrl": audioUrl
|
|
|
- }
|
|
|
- if (platform === "WEB") {
|
|
|
- current["source"] = format
|
|
|
+ "source": format
|
|
|
}
|
|
|
formats.push(current)
|
|
|
- qualities.push(format["audioQuality"]);
|
|
|
+ qualities.push(format["qualityLabel"]);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -450,7 +314,7 @@ detail = async (url, platform) => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-search = async (keyword, next, platform) => {
|
|
|
+search = async (keyword, next, requestId, platform) => {
|
|
|
try {
|
|
|
console.log(`search keyword: ${keyword}`);
|
|
|
console.log(`search next: ${next}`);
|
|
|
@@ -466,7 +330,7 @@ search = async (keyword, next, platform) => {
|
|
|
},
|
|
|
continuation: nextObject["continuation"]
|
|
|
};
|
|
|
- let res = await request('POST', `https://www.youtube.com/youtubei/v1/search?key=${key}`, JSON.stringify(body), {}, platform);
|
|
|
+ let res = await request('POST', `https://www.youtube.com/youtubei/v1/search?key=${key}`, JSON.stringify(body), {}, requestId, platform);
|
|
|
const {data, _} = res;
|
|
|
res = JSON.parse(data);
|
|
|
const videos = [];
|
|
|
@@ -508,7 +372,7 @@ search = async (keyword, next, platform) => {
|
|
|
} else {
|
|
|
let url = `https://www.youtube.com/results?q=${encodeURIComponent(keyword)}&sp=EgIQAQ%253D%253D`;
|
|
|
|
|
|
- const htmlRes = await request('GET', url, null, {}, platform);
|
|
|
+ const htmlRes = await request('GET', url, null, {}, requestId, platform);
|
|
|
const {data: html, _} = htmlRes;
|
|
|
|
|
|
let regex = /var ytInitialData\s*=\s*({.*?});/;
|
