From a68fcde7f94b911c70f327ed78d2a337d0b6b811 Mon Sep 17 00:00:00 2001 From: Ashley //// Date: Wed, 24 Apr 2024 15:44:33 +0000 Subject: [PATCH] test ignore --- src/libpoketube/libpoketube-core.js | 135 +++++++++++++++------------- 1 file changed, 71 insertions(+), 64 deletions(-) diff --git a/src/libpoketube/libpoketube-core.js b/src/libpoketube/libpoketube-core.js index 63ce3720..a2b18e8b 100644 --- a/src/libpoketube/libpoketube-core.js +++ b/src/libpoketube/libpoketube-core.js @@ -67,91 +67,98 @@ class InnerTubePokeVidious { * @param {string} v - Video ID. * @returns {Promise} Promise resolving to the video information. */ - async getYouTubeApiVideo(f, v, contentlang, contentregion) { - +async getYouTubeApiVideo(f, v, contentlang, contentregion) { + const { fetch } = await import("undici"); if (v == null) return "Gib ID"; // Check if result is already cached if (this.cache[v] && Date.now() - this.cache[v].timestamp < 3600000) { - return this.cache[v].result; + return this.cache[v].result; } const headers = {}; let desc = ""; try { - const [invComments, videoInfo, videoData] = await Promise.all([ - fetch(`${this.config.invapi}/comments/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()), - fetch(`${this.config.invapi}/videos/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()), - curly - .get(`${this.config.tubeApi}video?v=${v}`, { - httpHeader: Object.entries(headers).map(([k, v]) => `${k}: ${v}`), - }) - .then((res) => { - const json = toJson(res.data); - const video = this.getJson(json); - return { json, video }; - }), - ]); + const [invComments, videoInfo, videoData] = await Promise.all([ + fetch(`${this.config.invapi}/comments/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()), + fetch(`${this.config.invapi}/videos/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()), + curly + .get(`${this.config.tubeApi}video?v=${v}`, { + httpHeader: Object.entries(headers).map(([k, v]) => `${k}: ${v}`), + }) + .then((res) => { + const json = toJson(res.data); + const video = this.getJson(json); + return { json, video }; + }), + ]); - - const comments = await this.getJson(invComments); - - const vid = await this.getJson(videoInfo); - const { json, video } = videoData; + const comments = await this.getJson(invComments); + let vid = await this.getJson(videoInfo); + const { json, video } = videoData; - var channel_uploads = { }; - if (f == "true") { - channel_uploads = await fetch( - `${this.config.invapi}/channels/${vid.authorId}?hl=${contentlang}®ion=${contentregion}` - ); - var p = this.getJson(await channel_uploads.text()); - } + var channel_uploads = {}; + if (f == "true") { + channel_uploads = await fetch( + `${this.config.invapi}/channels/${vid.authorId}?hl=${contentlang}®ion=${contentregion}` + ); + var p = this.getJson(await channel_uploads.text()); + } - if (!vid) { - console.log( - `Sorry nya, we couldn't find any information about that video qwq` - ); - } + // Retry fetching videoInfo if vid is null, limited to 3 retries + let retryCount = 0; + while (!vid && retryCount < 3) { + console.log(`Retrying fetching videoInfo... Retry ${retryCount + 1}`); + const retryVideoInfo = await fetch(`${this.config.invapi}/videos/${v}?hl=${contentlang}®ion=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()); + vid = await this.getJson(retryVideoInfo); + retryCount++; + } - if (this.checkUnexistingObject(vid)) { - const fe = await getdislikes(v); + if (!vid) { + console.log( + `Sorry nya, we couldn't find any information about that video qwq` + ); + } - try { - const headers = {}; + if (this.checkUnexistingObject(vid)) { + const fe = await getdislikes(v); - // Store result in cache - this.cache[v] = { - result: { - json: json?.video, - video, - vid, - comments, - channel_uploads: p, - engagement: fe.engagement, - wiki: "", - desc: "", - color: await getColors( - `https://vid.puffyan.us/vi/${v}/hqdefault.jpg?sqp=${this.sqp}` - ).then((colors) => colors[0].hex()), - color2: await getColors( - `https://vid.puffyan.us/vi/${v}/hqdefault.jpg?sqp=${this.sqp}` - ).then((colors) => colors[1].hex()), - }, - timestamp: Date.now(), - }; + try { + const headers = {}; - return this.cache[v].result; - } catch (error) { - this.initError("Error getting video", error); - } - } + // Store result in cache + this.cache[v] = { + result: { + json: json?.video, + video, + vid, + comments, + channel_uploads: p, + engagement: fe.engagement, + wiki: "", + desc: "", + color: await getColors( + `https://vid.puffyan.us/vi/${v}/hqdefault.jpg?sqp=${this.sqp}` + ).then((colors) => colors[0].hex()), + color2: await getColors( + `https://vid.puffyan.us/vi/${v}/hqdefault.jpg?sqp=${this.sqp}` + ).then((colors) => colors[1].hex()), + }, + timestamp: Date.now(), + }; + + return this.cache[v].result; + } catch (error) { + this.initError("Error getting video", error); + } + } } catch { - - } + } +} /**