2014-06-24 00:42:43 +02:00
|
|
|
/*******************************************************************************
|
|
|
|
|
2016-04-02 02:58:35 +02:00
|
|
|
uBlock Origin - a browser extension to block requests.
|
2018-07-26 00:04:53 +02:00
|
|
|
Copyright (C) 2014-present Raymond Hill
|
2014-06-24 00:42:43 +02:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
|
|
|
|
|
|
Home: https://github.com/gorhill/uBlock
|
|
|
|
*/
|
|
|
|
|
2016-10-28 14:40:38 +02:00
|
|
|
'use strict';
|
|
|
|
|
2014-06-24 00:42:43 +02:00
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
µBlock.assets = (function() {
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-13 18:30:54 +01:00
|
|
|
const reIsExternalPath = /^(?:[a-z-]+):\/\//,
|
2017-01-18 19:17:47 +01:00
|
|
|
reIsUserAsset = /^user-/,
|
2017-01-23 16:13:07 +01:00
|
|
|
errorCantConnectTo = vAPI.i18n('errorCantConnectTo'),
|
|
|
|
noopfunc = function(){};
|
2014-09-08 23:46:58 +02:00
|
|
|
|
2018-12-13 18:30:54 +01:00
|
|
|
const api = {};
|
2014-08-20 02:41:52 +02:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
var observers = [];
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.addObserver = function(observer) {
|
|
|
|
if ( observers.indexOf(observer) === -1 ) {
|
|
|
|
observers.push(observer);
|
|
|
|
}
|
2014-12-20 21:28:16 +01:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.removeObserver = function(observer) {
|
|
|
|
var pos;
|
|
|
|
while ( (pos = observers.indexOf(observer)) !== -1 ) {
|
|
|
|
observers.splice(pos, 1);
|
|
|
|
}
|
2014-12-20 21:28:16 +01:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
var fireNotification = function(topic, details) {
|
2017-12-28 19:49:02 +01:00
|
|
|
var result, r;
|
2017-01-18 19:17:47 +01:00
|
|
|
for ( var i = 0; i < observers.length; i++ ) {
|
2017-12-28 19:49:02 +01:00
|
|
|
r = observers[i](topic, details);
|
|
|
|
if ( r !== undefined ) { result = r; }
|
2016-04-02 02:58:35 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
return result;
|
2016-04-02 02:58:35 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2017-03-05 18:54:47 +01:00
|
|
|
api.fetchText = function(url, onLoad, onError) {
|
2018-12-13 18:30:54 +01:00
|
|
|
const isExternal = reIsExternalPath.test(url);
|
|
|
|
let actualUrl = isExternal ? url : vAPI.getURL(url);
|
2017-05-08 17:49:48 +02:00
|
|
|
|
|
|
|
// https://github.com/gorhill/uBlock/issues/2592
|
2019-04-20 23:16:49 +02:00
|
|
|
// Force browser cache to be bypassed, but only for resources which have
|
|
|
|
// been fetched more than one hour ago.
|
2017-05-08 17:49:48 +02:00
|
|
|
if ( isExternal ) {
|
2019-04-20 23:16:49 +02:00
|
|
|
const queryValue = `_=${Math.floor(Date.now() / 3600000) % 12}`;
|
2017-05-08 17:49:48 +02:00
|
|
|
if ( actualUrl.indexOf('?') === -1 ) {
|
2017-05-08 18:12:56 +02:00
|
|
|
actualUrl += '?';
|
2017-05-08 17:49:48 +02:00
|
|
|
} else {
|
2017-05-08 18:12:56 +02:00
|
|
|
actualUrl += '&';
|
2017-05-08 17:49:48 +02:00
|
|
|
}
|
2017-05-08 18:12:56 +02:00
|
|
|
actualUrl += queryValue;
|
2017-05-08 17:49:48 +02:00
|
|
|
}
|
2015-02-24 21:35:32 +01:00
|
|
|
|
2015-10-14 16:28:37 +02:00
|
|
|
if ( typeof onError !== 'function' ) {
|
|
|
|
onError = onLoad;
|
|
|
|
}
|
|
|
|
|
2019-04-21 12:12:20 +02:00
|
|
|
return new Promise(resolve => {
|
2019-04-20 23:16:49 +02:00
|
|
|
// Start of executor
|
|
|
|
|
2018-12-13 18:30:54 +01:00
|
|
|
const timeoutAfter = µBlock.hiddenSettings.assetFetchTimeout * 1000 || 30000;
|
|
|
|
const xhr = new XMLHttpRequest();
|
|
|
|
let contentLoaded = 0;
|
|
|
|
let timeoutTimer;
|
2017-04-23 15:00:15 +02:00
|
|
|
|
2018-12-13 18:30:54 +01:00
|
|
|
const cleanup = function() {
|
2017-04-23 15:00:15 +02:00
|
|
|
xhr.removeEventListener('load', onLoadEvent);
|
|
|
|
xhr.removeEventListener('error', onErrorEvent);
|
|
|
|
xhr.removeEventListener('abort', onErrorEvent);
|
|
|
|
xhr.removeEventListener('progress', onProgressEvent);
|
|
|
|
if ( timeoutTimer !== undefined ) {
|
|
|
|
clearTimeout(timeoutTimer);
|
|
|
|
timeoutTimer = undefined;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-04-20 23:16:49 +02:00
|
|
|
const onResolve = function(details) {
|
|
|
|
if ( onLoad instanceof Function ) {
|
2019-04-21 12:12:20 +02:00
|
|
|
return onLoad(details);
|
2019-04-20 23:16:49 +02:00
|
|
|
}
|
|
|
|
resolve(details);
|
|
|
|
};
|
|
|
|
|
|
|
|
const onReject = function(details) {
|
|
|
|
if ( onError instanceof Function ) {
|
2019-04-21 12:12:20 +02:00
|
|
|
return onError(details);
|
2019-04-20 23:16:49 +02:00
|
|
|
}
|
2019-04-21 12:12:20 +02:00
|
|
|
resolve(details);
|
2019-04-20 23:16:49 +02:00
|
|
|
};
|
|
|
|
|
2014-10-26 15:19:38 +01:00
|
|
|
// https://github.com/gorhill/uMatrix/issues/15
|
2018-12-13 18:30:54 +01:00
|
|
|
const onLoadEvent = function() {
|
2017-04-23 15:00:15 +02:00
|
|
|
cleanup();
|
2015-02-24 00:31:29 +01:00
|
|
|
// xhr for local files gives status 0, but actually succeeds
|
2018-12-13 18:30:54 +01:00
|
|
|
const details = {
|
|
|
|
url,
|
2017-03-05 18:54:47 +01:00
|
|
|
content: '',
|
|
|
|
statusCode: this.status || 200,
|
|
|
|
statusText: this.statusText || ''
|
|
|
|
};
|
|
|
|
if ( details.statusCode < 200 || details.statusCode >= 300 ) {
|
2019-04-20 23:16:49 +02:00
|
|
|
return onReject(details);
|
2015-02-15 13:16:31 +01:00
|
|
|
}
|
2015-02-24 00:31:29 +01:00
|
|
|
// consider an empty result to be an error
|
|
|
|
if ( stringIsNotEmpty(this.responseText) === false ) {
|
2019-04-20 23:16:49 +02:00
|
|
|
return onReject(details);
|
2015-02-15 13:16:31 +01:00
|
|
|
}
|
|
|
|
// we never download anything else than plain text: discard if response
|
2015-02-24 00:31:29 +01:00
|
|
|
// appears to be a HTML document: could happen when server serves
|
2015-02-15 13:16:31 +01:00
|
|
|
// some kind of error page I suppose
|
2018-12-13 18:30:54 +01:00
|
|
|
const text = this.responseText.trim();
|
2015-12-15 16:40:40 +01:00
|
|
|
if ( text.startsWith('<') && text.endsWith('>') ) {
|
2019-04-20 23:16:49 +02:00
|
|
|
return onReject(details);
|
2014-10-26 15:19:38 +01:00
|
|
|
}
|
2017-03-05 18:54:47 +01:00
|
|
|
details.content = this.responseText;
|
2019-04-20 23:16:49 +02:00
|
|
|
onResolve(details);
|
2014-10-26 15:19:38 +01:00
|
|
|
};
|
2015-02-24 21:35:32 +01:00
|
|
|
|
2018-12-13 18:30:54 +01:00
|
|
|
const onErrorEvent = function() {
|
2017-04-23 15:00:15 +02:00
|
|
|
cleanup();
|
2018-12-13 18:30:54 +01:00
|
|
|
µBlock.logger.writeOne({
|
2019-01-12 22:36:20 +01:00
|
|
|
realm: 'message',
|
|
|
|
type: 'error',
|
|
|
|
text: errorCantConnectTo.replace('{{msg}}', actualUrl)
|
2018-12-13 18:30:54 +01:00
|
|
|
});
|
2019-04-20 23:16:49 +02:00
|
|
|
onReject({ url, content: '' });
|
2017-04-23 15:00:15 +02:00
|
|
|
};
|
|
|
|
|
2018-12-13 18:30:54 +01:00
|
|
|
const onTimeout = function() {
|
2017-04-23 15:00:15 +02:00
|
|
|
xhr.abort();
|
|
|
|
};
|
|
|
|
|
|
|
|
// https://github.com/gorhill/uBlock/issues/2526
|
|
|
|
// - Timeout only when there is no progress.
|
2018-12-13 18:30:54 +01:00
|
|
|
const onProgressEvent = function(ev) {
|
2017-04-23 15:00:15 +02:00
|
|
|
if ( ev.loaded === contentLoaded ) { return; }
|
|
|
|
contentLoaded = ev.loaded;
|
|
|
|
if ( timeoutTimer !== undefined ) {
|
|
|
|
clearTimeout(timeoutTimer);
|
|
|
|
}
|
|
|
|
timeoutTimer = vAPI.setTimeout(onTimeout, timeoutAfter);
|
2015-02-24 00:31:29 +01:00
|
|
|
};
|
2015-02-24 21:35:32 +01:00
|
|
|
|
|
|
|
// Be ready for thrown exceptions:
|
|
|
|
// I am pretty sure it used to work, but now using a URL such as
|
|
|
|
// `file:///` on Chromium 40 results in an exception being thrown.
|
2015-02-24 00:31:29 +01:00
|
|
|
try {
|
2017-03-05 18:54:47 +01:00
|
|
|
xhr.open('get', actualUrl, true);
|
2017-04-23 15:00:15 +02:00
|
|
|
xhr.addEventListener('load', onLoadEvent);
|
|
|
|
xhr.addEventListener('error', onErrorEvent);
|
|
|
|
xhr.addEventListener('abort', onErrorEvent);
|
|
|
|
xhr.addEventListener('progress', onProgressEvent);
|
2015-02-24 00:31:29 +01:00
|
|
|
xhr.responseType = 'text';
|
|
|
|
xhr.send();
|
2017-04-23 15:00:15 +02:00
|
|
|
timeoutTimer = vAPI.setTimeout(onTimeout, timeoutAfter);
|
2015-02-24 00:31:29 +01:00
|
|
|
} catch (e) {
|
2017-04-23 15:00:15 +02:00
|
|
|
onErrorEvent.call(xhr);
|
2015-02-24 00:31:29 +01:00
|
|
|
}
|
2019-04-20 23:16:49 +02:00
|
|
|
|
|
|
|
// End of executor
|
|
|
|
});
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
|
|
|
|
2017-12-15 13:39:21 +01:00
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
// https://github.com/gorhill/uBlock/issues/3331
|
|
|
|
// Support the seamless loading of sublists.
|
|
|
|
|
|
|
|
api.fetchFilterList = function(mainlistURL, onLoad, onError) {
|
2018-12-05 21:57:41 +01:00
|
|
|
const content = [];
|
|
|
|
const pendingSublistURLs = new Set([ mainlistURL ]);
|
|
|
|
const loadedSublistURLs = new Set();
|
|
|
|
const toParsedURL = api.fetchFilterList.toParsedURL;
|
2019-01-29 17:52:16 +01:00
|
|
|
|
|
|
|
// https://github.com/NanoAdblocker/NanoCore/issues/239
|
|
|
|
// Anything under URL's root directory is allowed to be fetched. The
|
|
|
|
// URL of a sublist will always be relative to the URL of the parent
|
|
|
|
// list (instead of the URL of the root list).
|
|
|
|
const rootDirectoryURL = toParsedURL(mainlistURL);
|
|
|
|
if ( rootDirectoryURL !== undefined ) {
|
|
|
|
const pos = rootDirectoryURL.pathname.lastIndexOf('/');
|
|
|
|
if ( pos !== -1 ) {
|
|
|
|
rootDirectoryURL.pathname =
|
|
|
|
rootDirectoryURL.pathname.slice(0, pos + 1);
|
|
|
|
}
|
|
|
|
}
|
2018-12-05 21:57:41 +01:00
|
|
|
|
|
|
|
let errored = false;
|
|
|
|
|
|
|
|
const processIncludeDirectives = function(details) {
|
|
|
|
const reInclude = /^!#include +(\S+)/gm;
|
|
|
|
const out = [];
|
|
|
|
const content = details.content;
|
|
|
|
let lastIndex = 0;
|
2018-04-05 13:29:15 +02:00
|
|
|
for (;;) {
|
2018-12-05 21:57:41 +01:00
|
|
|
const match = reInclude.exec(content);
|
2018-04-05 13:29:15 +02:00
|
|
|
if ( match === null ) { break; }
|
|
|
|
if ( toParsedURL(match[1]) !== undefined ) { continue; }
|
|
|
|
if ( match[1].indexOf('..') !== -1 ) { continue; }
|
2019-01-29 17:52:16 +01:00
|
|
|
const subURL = toParsedURL(details.url);
|
|
|
|
subURL.pathname = subURL.pathname.replace(/[^/]+$/, match[1]);
|
|
|
|
if ( subURL.href.startsWith(rootDirectoryURL.href) === false ) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ( pendingSublistURLs.has(subURL.href) ) { continue; }
|
|
|
|
if ( loadedSublistURLs.has(subURL.href) ) { continue; }
|
|
|
|
pendingSublistURLs.add(subURL.href);
|
|
|
|
api.fetchText(subURL.href, onLocalLoadSuccess, onLocalLoadError);
|
|
|
|
out.push(content.slice(lastIndex, match.index).trim(), subURL.href);
|
2018-12-05 21:57:41 +01:00
|
|
|
lastIndex = reInclude.lastIndex;
|
2018-04-05 13:29:15 +02:00
|
|
|
}
|
2018-12-05 21:57:41 +01:00
|
|
|
out.push(lastIndex === 0 ? content : content.slice(lastIndex).trim());
|
|
|
|
return out;
|
2018-04-05 13:29:15 +02:00
|
|
|
};
|
2017-12-15 13:39:21 +01:00
|
|
|
|
2018-12-05 21:57:41 +01:00
|
|
|
const onLocalLoadSuccess = function(details) {
|
2017-12-15 13:39:21 +01:00
|
|
|
if ( errored ) { return; }
|
|
|
|
|
2018-12-05 21:57:41 +01:00
|
|
|
const isSublist = details.url !== mainlistURL;
|
2017-12-15 13:39:21 +01:00
|
|
|
|
|
|
|
pendingSublistURLs.delete(details.url);
|
|
|
|
loadedSublistURLs.add(details.url);
|
2018-12-05 21:57:41 +01:00
|
|
|
|
|
|
|
// https://github.com/uBlockOrigin/uBlock-issues/issues/329
|
|
|
|
// Insert fetched content at position of related #!include directive
|
|
|
|
let slot = isSublist ? content.indexOf(details.url) : 0;
|
|
|
|
if ( isSublist ) {
|
|
|
|
content.splice(
|
|
|
|
slot,
|
|
|
|
1,
|
|
|
|
'! >>>>>>>> ' + details.url,
|
|
|
|
details.content.trim(),
|
|
|
|
'! <<<<<<<< ' + details.url
|
|
|
|
);
|
|
|
|
slot += 1;
|
|
|
|
} else {
|
|
|
|
content[0] = details.content.trim();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find and process #!include directives
|
2019-01-29 17:52:16 +01:00
|
|
|
if (
|
|
|
|
rootDirectoryURL !== undefined &&
|
|
|
|
rootDirectoryURL.pathname.length > 0
|
|
|
|
) {
|
2018-12-05 21:57:41 +01:00
|
|
|
const processed = processIncludeDirectives(details);
|
|
|
|
if ( processed.length > 1 ) {
|
|
|
|
content.splice(slot, 1, ...processed);
|
|
|
|
}
|
2017-12-15 13:39:21 +01:00
|
|
|
}
|
|
|
|
|
2018-03-18 18:56:20 +01:00
|
|
|
if ( pendingSublistURLs.size !== 0 ) { return; }
|
2017-12-15 13:39:21 +01:00
|
|
|
|
|
|
|
details.url = mainlistURL;
|
|
|
|
details.content = content.join('\n').trim();
|
|
|
|
onLoad(details);
|
|
|
|
};
|
|
|
|
|
2018-07-06 15:50:41 +02:00
|
|
|
// https://github.com/AdguardTeam/FiltersRegistry/issues/82
|
|
|
|
// Not checking for `errored` status was causing repeated notifications
|
2018-07-06 16:47:51 +02:00
|
|
|
// to the caller. This can happen when more than one out of multiple
|
2018-07-06 15:50:41 +02:00
|
|
|
// sublists can't be fetched.
|
2018-12-05 21:57:41 +01:00
|
|
|
const onLocalLoadError = function(details) {
|
2018-07-06 15:50:41 +02:00
|
|
|
if ( errored ) { return; }
|
|
|
|
|
2017-12-15 13:39:21 +01:00
|
|
|
errored = true;
|
|
|
|
details.url = mainlistURL;
|
|
|
|
details.content = '';
|
|
|
|
onError(details);
|
|
|
|
};
|
|
|
|
|
|
|
|
this.fetchText(mainlistURL, onLocalLoadSuccess, onLocalLoadError);
|
|
|
|
};
|
|
|
|
|
2017-12-15 15:24:06 +01:00
|
|
|
api.fetchFilterList.toParsedURL = function(url) {
|
|
|
|
try {
|
|
|
|
return new URL(url);
|
|
|
|
} catch (ex) {
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
/*******************************************************************************
|
2014-07-22 18:26:11 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
The purpose of the asset source registry is to keep key detail information
|
|
|
|
about an asset:
|
|
|
|
- Where to load it from: this may consist of one or more URLs, either local
|
|
|
|
or remote.
|
|
|
|
- After how many days an asset should be deemed obsolete -- i.e. in need of
|
|
|
|
an update.
|
|
|
|
- The origin and type of an asset.
|
|
|
|
- The last time an asset was registered.
|
|
|
|
|
|
|
|
**/
|
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
let assetSourceRegistryPromise,
|
2017-01-18 19:17:47 +01:00
|
|
|
assetSourceRegistry = Object.create(null);
|
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const registerAssetSource = function(assetKey, dict) {
|
|
|
|
const entry = assetSourceRegistry[assetKey] || {};
|
|
|
|
for ( const prop in dict ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( dict.hasOwnProperty(prop) === false ) { continue; }
|
|
|
|
if ( dict[prop] === undefined ) {
|
|
|
|
delete entry[prop];
|
|
|
|
} else {
|
|
|
|
entry[prop] = dict[prop];
|
|
|
|
}
|
2015-01-16 16:57:56 +01:00
|
|
|
}
|
2018-12-07 22:51:18 +01:00
|
|
|
let contentURL = dict.contentURL;
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( contentURL !== undefined ) {
|
|
|
|
if ( typeof contentURL === 'string' ) {
|
|
|
|
contentURL = entry.contentURL = [ contentURL ];
|
|
|
|
} else if ( Array.isArray(contentURL) === false ) {
|
|
|
|
contentURL = entry.contentURL = [];
|
|
|
|
}
|
2018-12-07 22:51:18 +01:00
|
|
|
let remoteURLCount = 0;
|
|
|
|
for ( let i = 0; i < contentURL.length; i++ ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( reIsExternalPath.test(contentURL[i]) ) {
|
|
|
|
remoteURLCount += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
entry.hasLocalURL = remoteURLCount !== contentURL.length;
|
|
|
|
entry.hasRemoteURL = remoteURLCount !== 0;
|
|
|
|
} else if ( entry.contentURL === undefined ) {
|
|
|
|
entry.contentURL = [];
|
2014-12-20 21:28:16 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( typeof entry.updateAfter !== 'number' ) {
|
|
|
|
entry.updateAfter = 5;
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( entry.submitter ) {
|
|
|
|
entry.submitTime = Date.now(); // To detect stale entries
|
2014-06-24 00:42:43 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
assetSourceRegistry[assetKey] = entry;
|
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const unregisterAssetSource = function(assetKey) {
|
2017-01-18 19:17:47 +01:00
|
|
|
assetCacheRemove(assetKey);
|
|
|
|
delete assetSourceRegistry[assetKey];
|
|
|
|
};
|
2014-07-22 18:26:11 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const saveAssetSourceRegistry = (function() {
|
|
|
|
let timer;
|
|
|
|
const save = function() {
|
2017-01-18 19:17:47 +01:00
|
|
|
timer = undefined;
|
2018-08-11 16:39:43 +02:00
|
|
|
µBlock.cacheStorage.set({ assetSourceRegistry: assetSourceRegistry });
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
2017-01-18 19:17:47 +01:00
|
|
|
return function(lazily) {
|
|
|
|
if ( timer !== undefined ) {
|
|
|
|
clearTimeout(timer);
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( lazily ) {
|
|
|
|
timer = vAPI.setTimeout(save, 500);
|
|
|
|
} else {
|
|
|
|
save();
|
2015-08-25 16:09:37 +02:00
|
|
|
}
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
2017-01-18 19:17:47 +01:00
|
|
|
})();
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const updateAssetSourceRegistry = function(json, silent) {
|
|
|
|
let newDict;
|
2017-01-18 19:17:47 +01:00
|
|
|
try {
|
|
|
|
newDict = JSON.parse(json);
|
|
|
|
} catch (ex) {
|
|
|
|
}
|
|
|
|
if ( newDict instanceof Object === false ) { return; }
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const oldDict = assetSourceRegistry;
|
2017-01-26 16:17:38 +01:00
|
|
|
|
|
|
|
// Remove obsolete entries (only those which were built-in).
|
2018-12-07 22:51:18 +01:00
|
|
|
for ( const assetKey in oldDict ) {
|
2017-01-26 16:17:38 +01:00
|
|
|
if (
|
|
|
|
newDict[assetKey] === undefined &&
|
|
|
|
oldDict[assetKey].submitter === undefined
|
|
|
|
) {
|
|
|
|
unregisterAssetSource(assetKey);
|
2014-07-22 18:26:11 +02:00
|
|
|
}
|
2017-01-26 16:17:38 +01:00
|
|
|
}
|
|
|
|
// Add/update existing entries. Notify of new asset sources.
|
2018-12-07 22:51:18 +01:00
|
|
|
for ( const assetKey in newDict ) {
|
2017-01-26 16:17:38 +01:00
|
|
|
if ( oldDict[assetKey] === undefined && !silent ) {
|
|
|
|
fireNotification(
|
|
|
|
'builtin-asset-source-added',
|
|
|
|
{ assetKey: assetKey, entry: newDict[assetKey] }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
registerAssetSource(assetKey, newDict[assetKey]);
|
|
|
|
}
|
|
|
|
saveAssetSourceRegistry();
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const getAssetSourceRegistry = function(callback) {
|
|
|
|
if ( assetSourceRegistryPromise === undefined ) {
|
2019-02-17 21:40:09 +01:00
|
|
|
assetSourceRegistryPromise = µBlock.cacheStorage.get(
|
|
|
|
'assetSourceRegistry'
|
|
|
|
).then(bin => {
|
2018-12-07 22:51:18 +01:00
|
|
|
if (
|
2019-02-17 21:40:09 +01:00
|
|
|
bin instanceof Object &&
|
|
|
|
bin.assetSourceRegistry instanceof Object
|
2018-12-07 22:51:18 +01:00
|
|
|
) {
|
2019-02-17 21:40:09 +01:00
|
|
|
assetSourceRegistry = bin.assetSourceRegistry;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
return new Promise(resolve => {
|
2018-12-07 22:51:18 +01:00
|
|
|
api.fetchText(
|
|
|
|
µBlock.assetsBootstrapLocation || 'assets/assets.json',
|
|
|
|
details => {
|
|
|
|
updateAssetSourceRegistry(details.content, true);
|
|
|
|
resolve();
|
|
|
|
}
|
|
|
|
);
|
2019-02-17 21:40:09 +01:00
|
|
|
});
|
2018-12-07 22:51:18 +01:00
|
|
|
});
|
|
|
|
}
|
2014-09-05 22:15:42 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
assetSourceRegistryPromise.then(( ) => {
|
|
|
|
callback(assetSourceRegistry);
|
2017-01-18 19:17:47 +01:00
|
|
|
});
|
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.registerAssetSource = function(assetKey, details) {
|
|
|
|
getAssetSourceRegistry(function() {
|
|
|
|
registerAssetSource(assetKey, details);
|
|
|
|
saveAssetSourceRegistry(true);
|
|
|
|
});
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.unregisterAssetSource = function(assetKey) {
|
|
|
|
getAssetSourceRegistry(function() {
|
|
|
|
unregisterAssetSource(assetKey);
|
|
|
|
saveAssetSourceRegistry(true);
|
|
|
|
});
|
|
|
|
};
|
2014-08-20 15:24:16 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
The purpose of the asset cache registry is to keep track of all assets
|
|
|
|
which have been persisted into the local cache.
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
**/
|
2014-07-25 22:12:20 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const assetCacheRegistryStartTime = Date.now();
|
|
|
|
let assetCacheRegistryPromise;
|
|
|
|
let assetCacheRegistry = {};
|
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
const getAssetCacheRegistry = function() {
|
2018-12-07 22:51:18 +01:00
|
|
|
if ( assetCacheRegistryPromise === undefined ) {
|
2019-02-17 21:40:09 +01:00
|
|
|
assetCacheRegistryPromise = µBlock.cacheStorage.get(
|
|
|
|
'assetCacheRegistry'
|
|
|
|
).then(bin => {
|
|
|
|
if (
|
|
|
|
bin instanceof Object &&
|
|
|
|
bin.assetCacheRegistry instanceof Object
|
|
|
|
) {
|
|
|
|
assetCacheRegistry = bin.assetCacheRegistry;
|
|
|
|
}
|
2018-12-07 22:51:18 +01:00
|
|
|
});
|
2017-01-18 19:17:47 +01:00
|
|
|
}
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
return assetCacheRegistryPromise.then(( ) => assetCacheRegistry);
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const saveAssetCacheRegistry = (function() {
|
|
|
|
let timer;
|
|
|
|
const save = function() {
|
2017-01-18 19:17:47 +01:00
|
|
|
timer = undefined;
|
2018-12-07 22:51:18 +01:00
|
|
|
µBlock.cacheStorage.set({ assetCacheRegistry });
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
|
|
|
return function(lazily) {
|
|
|
|
if ( timer !== undefined ) { clearTimeout(timer); }
|
|
|
|
if ( lazily ) {
|
|
|
|
timer = vAPI.setTimeout(save, 500);
|
|
|
|
} else {
|
|
|
|
save();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
})();
|
2014-07-25 22:12:20 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const assetCacheRead = function(assetKey, callback) {
|
|
|
|
const internalKey = 'cache/' + assetKey;
|
2014-07-25 22:12:20 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const reportBack = function(content) {
|
2018-08-06 18:34:41 +02:00
|
|
|
if ( content instanceof Blob ) { content = ''; }
|
2018-07-26 00:04:53 +02:00
|
|
|
let details = { assetKey: assetKey, content: content };
|
2018-08-06 18:34:41 +02:00
|
|
|
if ( content === '' ) { details.error = 'E_NOTFOUND'; }
|
2014-08-20 02:41:52 +02:00
|
|
|
callback(details);
|
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const onAssetRead = function(bin) {
|
2018-07-26 00:04:53 +02:00
|
|
|
if (
|
|
|
|
bin instanceof Object === false ||
|
2018-08-06 18:34:41 +02:00
|
|
|
bin.hasOwnProperty(internalKey) === false
|
2018-07-26 00:04:53 +02:00
|
|
|
) {
|
2018-08-06 18:34:41 +02:00
|
|
|
return reportBack('');
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2018-07-26 00:04:53 +02:00
|
|
|
let entry = assetCacheRegistry[assetKey];
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( entry === undefined ) {
|
2018-08-06 18:34:41 +02:00
|
|
|
return reportBack('');
|
2017-01-18 19:17:47 +01:00
|
|
|
}
|
|
|
|
entry.readTime = Date.now();
|
|
|
|
saveAssetCacheRegistry(true);
|
2018-08-11 16:39:43 +02:00
|
|
|
reportBack(bin[internalKey]);
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2019-02-17 21:40:09 +01:00
|
|
|
Promise.all([
|
|
|
|
getAssetCacheRegistry(),
|
|
|
|
µBlock.cacheStorage.get(internalKey),
|
|
|
|
]).then(results => {
|
|
|
|
onAssetRead(results[1]);
|
2019-02-14 19:33:55 +01:00
|
|
|
});
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const assetCacheWrite = function(assetKey, details, callback) {
|
2018-08-06 18:34:41 +02:00
|
|
|
let internalKey = 'cache/' + assetKey;
|
|
|
|
let content = '';
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( typeof details === 'string' ) {
|
|
|
|
content = details;
|
|
|
|
} else if ( details instanceof Object ) {
|
|
|
|
content = details.content || '';
|
|
|
|
}
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( content === '' ) {
|
|
|
|
return assetCacheRemove(assetKey, callback);
|
|
|
|
}
|
2014-08-20 02:41:52 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const onReady = function() {
|
2018-08-06 18:34:41 +02:00
|
|
|
let entry = assetCacheRegistry[assetKey];
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( entry === undefined ) {
|
|
|
|
entry = assetCacheRegistry[assetKey] = {};
|
|
|
|
}
|
|
|
|
entry.writeTime = entry.readTime = Date.now();
|
|
|
|
if ( details instanceof Object && typeof details.url === 'string' ) {
|
|
|
|
entry.remoteURL = details.url;
|
|
|
|
}
|
2019-03-23 02:09:27 +01:00
|
|
|
µBlock.cacheStorage.set({ assetCacheRegistry, [internalKey]: content });
|
2018-12-07 22:51:18 +01:00
|
|
|
const result = { assetKey, content };
|
2018-10-25 01:02:15 +02:00
|
|
|
if ( typeof callback === 'function' ) {
|
|
|
|
callback(result);
|
|
|
|
}
|
2018-10-25 16:10:21 +02:00
|
|
|
// https://github.com/uBlockOrigin/uBlock-issues/issues/248
|
2018-10-25 01:02:15 +02:00
|
|
|
fireNotification('after-asset-updated', result);
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
2019-02-14 19:33:55 +01:00
|
|
|
|
2019-02-17 21:40:09 +01:00
|
|
|
getAssetCacheRegistry().then(( ) => onReady());
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const assetCacheRemove = function(pattern, callback) {
|
2019-02-14 19:33:55 +01:00
|
|
|
getAssetCacheRegistry().then(cacheDict => {
|
|
|
|
const removedEntries = [];
|
|
|
|
const removedContent = [];
|
2018-12-07 22:51:18 +01:00
|
|
|
for ( const assetKey in cacheDict ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( pattern instanceof RegExp && !pattern.test(assetKey) ) {
|
|
|
|
continue;
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( typeof pattern === 'string' && assetKey !== pattern ) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
removedEntries.push(assetKey);
|
|
|
|
removedContent.push('cache/' + assetKey);
|
|
|
|
delete cacheDict[assetKey];
|
2014-07-20 21:00:26 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( removedContent.length !== 0 ) {
|
2018-08-11 16:39:43 +02:00
|
|
|
µBlock.cacheStorage.remove(removedContent);
|
2018-12-07 22:51:18 +01:00
|
|
|
µBlock.cacheStorage.set({ assetCacheRegistry });
|
2017-01-18 19:17:47 +01:00
|
|
|
}
|
|
|
|
if ( typeof callback === 'function' ) {
|
|
|
|
callback();
|
|
|
|
}
|
2018-12-07 22:51:18 +01:00
|
|
|
for ( let i = 0; i < removedEntries.length; i++ ) {
|
|
|
|
fireNotification(
|
|
|
|
'after-asset-updated',
|
|
|
|
{ assetKey: removedEntries[i] }
|
|
|
|
);
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2019-02-14 19:33:55 +01:00
|
|
|
});
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const assetCacheMarkAsDirty = function(pattern, exclude, callback) {
|
2019-02-14 19:33:55 +01:00
|
|
|
if ( typeof exclude === 'function' ) {
|
|
|
|
callback = exclude;
|
|
|
|
exclude = undefined;
|
|
|
|
}
|
|
|
|
getAssetCacheRegistry().then(cacheDict => {
|
2018-12-07 22:51:18 +01:00
|
|
|
let mustSave = false;
|
|
|
|
for ( const assetKey in cacheDict ) {
|
2017-01-23 15:35:05 +01:00
|
|
|
if ( pattern instanceof RegExp ) {
|
|
|
|
if ( pattern.test(assetKey) === false ) { continue; }
|
|
|
|
} else if ( typeof pattern === 'string' ) {
|
|
|
|
if ( assetKey !== pattern ) { continue; }
|
|
|
|
} else if ( Array.isArray(pattern) ) {
|
|
|
|
if ( pattern.indexOf(assetKey) === -1 ) { continue; }
|
2014-08-26 06:19:52 +02:00
|
|
|
}
|
2017-01-23 15:35:05 +01:00
|
|
|
if ( exclude instanceof RegExp ) {
|
|
|
|
if ( exclude.test(assetKey) ) { continue; }
|
|
|
|
} else if ( typeof exclude === 'string' ) {
|
|
|
|
if ( assetKey === exclude ) { continue; }
|
|
|
|
} else if ( Array.isArray(exclude) ) {
|
|
|
|
if ( exclude.indexOf(assetKey) !== -1 ) { continue; }
|
2017-01-18 19:17:47 +01:00
|
|
|
}
|
2018-12-07 22:51:18 +01:00
|
|
|
const cacheEntry = cacheDict[assetKey];
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( !cacheEntry.writeTime ) { continue; }
|
|
|
|
cacheDict[assetKey].writeTime = 0;
|
|
|
|
mustSave = true;
|
2014-08-21 01:39:49 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( mustSave ) {
|
2018-12-07 22:51:18 +01:00
|
|
|
µBlock.cacheStorage.set({ assetCacheRegistry });
|
2017-01-18 19:17:47 +01:00
|
|
|
}
|
|
|
|
if ( typeof callback === 'function' ) {
|
|
|
|
callback();
|
2014-07-20 21:00:26 +02:00
|
|
|
}
|
2019-02-14 19:33:55 +01:00
|
|
|
});
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
2014-08-20 02:41:52 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
/******************************************************************************/
|
2014-08-20 02:41:52 +02:00
|
|
|
|
2018-12-07 22:51:18 +01:00
|
|
|
const stringIsNotEmpty = function(s) {
|
2017-01-18 19:17:47 +01:00
|
|
|
return typeof s === 'string' && s !== '';
|
|
|
|
};
|
|
|
|
|
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
User assets are NOT persisted in the cache storage. User assets are
|
|
|
|
recognized by the asset key which always starts with 'user-'.
|
|
|
|
|
|
|
|
TODO(seamless migration):
|
|
|
|
Can remove instances of old user asset keys when I am confident all users
|
|
|
|
are using uBO v1.11 and beyond.
|
|
|
|
|
|
|
|
**/
|
2014-08-20 02:41:52 +02:00
|
|
|
|
2019-03-06 14:59:13 +01:00
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
User assets are NOT persisted in the cache storage. User assets are
|
|
|
|
recognized by the asset key which always starts with 'user-'.
|
|
|
|
|
|
|
|
**/
|
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
const readUserAsset = function(assetKey, callback) {
|
|
|
|
const reportBack = function(content) {
|
2019-03-06 14:59:13 +01:00
|
|
|
callback({ assetKey, content });
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
2019-03-06 14:59:13 +01:00
|
|
|
vAPI.storage.get(assetKey, bin => {
|
|
|
|
const content =
|
|
|
|
bin instanceof Object && typeof bin[assetKey] === 'string'
|
|
|
|
? bin[assetKey]
|
|
|
|
: '';
|
2017-01-18 19:17:47 +01:00
|
|
|
return reportBack(content);
|
2019-03-06 14:59:13 +01:00
|
|
|
});
|
|
|
|
// Remove obsolete entry
|
|
|
|
// TODO: remove once everybody is well beyond 1.18.6
|
|
|
|
vAPI.storage.remove('assets/user/filters.txt');
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
const saveUserAsset = function(assetKey, content, callback) {
|
2019-03-06 14:59:13 +01:00
|
|
|
vAPI.storage.set({ [assetKey]: content }, ( ) => {
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( callback instanceof Function ) {
|
2019-03-06 14:59:13 +01:00
|
|
|
callback({ assetKey, content });
|
2017-01-18 19:17:47 +01:00
|
|
|
}
|
2019-03-06 14:59:13 +01:00
|
|
|
});
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
2014-08-20 02:41:52 +02:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2017-01-23 16:13:07 +01:00
|
|
|
api.get = function(assetKey, options, callback) {
|
|
|
|
if ( typeof options === 'function' ) {
|
|
|
|
callback = options;
|
|
|
|
options = {};
|
|
|
|
} else if ( typeof callback !== 'function' ) {
|
|
|
|
callback = noopfunc;
|
|
|
|
}
|
2019-05-23 15:55:54 +02:00
|
|
|
// This can happen if the method was called as a thenable.
|
|
|
|
if ( options instanceof Object === false ) {
|
|
|
|
options = {};
|
|
|
|
}
|
2017-01-23 16:13:07 +01:00
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
return new Promise(resolve => {
|
|
|
|
// start of executor
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( assetKey === µBlock.userFiltersPath ) {
|
2019-02-14 19:33:55 +01:00
|
|
|
readUserAsset(assetKey, details => {
|
|
|
|
callback(details);
|
|
|
|
resolve(details);
|
|
|
|
});
|
2017-01-18 19:17:47 +01:00
|
|
|
return;
|
|
|
|
}
|
2014-08-20 02:41:52 +02:00
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
let assetDetails = {},
|
2017-01-18 19:17:47 +01:00
|
|
|
contentURLs,
|
|
|
|
contentURL;
|
2014-08-20 02:41:52 +02:00
|
|
|
|
2019-05-24 01:29:59 +02:00
|
|
|
const reportBack = (content, err) => {
|
|
|
|
const details = { assetKey, content };
|
2014-08-20 02:41:52 +02:00
|
|
|
if ( err ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
details.error = assetDetails.lastError = err;
|
|
|
|
} else {
|
|
|
|
assetDetails.lastError = undefined;
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2019-05-24 01:29:59 +02:00
|
|
|
if ( options.needSourceURL ) {
|
|
|
|
if (
|
|
|
|
contentURL === undefined &&
|
|
|
|
assetCacheRegistry instanceof Object &&
|
|
|
|
assetCacheRegistry[assetKey] instanceof Object
|
|
|
|
) {
|
|
|
|
details.sourceURL = assetCacheRegistry[assetKey].remoteURL;
|
|
|
|
}
|
|
|
|
if ( reIsExternalPath.test(contentURL) ) {
|
|
|
|
details.sourceURL = contentURL;
|
|
|
|
}
|
|
|
|
}
|
2014-08-20 02:41:52 +02:00
|
|
|
callback(details);
|
2019-02-14 19:33:55 +01:00
|
|
|
resolve(details);
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2019-05-24 01:29:59 +02:00
|
|
|
const onContentNotLoaded = ( ) => {
|
2019-02-14 19:33:55 +01:00
|
|
|
let isExternal;
|
2017-01-18 19:17:47 +01:00
|
|
|
while ( (contentURL = contentURLs.shift()) ) {
|
|
|
|
isExternal = reIsExternalPath.test(contentURL);
|
|
|
|
if ( isExternal === false || assetDetails.hasLocalURL !== true ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( !contentURL ) {
|
|
|
|
return reportBack('', 'E_NOTFOUND');
|
|
|
|
}
|
2017-12-15 13:39:21 +01:00
|
|
|
if ( assetDetails.content === 'filters' ) {
|
|
|
|
api.fetchFilterList(contentURL, onContentLoaded, onContentNotLoaded);
|
|
|
|
} else {
|
|
|
|
api.fetchText(contentURL, onContentLoaded, onContentNotLoaded);
|
|
|
|
}
|
2014-07-20 21:00:26 +02:00
|
|
|
};
|
|
|
|
|
2019-05-24 01:29:59 +02:00
|
|
|
const onContentLoaded = details => {
|
2017-03-05 18:54:47 +01:00
|
|
|
if ( stringIsNotEmpty(details.content) === false ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
onContentNotLoaded();
|
|
|
|
return;
|
|
|
|
}
|
2017-01-23 16:13:07 +01:00
|
|
|
if ( reIsExternalPath.test(contentURL) && options.dontCache !== true ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
assetCacheWrite(assetKey, {
|
2017-03-05 18:54:47 +01:00
|
|
|
content: details.content,
|
2017-01-18 19:17:47 +01:00
|
|
|
url: contentURL
|
|
|
|
});
|
|
|
|
}
|
2017-03-05 18:54:47 +01:00
|
|
|
reportBack(details.content);
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2019-05-24 01:29:59 +02:00
|
|
|
const onCachedContentLoaded = details => {
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( details.content !== '' ) {
|
|
|
|
return reportBack(details.content);
|
|
|
|
}
|
|
|
|
getAssetSourceRegistry(function(registry) {
|
|
|
|
assetDetails = registry[assetKey] || {};
|
|
|
|
if ( typeof assetDetails.contentURL === 'string' ) {
|
|
|
|
contentURLs = [ assetDetails.contentURL ];
|
|
|
|
} else if ( Array.isArray(assetDetails.contentURL) ) {
|
|
|
|
contentURLs = assetDetails.contentURL.slice(0);
|
|
|
|
} else {
|
|
|
|
contentURLs = [];
|
|
|
|
}
|
|
|
|
onContentNotLoaded();
|
|
|
|
});
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
assetCacheRead(assetKey, onCachedContentLoaded);
|
2019-02-14 19:33:55 +01:00
|
|
|
// end of executor
|
|
|
|
});
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
const getRemote = function(assetKey, callback) {
|
2017-01-18 19:17:47 +01:00
|
|
|
var assetDetails = {},
|
|
|
|
contentURLs,
|
|
|
|
contentURL;
|
2014-08-20 02:41:52 +02:00
|
|
|
|
|
|
|
var reportBack = function(content, err) {
|
2017-01-18 19:17:47 +01:00
|
|
|
var details = { assetKey: assetKey, content: content };
|
2014-08-20 02:41:52 +02:00
|
|
|
if ( err ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
details.error = assetDetails.lastError = err;
|
|
|
|
} else {
|
|
|
|
assetDetails.lastError = undefined;
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
|
|
|
callback(details);
|
|
|
|
};
|
|
|
|
|
2017-03-05 18:54:47 +01:00
|
|
|
var onRemoteContentLoaded = function(details) {
|
|
|
|
if ( stringIsNotEmpty(details.content) === false ) {
|
2017-01-18 19:17:47 +01:00
|
|
|
registerAssetSource(assetKey, { error: { time: Date.now(), error: 'No content' } });
|
|
|
|
tryLoading();
|
2015-02-06 18:20:30 +01:00
|
|
|
return;
|
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
assetCacheWrite(assetKey, {
|
2017-03-05 18:54:47 +01:00
|
|
|
content: details.content,
|
2017-01-18 19:17:47 +01:00
|
|
|
url: contentURL
|
|
|
|
});
|
|
|
|
registerAssetSource(assetKey, { error: undefined });
|
2017-03-05 18:54:47 +01:00
|
|
|
reportBack(details.content);
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2017-03-05 18:54:47 +01:00
|
|
|
var onRemoteContentError = function(details) {
|
|
|
|
var text = details.statusText;
|
|
|
|
if ( details.statusCode === 0 ) {
|
2017-01-22 22:05:16 +01:00
|
|
|
text = 'network error';
|
|
|
|
}
|
|
|
|
registerAssetSource(assetKey, { error: { time: Date.now(), error: text } });
|
2017-01-18 19:17:47 +01:00
|
|
|
tryLoading();
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
var tryLoading = function() {
|
|
|
|
while ( (contentURL = contentURLs.shift()) ) {
|
|
|
|
if ( reIsExternalPath.test(contentURL) ) { break; }
|
2014-07-20 21:00:26 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( !contentURL ) {
|
|
|
|
return reportBack('', 'E_NOTFOUND');
|
2016-10-29 16:28:50 +02:00
|
|
|
}
|
2017-12-15 13:39:21 +01:00
|
|
|
if ( assetDetails.content === 'filters' ) {
|
|
|
|
api.fetchFilterList(contentURL, onRemoteContentLoaded, onRemoteContentError);
|
|
|
|
} else {
|
|
|
|
api.fetchText(contentURL, onRemoteContentLoaded, onRemoteContentError);
|
|
|
|
}
|
2016-10-29 16:28:50 +02:00
|
|
|
};
|
2015-02-24 00:31:29 +01:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
getAssetSourceRegistry(function(registry) {
|
|
|
|
assetDetails = registry[assetKey] || {};
|
|
|
|
if ( typeof assetDetails.contentURL === 'string' ) {
|
|
|
|
contentURLs = [ assetDetails.contentURL ];
|
|
|
|
} else if ( Array.isArray(assetDetails.contentURL) ) {
|
|
|
|
contentURLs = assetDetails.contentURL.slice(0);
|
|
|
|
} else {
|
|
|
|
contentURLs = [];
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
tryLoading();
|
|
|
|
});
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
|
|
|
|
2014-08-21 01:39:49 +02:00
|
|
|
/******************************************************************************/
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.put = function(assetKey, content, callback) {
|
2019-02-14 19:33:55 +01:00
|
|
|
return new Promise(resolve => {
|
|
|
|
const onDone = function(details) {
|
|
|
|
if ( typeof callback === 'function' ) {
|
|
|
|
callback(details);
|
|
|
|
}
|
|
|
|
resolve(details);
|
|
|
|
};
|
|
|
|
if ( reIsUserAsset.test(assetKey) ) {
|
|
|
|
saveUserAsset(assetKey, content, onDone);
|
|
|
|
} else {
|
|
|
|
assetCacheWrite(assetKey, content, onDone);
|
|
|
|
}
|
|
|
|
});
|
2015-08-18 19:15:58 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.metadata = function(callback) {
|
2019-05-24 01:29:59 +02:00
|
|
|
let assetRegistryReady = false,
|
2017-01-18 19:17:47 +01:00
|
|
|
cacheRegistryReady = false;
|
2014-08-27 15:37:08 +02:00
|
|
|
|
2019-05-24 01:29:59 +02:00
|
|
|
const onReady = function() {
|
|
|
|
const assetDict = JSON.parse(JSON.stringify(assetSourceRegistry));
|
|
|
|
const cacheDict = assetCacheRegistry;
|
|
|
|
const now = Date.now();
|
|
|
|
for ( const assetKey in assetDict ) {
|
|
|
|
const assetEntry = assetDict[assetKey];
|
|
|
|
const cacheEntry = cacheDict[assetKey];
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( cacheEntry ) {
|
|
|
|
assetEntry.cached = true;
|
|
|
|
assetEntry.writeTime = cacheEntry.writeTime;
|
2019-05-24 01:29:59 +02:00
|
|
|
const obsoleteAfter =
|
|
|
|
cacheEntry.writeTime + assetEntry.updateAfter * 86400000;
|
2017-01-18 19:17:47 +01:00
|
|
|
assetEntry.obsolete = obsoleteAfter < now;
|
|
|
|
assetEntry.remoteURL = cacheEntry.remoteURL;
|
2018-03-04 21:00:42 +01:00
|
|
|
} else if (
|
|
|
|
assetEntry.contentURL &&
|
|
|
|
assetEntry.contentURL.length !== 0
|
|
|
|
) {
|
2017-01-18 19:17:47 +01:00
|
|
|
assetEntry.writeTime = 0;
|
|
|
|
assetEntry.obsolete = true;
|
2014-08-20 02:41:52 +02:00
|
|
|
}
|
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
callback(assetDict);
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
|
|
|
|
2019-05-24 01:29:59 +02:00
|
|
|
getAssetSourceRegistry(( ) => {
|
2017-01-18 19:17:47 +01:00
|
|
|
assetRegistryReady = true;
|
|
|
|
if ( cacheRegistryReady ) { onReady(); }
|
|
|
|
});
|
2014-06-24 00:42:43 +02:00
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
getAssetCacheRegistry().then(( ) => {
|
2017-01-26 16:17:38 +01:00
|
|
|
cacheRegistryReady = true;
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( assetRegistryReady ) { onReady(); }
|
|
|
|
});
|
2014-08-20 02:41:52 +02:00
|
|
|
};
|
2014-06-24 00:42:43 +02:00
|
|
|
|
|
|
|
/******************************************************************************/
|
2019-02-14 19:33:55 +01:00
|
|
|
|
2017-01-23 15:35:05 +01:00
|
|
|
api.purge = assetCacheMarkAsDirty;
|
2014-08-25 02:52:34 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.remove = function(pattern, callback) {
|
|
|
|
assetCacheRemove(pattern, callback);
|
2015-10-14 20:16:43 +02:00
|
|
|
};
|
2015-10-14 16:28:37 +02:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.rmrf = function() {
|
|
|
|
assetCacheRemove(/./);
|
2014-06-24 00:42:43 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
// Asset updater area.
|
2019-05-20 00:31:12 +02:00
|
|
|
const updaterAssetDelayDefault = 120000;
|
|
|
|
const updaterUpdated = [];
|
|
|
|
const updaterFetched = new Set();
|
|
|
|
|
|
|
|
let updaterStatus,
|
2017-01-18 19:17:47 +01:00
|
|
|
updaterTimer,
|
|
|
|
updaterAssetDelay = updaterAssetDelayDefault,
|
2017-09-29 14:22:17 +02:00
|
|
|
noRemoteResources;
|
2015-02-24 00:31:29 +01:00
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
const updateFirst = function() {
|
2018-03-11 15:38:35 +01:00
|
|
|
// https://github.com/gorhill/uBlock/commit/126110c9a0a0630cd556f5cb215422296a961029
|
|
|
|
// Firefox extension reviewers do not want uBO/webext to fetch its own
|
|
|
|
// scriptlets/resources asset from the project's own repo (github.com).
|
|
|
|
// https://github.com/uBlockOrigin/uAssets/issues/1647#issuecomment-371456830
|
|
|
|
// Allow self-hosted dev build to update: if update_url is present but
|
|
|
|
// null, assume the extension is hosted on AMO.
|
2017-09-29 14:22:17 +02:00
|
|
|
if ( noRemoteResources === undefined ) {
|
|
|
|
noRemoteResources =
|
2018-04-05 13:29:15 +02:00
|
|
|
vAPI.webextFlavor.soup.has('firefox') &&
|
2018-04-14 12:09:36 +02:00
|
|
|
vAPI.webextFlavor.soup.has('webext') &&
|
|
|
|
vAPI.webextFlavor.soup.has('devbuild') === false;
|
2017-09-29 14:22:17 +02:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
updaterStatus = 'updating';
|
|
|
|
updaterFetched.clear();
|
2019-05-20 00:31:12 +02:00
|
|
|
updaterUpdated.length = 0;
|
2017-01-18 19:17:47 +01:00
|
|
|
fireNotification('before-assets-updated');
|
|
|
|
updateNext();
|
2015-02-13 18:10:10 +01:00
|
|
|
};
|
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
const updateNext = function() {
|
|
|
|
let assetDict, cacheDict;
|
2015-03-11 04:46:18 +01:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
// This will remove a cached asset when it's no longer in use.
|
2019-05-20 00:31:12 +02:00
|
|
|
const garbageCollectOne = function(assetKey) {
|
|
|
|
const cacheEntry = cacheDict[assetKey];
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( cacheEntry && cacheEntry.readTime < assetCacheRegistryStartTime ) {
|
|
|
|
assetCacheRemove(assetKey);
|
2015-02-13 18:10:10 +01:00
|
|
|
}
|
2015-03-11 16:05:13 +01:00
|
|
|
};
|
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
const findOne = function() {
|
|
|
|
const now = Date.now();
|
|
|
|
for ( const assetKey in assetDict ) {
|
|
|
|
const assetEntry = assetDict[assetKey];
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( assetEntry.hasRemoteURL !== true ) { continue; }
|
|
|
|
if ( updaterFetched.has(assetKey) ) { continue; }
|
2019-05-20 00:31:12 +02:00
|
|
|
const cacheEntry = cacheDict[assetKey];
|
|
|
|
if (
|
|
|
|
cacheEntry &&
|
|
|
|
(cacheEntry.writeTime + assetEntry.updateAfter * 86400000) > now
|
|
|
|
) {
|
2015-03-11 16:05:13 +01:00
|
|
|
continue;
|
|
|
|
}
|
remove ability to pull latest version of resources.txt from remote repo.
This is required as per Firefox extension reviewers. Mail exchange:
========
Reviewer:
> Do I read the code correctly that you are executing remote JS by
> downloading/updating from
> https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resources.txt
> and injecting scripts in contentscripts.js?
Me:
> Yes, resources.txt contains scriptlets or other resources used to:
>
> - Minimize potential page breakage (e.g. google-analytics.com/ga.js);
> - Defuse anti-blockers (e.g. bab-defuser.js);
> - Defuse anti-blockers or minimize page breakage through redirection
> (e.g. 2x2-transparent.png)
>
> This is not a new feature -- this is also part of the legacy version,
> and I consider this is a major feature of uBO. Given how fast things can
> change out there, this allows me to quickly push fixes when a new issue
> is reported for a site without having to go through a full update of the
> extension.
Reviewer:
> I am aware that this is not a new feature. I am unclear why it has been
> allowed in the past, since it violates our policy about remote code
> execution. I assume it was missed due to the fairly complex codebase.
>
> I can approve this version so you are not blocked on the migration, but
> eventually, you cannot use functionality that executes remote code.
> Since we're moving to a more automated review process, you will be able
> to ship new versions without being blocked on a human review.
Me:
> Do I understand correctly that extensions such as TamperMonkey or
> ViolentMonkey won't be allowed on AMO?
>
> Those extensions are even more permissive than uBO given a user can
> import scripts from any source, while with uBO only scriptlets which are
> part of the project are allowed.
Reviewer:
> The key difference between add-ons like Tampermonkey and uBO is that in
> Tampermonkey, users are making an active and conscious decision to
> download and execute that specific code. In uBO, the user did not
> initiate that download/execution, nor are they even aware of it
> happening.
Me:
> So users of TamperMonkey -- tech-savvy or not -- can download & inject
> countless 3rd-party user scripts from countless authors, have them
> update on their own automatically at regular interval with no user
> intervention.
>
> On the other hand, it's not acceptable for me, the author of the
> extension, who users implicitly trusted when installing the extension,
> who is completely controlling and vouching for the content of
> "resources.txt", to have this one 1st-party resource file[1] to be
> updated at regular interval with no user intervention.
>
> So anyways, what is expected from me at this point? Do I need to remove
> scriptlet injection and resource redirection features? Do I need to
> remove only the updating part of resources.txt?
>
> [1] key to core features of uBO (counter anti-blockers + page breakage
> mitigations) and possibly an important factor in installing the
> extension.
========
Now about this commit: the purpose of the code change here is to
prevent "resources.txt" -- which is part of the package -- from being
updated -- this applies only to the Firefox webext[-hybrid] version
of uBO.
2017-08-30 15:15:06 +02:00
|
|
|
// Update of user scripts/resources forbidden?
|
2017-09-29 14:22:17 +02:00
|
|
|
if ( assetKey === 'ublock-resources' && noRemoteResources ) {
|
remove ability to pull latest version of resources.txt from remote repo.
This is required as per Firefox extension reviewers. Mail exchange:
========
Reviewer:
> Do I read the code correctly that you are executing remote JS by
> downloading/updating from
> https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resources.txt
> and injecting scripts in contentscripts.js?
Me:
> Yes, resources.txt contains scriptlets or other resources used to:
>
> - Minimize potential page breakage (e.g. google-analytics.com/ga.js);
> - Defuse anti-blockers (e.g. bab-defuser.js);
> - Defuse anti-blockers or minimize page breakage through redirection
> (e.g. 2x2-transparent.png)
>
> This is not a new feature -- this is also part of the legacy version,
> and I consider this is a major feature of uBO. Given how fast things can
> change out there, this allows me to quickly push fixes when a new issue
> is reported for a site without having to go through a full update of the
> extension.
Reviewer:
> I am aware that this is not a new feature. I am unclear why it has been
> allowed in the past, since it violates our policy about remote code
> execution. I assume it was missed due to the fairly complex codebase.
>
> I can approve this version so you are not blocked on the migration, but
> eventually, you cannot use functionality that executes remote code.
> Since we're moving to a more automated review process, you will be able
> to ship new versions without being blocked on a human review.
Me:
> Do I understand correctly that extensions such as TamperMonkey or
> ViolentMonkey won't be allowed on AMO?
>
> Those extensions are even more permissive than uBO given a user can
> import scripts from any source, while with uBO only scriptlets which are
> part of the project are allowed.
Reviewer:
> The key difference between add-ons like Tampermonkey and uBO is that in
> Tampermonkey, users are making an active and conscious decision to
> download and execute that specific code. In uBO, the user did not
> initiate that download/execution, nor are they even aware of it
> happening.
Me:
> So users of TamperMonkey -- tech-savvy or not -- can download & inject
> countless 3rd-party user scripts from countless authors, have them
> update on their own automatically at regular interval with no user
> intervention.
>
> On the other hand, it's not acceptable for me, the author of the
> extension, who users implicitly trusted when installing the extension,
> who is completely controlling and vouching for the content of
> "resources.txt", to have this one 1st-party resource file[1] to be
> updated at regular interval with no user intervention.
>
> So anyways, what is expected from me at this point? Do I need to remove
> scriptlet injection and resource redirection features? Do I need to
> remove only the updating part of resources.txt?
>
> [1] key to core features of uBO (counter anti-blockers + page breakage
> mitigations) and possibly an important factor in installing the
> extension.
========
Now about this commit: the purpose of the code change here is to
prevent "resources.txt" -- which is part of the package -- from being
updated -- this applies only to the Firefox webext[-hybrid] version
of uBO.
2017-08-30 15:15:06 +02:00
|
|
|
continue;
|
|
|
|
}
|
2017-05-08 20:00:41 +02:00
|
|
|
if (
|
|
|
|
fireNotification(
|
|
|
|
'before-asset-updated',
|
|
|
|
{ assetKey: assetKey, type: assetEntry.content }
|
2017-12-28 19:49:02 +01:00
|
|
|
) === true
|
2017-05-08 20:00:41 +02:00
|
|
|
) {
|
2017-01-18 19:17:47 +01:00
|
|
|
return assetKey;
|
2015-03-11 16:05:13 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
garbageCollectOne(assetKey);
|
2015-03-11 16:05:13 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
const updatedOne = function(details) {
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( details.content !== '' ) {
|
|
|
|
updaterUpdated.push(details.assetKey);
|
|
|
|
if ( details.assetKey === 'assets.json' ) {
|
|
|
|
updateAssetSourceRegistry(details.content);
|
|
|
|
}
|
2017-01-22 22:05:16 +01:00
|
|
|
} else {
|
|
|
|
fireNotification('asset-update-failed', { assetKey: details.assetKey });
|
2015-02-13 18:10:10 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( findOne() !== undefined ) {
|
|
|
|
vAPI.setTimeout(updateNext, updaterAssetDelay);
|
|
|
|
} else {
|
|
|
|
updateDone();
|
2015-02-13 18:10:10 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
};
|
2015-03-11 04:46:18 +01:00
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
const updateOne = function() {
|
|
|
|
const assetKey = findOne();
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( assetKey === undefined ) {
|
|
|
|
return updateDone();
|
|
|
|
}
|
|
|
|
updaterFetched.add(assetKey);
|
|
|
|
getRemote(assetKey, updatedOne);
|
|
|
|
};
|
2015-03-11 04:46:18 +01:00
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
getAssetSourceRegistry(function(dict) {
|
|
|
|
assetDict = dict;
|
|
|
|
if ( !cacheDict ) { return; }
|
|
|
|
updateOne();
|
2015-03-11 04:46:18 +01:00
|
|
|
});
|
|
|
|
|
2019-02-14 19:33:55 +01:00
|
|
|
getAssetCacheRegistry().then(dict => {
|
2017-01-18 19:17:47 +01:00
|
|
|
cacheDict = dict;
|
|
|
|
if ( !assetDict ) { return; }
|
|
|
|
updateOne();
|
|
|
|
});
|
2015-03-11 04:46:18 +01:00
|
|
|
};
|
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
const updateDone = function() {
|
|
|
|
const assetKeys = updaterUpdated.slice(0);
|
2017-01-18 19:17:47 +01:00
|
|
|
updaterFetched.clear();
|
2019-05-20 00:31:12 +02:00
|
|
|
updaterUpdated.length = 0;
|
2017-01-18 19:17:47 +01:00
|
|
|
updaterStatus = undefined;
|
|
|
|
updaterAssetDelay = updaterAssetDelayDefault;
|
|
|
|
fireNotification('after-assets-updated', { assetKeys: assetKeys });
|
2015-03-11 16:05:13 +01:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.updateStart = function(details) {
|
2019-05-20 00:31:12 +02:00
|
|
|
const oldUpdateDelay = updaterAssetDelay;
|
|
|
|
const newUpdateDelay = typeof details.delay === 'number' ?
|
|
|
|
details.delay :
|
|
|
|
updaterAssetDelayDefault;
|
2017-01-18 19:17:47 +01:00
|
|
|
updaterAssetDelay = Math.min(oldUpdateDelay, newUpdateDelay);
|
|
|
|
if ( updaterStatus !== undefined ) {
|
|
|
|
if ( newUpdateDelay < oldUpdateDelay ) {
|
|
|
|
clearTimeout(updaterTimer);
|
|
|
|
updaterTimer = vAPI.setTimeout(updateNext, updaterAssetDelay);
|
2015-02-13 18:10:10 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
return;
|
2015-02-13 18:10:10 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
updateFirst();
|
2015-02-13 18:10:10 +01:00
|
|
|
};
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
api.updateStop = function() {
|
|
|
|
if ( updaterTimer ) {
|
|
|
|
clearTimeout(updaterTimer);
|
|
|
|
updaterTimer = undefined;
|
2015-02-24 00:31:29 +01:00
|
|
|
}
|
2017-01-18 19:17:47 +01:00
|
|
|
if ( updaterStatus !== undefined ) {
|
|
|
|
updateDone();
|
2015-02-13 18:10:10 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-05-20 00:31:12 +02:00
|
|
|
api.isUpdating = function() {
|
|
|
|
return updaterStatus === 'updating' &&
|
|
|
|
updaterAssetDelay <= µBlock.hiddenSettings.manualUpdateAssetFetchPeriod;
|
|
|
|
};
|
|
|
|
|
2014-08-20 02:41:52 +02:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2017-01-18 19:17:47 +01:00
|
|
|
return api;
|
2015-06-23 17:37:44 +02:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2014-06-24 00:42:43 +02:00
|
|
|
})();
|
|
|
|
|
|
|
|
/******************************************************************************/
|