ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

fix helpers

Browse Source
This commit is contained in:
meow 2022-05-06 06:16:41 +03:00
parent 7dd699370f
commit 835237382f
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
assets/js/_helpers.js
View File

@ -25,7 +25,7 @@ Math.sign = Math.sign || function(x) {
}; };
// Monstrous global variable for handy code // Monstrous global variable for handy code
helpers = helpers || { window.helpers = window.helpers || {
/** /**
* https://en.wikipedia.org/wiki/Clamping_(graphics) * https://en.wikipedia.org/wiki/Clamping_(graphics)
* @param {Number} num Source number * @param {Number} num Source number
@ -38,9 +38,9 @@ helpers = helpers || {
var t = max; max = min; min = t; // swap max and min var t = max; max = min; min = t; // swap max and min
} }
if (max > num) if (max < num)
return max; return max;
if (min < num) if (min > num)
return min; return min;
return num; return num;
}, },
@ -62,14 +62,17 @@ helpers = helpers || {
if (method === 'POST') if (method === 'POST')
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onreadystatechange = function () { // better than onreadystatechange because of 404 codes https://stackoverflow.com/a/36182963
if (xhr.readyState === XMLHttpRequest.DONE) { xhr.onloadend = function () {
if (xhr.status === 200) if (xhr.status === 200) {
if (callbacks.on200) if (callbacks.on200)
callbacks.on200(xhr.response); callbacks.on200(xhr.response);
else } else {
if (callbacks.onNon200) // handled by onerror
callbacks.onNon200(xhr); if (xhr.status === 0) return;
if (callbacks.onNon200)
callbacks.onNon200(xhr);
} }
}; };
@ -89,14 +92,14 @@ helpers = helpers || {
xhr.send(); xhr.send();
}, },
/** @private */ /** @private */
_xhrRetry(method, url, options, callbacks) { _xhrRetry: function(method, url, options, callbacks) {
if (options.retries <= 0) { if (options.retries <= 0) {
console.warn('Failed to pull', options.entity_name); console.warn('Failed to pull', options.entity_name);
if (callbacks.onTotalFail) if (callbacks.onTotalFail)
callbacks.onTotalFail(); callbacks.onTotalFail();
return; return;
} }
helpers.xhr(method, url, options, callbacks); helpers._xhr(method, url, options, callbacks);
}, },
/** /**
* @callback callbackXhrOn200 * @callback callbackXhrOn200
@ -123,18 +126,19 @@ helpers = helpers || {
* @param {callbackXhrError} [callbacks.onError] * @param {callbackXhrError} [callbacks.onError]
* @param {callbackXhrError} [callbacks.onTotalFail] - if failed after all retries * @param {callbackXhrError} [callbacks.onTotalFail] - if failed after all retries
*/ */
xhr(method, url, options, callbacks) { xhr: function(method, url, options, callbacks) {
if (options.retries > 1) { if (!options.retries || options.retries <= 1) {
helpers._xhr(method, url, options, callbacks); helpers._xhr(method, url, options, callbacks);
return; return;
} }
if (!options.entity_name) options.entity_name = 'unknown'; if (!options.entity_name) options.entity_name = 'unknown';
if (!options.retry_timeout) options.retry_timeout = 1; if (!options.retry_timeout) options.retry_timeout = 1000;
const retries_total = options.retries; const retries_total = options.retries;
let currentTry = 1;
const retry = function () { const retry = function () {
console.warn('Pulling ' + options.entity_name + ' failed... ' + options.retries + '/' + retries_total); console.warn('Pulling ' + options.entity_name + ' failed... ' + (currentTry++) + '/' + retries_total);
setTimeout(function () { setTimeout(function () {
options.retries--; options.retries--;
helpers._xhrRetry(method, url, options, callbacks); helpers._xhrRetry(method, url, options, callbacks);