mirror of
https://codeberg.org/ashley/poke.git
synced 2024-11-22 22:57:54 +01:00
fetch data again if it fails to fetch
This commit is contained in:
parent
5c776cd1ef
commit
666a9b63e1
1 changed files with 98 additions and 76 deletions
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* PokeTube is a Free/Libre youtube front-end !
|
* Poke is a Free/Libre youtube front-end !
|
||||||
*
|
*
|
||||||
* This file is Licensed under LGPL-3.0-or-later. Poketube itself is GPL, Only this file is LGPL.
|
* This file is Licensed under LGPL-3.0-or-later. Poketube itself is GPL, Only this file is LGPL.
|
||||||
* See a copy here: https://www.gnu.org/licenses/lgpl-3.0.txt
|
* See a copy here: https://www.gnu.org/licenses/lgpl-3.0.txt
|
||||||
|
@ -10,9 +10,8 @@ const { toJson } = require("xml2json");
|
||||||
const { curly } = require("node-libcurl");
|
const { curly } = require("node-libcurl");
|
||||||
const getdislikes = require("../libpoketube/libpoketube-dislikes.js");
|
const getdislikes = require("../libpoketube/libpoketube-dislikes.js");
|
||||||
const getColors = require("get-image-colors");
|
const getColors = require("get-image-colors");
|
||||||
const config = require("../../config.json")
|
const config = require("../../config.json");
|
||||||
const { Innertube, UniversalCache } = require('youtubei.js');
|
const { Innertube, UniversalCache } = require("youtubei.js");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class representing PokeTube's core functionality.
|
* Class representing PokeTube's core functionality.
|
||||||
|
@ -31,10 +30,11 @@ class InnerTubePokeVidious {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
this.cache = {};
|
this.cache = {};
|
||||||
this.language = "hl=en-US";
|
this.language = "hl=en-US";
|
||||||
this.apikey = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"
|
this.apikey = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8";
|
||||||
this.INNERTUBE_CONTEXT_CLIENT_VERSION = "1"
|
this.INNERTUBE_CONTEXT_CLIENT_VERSION = "1";
|
||||||
this.region = "region=US";
|
this.region = "region=US";
|
||||||
this.sqp = "-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw";
|
this.sqp =
|
||||||
|
"-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -69,9 +69,32 @@ class InnerTubePokeVidious {
|
||||||
* @returns {Promise<object>} Promise resolving to the video information.
|
* @returns {Promise<object>} Promise resolving to the video information.
|
||||||
*/
|
*/
|
||||||
async getYouTubeApiVideo(f, v, contentlang, contentregion) {
|
async getYouTubeApiVideo(f, v, contentlang, contentregion) {
|
||||||
|
/**
|
||||||
|
* Fetch data from the specified URL with the given headers, retrying if status code is 500.
|
||||||
|
* @param {string} url - The URL to fetch data from.
|
||||||
|
* @param {Object} headers - The headers to include in the fetch request.
|
||||||
|
* @returns {Promise<string>} A promise that resolves to the text content of the response.
|
||||||
|
*/
|
||||||
|
async function fetchData(url, headers) {
|
||||||
|
/**
|
||||||
|
* @type {Response}
|
||||||
|
*/
|
||||||
|
const response = await fetch(url, { headers });
|
||||||
|
|
||||||
|
if (response.status === 500) {
|
||||||
|
// If status is 500, fetch again
|
||||||
|
console.log("Retrying due to status 500...");
|
||||||
|
return fetchData(url, headers);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.text();
|
||||||
|
}
|
||||||
|
|
||||||
const { fetch } = await import("undici");
|
const { fetch } = await import("undici");
|
||||||
const yt = await Innertube.create({ cache: new UniversalCache(false), generate_session_locally: true });
|
const yt = await Innertube.create({
|
||||||
|
cache: new UniversalCache(false),
|
||||||
|
generate_session_locally: true,
|
||||||
|
});
|
||||||
|
|
||||||
if (v == null) return "Gib ID";
|
if (v == null) return "Gib ID";
|
||||||
|
|
||||||
|
@ -85,7 +108,7 @@ class InnerTubePokeVidious {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const [videoInfo, videoData] = await Promise.all([
|
const [videoInfo, videoData] = await Promise.all([
|
||||||
fetch(`${this.config.invapi}/videos/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()),
|
fetchData(`${this.config.invapi}/videos/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`),
|
||||||
curly
|
curly
|
||||||
.get(`${this.config.tubeApi}video?v=${v}`, {
|
.get(`${this.config.tubeApi}video?v=${v}`, {
|
||||||
httpHeader: Object.entries(headers).map(([k, v]) => `${k}: ${v}`),
|
httpHeader: Object.entries(headers).map(([k, v]) => `${k}: ${v}`),
|
||||||
|
@ -97,13 +120,12 @@ class InnerTubePokeVidious {
|
||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
const comments = await yt.getComments(v);
|
const comments = await yt.getComments(v);
|
||||||
|
|
||||||
const vid = await this.getJson(videoInfo);
|
const vid = await this.getJson(videoInfo);
|
||||||
const { json, video } = videoData;
|
const { json, video } = videoData;
|
||||||
|
|
||||||
var channel_uploads = { };
|
var channel_uploads = {};
|
||||||
if (f == "true") {
|
if (f == "true") {
|
||||||
channel_uploads = await fetch(
|
channel_uploads = await fetch(
|
||||||
`${this.config.invapi}/channels/${vid.authorId}?hl=${contentlang}®ion=${contentregion}`
|
`${this.config.invapi}/channels/${vid.authorId}?hl=${contentlang}®ion=${contentregion}`
|
||||||
|
@ -149,11 +171,8 @@ class InnerTubePokeVidious {
|
||||||
this.initError("Error getting video", error);
|
this.initError("Error getting video", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a video ID is valid.
|
* Check if a video ID is valid.
|
||||||
|
@ -182,7 +201,10 @@ class InnerTubePokeVidious {
|
||||||
const pokeTubeApiCore = new InnerTubePokeVidious({
|
const pokeTubeApiCore = new InnerTubePokeVidious({
|
||||||
tubeApi: "https://inner-api.poketube.fun/api/",
|
tubeApi: "https://inner-api.poketube.fun/api/",
|
||||||
invapi: "https://invid-api.poketube.fun/api/v1",
|
invapi: "https://invid-api.poketube.fun/api/v1",
|
||||||
invapi_alt: config.proxylocation === "EU" ? "https://invid-api.poketube.fun/api/v1" : "https://iv.ggtyler.dev/api/v1",
|
invapi_alt:
|
||||||
|
config.proxylocation === "EU"
|
||||||
|
? "https://invid-api.poketube.fun/api/v1"
|
||||||
|
: "https://iv.ggtyler.dev/api/v1",
|
||||||
dislikes: "https://returnyoutubedislikeapi.com/votes?videoId=",
|
dislikes: "https://returnyoutubedislikeapi.com/votes?videoId=",
|
||||||
t_url: "https://t.poketube.fun/",
|
t_url: "https://t.poketube.fun/",
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue