kavin/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2025-01-10 11:30:34 +05:30
Code Issues Packages Projects Releases Wiki Activity

fix bugs, rollback event function and readable

Browse Source
This commit is contained in:
bonjinnorenka 2023-09-08 00:46:37 +09:00
parent b1a1e5230d
commit c3ea7fb72c
2 changed files with 119 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/js/embed.js
View File

@ -22,6 +22,8 @@ function get_playlist(plid) {
player.on('ended', function () { player.on('ended', function () {
var url = new URL('https://example.com/embed/' + response.nextVideo); var url = new URL('https://example.com/embed/' + response.nextVideo);
const search_params = new URLSearchParams(location.search);
url.searchParams.set('list', plid); url.searchParams.set('list', plid);
if (!plid.startsWith('RD')) if (!plid.startsWith('RD'))
url.searchParams.set('index', response.index); url.searchParams.set('index', response.index);
@ -33,6 +35,12 @@ function get_playlist(plid) {
url.searchParams.set('speed', video_data.params.speed); url.searchParams.set('speed', video_data.params.speed);
if (video_data.params.local !== video_data.preferences.local) if (video_data.params.local !== video_data.preferences.local)
url.searchParams.set('local', video_data.params.local); url.searchParams.set('local', video_data.params.local);
if (search_params.get('widgetid') !== null)
url.searchParams.set('widgetid', search_params.get('widgetid'));
if (search_params.get('origin') !== null)
url.searchParams.set('origin', search_params.get('origin'));
if (search_params.get('enablejsapi') !== null)
url.searchParams.set('enablejsapi', search_params.get('enablejsapi'));
location.assign(url.pathname + url.search); location.assign(url.pathname + url.search);
}); });

103
assets/js/invidious_iframe_api.js
View File

@ -9,17 +9,41 @@ class invidious_embed {
static videodata_cahce = {}; static videodata_cahce = {};
addEventListener(eventname, func) { addEventListener(eventname, func) {
if (typeof func === 'function') {
if (eventname in invidious_embed.eventname_table) { if (eventname in invidious_embed.eventname_table) {
eventname = invidious_embed.eventname_table[eventname]; this.eventobject[invidious_embed.eventname_table[eventname]].push(func);
} else if (invidious_embed.available_event_name.includes(eventname)) {
this.eventobject[eventname].push(func);
} else {
console.warn('addEventListener cannot find such eventname : ' + eventname);
}
} else {
console.warn("addEventListner secound args must be function");
} }
this.eventElement.addEventListener(eventname,func);
} }
removeEventListener(eventname, func) { removeEventListener(eventname, func) {
if (typeof func === 'function') {
let internal_eventname;
if (eventname in invidious_embed.eventname_table) { if (eventname in invidious_embed.eventname_table) {
eventname = invidious_embed.eventname_table[eventname]; internal_eventname = invidious_embed.eventname_table[eventname];
} else if (invidious_embed.available_event_name.includes(eventname)) {
internal_eventname = eventname;
} else {
console.warn('removeEventListner cannot find such eventname : ' + eventname);
return;
}
this.eventobject[internal_eventname] = this.eventobject[internal_eventname].filter(x => {
const allowFunctionDetected = x.toString()[0] === '(';
if (allowFunctionDetected) {
x.toString() !== func.toString();
} else {
x !== func;
}
});
} else {
console.warn("removeEventListener secound args must be function");
} }
this.eventElement.removeEventListener(eventname,func);
} }
async instance_access_check(instance_origin) { async instance_access_check(instance_origin) {
@ -110,7 +134,6 @@ class invidious_embed {
} }
async Player(element, options) { async Player(element, options) {
this.eventElement = document.createElement("span");
this.player_status = -1; this.player_status = -1;
this.error_code = 0; this.error_code = 0;
this.volume = 100; this.volume = 100;
@ -118,6 +141,7 @@ class invidious_embed {
this.playlistVideoIds = []; this.playlistVideoIds = [];
this.eventobject = { ready: [], ended: [], error: [], ratechange: [], volumechange: [], waiting: [], timeupdate: [], loadedmetadata: [], play: [], seeking: [], seeked: [], playerresize: [], pause: [], statechange: [] }; this.eventobject = { ready: [], ended: [], error: [], ratechange: [], volumechange: [], waiting: [], timeupdate: [], loadedmetadata: [], play: [], seeking: [], seeked: [], playerresize: [], pause: [], statechange: [] };
let replace_elemnt; let replace_elemnt;
this.isPlaylistVideoList = false;
if (element === undefined || element === null) { if (element === undefined || element === null) {
throw 'Please, pass element id or HTMLElement as first argument'; throw 'Please, pass element id or HTMLElement as first argument';
} else if (typeof element === 'string') { } else if (typeof element === 'string') {
@ -176,7 +200,7 @@ class invidious_embed {
} else { } else {
console.warn('player vars key must be string'); console.warn('player vars key must be string');
} }
}) });
if (options.playerVars.start !== undefined) { if (options.playerVars.start !== undefined) {
no_start_parameter = false; no_start_parameter = false;
} }
@ -191,14 +215,19 @@ class invidious_embed {
} }
iframe_src += "?" + search_params.toString(); iframe_src += "?" + search_params.toString();
if (typeof options.events === 'object') { if (typeof options.events === 'object') {
for (let x in options.events) { Object.keys(options.events).forEach(key => {
this.addEventListener(x, options.events[x]); if (typeof options.events[key] === 'function') {
this.addEventListener(key, options.events[key]);
} else {
console.warn('event function must be function');
} }
});
} }
this.player_iframe = document.createElement("iframe"); this.player_iframe = document.createElement("iframe");
this.loaded = false; this.loaded = false;
this.addEventListener('loadedmetadata', () => { this.event_executor('ready'); this.loaded = true; }); this.addEventListener('loadedmetadata', () => { this.event_executor('ready'); this.loaded = true; });
this.addEventListener('loadedmetadata', () => { this.setVolume(this.volume); }); this.addEventListener('loadedmetadata', () => { this.setVolume(this.volume); });
this.addEventListener('ended', () => { if (this.isPlaylistVideoList) { this.nextVideo() } })
this.player_iframe.src = iframe_src; this.player_iframe.src = iframe_src;
if (typeof options.width === 'number') { if (typeof options.width === 'number') {
this.player_iframe.width = options.width; this.player_iframe.width = options.width;
@ -206,8 +235,8 @@ class invidious_embed {
this.player_iframe.width = 640; this.player_iframe.width = 640;
this.player_iframe.style.maxWidth = '100%'; this.player_iframe.style.maxWidth = '100%';
} }
if (typeof options.width === 'number') { if (typeof options.height === 'number') {
this.player_iframe.width = options.width; this.player_iframe.height = options.height;
} else { } else {
this.player_iframe.height = this.player_iframe.width * (9 / 16); this.player_iframe.height = this.player_iframe.width * (9 / 16);
} }
@ -224,13 +253,22 @@ class invidious_embed {
} }
event_executor(eventname) { event_executor(eventname) {
let event_parameter = {detail:undefined}; const execute_functions = this.eventobject[eventname];
if (eventname === 'statechange') { let return_data = { type: eventname, data: null, target: this };
event_parameter.detail = this.getPlayerState(); switch (eventname) {
} else if (eventname === 'error'){ case 'statechange':
event_parameter.detail = this.error_code; return_data.data = this.getPlayerState();
break;
case 'error':
return_data.data = this.error_code;
} }
this.eventElement.dispatchEvent(new Event(eventname,event_parameter)); execute_functions.forEach(func => {
try {
func(return_data);
} catch (e) {
console.error(e);
}
});
} }
receiveMessage(message) { receiveMessage(message) {
@ -415,7 +453,7 @@ class invidious_embed {
} }
} }
if (mediaContetUrl.length > 0) { if (mediaContetUrl.length > 0) {
const match_result = mediaContetUrl.match(/\/([A-Za-z0-9]{11})\//); const match_result = mediaContetUrl.match(/\/([A-Za-z0-9]{11})/);
if (match_result !== null && match_result.length === 2) { if (match_result !== null && match_result.length === 2) {
videoId = match_result[1]; videoId = match_result[1];
} else { } else {
@ -472,29 +510,34 @@ class invidious_embed {
} }
loadVideoById(option, startSeconds) { loadVideoById(option, startSeconds) {
this.isPlaylistVideoList = false;
this.playOtherVideoById(option, true, startSeconds, {}); this.playOtherVideoById(option, true, startSeconds, {});
} }
cueVideoById(option, startSeconds) { cueVideoById(option, startSeconds) {
this.isPlaylistVideoList = false;
this.playOtherVideoById(option, false, startSeconds, {}); this.playOtherVideoById(option, false, startSeconds, {});
} }
cueVideoByUrl(option, startSeconds) { cueVideoByUrl(option, startSeconds) {
this.isPlaylistVideoList = false;
this.playOtherVideoById(option, false, startSeconds, {}); this.playOtherVideoById(option, false, startSeconds, {});
} }
loadVideoByUrl(option, startSeconds) { loadVideoByUrl(option, startSeconds) {
this.isPlaylistVideoList = false;
this.playOtherVideoById(option, true, startSeconds, {}); this.playOtherVideoById(option, true, startSeconds, {});
} }
async playPlaylist(playlistData, autoplay, index, startSeconds) { async playPlaylist(playlistData, autoplay, index, startSeconds) {
let playlistId; let playlistId;
if (typeof playlistData === 'string') { if (typeof playlistData === 'string') {
this.playlistVideoIds = await this.getPlaylistVideoids(playlistData); this.playlistVideoIds = [playlistData];
playlistId = playlistData; this.isPlaylistVideoList = true;
} else if (typeof playlistData === 'object') { } else if (typeof playlistData === 'object') {
if (Array.isArray(playlistData)) { if (Array.isArray(playlistData)) {
this.playlistVideoIds = playlistData; this.playlistVideoIds = playlistData;
this.isPlaylistVideoList = true;
} else { } else {
index = playlistData['index']; index = playlistData['index'];
let listType = 'playlist'; let listType = 'playlist';
@ -503,13 +546,11 @@ class invidious_embed {
} }
switch (listType) { switch (listType) {
case 'playlist': case 'playlist':
if (Array.isArray(playlistData['list'])) { if (typeof playlistData['list'] === 'string') {
this.playlistVideoIds = playlistData['list'];
} else if(typeof playlistData['list'] === 'string') {
this.playlistVideoIds = await this.getPlaylistVideoids(playlistData['list']); this.playlistVideoIds = await this.getPlaylistVideoids(playlistData['list']);
playlistId = playlistData['list']; playlistId = playlistData['list'];
} else { } else {
console.error('playlist data list must be string or array of strings'); console.error('playlist data list must be string');
return; return;
} }
break; break;
@ -521,6 +562,9 @@ class invidious_embed {
return; return;
} }
} }
if (typeof playlistData.startSeconds === 'number') {
startSeconds = playlistData.startSeconds;
}
} else { } else {
console.error('playlist function first argument must be string or array of string'); console.error('playlist function first argument must be string or array of string');
return; return;
@ -541,6 +585,11 @@ class invidious_embed {
parameter['list'] = playlistId; parameter['list'] = playlistId;
this.playlistId = playlistId; this.playlistId = playlistId;
} }
this.sub_index = parameter.index;
if (index >= this.playlistVideoIds.length) {
index = 0;
parameter.index = 0;
}
this.playOtherVideoById(this.playlistVideoIds[index], autoplay, startSeconds, parameter); this.playOtherVideoById(this.playlistVideoIds[index], autoplay, startSeconds, parameter);
} }
@ -566,6 +615,9 @@ class invidious_embed {
async nextVideo() { async nextVideo() {
let now_index = this.promise_send_event('getplaylistindex'); let now_index = this.promise_send_event('getplaylistindex');
if (now_index === null) {
now_index = this.sub_index;
}
if (now_index === this.playlistVideoIds.length - 1) { if (now_index === this.playlistVideoIds.length - 1) {
if (this.loop) { if (this.loop) {
now_index = 0; now_index = 0;
@ -576,6 +628,7 @@ class invidious_embed {
} else { } else {
now_index++; now_index++;
} }
this.sub_index = now_index;
let parameter = { index: now_index }; let parameter = { index: now_index };
if (this.playlistId !== undefined) { if (this.playlistId !== undefined) {
parameter['list'] = this.playlistId; parameter['list'] = this.playlistId;
@ -585,6 +638,9 @@ class invidious_embed {
async previousVideo() { async previousVideo() {
let now_index = this.promise_send_event('getplaylistindex'); let now_index = this.promise_send_event('getplaylistindex');
if (now_index === null) {
now_index = this.sub_index;
}
if (now_index === 0) { if (now_index === 0) {
if (this.loop) { if (this.loop) {
now_index = this.playlistVideoIds.length - 1; now_index = this.playlistVideoIds.length - 1;
@ -595,6 +651,7 @@ class invidious_embed {
} else { } else {
now_index--; now_index--;
} }
this.sub_index = now_index;
let parameter = { index: now_index }; let parameter = { index: now_index };
if (this.playlistId !== undefined) { if (this.playlistId !== undefined) {
parameter['list'] = this.playlistId; parameter['list'] = this.playlistId;