etc
/
VueTube
mirror of https://github.com/VueTubeApp/VueTube
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #627 from pixkk/main 

Major update
This commit is contained in:
Luka 2023-05-26 16:37:37 +00:00 committed by GitHub
parent 0a566dfe87 5d288412f9
commit 1aeaf958e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 187 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NUXT/components/Comments/authorCommentBadgeRenderer.vue
View File

@ -1,7 +1,7 @@
<template>
<div
class="author-comment-badge-renderer"
v-if="metadata && iconTypeMap.hasOwnProperty(metadata.icon.iconType)"
v-if="metadata && iconTypeMap.hasOwnProperty(metadata.icon)"
>
<v-tooltip top>
<template v-slot:activator="{ on, attrs }">

132
NUXT/components/Player/index.vue
View File

@ -27,7 +27,6 @@
},
}"
mediagroup="vuetubecute"
autoplay
width="100%"
:src="vidSrc"
:height="isFullscreen ? '100%' : 'auto'"
@ -418,20 +417,76 @@ export default {
console.log("recommends", this.recommends);
console.log("video", this.video);
this.vid = this.$refs.player;
this.aud = this.$refs.audio;
// TODO: this.$store.state.player.quality, check if exists and select the closest one
if (this.$store.state.player.preload) this.prebuffer(this.sources[0].url);
else {
this.prebuffer(this.sources[0].url);
this.sources.forEach((source) => {
if (source.mimeType.indexOf("audio") > -1) {
this.audSrc = source.url;
this.vidSrc = this.sources[0].url;
}
});
/**
* Video quality selection which device can play normally
* @returns {number[]}
*/
function getPreferredQuality() {
let width;
let height;
// Detecting device - https://stackoverflow.com/a/11381730/18543384
window.mobileCheck = function () {
let check = false;
(function (a) {
if (
/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
a
) ||
/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
a.substr(0, 4)
)
)
check = true;
})(navigator.userAgent || navigator.vendor || window.opera);
return check;
};
// The smartphone screen width is smaller than the length (1080x1920).
// On a computer, the opposite is true (1920x1080).
// Detecting smaller side of the display.
if (window.mobileCheck) {
width = window.screen.width * window.devicePixelRatio;
height = window.screen.height * window.devicePixelRatio;
} else {
width = window.screen.height * window.devicePixelRatio;
height = window.screen.width * window.devicePixelRatio;
}
return [width, height];
}
// TODO: this.$store.state.player.quality, check if exists and select the closest one
let displayInfo = getPreferredQuality();
let indexOfPreferredQuality = 0;
console.warn(displayInfo);
for (let i = this.sources.length; i > 0; i--) {
if (i === this.sources.length) continue;
else {
// if quality height <= to the smaller side of the display,
// write the index of the source to a variable indexOfPreferredQuality.
if (
this.sources[i].height <= displayInfo[1] &&
this.sources[i].mimeType.includes("video")
) {
indexOfPreferredQuality = i;
}
if (this.sources[i].mimeType.indexOf("audio") > -1) {
this.audSrc = this.sources[i].url;
}
}
}
this.vidSrc = this.sources[indexOfPreferredQuality].url;
// this.prebuffer(this.sources[indexOfPreferredQuality].url);
this.sources.forEach((source) => {
if (source.mimeType.indexOf("audio") > -1) {
this.audSrc = source.url;
return;
}
});
// TODO: detect this.isMusic from the video or channel metadata instead of just SB segments
this.$youtube.getSponsorBlock(this.video.id, (data) => {
// console.warn("sbreturn", data);
if (Array.isArray(data)) {
@ -446,9 +501,7 @@ export default {
}
});
// TODO: detect this.isMusic from the video or channel metadata instead of just SB segments
this.$refs.player.addEventListener("loadeddata", this.loadedDataEvent);
this.aud.addEventListener("loadeddata", this.loadedAudioEvent);
},
created() {
screen.orientation.addEventListener("change", () =>
@ -459,19 +512,28 @@ export default {
this.cleanup();
},
methods: {
loadedAudioEvent() {
this.$refs.player.addEventListener("loadeddata", this.loadedDataEvent);
this.loadedDataEvent();
},
loadedDataEvent() {
// console.log(e);
// if (vid.networkState === vid.NETWORK_LOADING) {
// // The user agent is actively trying to download data.
// }
// networkState: An integer property that represents the network state of the video. The possible values are:
// NETWORK_EMPTY (0): No source has been set or the video element's load() method has not been called.
// NETWORK_IDLE (1): The video element's load() method has been called, and the video is fetching the media resource.
// NETWORK_LOADING (2): The video is in the process of downloading the media resource.
// NETWORK_NO_SOURCE (3): No suitable source found for the video.
// if (vid.readyState < vid.HAVE_FUTURE_DATA) {
// // There is not enough data to keep playing from this point
// }
if (this.vid.readyState >= 3) {
//readyState: An integer property that represents the readiness state of the video. The possible values are:
// HAVE_NOTHING (0): No information about the media resource is available.
// HAVE_METADATA (1): Basic metadata about the media resource, such as duration, is available.
// HAVE_CURRENT_DATA (2): Data for the current playback position is available but not enough to start playback.
// HAVE_FUTURE_DATA (3): Data for the current and at least the next frame is available.
// HAVE_ENOUGH_DATA (4): Enough data is available to start playback.
if (this.vid.readyState >= 3 && this.aud.readyState >= 3) {
this.vid.play();
this.aud.play();
this.bufferingDetected = false;
this.$refs.audio.currentTime = this.vid.currentTime;
this.$refs.audio.play();
if (!this.isMusic) {
this.$refs.audio.playbackRate = this.$store.state.player.speed;
@ -515,7 +577,11 @@ export default {
clearTimeout(this.bufferingDetected);
this.bufferingDetected = false;
}
if (this.$refs.audio.paused && !this.$refs.player.paused)
if (
this.$refs.audio.paused &&
!this.$refs.player.paused &&
this.$refs.player.readyState >= 3
)
this.$refs.audio.play();
this.buffered = (this.vid.buffered.end(0) / this.vid.duration) * 100;
},
@ -535,8 +601,8 @@ export default {
clearTimeout(this.bufferingDetected);
this.$refs.audio.currentTime = this.vid.currentTime;
this.bufferingDetected = false;
this.$refs.audio.play();
}
this.$refs.audio.play();
},
cleanup() {
if (this.xhr) this.xhr.abort();
@ -558,9 +624,8 @@ export default {
"load",
() => {
if (this.xhr.status === 200) {
var blob = this.xhr.response;
console.error(this.xhr);
this.blobToDataURL(blob, (dataurl) => {
this.blobToDataURL(this.xhr.response, (dataurl) => {
console.log(dataurl);
this.vidSrc = dataurl;
this.buffered = 100;
@ -586,13 +651,10 @@ export default {
this.xhr.send();
},
// !NOTE: (BUG) too big to process for 1080p vids over 2 minutes
blobToDataURL(blob, callback) {
var a = new FileReader();
a.onload = function (e) {
callback(e.target.result);
};
a.readAsDataURL(blob);
let url = URL.createObjectURL(new Blob([blob]));
callback(url);
},
shortNext() {
this.shortTransition = true;

4
NUXT/components/Playlist/playlistCard.vue
View File

@ -84,10 +84,10 @@ export default {
try {
const videoId =
this.playlist.videos.length === 0 ? "" : this.playlist.videos[0].id;
return `https://img.youtube.com/vi/${videoId}/maxresdefault.jpg`;
return `https://img.youtube.com/vi/${videoId}/hqdefault.jpg`;
} catch (e) {
alert(e.message);
return `https://img.youtube.com/vi//maxresdefault.jpg`;
return `https://img.youtube.com/vi//hqdefault.jpg`;
}
},
},

2
NUXT/components/Playlist/playlistVideoCard.vue
View File

@ -89,7 +89,7 @@ export default {
props: { video: { type: Object, required: true } },
computed: {
thumbnail() {
return `https://img.youtube.com/vi/${this.video.id}/maxresdefault.jpg`;
return `https://img.youtube.com/vi/${this.video.id}/hqdefault.jpg`;
},
},
methods: {

10
NUXT/components/UtilRenderers/YtTextFormatterNew.vue
View File

@ -89,18 +89,18 @@ export default {
text[1].indexOf("/channel/") > -1 ||
text[1].indexOf("youtube.com/c/") > -1
) {
let nameOfUrl = text[0].replace(/   /, " ");
// let newUrl =
// "<a" + ' onclick=openInternal("' + text[1] + '") style="background-color: rgba(0,0,0,0.051); border-radius: 8px; white-space: nowrap;">' + img + nameOfUrl + "</a>";
let nameOfUrl = text[0].replace(/   /, " ").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
// Temporary
let newUrl =
"<a" +
' onclick=openInternal("channel") style="background-color: rgba(0,0,0,0.051); border-radius: 8px; white-space: nowrap;">' +
img +
nameOfUrl +
"</a>";
tempContent = tempContent.replaceAll(text[0], newUrl);
tempContent = tempContent.replaceAll(
new RegExp(`\\b${text[0]}\\b`, "g"),
newUrl
);
} else {
let params = new Proxy(new URLSearchParams(text[1]), {
get: (searchParams, prop) => searchParams.get(prop),

4
NUXT/components/historyCard.vue
View File

@ -89,7 +89,7 @@ export default {
props: ["video"],
computed: {
thumbnail() {
return `https://img.youtube.com/vi/${this.video.id}/maxresdefault.jpg`;
return `https://img.youtube.com/vi/${this.video.id}/hqdefault.jpg`;
},
},
methods: {
@ -98,4 +98,4 @@ export default {
},
},
};
</script>
</script>

113
NUXT/plugins/innertube.js
View File

@ -24,80 +24,82 @@ class Innertube {
return typeof this.ErrorCallback === "function";
}
async initAsync() {
const html = await Http.get({
url: constants.URLS.YT_URL,
params: { hl: "en" },
}).catch((error) => error);
async makeDecipherFunction(html) {
// Get url of base.js file
const baseJsUrl =
constants.URLS.YT_URL +
getBetweenStrings(html.data, '"jsUrl":"', '","cssUrl"');
try {
if (html instanceof Error && this.checkErrorCallback)
this.ErrorCallback(html.message, true);
// Get base.js content
const baseJs = await Http.get({
url: baseJsUrl,
}).catch((error) => error);
// Example:
//;var IF={k4:function(a,b){var c=a[0];a[0]=a[b%a.length];a[b%a.length]=c},
// VN:function(a){a.reverse()},
// DW:function(a,b){a.splice(0,b)}};
let isMatch;
if (
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z]+:function\(a\)\{[^}]*\},\n[A-Za-z]+:function\([^)]*\)\{[^}]*\}\};/.exec(
// Get base.js content
const baseJs = await Http.get({
url: baseJsUrl,
}).catch((error) => error);
// Example:
//;var IF={k4:function(a,b){var c=a[0];a[0]=a[b%a.length];a[b%a.length]=c},
// VN:function(a){a.reverse()},
// DW:function(a,b){a.splice(0,b)}};
let isMatch;
if (
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z0-9]+:function\(a\)\{[^}]*\},\n[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\}\};/.exec(
baseJs.data
)
) {
isMatch =
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z0-9]+:function\(a\)\{[^}]*\},\n[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\}\};/.exec(
baseJs.data
)
) {
isMatch =
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z]+:function\(a\)\{[^}]*\},\n[A-Za-z]+:function\([^)]*\)\{[^}]*\}\};/.exec(
baseJs.data
);
} else if (
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z]+:function\([A-Za-z],[A-Za-z]\)\{[^}]*\},\n[A-Za-z]+:function\([^)]*\)\{[^}]*\}\};/.exec(
);
} else if (
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z0-9]+:function\([A-Za-z],[A-Za-z]\)\{[^}]*\},\n[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\}\};/.exec(
baseJs.data
)
) {
isMatch =
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z0-9]+:function\([A-Za-z],[A-Za-z]\)\{[^}]*\},\n[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\}\};/.exec(
baseJs.data
)
) {
isMatch =
/;var [A-Za-z]+=\{[A-Za-z0-9]+:function\([^)]*\)\{[^}]*\},\n[A-Za-z]+:function\([A-Za-z],[A-Za-z]\)\{[^}]*\},\n[A-Za-z]+:function\([^)]*\)\{[^}]*\}\};/.exec(
baseJs.data
);
}
);
}
if (isMatch) {
console.log("The input string matches the regex pattern.");
} else {
console.log("The input string does not match the regex pattern.");
}
// Get first part of decipher function
if (isMatch) {
console.log("The input string matches the regex pattern.");
const firstPart = isMatch[0].substring(1);
if (
/\{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return [A-Za-z]\.join\(""\)\};/.exec(
/\{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return [A-Za-z]\.join\(""\)\};/.exec(
baseJs.data
)
) {
isMatch =
/\{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return [A-Za-z]\.join\(""\)\};/.exec(
/\{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return [A-Za-z]\.join\(""\)\};/.exec(
baseJs.data
);
} else if (
/{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);return +[A-Za-z]\.join\(""\)};/.exec(
/{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return +[A-Za-z]\.join\(""\)};/.exec(
baseJs.data
)
) {
isMatch =
/{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);return +[A-Za-z]\.join\(""\)};/.exec(
/{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return +[A-Za-z]\.join\(""\)};/.exec(
baseJs.data
);
} else if (
/\{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return +[A-Za-z]\.join\(""\)};/.exec(
baseJs.data
)
) {
isMatch =
/\{[A-Za-z]=[A-Za-z]\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return +[A-Za-z]\.join\(""\)};/.exec(
baseJs.data
);
} else {
isMatch =
/\{a=a\.split\(""\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);[A-Za-z]+\.[A-Za-z]+\([^)]*\);return a\.join\(""\)\};/.exec(
/\{a=a\.split\(""\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);[A-Za-z]+\.[A-Za-z0-9]+\([^)]*\);return a\.join\(""\)\};/.exec(
baseJs.data
);
}
if (!isMatch) {
console.warn(
"The second part of decipher string does not match the regex pattern."
);
}
// Example:
// {a=a.split("");IF.k4(a,4);IF.VN(a,68);IF.DW(a,2);IF.VN(a,66);IF.k4(a,19);IF.DW(a,2);IF.VN(a,36);IF.DW(a,2);IF.k4(a,41);return a.join("")};
@ -110,6 +112,23 @@ class Innertube {
let signatureIntValue = /.sts="[0-9]+";/.exec(baseJs.data);
// Get signature timestamp
this.signatureTimestamp = signatureIntValue[0].replace(/\D/g, "");
} else {
console.warn(
"The first part of decipher string does not match the regex pattern."
);
}
}
async initAsync() {
const html = await Http.get({
url: constants.URLS.YT_URL,
params: { hl: "en" },
}).catch((error) => error);
await this.makeDecipherFunction(html);
try {
if (html instanceof Error && this.checkErrorCallback)
this.ErrorCallback(html.message, true);
try {
const data = JSON.parse(
"{" + getBetweenStrings(html.data, "ytcfg.set({", ");")
@ -385,7 +404,7 @@ class Innertube {
static getThumbnail(id, resolution) {
if (resolution == "max") {
const url = `https://img.youtube.com/vi/${id}/maxresdefault.jpg`;
const url = `https://img.youtube.com/vi/${id}/hqdefault.jpg`;
let img = new Image();
img.src = url;
img.onload = function () {

2
NUXT/plugins/renderers.js
View File

@ -13,7 +13,7 @@ class rendererUtils {
} else if (base.watchEndpoint) {
return `/watch?v=${base.watchEndpoint.videoId}`;
} else if (base.navigationEndpoint) {
return; //for now
return base.navigationEndpoint.browseEndpoint.canonicalBaseUrl; //for now
} else if (base.searchEndpoint) {
return `/search?q=${encodeURI(base.searchEndpoint.query)}`;
}

2
NUXT/plugins/youtube.js
View File

@ -102,7 +102,7 @@ const innertubeModule = {
getThumbnail(id, resolution, backupThumbnail) {
if (resolution == "max") {
const url = `https://img.youtube.com/vi/${id}/maxresdefault.jpg`;
const url = `https://img.youtube.com/vi/${id}/hqdefault.jpg`;
let img = new Image();
img.src = url;
img.onload = function () {

16
NUXT/store/channel/index.js
View File

@ -6,7 +6,7 @@ const getDefaultState = () => {
banner: null,
title: null,
subscribe: null,
subscribeAlt: null,
subscribeAlt: "",
descriptionPreview: null,
subscribers: null,
videosCount: null,
@ -22,12 +22,18 @@ export const actions = {
Object.assign(state, getDefaultState());
state.loading = true;
console.log(channelUrl);
const channelRequest =
let channelRequest = "";
console.warn(channelUrl);
if (
channelUrl.includes("/c/") ||
channelUrl.includes("/user/") ||
channelUrl.includes("/channel/")
? `https://youtube.com/${channelUrl}`
: `https://youtube.com/channel/${channelUrl}`;
channelUrl.includes("/channel/") ||
channelUrl.includes("/@")
) {
channelRequest = `https://youtube.com/${channelUrl}`;
} else {
channelRequest = `https://youtube.com/channel/${channelUrl}`;
}
this.$youtube
.getChannel(channelRequest)
.then((channel) => {