anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2024-11-27 20:03:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Show AZ heading noncritical error

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2018-04-04 21:19:12 +05:00
parent eac777406b
commit 4e7bfd7be6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
View File

@ -106,9 +106,15 @@
'Getting PAC script from provider...', pacUrl, 'Getting PAC script from provider...', pacUrl,
cb cb
); );
const warnings = [];
const originalCb = cb;
cb = (...args) => originalCb(...args, ...warnings);
const addWarning = (wText) => { warnings.push(new Warning(wText)) };
// TODO: dirty hack (labels should be UI related only) // TODO: dirty hack (labels should be UI related only)
if (provider.label === 'Антицензорити') { if (provider.label === 'Антицензорити') {
const azUrl = window.apis.antiCensorRu.pacProviders['Антизапрет'].pacUrls[0]; const azUrl = window.apis.antiCensorRu.pacProviders['Антизапрет'].pacUrls[0] + "ERROR";
console.log('HEADing antizapret...'); console.log('HEADing antizapret...');
let headError = null; let headError = null;
const numberOfTries = 2; const numberOfTries = 2;
@ -125,8 +131,9 @@
); );
} }
if (headError) { if (headError) {
const errText = \`\${azUrl} недоступен!\`; const errText = \`\${azUrl} недоступен! <a href="https://rebrand.ly/ac-contact">Сообщите нам!</a>\`;
console.log(errText); console.log(errText);
addWarning(errText);
/* Do nothing for now like it's not critical. Otherwise uncomment. /* Do nothing for now like it's not critical. Otherwise uncomment.
clarifyThen( clarifyThen(
errText, errText,
@ -143,13 +150,13 @@
const res = {lastModified: lastModifiedStr}; const res = {lastModified: lastModifiedStr};
const ifWasEverModified = lastModifiedStr !== new Date(0).toUTCString(); const ifWasEverModified = lastModifiedStr !== new Date(0).toUTCString();
if (ifWasEverModified) { if (ifWasEverModified) {
return cb(
null, res, addWarning(
new Warning( 'Ваш PAC-скрипт не нуждается в обновлении. Его дата: ' +
'Ваш PAC-скрипт не нуждается в обновлении. Его дата: ' + lastModifiedStr
lastModifiedStr
)
); );
return cb(null, res);
} }
} }
@ -174,7 +181,7 @@
pacData, pacData,
(err, res) => cb( (err, res) => cb(
err, err,
Object.assign(res || {}, {lastModified: newLastModifiedStr}) Object.assign(res || {}, {lastModified: newLastModifiedStr}),
) )
); );
@ -183,7 +190,7 @@
clarifyThen( clarifyThen(
'Не удалось скачать PAC-скрипт с адресов: [ ' 'Не удалось скачать PAC-скрипт с адресов: [ '
+ provider.pacUrls.join(' , ') + ' ].', + provider.pacUrls.join(' , ') + ' ].',
cb cb,
) )
); );