mirror of https://github.com/VueTubeApp/VueTube
small debug fixes
This commit is contained in:
parent
505b69365f
commit
dba23bec6b
|
@ -12,21 +12,30 @@ class Innertube {
|
|||
}
|
||||
|
||||
async init() {
|
||||
const html = await Http.request({ method: 'GET', url: 'https://www.youtube.com', params: { hl: "en" } }).catch((error) => error);
|
||||
const html = await Http.get({ url: 'https://www.youtube.com', params: { hl: "en" } }).catch((error) => error);
|
||||
if (html instanceof Error) this.ErrorCallback(html.message, true);
|
||||
try {
|
||||
const data = JSON.parse(getBetweenStrings(html.data, 'ytcfg.set({', '});'));
|
||||
const data = JSON.parse(getBetweenStrings(html.data, 'ytcfg.set(', ');'));
|
||||
if (data.INNERTUBE_CONTEXT) {
|
||||
this.key = data.INNERTUBE_API_KEY;
|
||||
this.context = data.INNERTUBE_CONTEXT;
|
||||
this.context.clientName = "ANDROID";
|
||||
this.context.clientVersion = "16.25";
|
||||
}
|
||||
|
||||
} catch (err) {
|
||||
console.log(err)
|
||||
this.ErrorCallback(err, true)
|
||||
this.retry_count >= 10 ? this.init() : this.ErrorCallback("Failed to retrieve Innertube session", true);
|
||||
}
|
||||
};
|
||||
|
||||
static async create(ErrorCallback) {
|
||||
const created = new Innertube(ErrorCallback);
|
||||
await created.init();
|
||||
return created;
|
||||
}
|
||||
|
||||
async browse(action_type) {
|
||||
let data = { context: this.context }
|
||||
|
||||
|
@ -41,10 +50,16 @@ class Innertube {
|
|||
default:
|
||||
}
|
||||
|
||||
const response = await Http.request({
|
||||
method: 'POST',
|
||||
console.log(data)
|
||||
|
||||
const response = await Http.post({
|
||||
url: `https://www.youtube.com/youtubei/v1/browse?key=${this.key}`,
|
||||
data: JSON.stringify(data)
|
||||
data: JSON.stringify(data),
|
||||
headers: {
|
||||
"Access-Control-Allow-Origin": "*",
|
||||
"Access-Control-Allow-Methods": "DELETE, POST, GET, OPTIONS",
|
||||
"Access-Control-Allow-Headers": "Content-Type, Authorization, X-Requested-With"
|
||||
}
|
||||
}).catch((error) => error);
|
||||
|
||||
if (response instanceof Error) return { success: false, status_code: response.response.status, message: response.message };
|
||||
|
|
|
@ -1,9 +1,13 @@
|
|||
// Collection of functions that are useful but non-specific to any particular files
|
||||
|
||||
function getBetweenStrings(data, start_string, end_string) {
|
||||
const regex = new RegExp(`${start_string}(.*?)${end_string}`, "s");
|
||||
const regex = new RegExp(`${escapeRegExp(start_string)}(.*?)${escapeRegExp(end_string)}`, "s");
|
||||
const match = data.match(regex);
|
||||
return match ? match[1] : undefined;
|
||||
}
|
||||
|
||||
function escapeRegExp(string) {
|
||||
return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||
}
|
||||
|
||||
module.exports = { getBetweenStrings };
|
|
@ -120,7 +120,7 @@ const searchModule = {
|
|||
},
|
||||
|
||||
async recommend() {
|
||||
const recommendAPI = new Innertube((message, isError) => {
|
||||
const recommendAPI = await Innertube.create((message, isError) => {
|
||||
logger("recommendation", message, isError)
|
||||
});
|
||||
return await recommendAPI.getRecommendations();
|
||||
|
|
Loading…
Reference in New Issue