Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-24 11:22:44 +01:00
Code Issues Releases Wiki Activity

adjust lz4 ttl as suggested by @gwarser; cache resources selfie as string

Browse Source
This commit is contained in:
Raymond Hill 2018-08-22 08:13:10 -04:00
parent 9ba78c95b6
commit 58bd6b6974
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/lz4.js
View File

@ -41,10 +41,10 @@ let pendingInitialization;
let textEncoder, textDecoder;
let ttlCount = 0;
let ttlTimer;
const ttlDelay = 60 * 1000;
let ttlDelay = 60000;
let init = function() {
ttlDelay = µBlock.hiddenSettings.autoUpdateAssetFetchPeriod * 1000 + 15000;
if ( lz4CodecInstance === null ) {
return Promise.resolve(null);
}

36
src/js/redirect-engine.js
View File

@ -501,25 +501,25 @@ RedirectEngine.prototype.resourcesFromString = function(text) {
/******************************************************************************/
var resourcesSelfieVersion = 3;
let resourcesSelfieVersion = 3;
RedirectEngine.prototype.selfieFromResources = function() {
µBlock.cacheStorage.set({
resourcesSelfie: {
version: resourcesSelfieVersion,
resources: Array.from(this.resources)
}
});
let selfie = {
version: resourcesSelfieVersion,
resources: Array.from(this.resources)
};
µBlock.cacheStorage.set({ resourcesSelfie: JSON.stringify(selfie) });
};
RedirectEngine.prototype.resourcesFromSelfie = function(callback) {
var me = this;
var onSelfieReady = function(bin) {
if ( bin instanceof Object === false ) {
return callback(false);
µBlock.cacheStorage.get('resourcesSelfie', bin => {
let selfie = bin && bin.resourcesSelfie;
if ( typeof selfie === 'string' ) {
try {
selfie = JSON.parse(selfie);
} catch(ex) {
}
}
var selfie = bin.resourcesSelfie;
if (
selfie instanceof Object === false ||
selfie.version !== resourcesSelfieVersion ||
@ -527,14 +527,12 @@ RedirectEngine.prototype.resourcesFromSelfie = function(callback) {
) {
return callback(false);
}
me.resources = new Map();
for ( var entry of bin.resourcesSelfie.resources ) {
me.resources.set(entry[0], RedirectEntry.fromSelfie(entry[1]));
this.resources = new Map();
for ( let entry of selfie.resources ) {
this.resources.set(entry[0], RedirectEntry.fromSelfie(entry[1]));
}
callback(true);
};
µBlock.cacheStorage.get('resourcesSelfie', onSelfieReady);
});
};
RedirectEngine.prototype.invalidateResourcesSelfie = function() {